diff --git a/src/AppColorSchemeChooser.cpp b/src/AppColorSchemeChooser.cpp
index eaaaf1866..faef826c4 100644
--- a/src/AppColorSchemeChooser.cpp
+++ b/src/AppColorSchemeChooser.cpp
@@ -9,9 +9,7 @@
 #include "konsoledebug.h"
 
 #include <QMenu>
-#include <QModelIndex>
 
-#include <KActionCollection>
 #include <KActionMenu>
 #include <KConfigGroup>
 #include <KLocalizedString>
diff --git a/src/Application.cpp b/src/Application.cpp
index 07d999a22..567443317 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -13,7 +13,6 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QHash>
-#include <QMenuBar>
 #include <QStandardPaths>
 #include <QTimer>
 
diff --git a/src/CheckableSessionModel.h b/src/CheckableSessionModel.h
index d29657817..17964b9a0 100644
--- a/src/CheckableSessionModel.h
+++ b/src/CheckableSessionModel.h
@@ -8,7 +8,6 @@
 #define CHECKABLESESSIONMODEL_H
 
 // Qt
-#include <QPointer>
 #include <QSet>
 
 // Konsole
diff --git a/src/EscapeSequenceUrlExtractor.h b/src/EscapeSequenceUrlExtractor.h
index c42a280d5..b5085bbc5 100644
--- a/src/EscapeSequenceUrlExtractor.h
+++ b/src/EscapeSequenceUrlExtractor.h
@@ -9,7 +9,6 @@
 */
 
 #include <QObject>
