diff --git a/src/Application.h b/src/Application.h
--- a/src/Application.h
+++ b/src/Application.h
@@ -21,7 +21,6 @@
 #define APPLICATION_H
 
 // Qt
-#include <QApplication>
 #include <QCommandLineParser>
 
 // Konsole
diff --git a/src/Application.cpp b/src/Application.cpp
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -21,6 +21,7 @@
 #include "Application.h"
 
 // Qt
+#include <QApplication>
 #include <QHashIterator>
 #include <QFileInfo>
 #include <QDir>
diff --git a/src/EditProfileDialog.h b/src/EditProfileDialog.h
--- a/src/EditProfileDialog.h
+++ b/src/EditProfileDialog.h
@@ -25,7 +25,6 @@
 #include <QAbstractItemDelegate>
 #include <QDialog>
 #include <QHash>
-#include <QPointer>
 #include <QButtonGroup>
 #include <QWidget>
 #include <QGridLayout>
diff --git a/src/KeyboardTranslator.h b/src/KeyboardTranslator.h
--- a/src/KeyboardTranslator.h
+++ b/src/KeyboardTranslator.h
@@ -23,10 +23,10 @@
 #define KEYBOARDTRANSLATOR_H
 
 // Qt
-#include <QHash>
 #include <QList>
-#include <QString>
 #include <QMetaType>
+#include <QMultiHash>
+#include <QString>
 
 // Konsole
 #include "konsoleprivate_export.h"
diff --git a/src/ProcessInfo.h b/src/ProcessInfo.h
--- a/src/ProcessInfo.h
+++ b/src/ProcessInfo.h
@@ -22,7 +22,6 @@
 
 // Qt
 #include <QFile>
-#include <QMap>
 #include <QString>
 #include <QVector>
 
diff --git a/src/SessionController.h b/src/SessionController.h
--- a/src/SessionController.h
+++ b/src/SessionController.h
@@ -22,11 +22,9 @@
 #define SESSIONCONTROLLER_H
 
 // Qt
-#include <QList>
 #include <QSet>
 #include <QPointer>
 #include <QString>
-#include <QHash>
 #include <QRegularExpression>
 
 // KDE
diff --git a/src/SessionController.cpp b/src/SessionController.cpp
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -27,6 +27,7 @@
 // Qt
 #include <QApplication>
 #include <QAction>
+#include <QList>
 #include <QMenu>
 #include <QKeyEvent>
 #include <QPrinter>
diff --git a/src/ViewContainer.h b/src/ViewContainer.h
--- a/src/ViewContainer.h
+++ b/src/ViewContainer.h
@@ -24,11 +24,8 @@
 
 // Qt
 #include <QObject>
-#include <QPointer>
-#include <QHash>
 #include <QList>
 #include <QTabWidget>
-#include <QTabBar>
 
 // Konsole
 #include "Profile.h"
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -25,6 +25,7 @@
 // Qt
 #include <QStringList>
 #include <QAction>
+#include <QTabBar>
 
 // KDE
 #include <KAcceleratorManager>
diff --git a/src/ViewProperties.h b/src/ViewProperties.h
--- a/src/ViewProperties.h
+++ b/src/ViewProperties.h
@@ -24,7 +24,6 @@
 #include <QIcon>
 #include <QObject>
 #include <QHash>
-#include <QMimeData>
 #include <QUrl>
 
 // Konsole
diff --git a/src/main.cpp b/src/main.cpp
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,6 +25,7 @@
 
 // OS specific
 #include <qplatformdefs.h>
+#include <QApplication>
 #include <QCommandLineParser>
 #include <QStandardPaths>
 #include <QDir>