diff --git a/src/fs/apfs.h b/src/fs/apfs.h
index 2af3a40..94710d4 100644
--- a/src/fs/apfs.h
+++ b/src/fs/apfs.h
@@ -22,10 +22,6 @@
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
-class QString;
-
 namespace FS
 {
 /** An APFS file system.
diff --git a/src/fs/bitlocker.h b/src/fs/bitlocker.h
index 493eb4d..36123d4 100644
--- a/src/fs/bitlocker.h
+++ b/src/fs/bitlocker.h
@@ -22,10 +22,6 @@
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
-class QString;
-
 namespace FS
 {
 /** A Bitlocker encrypted file system.
diff --git a/src/fs/btrfs.cpp b/src/fs/btrfs.cpp
index c7c1edb..1d84802 100644
--- a/src/fs/btrfs.cpp
+++ b/src/fs/btrfs.cpp
@@ -23,7 +23,6 @@
 #include "util/report.h"
 
 #include <QRegularExpression>
-#include <QString>
 #include <QTemporaryDir>
 
 #include <KLocalizedString>
diff --git a/src/fs/btrfs.h b/src/fs/btrfs.h
index 694f8c8..2d7402d 100644
--- a/src/fs/btrfs.h
+++ b/src/fs/btrfs.h
@@ -16,20 +16,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_BTRFS_H)
-
+#ifndef KPMCORE_BTRFS_H
 #define KPMCORE_BTRFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A btrfs file system.
diff --git a/src/fs/exfat.cpp b/src/fs/exfat.cpp
index 3173450..2880c3e 100644
--- a/src/fs/exfat.cpp
+++ b/src/fs/exfat.cpp
@@ -21,8 +21,6 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
-#include <QString>
-
 namespace FS
 {
 FileSystem::CommandSupportType exfat::m_GetUsed = FileSystem::cmdSupportNone;
diff --git a/src/fs/exfat.h b/src/fs/exfat.h
index 55940b0..07238ea 100644
--- a/src/fs/exfat.h
+++ b/src/fs/exfat.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_EXFAT_H)
-
+#ifndef KPMCORE_EXFAT_H
 #define KPMCORE_EXFAT_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** An exfat file system.
diff --git a/src/fs/ext2.cpp b/src/fs/ext2.cpp
index fce9274..431c14c 100644
--- a/src/fs/ext2.cpp
+++ b/src/fs/ext2.cpp
@@ -22,7 +22,6 @@
 #include "util/capacity.h"
 
 #include <QRegularExpression>
-#include <QString>
 
 namespace FS
 {
diff --git a/src/fs/ext2.h b/src/fs/ext2.h
index ec2ca59..3ab2ac8 100644
--- a/src/fs/ext2.h
+++ b/src/fs/ext2.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_EXT2_H)
-
+#ifndef KPMCORE_EXT2_H
 #define KPMCORE_EXT2_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** An ext2 file system.
diff --git a/src/fs/ext3.cpp b/src/fs/ext3.cpp
index 7fa67c9..07d3342 100644
--- a/src/fs/ext3.cpp
+++ b/src/fs/ext3.cpp
@@ -20,8 +20,6 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
-#include <QStringList>
-
 namespace FS
 {
 ext3::ext3(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) :
diff --git a/src/fs/ext3.h b/src/fs/ext3.h
index 23ac4df..1eb5b2b 100644
--- a/src/fs/ext3.h
+++ b/src/fs/ext3.h
@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_EXT3_H)
+#ifndef KPMCORE_EXT3_H
 
 #define KPMCORE_EXT3_H
 
@@ -23,12 +23,8 @@
 
 #include "fs/ext2.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** An ext3 file system.
diff --git a/src/fs/ext4.cpp b/src/fs/ext4.cpp
index 0fa3811..0c98520 100644
--- a/src/fs/ext4.cpp
+++ b/src/fs/ext4.cpp
@@ -20,8 +20,6 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
-#include <QStringList>
-
 namespace FS
 {
 ext4::ext4(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) :
diff --git a/src/fs/ext4.h b/src/fs/ext4.h
index 8050413..7badd71 100644
--- a/src/fs/ext4.h
+++ b/src/fs/ext4.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_EXT4_H)
-
+#ifndef KPMCORE_EXT4_H
 #define KPMCORE_EXT4_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/ext2.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** An ext4 file system.
diff --git a/src/fs/extended.h b/src/fs/extended.h
index ef00a7c..f5a426b 100644
--- a/src/fs/extended.h
+++ b/src/fs/extended.h
@@ -15,18 +15,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_EXTENDED_H)
-
+#ifndef KPMCORE_EXTENDED_H
 #define KPMCORE_EXTENDED_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
-class QString;
-
 namespace FS
 {
 /** An extended file system.
diff --git a/src/fs/f2fs.cpp b/src/fs/f2fs.cpp
index f8c62cb..0d132f6 100644
--- a/src/fs/f2fs.cpp
+++ b/src/fs/f2fs.cpp
@@ -23,7 +23,6 @@
 
 #include <cmath>
 
-#include <QString>
 #include <QTemporaryDir>
 #include <QUuid>
 
diff --git a/src/fs/f2fs.h b/src/fs/f2fs.h
index 4d2d92b..8577791 100644
--- a/src/fs/f2fs.h
+++ b/src/fs/f2fs.h
@@ -22,12 +22,8 @@
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A f2fs file system.
diff --git a/src/fs/fat12.cpp b/src/fs/fat12.cpp
index b4917fe..977babb 100644
--- a/src/fs/fat12.cpp
+++ b/src/fs/fat12.cpp
@@ -26,8 +26,6 @@
 
 #include <QRegularExpression>
 #include <QRegularExpressionValidator>
-#include <QString>
-#include <QStringList>
 
 #include <ctime>
 
diff --git a/src/fs/fat12.h b/src/fs/fat12.h
index 5a02895..a42f6a7 100644
--- a/src/fs/fat12.h
+++ b/src/fs/fat12.h
@@ -23,12 +23,8 @@
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A fat12 file system.
diff --git a/src/fs/fat16.cpp b/src/fs/fat16.cpp
index 69962de..946bac0 100644
--- a/src/fs/fat16.cpp
+++ b/src/fs/fat16.cpp
@@ -24,9 +24,6 @@
 
 #include <KLocalizedString>
 
-#include <QString>
-#include <QStringList>
-
 #include <ctime>
 
 namespace FS
diff --git a/src/fs/fat16.h b/src/fs/fat16.h
index ea988a5..686805e 100644
--- a/src/fs/fat16.h
+++ b/src/fs/fat16.h
@@ -23,8 +23,6 @@
 
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A fat16 file system.
diff --git a/src/fs/fat32.cpp b/src/fs/fat32.cpp
index 2bb6b34..0c915f7 100644
--- a/src/fs/fat32.cpp
+++ b/src/fs/fat32.cpp
@@ -20,8 +20,6 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
-#include <QStringList>
-
 #include <ctime>
 
 namespace FS
diff --git a/src/fs/fat32.h b/src/fs/fat32.h
index a356bf7..e5bf351 100644
--- a/src/fs/fat32.h
+++ b/src/fs/fat32.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_FAT32_H)
-
+#ifndef KPMCORE_FAT32_H
 #define KPMCORE_FAT32_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/fat16.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A fat32 file system.
diff --git a/src/fs/filesystem.h b/src/fs/filesystem.h
index 052a391..c7001f1 100644
--- a/src/fs/filesystem.h
+++ b/src/fs/filesystem.h
@@ -23,8 +23,6 @@
 #include "util/libpartitionmanagerexport.h"
 
 #include <QList>
-#include <QStringList>
-#include <QString>
 #include <QtGlobal>
 #include <QUrl>
 
diff --git a/src/fs/filesystem_p.h b/src/fs/filesystem_p.h
index ed410ba..3c8b8cf 100644
--- a/src/fs/filesystem_p.h
+++ b/src/fs/filesystem_p.h
@@ -20,8 +20,6 @@
 
 #include "fs/filesystem.h"
 
-#include <QString>
-
 class FileSystemPrivate {
 public:
     FileSystem::Type m_Type;
diff --git a/src/fs/filesystemfactory.h b/src/fs/filesystemfactory.h
index 6679bbc..5d4ce18 100644
--- a/src/fs/filesystemfactory.h
+++ b/src/fs/filesystemfactory.h
@@ -23,9 +23,6 @@
 #include "util/libpartitionmanagerexport.h"
 
 #include <QMap>
-#include <QtGlobal>
-
-class QString;
 
 /** Factory to create instances of FileSystem.
     @author Volker Lanz <vl@fidra.de>
diff --git a/src/fs/hfs.cpp b/src/fs/hfs.cpp
index 15677fc..96e2d5a 100644
--- a/src/fs/hfs.cpp
+++ b/src/fs/hfs.cpp
@@ -21,8 +21,6 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
-#include <QStringList>
-
 namespace FS
 {
 FileSystem::CommandSupportType hfs::m_GetUsed = FileSystem::cmdSupportNone;
diff --git a/src/fs/hfs.h b/src/fs/hfs.h
index 780dc72..8650aeb 100644
--- a/src/fs/hfs.h
+++ b/src/fs/hfs.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_HFS_H)
-
+#ifndef KPMCORE_HFS_H
 #define KPMCORE_HFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** An hfs file system.
diff --git a/src/fs/hfsplus.cpp b/src/fs/hfsplus.cpp
index 81341ff..f70f1e2 100644
--- a/src/fs/hfsplus.cpp
+++ b/src/fs/hfsplus.cpp
@@ -21,8 +21,6 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
-#include <QStringList>
-
 namespace FS
 {
 FileSystem::CommandSupportType hfsplus::m_GetLabel = FileSystem::cmdSupportNone;
diff --git a/src/fs/hfsplus.h b/src/fs/hfsplus.h
index 8f3e2d4..82379c3 100644
--- a/src/fs/hfsplus.h
+++ b/src/fs/hfsplus.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_HFSPLUS_H)
-
+#ifndef KPMCORE_HFSPLUS_H
 #define KPMCORE_HFSPLUS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** An hfsplus file system.
diff --git a/src/fs/hpfs.cpp b/src/fs/hpfs.cpp
index 55c41a1..3a8ec81 100644
--- a/src/fs/hpfs.cpp
+++ b/src/fs/hpfs.cpp
@@ -19,8 +19,6 @@
 
 #include "util/capacity.h"
 
-#include <QString>
-
 namespace FS
 {
 FileSystem::CommandSupportType hpfs::m_GetUsed = FileSystem::cmdSupportNone;
diff --git a/src/fs/hpfs.h b/src/fs/hpfs.h
index 7bbb9ba..3269c71 100644
--- a/src/fs/hpfs.h
+++ b/src/fs/hpfs.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_HPFS_H)
-
+#ifndef KPMCORE_HPFS_H
 #define KPMCORE_HPFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A hpfs file system.
diff --git a/src/fs/iso9660.h b/src/fs/iso9660.h
index f6b2192..3c57c1e 100644
--- a/src/fs/iso9660.h
+++ b/src/fs/iso9660.h
@@ -15,8 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_ISO9660_H)
-
+#ifndef KPMCORE_ISO9660_H
 #define KPMCORE_ISO9660_H
 
 #include "util/libpartitionmanagerexport.h"
@@ -25,8 +24,6 @@
 
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A iso9660 file system.
diff --git a/src/fs/jfs.cpp b/src/fs/jfs.cpp
index dfb90a0..05eb2e5 100644
--- a/src/fs/jfs.cpp
+++ b/src/fs/jfs.cpp
@@ -22,7 +22,6 @@
 #include "util/capacity.h"
 
 #include <QRegularExpression>
-#include <QStringList>
 #include <QTemporaryDir>
 
 #include <KLocalizedString>
diff --git a/src/fs/jfs.h b/src/fs/jfs.h
index c67ab27..f49e7aa 100644
--- a/src/fs/jfs.h
+++ b/src/fs/jfs.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_JFS_H)
-
+#ifndef KPMCORE_JFS_H
 #define KPMCORE_JFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A JFS file system.
diff --git a/src/fs/linuxraidmember.h b/src/fs/linuxraidmember.h
index aa71cdd..5985354 100644
--- a/src/fs/linuxraidmember.h
+++ b/src/fs/linuxraidmember.h
@@ -24,8 +24,6 @@
 
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A linux_raid_member file system.
diff --git a/src/fs/linuxswap.h b/src/fs/linuxswap.h
index d36392b..adc7da6 100644
--- a/src/fs/linuxswap.h
+++ b/src/fs/linuxswap.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_LINUXSWAP_H)
-
+#ifndef KPMCORE_LINUXSWAP_H
 #define KPMCORE_LINUXSWAP_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A linux swap pseudo file system.
diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp
index 6215554..de67b23 100644
--- a/src/fs/luks.cpp
+++ b/src/fs/luks.cpp
@@ -37,7 +37,6 @@
 #include <QRegularExpression>
 #include <QPointer>
 #include <QStorageInfo>
-#include <QString>
 #include <QUuid>
 #include <QWidget>
 
diff --git a/src/fs/luks.h b/src/fs/luks.h
index 7dddba1..2ead990 100644
--- a/src/fs/luks.h
+++ b/src/fs/luks.h
@@ -24,11 +24,8 @@
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
 class QWidget;
 
 namespace FS
diff --git a/src/fs/luks2.h b/src/fs/luks2.h
index cb014f8..71df99d 100644
--- a/src/fs/luks2.h
+++ b/src/fs/luks2.h
@@ -15,18 +15,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_LUKS2_H)
-
+#ifndef KPMCORE_LUKS2_H
 #define KPMCORE_LUKS2_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/luks.h"
 
-#include <QtGlobal>
-
-class QString;
-
 namespace FS
 {
 /** A LUKS2 crypto file system.
diff --git a/src/fs/lvm2_pv.cpp b/src/fs/lvm2_pv.cpp
index 6a3a4c7..e5e7477 100644
--- a/src/fs/lvm2_pv.cpp
+++ b/src/fs/lvm2_pv.cpp
@@ -22,8 +22,6 @@
 #include "util/externalcommand.h"
 #include "util/capacity.h"
 
-#include <QString>
-
 #include <KLocalizedString>
 
 namespace FS
diff --git a/src/fs/lvm2_pv.h b/src/fs/lvm2_pv.h
index 15bbd92..50066e5 100644
--- a/src/fs/lvm2_pv.h
+++ b/src/fs/lvm2_pv.h
@@ -16,8 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_LVM2_PV_H)
-
+#ifndef KPMCORE_LVM2_PV_H
 #define KPMCORE_LVM2_PV_H
 
 #include "util/libpartitionmanagerexport.h"
@@ -25,10 +24,7 @@
 #include "core/partition.h"
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
-class QString;
 
 /** Stores information about LVM PV or potentially encrypted LVM PV
  * @author Andrius Štikonas <andrius@stikonas.eu>
diff --git a/src/fs/nilfs2.cpp b/src/fs/nilfs2.cpp
index 5fd15a1..3c53b3f 100644
--- a/src/fs/nilfs2.cpp
+++ b/src/fs/nilfs2.cpp
@@ -25,7 +25,6 @@
 #include <cmath>
 
 #include <QRegularExpression>
-#include <QString>
 #include <QTemporaryDir>
 #include <QUuid>
 
diff --git a/src/fs/nilfs2.h b/src/fs/nilfs2.h
index 9432208..dfe0108 100644
--- a/src/fs/nilfs2.h
+++ b/src/fs/nilfs2.h
@@ -16,20 +16,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_NILFS2_H)
-
+#ifndef KPMCORE_NILFS2_H
 #define KPMCORE_NILFS2_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A nilfs2 file system.
diff --git a/src/fs/ntfs.cpp b/src/fs/ntfs.cpp
index 8639383..47dc39b 100644
--- a/src/fs/ntfs.cpp
+++ b/src/fs/ntfs.cpp
@@ -26,8 +26,6 @@
 #include <KLocalizedString>
 
 #include <QRegularExpression>
-#include <QString>
-#include <QStringList>
 #include <QFile>
 
 #include <algorithm>
diff --git a/src/fs/ntfs.h b/src/fs/ntfs.h
index c1d409e..09feb94 100644
--- a/src/fs/ntfs.h
+++ b/src/fs/ntfs.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_NTFS_H)
-
+#ifndef KPMCORE_NTFS_H
 #define KPMCORE_NTFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** An NTFS file system.
diff --git a/src/fs/ocfs2.cpp b/src/fs/ocfs2.cpp
index af8eaaa..6647d20 100644
--- a/src/fs/ocfs2.cpp
+++ b/src/fs/ocfs2.cpp
@@ -22,7 +22,6 @@
 #include "util/capacity.h"
 
 #include <QRegularExpression>
-#include <QString>
 
 namespace FS
 {
diff --git a/src/fs/ocfs2.h b/src/fs/ocfs2.h
index 1a86172..44b0ebd 100644
--- a/src/fs/ocfs2.h
+++ b/src/fs/ocfs2.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_OCFS2_H)
-
+#ifndef KPMCORE_OCFS2_H
 #define KPMCORE_OCFS2_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A ocfs2 file system.
diff --git a/src/fs/reiser4.cpp b/src/fs/reiser4.cpp
index 38e1d1e..c367411 100644
--- a/src/fs/reiser4.cpp
+++ b/src/fs/reiser4.cpp
@@ -22,7 +22,6 @@
 #include "util/externalcommand.h"
 
 #include <QRegularExpression>
-#include <QStringList>
 
 namespace FS
 {
diff --git a/src/fs/reiser4.h b/src/fs/reiser4.h
index 34f4a13..c35ffce 100644
--- a/src/fs/reiser4.h
+++ b/src/fs/reiser4.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_REISER4_H)
-
+#ifndef KPMCORE_REISER4_H
 #define KPMCORE_REISER4_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A Reiser4 file system.
diff --git a/src/fs/reiserfs.cpp b/src/fs/reiserfs.cpp
index 5bfeb06..553196d 100644
--- a/src/fs/reiserfs.cpp
+++ b/src/fs/reiserfs.cpp
@@ -22,8 +22,6 @@
 #include "util/capacity.h"
 
 #include <QRegularExpression>
-#include <QString>
-#include <QStringList>
 #include <QUuid>
 
 namespace FS
diff --git a/src/fs/reiserfs.h b/src/fs/reiserfs.h
index 598c4d2..219f430 100644
--- a/src/fs/reiserfs.h
+++ b/src/fs/reiserfs.h
@@ -15,8 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_REISERFS_H)
-
+#ifndef KPMCORE_REISERFS_H
 #define KPMCORE_REISERFS_H
 
 #include "util/libpartitionmanagerexport.h"
@@ -25,12 +24,8 @@
 
 #include "util/capacity.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A ReiserFS file system.
diff --git a/src/fs/udf.cpp b/src/fs/udf.cpp
index b0d28a9..90d90bb 100644
--- a/src/fs/udf.cpp
+++ b/src/fs/udf.cpp
@@ -25,8 +25,6 @@
 
 #include <QRegularExpression>
 #include <QRegularExpressionValidator>
-#include <QString>
-#include <QStringList>
 
 namespace FS
 {
diff --git a/src/fs/udf.h b/src/fs/udf.h
index f49df36..511982f 100644
--- a/src/fs/udf.h
+++ b/src/fs/udf.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_UDF_H)
-
+#ifndef KPMCORE_UDF_H
 #define KPMCORE_UDF_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A udf file system.
diff --git a/src/fs/ufs.h b/src/fs/ufs.h
index 2c67f92..4d057d2 100644
--- a/src/fs/ufs.h
+++ b/src/fs/ufs.h
@@ -15,18 +15,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_UFS_H)
-
+#ifndef KPMCORE_UFS_H
 #define KPMCORE_UFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
-class QString;
-
 namespace FS
 {
 /** A UFS file system.
diff --git a/src/fs/unformatted.h b/src/fs/unformatted.h
index 8c66407..2d1234c 100644
--- a/src/fs/unformatted.h
+++ b/src/fs/unformatted.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_UNFORMATTED_H)
-
+#ifndef KPMCORE_UNFORMATTED_H
 #define KPMCORE_UNFORMATTED_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A pseudo file system for unformatted partitions.
diff --git a/src/fs/unknown.h b/src/fs/unknown.h
index cf87ca4..bb5cff6 100644
--- a/src/fs/unknown.h
+++ b/src/fs/unknown.h
@@ -22,8 +22,6 @@
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 namespace FS
 {
 /** A pseudo file system for partitions whose file system we cannot determine.
diff --git a/src/fs/xfs.cpp b/src/fs/xfs.cpp
index 25d2ef3..0e20295 100644
--- a/src/fs/xfs.cpp
+++ b/src/fs/xfs.cpp
@@ -23,8 +23,6 @@
 #include "util/report.h"
 
 #include <QRegularExpression>
-#include <QString>
-#include <QStringList>
 #include <QTemporaryDir>
 
 #include <KLocalizedString>
diff --git a/src/fs/xfs.h b/src/fs/xfs.h
index 3199c93..b9e489f 100644
--- a/src/fs/xfs.h
+++ b/src/fs/xfs.h
@@ -15,20 +15,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_XFS_H)
-
+#ifndef KPMCORE_XFS_H
 #define KPMCORE_XFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** An XFS file system.
diff --git a/src/fs/zfs.cpp b/src/fs/zfs.cpp
index a3cb201..0455bb7 100644
--- a/src/fs/zfs.cpp
+++ b/src/fs/zfs.cpp
@@ -22,8 +22,6 @@
 #include "util/capacity.h"
 #include "util/report.h"
 
-#include <QString>
-
 namespace FS
 {
 FileSystem::CommandSupportType zfs::m_GetUsed = FileSystem::cmdSupportNone;
diff --git a/src/fs/zfs.h b/src/fs/zfs.h
index c87f971..9996614 100644
--- a/src/fs/zfs.h
+++ b/src/fs/zfs.h
@@ -16,20 +16,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_ZFS_H)
-
+#ifndef KPMCORE_ZFS_H
 #define KPMCORE_ZFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
 #include "fs/filesystem.h"
 
-#include <QtGlobal>
-
 class Report;
 
-class QString;
-
 namespace FS
 {
 /** A zfs file system.
diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp
index 5ed64c1..e73a10d 100644
--- a/src/util/externalcommand.cpp
+++ b/src/util/externalcommand.cpp
@@ -36,8 +36,6 @@
 #include <QEventLoop>
 #include <QtGlobal>
 #include <QStandardPaths>
-#include <QString>
-#include <QStringList>
 #include <QTimer>
 #include <QThread>
 #include <QVariant>
diff --git a/src/util/externalcommand.h b/src/util/externalcommand.h
index c36c42e..4a5d980 100644
--- a/src/util/externalcommand.h
+++ b/src/util/externalcommand.h
@@ -23,8 +23,6 @@
 
 #include <QDebug>
 #include <QProcess>
-#include <QString>
-#include <QStringList>
 #include <QtGlobal>
 #include <QThread>
 #include <QVariant>
diff --git a/src/util/externalcommandhelper.cpp b/src/util/externalcommandhelper.cpp
index 9e96966..845738c 100644
--- a/src/util/externalcommandhelper.cpp
+++ b/src/util/externalcommandhelper.cpp
@@ -22,7 +22,6 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QFile>
-#include <QString>
 #include <QTime>
 #include <QVariant>
 
diff --git a/src/util/externalcommandhelper.h b/src/util/externalcommandhelper.h
index 6d7029b..ef7539b 100644
--- a/src/util/externalcommandhelper.h
+++ b/src/util/externalcommandhelper.h
@@ -24,7 +24,6 @@
 #include <KAuth>
 
 #include <QEventLoop>
-#include <QString>
 #include <QProcess>
 
 using namespace KAuth;