-#include <QPointer>
 
 namespace Konsole
 {
diff --git a/src/Part.h b/src/Part.h
index 374b16e9d..e1839abc3 100644
--- a/src/Part.h
+++ b/src/Part.h
@@ -13,7 +13,6 @@
 
 // Qt
 #include <QVariantList>
-#include <QtContainerFwd>
 
 // Konsole
 #include "config-konsole.h"
diff --git a/src/Pty.h b/src/Pty.h
index ce0ce7b6f..951e44333 100644
--- a/src/Pty.h
+++ b/src/Pty.h
@@ -10,7 +10,6 @@
 
 // Qt
 #include <QSize>
-#include <QtContainerFwd>
 
 // KDE
 #include <KPtyProcess>
diff --git a/src/autotests/TerminalInterfaceTest.cpp b/src/autotests/TerminalInterfaceTest.cpp
index 7f5d197c6..61cf331ae 100644
--- a/src/autotests/TerminalInterfaceTest.cpp
+++ b/src/autotests/TerminalInterfaceTest.cpp
@@ -11,7 +11,6 @@
 #include "config-konsole.h"
 
 // Qt
-#include <QDebug>
 #include <QDir>
 #include <QSignalSpy>
 
diff --git a/src/colorscheme/ColorScheme.cpp b/src/colorscheme/ColorScheme.cpp
index 6950384dc..fdab18388 100644
--- a/src/colorscheme/ColorScheme.cpp
+++ b/src/colorscheme/ColorScheme.cpp
@@ -13,7 +13,6 @@
 
 // Qt
 #include <QMetaEnum>
-#include <QPainter>
 
 // KDE
 #include <KConfig>
diff --git a/src/decoders/TerminalCharacterDecoder.h b/src/decoders/TerminalCharacterDecoder.h
index b8bf5241d..e1924a9bc 100644
--- a/src/decoders/TerminalCharacterDecoder.h
+++ b/src/decoders/TerminalCharacterDecoder.h
@@ -9,7 +9,6 @@
 
 // Qt
 #include <QExplicitlySharedDataPointer>
-#include <QList>
 
 // Konsole characters
 #include <Character.h>
diff --git a/src/filterHotSpots/ColorFilterHotSpot.h b/src/filterHotSpots/ColorFilterHotSpot.h
index f37620ca1..563854995 100644
--- a/src/filterHotSpots/ColorFilterHotSpot.h
+++ b/src/filterHotSpots/ColorFilterHotSpot.h
@@ -11,7 +11,6 @@
 
 #include <QColor>
 #include <QPoint>
-#include <QPointer>
 
 namespace Konsole
 {
diff --git a/src/filterHotSpots/FileFilter.h b/src/filterHotSpots/FileFilter.h
index 2ee278fea..7c13ec409 100644
--- a/src/filterHotSpots/FileFilter.h
+++ b/src/filterHotSpots/FileFilter.h
@@ -9,7 +9,6 @@
 #define FILE_FILTER
 
 #include <QPointer>
-#include <QSet>
 #include <QString>
 
 #include "RegExpFilter.h"
diff --git a/src/filterHotSpots/Filter.h b/src/filterHotSpots/Filter.h
index fcd9f4233..7f11e14c6 100644
--- a/src/filterHotSpots/Filter.h
+++ b/src/filterHotSpots/Filter.h
@@ -11,18 +11,10 @@
 // Qt
 #include <QList>
 #include <QMultiHash>
-#include <QObject>
 #include <QPoint>
-#include <QPointer>
-#include <QRect>
-#include <QRegularExpression>
-#include <QSet>
-#include <QStringList>
 
 // KDE
 #include <KFileItem>
-#include <KFileItemActions>
-#include <KIO/PreviewJob>
 
 #include <memory>
 
diff --git a/src/filterHotSpots/UrlFilterHotspot.cpp b/src/filterHotSpots/UrlFilterHotspot.cpp
index fc91e2705..e8f339da9 100644
--- a/src/filterHotSpots/UrlFilterHotspot.cpp
+++ b/src/filterHotSpots/UrlFilterHotspot.cpp
@@ -10,12 +10,10 @@
 #include <QAction>
 #include <QApplication>
 #include <QClipboard>
-#include <QRegularExpression>
 
 #include <KIO/OpenUrlJob>
 #include <KLocalizedString>
 #include <QIcon>
-#include <QMouseEvent>
 
 #include "UrlFilter.h"
 #include "terminalDisplay/TerminalDisplay.h"
diff --git a/src/keyboardtranslator/KeyboardTranslator.cpp b/src/keyboardtranslator/KeyboardTranslator.cpp
index 9f1ff0fef..191707fab 100644
--- a/src/keyboardtranslator/KeyboardTranslator.cpp
+++ b/src/keyboardtranslator/KeyboardTranslator.cpp
@@ -16,10 +16,7 @@
 #include <cstdio>
 
 // Qt
-#include <QBuffer>
 #include <QKeySequence>
-#include <QRegularExpression>
-#include <QTextStream>
 
 // KDE
 #include <KLocalizedString>
diff --git a/src/plugins/QuickCommands/filtermodel.cpp b/src/plugins/QuickCommands/filtermodel.cpp
index 9e4b3b573..dd90780a4 100644
--- a/src/plugins/QuickCommands/filtermodel.cpp
+++ b/src/plugins/QuickCommands/filtermodel.cpp
@@ -6,7 +6,6 @@
 */
 
 #include "filtermodel.h"
-#include <QDebug>
 
 FilterModel::FilterModel(QObject *parent)
     : QSortFilterProxyModel(parent)
diff --git a/src/plugins/QuickCommands/quickcommandsplugin.cpp b/src/plugins/QuickCommands/quickcommandsplugin.cpp
index c354d4569..ed7815409 100644
--- a/src/plugins/QuickCommands/quickcommandsplugin.cpp
+++ b/src/plugins/QuickCommands/quickcommandsplugin.cpp
@@ -7,12 +7,11 @@
 #include "quickcommandsmodel.h"
 #include "quickcommandswidget.h"
 
-#include <KActionCollection>
-#include <QMainWindow>
-
 #include "MainWindow.h"
 #include <KLocalizedString>
 
+#include <QDockWidget>
+
 K_PLUGIN_CLASS_WITH_JSON(QuickCommandsPlugin, "konsole_quickcommands.json")
 
 struct QuickCommandsPlugin::Private {
diff --git a/src/plugins/QuickCommands/quickcommandswidget.cpp b/src/plugins/QuickCommands/quickcommandswidget.cpp
index 0f878231d..62b850b4a 100644
--- a/src/plugins/QuickCommands/quickcommandswidget.cpp
+++ b/src/plugins/QuickCommands/quickcommandswidget.cpp
@@ -13,7 +13,6 @@
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <QStandardPaths>
-#include <QTabWidget>
 #include <QTemporaryFile>
 #include <QTimer>
 #include <kmessagebox.h>
diff --git a/src/plugins/SSHManager/sshmanagermodel.cpp b/src/plugins/SSHManager/sshmanagermodel.cpp
index 933c0e420..094b45992 100644
--- a/src/plugins/SSHManager/sshmanagermodel.cpp
+++ b/src/plugins/SSHManager/sshmanagermodel.cpp
@@ -14,7 +14,6 @@
 #include <KConfig>
 #include <KConfigGroup>
 
-#include <QDebug>
 #include <QFile>
 #include <QFileInfo>
 #include <QLoggingCategory>
diff --git a/src/plugins/SSHManager/sshmanagermodel.h b/src/plugins/SSHManager/sshmanagermodel.h
index 8a972b381..de821ddfa 100644
--- a/src/plugins/SSHManager/sshmanagermodel.h
+++ b/src/plugins/SSHManager/sshmanagermodel.h
@@ -9,7 +9,6 @@
 #define SSHMANAGERMODEL_H
 
 #include <QFileSystemWatcher>
-#include <QMap>
 #include <QStandardItemModel>
 
 #include <memory>
diff --git a/src/plugins/SSHManager/sshmanagerplugin.cpp b/src/plugins/SSHManager/sshmanagerplugin.cpp
index d1c320fbf..d3375c76e 100644
--- a/src/plugins/SSHManager/sshmanagerplugin.cpp
+++ b/src/plugins/SSHManager/sshmanagerplugin.cpp
@@ -14,12 +14,7 @@
 #include "session/SessionController.h"
 
 #include <QDockWidget>
-#include <QListView>
-#include <QMainWindow>
-#include <QMenuBar>
-#include <QTimer>
 
-#include <KActionCollection>
 #include <KLocalizedString>
 
 #include "MainWindow.h"
diff --git a/src/plugins/SSHManager/sshmanagerpluginwidget.cpp b/src/plugins/SSHManager/sshmanagerpluginwidget.cpp
index dacd0994b..46cb233cb 100644
--- a/src/plugins/SSHManager/sshmanagerpluginwidget.cpp
+++ b/src/plugins/SSHManager/sshmanagerpluginwidget.cpp
@@ -23,16 +23,13 @@
 #include <KLocalizedString>
 
 #include <QAction>
-#include <QDebug>
 #include <QFileDialog>
 #include <QIntValidator>
 #include <QItemSelectionModel>
 #include <QMenu>
-#include <QMessageBox>
 #include <QPoint>
 #include <QRegularExpression>
 #include <QRegularExpressionValidator>
-#include <QSortFilterProxyModel>
 #include <QStandardPaths>
 
 #include <KMessageBox>
diff --git a/src/pluginsystem/IKonsolePlugin.h b/src/pluginsystem/IKonsolePlugin.h
index af22223fd..717a62e54 100644
--- a/src/pluginsystem/IKonsolePlugin.h
+++ b/src/pluginsystem/IKonsolePlugin.h
@@ -8,15 +8,12 @@
 #ifndef IKONSOLEPLUGIN_H
 #define IKONSOLEPLUGIN_H
 
-#include <QDockWidget>
 #include <QList>
 #include <QObject>
 
 #include <terminalDisplay/TerminalDisplay.h>
 
-#include <KExportPlugin>
 #include <KPluginFactory>
-#include <KXMLGUIClient>
 
 #include <memory>
 
diff --git a/src/pluginsystem/PluginManager.h b/src/pluginsystem/PluginManager.h
index 8ade8f394..57f5de991 100644
--- a/src/pluginsystem/PluginManager.h
+++ b/src/pluginsystem/PluginManager.h
@@ -10,8 +10,6 @@
 
 #include <QObject>
 
-#include <QList>
-
 #include "konsole_export.h"
 #include <memory>
 
diff --git a/src/profile/Profile.cpp b/src/profile/Profile.cpp
index 2f5fb6d95..179ef11df 100644
--- a/src/profile/Profile.cpp
+++ b/src/profile/Profile.cpp
@@ -11,7 +11,6 @@
 #include "Profile.h"
 
 // Qt
-#include <QRegularExpression>
 #include <QTextCodec>
 
 // KDE
diff --git a/src/profile/ProfileCommandParser.cpp b/src/profile/ProfileCommandParser.cpp
index e58e88a80..b5a92b176 100644
--- a/src/profile/ProfileCommandParser.cpp
+++ b/src/profile/ProfileCommandParser.cpp
@@ -12,9 +12,7 @@
 // Konsole
 
 // Qt
-#include <QHash>
 #include <QRegularExpression>
-#include <QVariant>
 
 using namespace Konsole;
 
diff --git a/src/profile/ProfileGroup.h b/src/profile/ProfileGroup.h
index d4ba20985..9e97bd755 100644
--- a/src/profile/ProfileGroup.h
+++ b/src/profile/ProfileGroup.h
@@ -14,10 +14,6 @@
 #include "konsoleprofile_export.h"
 
 // Qt
-#include <QColor>
-#include <QFont>
-#include <QHash>
-#include <QStringList>
 #include <QVariant>
 
 namespace Konsole
diff --git a/src/profile/ProfileManager.cpp b/src/profile/ProfileManager.cpp
index a61c557c1..8a6b2e18c 100644
--- a/src/profile/ProfileManager.cpp
+++ b/src/profile/ProfileManager.cpp
@@ -16,6 +16,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QString>
+#include <QUrl>
 
 // KDE
 #include <KConfig>
diff --git a/src/profile/ProfileManager.h b/src/profile/ProfileManager.h
index 281b13830..dc0327367 100644
--- a/src/profile/ProfileManager.h
+++ b/src/profile/ProfileManager.h
@@ -10,14 +10,9 @@
 #define PROFILEMANAGER_H
 
 // Qt
-#include <QHash>
 #include <QKeySequence>
 #include <QList>
-#include <QSet>
-#include <QStack>
 #include <QStringList>
-#include <QUrl>
-#include <QVariant>
 
 #include <KSharedConfig>
 
diff --git a/src/profile/ProfileModel.cpp b/src/profile/ProfileModel.cpp
index 46f33fd7e..ce514a269 100644
--- a/src/profile/ProfileModel.cpp
+++ b/src/profile/ProfileModel.cpp
@@ -10,7 +10,6 @@
 
 #include <KLocalizedString>
 
-#include <QDebug>
 #include <QIcon>
 
 using namespace Konsole;
diff --git a/src/session/SessionController.cpp b/src/session/SessionController.cpp
index 65f35d4cf..79ed858a7 100644
--- a/src/session/SessionController.cpp
+++ b/src/session/SessionController.cpp
@@ -22,7 +22,6 @@
 #include <QKeyEvent>
 #include <QList>
 #include <QMenu>
-#include <QPainter>
 #include <QStandardPaths>
 #include <QUrl>
 
diff --git a/src/settings/ConfigurationDialog.h b/src/settings/ConfigurationDialog.h
index a0de101de..b9ef0a6ce 100644
--- a/src/settings/ConfigurationDialog.h
+++ b/src/settings/ConfigurationDialog.h
@@ -13,10 +13,6 @@
 #define CONFIGURATIONDIALOG_H
 
 // Qt
-#include <QAbstractButton>
-#include <QButtonGroup>
-#include <QMap>
-#include <QTimer>
 
 // KDE
 #include <KCoreConfigSkeleton>
diff --git a/src/settings/ProfileSettings.cpp b/src/settings/ProfileSettings.cpp
index fbad3a95d..9658a1281 100644
--- a/src/settings/ProfileSettings.cpp
+++ b/src/settings/ProfileSettings.cpp
@@ -9,8 +9,6 @@
 
 // Qt
 #include <QFileInfo>
-#include <QKeyEvent>
-#include <QStandardItem>
 #include <QStandardPaths>
 
 // Konsole
diff --git a/src/settings/ProfileSettings.h b/src/settings/ProfileSettings.h
index b09ba056b..c749359aa 100644
--- a/src/settings/ProfileSettings.h
+++ b/src/settings/ProfileSettings.h
@@ -9,9 +9,6 @@
 
 // Qt
 #include <QExplicitlySharedDataPointer>
-#include <QKeySequenceEdit>
-#include <QSet>
-#include <QStyledItemDelegate>
 
 // KDE
 
diff --git a/src/terminalDisplay/TerminalBell.h b/src/terminalDisplay/TerminalBell.h
index 67de56980..7aa7dfa4c 100644
--- a/src/terminalDisplay/TerminalBell.h
+++ b/src/terminalDisplay/TerminalBell.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include <QObject>
-#include <QWidget>
 
 #include <Enumeration.h>
 
diff --git a/src/terminalDisplay/TerminalDisplay.cpp b/src/terminalDisplay/TerminalDisplay.cpp
index 6d4d89af4..9d5e4eafe 100644
--- a/src/terminalDisplay/TerminalDisplay.cpp
+++ b/src/terminalDisplay/TerminalDisplay.cpp
@@ -26,7 +26,6 @@
 #include <QLabel>
 #include <QMimeData>
 #include <QPainter>
-#include <QPixmap>
 #include <QScrollEvent>
 #include <QScrollPrepareEvent>
 #include <QScroller>
diff --git a/src/terminalDisplay/TerminalPainter.h b/src/terminalDisplay/TerminalPainter.h
index 5f600f640..7baa9f7db 100644
--- a/src/terminalDisplay/TerminalPainter.h
+++ b/src/terminalDisplay/TerminalPainter.h
@@ -10,10 +10,7 @@
 #define TERMINALPAINTER_HPP
 
 // Qt
-#include <QPointer>
-#include <QScrollBar>
 #include <QVector>
-#include <QWidget>
 
 // Konsole
 #include "../characters/Character.h"
diff --git a/src/terminalDisplay/TerminalScrollBar.cpp b/src/terminalDisplay/TerminalScrollBar.cpp
index c55a2326e..b4f9b51d4 100644
--- a/src/terminalDisplay/TerminalScrollBar.cpp
+++ b/src/terminalDisplay/TerminalScrollBar.cpp
@@ -16,14 +16,11 @@
 #include "session/SessionController.h"
 
 // KDE
-#include <KMessageWidget>
 
 // Qt
 #include <QGuiApplication>
-#include <QLabel>
 #include <QProxyStyle>
 #include <QRect>
-#include <QTimer>
 
 namespace Konsole
 {
diff --git a/src/widgets/EditProfileDialog.cpp b/src/widgets/EditProfileDialog.cpp
index f2bc2ad3d..a46a9526f 100644
--- a/src/widgets/EditProfileDialog.cpp
+++ b/src/widgets/EditProfileDialog.cpp
@@ -14,8 +14,6 @@
 #include <QFileDialog>
 #include <QIcon>
 #include <QInputDialog>
-#include <QMenu>
-#include <QPainter>
 #include <QPushButton>
 #include <QRegularExpressionValidator>
 #include <QStandardItem>
@@ -29,8 +27,6 @@
 #include <KCodecAction>
 #include <KIconDialog>
 #include <KLocalizedString>
-#include <KMessageBox>
-#include <KNSCore/Engine>
 #include <KWindowSystem>
 #include <kconfigwidgets_version.h>
 
diff --git a/src/widgets/ViewSplitter.cpp b/src/widgets/ViewSplitter.cpp
index 3686e751c..fdfffec03 100644
--- a/src/widgets/ViewSplitter.cpp
+++ b/src/widgets/ViewSplitter.cpp
@@ -13,7 +13,6 @@
 #include <QChildEvent>
 #include <QDragEnterEvent>
 #include <QMimeData>
-#include <QStack>
 
 // C++
 #include <memory>
diff --git a/tools/uni2characterwidth/template.cpp b/tools/uni2characterwidth/template.cpp
index c9eab0ff7..67f9c69bb 100644
--- a/tools/uni2characterwidth/template.cpp
+++ b/tools/uni2characterwidth/template.cpp
@@ -9,7 +9,6 @@
 #include "template.h"
 #include <QDebug>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
 
 static const QString unescape(const QStringRef &str)
 {