diff --git a/src/solid/devices/backends/fstab/fstabhandling.cpp b/src/solid/devices/backends/fstab/fstabhandling.cpp
index d4a0283..1f89c25 100644
--- a/src/solid/devices/backends/fstab/fstabhandling.cpp
+++ b/src/solid/devices/backends/fstab/fstabhandling.cpp
@@ -1,355 +1,355 @@
 /*
     Copyright 2006-2010 Kevin Ottens <ervin@kde.org>
     Copyright 2010 Mario Bensi <mbensi@ipsquad.net>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 of the License, or (at your option) version 3, or any
     later version accepted by the membership of KDE e.V. (or its
     successor approved by the membership of KDE e.V.), which shall
     act as a proxy defined in Section 6 of version 3 of the license.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "fstabhandling.h"
 
 #include <QFile>
 #include <QObject>
 #include <QProcess>
 #include <QTextStream>
+#include <QThreadStorage>
 
 #include <solid/devices/soliddefs_p.h>
 
 #include <solid/config-solid.h>
 #include <stdlib.h>
 
 #if HAVE_SYS_MNTTAB_H
 #include <sys/mnttab.h>
 #endif
 #if HAVE_MNTENT_H
 #include <mntent.h>
 #elif defined(HAVE_SYS_MNTENT_H)
 #include <sys/mntent.h>
 #endif
 
 // This is the *BSD branch
 #if HAVE_SYS_MOUNT_H
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #include <sys/mount.h>
-#include <QThreadStorage>
 #endif
 
 #ifdef Q_OS_SOLARIS
 #define FSTAB "/etc/vfstab"
 #else
 #define FSTAB "/etc/fstab"
 #endif
 
 #if ! HAVE_GETMNTINFO
 # ifdef _PATH_MOUNTED
 // On some Linux, MNTTAB points to /etc/fstab !
 #  undef MNTTAB
 #  define MNTTAB _PATH_MOUNTED
 # else
 #  ifndef MNTTAB
 #   ifdef MTAB_FILE
 #    define MNTTAB MTAB_FILE
 #   else
 #    define MNTTAB "/etc/mnttab"
 #   endif
 #  endif
 # endif
 #endif
 
 // There are (at least) four kind of APIs:
 // setmntent + getmntent + struct mntent (linux...)
 //             getmntent + struct mnttab
 // getmntinfo + struct statfs&flags (BSD 4.4 and friends)
 // getfsent + char* (BSD 4.3 and friends)
 
 #if HAVE_SETMNTENT
 #define SETMNTENT setmntent
 #define ENDMNTENT endmntent
 #define STRUCT_MNTENT struct mntent *
 #define STRUCT_SETMNTENT FILE *
 #define GETMNTENT(file, var) ((var = getmntent(file)) != nullptr)
 #define MOUNTPOINT(var) var->mnt_dir
 #define MOUNTTYPE(var) var->mnt_type
 #define MOUNTOPTIONS(var) var->mnt_opts
 #define FSNAME(var) var->mnt_fsname
 #else
 #define SETMNTENT fopen
 #define ENDMNTENT fclose
 #define STRUCT_MNTENT struct mnttab
 #define STRUCT_SETMNTENT FILE *
 #define GETMNTENT(file, var) (getmntent(file, &var) == nullptr)
 #define MOUNTPOINT(var) var.mnt_mountp
 #define MOUNTTYPE(var) var.mnt_fstype
 #define MOUNTOPTIONS(var) var.mnt_mntopts
 #define FSNAME(var) var.mnt_special
 #endif
 
 Q_GLOBAL_STATIC(QThreadStorage<Solid::Backends::Fstab::FstabHandling>, globalFstabCache)
 
 Solid::Backends::Fstab::FstabHandling::FstabHandling()
     : m_fstabCacheValid(false),
       m_mtabCacheValid(false)
 { }
 
 bool _k_isFstabNetworkFileSystem(const QString &fstype, const QString &devName)
 {
     if (fstype == "nfs"
             || fstype == "nfs4"
             || fstype == "smbfs"
             || fstype == "cifs"
             || devName.startsWith(QLatin1String("//"))) {
         return true;
     }
     return false;
 }
 
 bool _k_isFstabSupportedLocalFileSystem(const QString &fstype)
 {
     if (fstype == "fuse.encfs" ||
         fstype == "fuse.cryfs" ||
         fstype == "overlay") {
         return true;
     }
     return false;
 }
 
 QString _k_deviceNameForMountpoint(const QString &source, const QString &fstype,
                                    const QString &mountpoint)
 {
     if (fstype.startsWith("fuse.") ||
         fstype == QLatin1String("overlay")) {
             return fstype + mountpoint;
     }
     return source;
 }
 
 void Solid::Backends::Fstab::FstabHandling::_k_updateFstabMountPointsCache()
 {
     if (globalFstabCache->localData().m_fstabCacheValid) {
         return;
     }
 
     globalFstabCache->localData().m_fstabCache.clear();
     globalFstabCache->localData().m_fstabOptionsCache.clear();
 
 #if HAVE_SETMNTENT
 
     FILE *fstab;
     if ((fstab = setmntent(FSTAB, "r")) == nullptr) {
         return;
     }
 
     struct mntent *fe;
     while ((fe = getmntent(fstab)) != nullptr) {
         const QString fsname = QFile::decodeName(fe->mnt_fsname);
         const QString fstype = QFile::decodeName(fe->mnt_type);
         if (_k_isFstabNetworkFileSystem(fstype, fsname) ||
             _k_isFstabSupportedLocalFileSystem(fstype)) {
             const QString mountpoint = QFile::decodeName(fe->mnt_dir);
             const QString device = _k_deviceNameForMountpoint(fsname, fstype, mountpoint);
             QStringList options = QFile::decodeName(fe->mnt_opts).split(QLatin1Char(','));
 
             globalFstabCache->localData().m_fstabCache.insert(device, mountpoint);
             globalFstabCache->localData().m_fstabFstypeCache.insert(device, fstype);
             while (!options.isEmpty()) {
                 globalFstabCache->localData().m_fstabOptionsCache.insert(device, options.takeFirst());
             }
         }
     }
 
     endmntent(fstab);
 
 #else
 
     QFile fstab(FSTAB);
     if (!fstab.open(QIODevice::ReadOnly)) {
         return;
     }
 
     QTextStream stream(&fstab);
     QString line;
 
     while (!stream.atEnd()) {
         line = stream.readLine().simplified();
         if (line.isEmpty() || line.startsWith('#')) {
             continue;
         }
 
         // not empty or commented out by '#'
         const QStringList items = line.split(' ');
 
 #ifdef Q_OS_SOLARIS
         if (items.count() < 5) {
             continue;
         }
 #else
         if (items.count() < 4) {
             continue;
         }
 #endif
         //prevent accessing a blocking directory
         if (_k_isFstabNetworkFileSystem(items.at(2), items.at(0)) ||
             _k_isFstabSupportedLocalFileSystem(items.at(2))) {
             const QString device = items.at(0);
             const QString mountpoint = items.at(1);
 
             globalFstabCache->localData().m_fstabCache.insert(device, mountpoint);
         }
     }
 
     fstab.close();
 #endif
     globalFstabCache->localData().m_fstabCacheValid = true;
 }
 
 QStringList Solid::Backends::Fstab::FstabHandling::deviceList()
 {
     _k_updateFstabMountPointsCache();
     _k_updateMtabMountPointsCache();
 
     QStringList devices = globalFstabCache->localData().m_fstabCache.keys();
     devices += globalFstabCache->localData().m_mtabCache.keys();
     devices.removeDuplicates();
     return devices;
 }
 
 QStringList Solid::Backends::Fstab::FstabHandling::mountPoints(const QString &device)
 {
     _k_updateFstabMountPointsCache();
     _k_updateMtabMountPointsCache();
 
     QStringList mountpoints = globalFstabCache->localData().m_fstabCache.values(device);
     mountpoints += globalFstabCache->localData().m_mtabCache.values(device);
     mountpoints.removeDuplicates();
     return mountpoints;
 }
 
 QStringList Solid::Backends::Fstab::FstabHandling::options(const QString &device)
 {
     _k_updateFstabMountPointsCache();
 
     QStringList options = globalFstabCache->localData().m_fstabOptionsCache.values(device);
     return options;
 }
 
 QString Solid::Backends::Fstab::FstabHandling::fstype(const QString &device)
 {
     _k_updateFstabMountPointsCache();
 
     return globalFstabCache->localData().m_fstabFstypeCache.value(device);
 }
 
 bool Solid::Backends::Fstab::FstabHandling::callSystemCommand(const QString &commandName, const QStringList &args,
                                                               const QObject *receiver, std::function<void(QProcess *)> callback)
 {
     QStringList env = QProcess::systemEnvironment();
     env.replaceInStrings(QRegExp("^PATH=(.*)", Qt::CaseInsensitive), "PATH=/sbin:/bin:/usr/sbin/:/usr/bin");
 
     QProcess *process = new QProcess();
 
     QObject::connect(process, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), receiver,
         [process, callback](int exitCode, QProcess::ExitStatus exitStatus) {
             Q_UNUSED(exitCode);
             Q_UNUSED(exitStatus);
             callback(process);
             process->deleteLater();
     });
 
     process->setEnvironment(env);
     process->start(commandName, args);
 
     if (process->waitForStarted()) {
         return true;
     }
 
     delete process;
     return false;
 }
 
 void Solid::Backends::Fstab::FstabHandling::_k_updateMtabMountPointsCache()
 {
     if (globalFstabCache->localData().m_mtabCacheValid) {
         return;
     }
 
     globalFstabCache->localData().m_mtabCache.clear();
 
 #if HAVE_GETMNTINFO
 
 #if GETMNTINFO_USES_STATVFS
     struct statvfs *mounted;
 #else
     struct statfs *mounted;
 #endif
 
     int num_fs = getmntinfo(&mounted, MNT_NOWAIT);
 
     for (int i = 0; i < num_fs; i++) {
         QString type = QFile::decodeName(mounted[i].f_fstypename);
         if (_k_isFstabNetworkFileSystem(type, QString()) ||
             _k_isFstabSupportedLocalFileSystem(type)) {
             const QString fsname = QFile::decodeName(mounted[i].f_mntfromname);
             const QString mountpoint = QFile::decodeName(mounted[i].f_mntonname);
             const QString device = _k_deviceNameForMountpoint(fsname, type, mountpoint);
             globalFstabCache->localData().m_mtabCache.insert(device, mountpoint);
             globalFstabCache->localData().m_fstabFstypeCache.insert(device, type);
         }
     }
 
 #else
     STRUCT_SETMNTENT mnttab;
     if ((mnttab = SETMNTENT(MNTTAB, "r")) == nullptr) {
         return;
     }
 
     STRUCT_MNTENT fe;
     while (GETMNTENT(mnttab, fe)) {
         QString type = QFile::decodeName(MOUNTTYPE(fe));
         if (_k_isFstabNetworkFileSystem(type, QString()) ||
             _k_isFstabSupportedLocalFileSystem(type)) {
             const QString fsname = QFile::decodeName(FSNAME(fe));
             const QString mountpoint = QFile::decodeName(MOUNTPOINT(fe));
             const QString device = _k_deviceNameForMountpoint(fsname, type, mountpoint);
             globalFstabCache->localData().m_mtabCache.insert(device, mountpoint);
             globalFstabCache->localData().m_fstabFstypeCache.insert(device, type);
         }
     }
     ENDMNTENT(mnttab);
 #endif
 
     globalFstabCache->localData().m_mtabCacheValid = true;
 }
 
 QStringList Solid::Backends::Fstab::FstabHandling::currentMountPoints(const QString &device)
 {
     _k_updateMtabMountPointsCache();
     return globalFstabCache->localData().m_mtabCache.values(device);
 }
 
 void Solid::Backends::Fstab::FstabHandling::flushMtabCache()
 {
     globalFstabCache->localData().m_mtabCacheValid = false;
 }
 
 void Solid::Backends::Fstab::FstabHandling::flushFstabCache()
 {
     globalFstabCache->localData().m_fstabCacheValid = false;
 }