diff --git a/src/analyzer/analyzerbase.h b/src/analyzer/analyzerbase.h
index 905373b3a..de8c9bdf5 100644
--- a/src/analyzer/analyzerbase.h
+++ b/src/analyzer/analyzerbase.h
@@ -31,8 +31,6 @@
 
 #include <vector>
 
-#include <QtGlobal>
-#include <QObject>
 #include <QWidget>
 #include <QBasicTimer>
 #include <QString>
diff --git a/src/collection/collectionquery.cpp b/src/collection/collectionquery.cpp
index 642caadd5..21c98d27e 100644
--- a/src/collection/collectionquery.cpp
+++ b/src/collection/collectionquery.cpp
@@ -29,7 +29,6 @@
 #include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QRegularExpression>
 #include <QSqlDatabase>
 
 #include "core/sqlquery.h"
diff --git a/src/collection/collectionquery.h b/src/collection/collectionquery.h
index 15d908d36..1d213a8b4 100644
--- a/src/collection/collectionquery.h
+++ b/src/collection/collectionquery.h
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <QMetaType>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
diff --git a/src/collection/collectiontask.h b/src/collection/collectiontask.h
index c93e828d0..f8ef8972e 100644
--- a/src/collection/collectiontask.h
+++ b/src/collection/collectiontask.h
@@ -20,7 +20,7 @@
 #ifndef COLLECTIONTASK_H
 #define COLLECTIONTASK_H
 
-#include <QtGlobal>
+#include <QtClassHelperMacros>
 #include <QString>
 
 #include "core/shared_ptr.h"
diff --git a/src/collection/collectionview.cpp b/src/collection/collectionview.cpp
index 6d95c9a21..ab1d603ac 100644
--- a/src/collection/collectionview.cpp
+++ b/src/collection/collectionview.cpp
@@ -25,7 +25,6 @@
 #include <memory>
 
 #include <QtGlobal>
-#include <QWidget>
 #include <QAbstractItemView>
 #include <QTreeView>
 #include <QItemSelectionModel>
@@ -46,7 +45,10 @@
 #include <QAction>
 #include <QMessageBox>
 #include <QSettings>
-#include <QtEvents>
+#include <QPaintEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QContextMenuEvent>
 
 #include "core/application.h"
 #include "core/iconloader.h"
diff --git a/src/collection/collectionview.h b/src/collection/collectionview.h
index 3aaf1ad33..9ae6c1052 100644
--- a/src/collection/collectionview.h
+++ b/src/collection/collectionview.h
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <QObject>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QString>
@@ -35,7 +34,6 @@
 #include "core/song.h"
 #include "widgets/autoexpandingtreeview.h"
 
-class QWidget;
 class QMenu;
 class QAction;
 class QContextMenuEvent;
diff --git a/src/collection/collectionviewcontainer.cpp b/src/collection/collectionviewcontainer.cpp
index 8b9a8e134..1863cc16e 100644
--- a/src/collection/collectionviewcontainer.cpp
+++ b/src/collection/collectionviewcontainer.cpp
@@ -21,9 +21,6 @@
 
 #include "config.h"
 
-#include <QWidget>
-#include <QKeyEvent>
-
 #include "collectionfilterwidget.h"
 #include "collectionview.h"
 #include "collectionviewcontainer.h"
diff --git a/src/collection/collectionviewcontainer.h b/src/collection/collectionviewcontainer.h
index 7230cc5f9..b6018a0e8 100644
--- a/src/collection/collectionviewcontainer.h
+++ b/src/collection/collectionviewcontainer.h
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <QObject>
 #include <QWidget>
 
 class CollectionFilterWidget;
diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp
index f2a6bc6b8..8a85fd07e 100644
--- a/src/core/mainwindow.cpp
+++ b/src/core/mainwindow.cpp
@@ -36,12 +36,10 @@
 #include <QScreen>
 #include <QMetaObject>
 #include <QThread>
-#include <QSortFilterProxyModel>
 #include <QByteArray>
 #include <QDir>
 #include <QFile>
 #include <QFileDialog>
-#include <QFileInfo>
 #include <QFontMetrics>
 #include <QList>
 #include <QSet>
@@ -60,7 +58,6 @@
 #include <QShortcut>
 #include <QMessageBox>
 #include <QErrorMessage>
-#include <QtEvents>
 #include <QSettings>
 #include <QColor>
 #include <QFrame>
@@ -74,6 +71,9 @@
 #include <QToolButton>
 #include <QCheckBox>
 #include <QClipboard>
+#include <QShowEvent>
+#include <QCloseEvent>
+#include <QKeyEvent>
 #ifdef HAVE_DBUS
 #  include <QDBusConnection>
 #  include <QDBusMessage>
diff --git a/src/core/metatypes.cpp b/src/core/metatypes.cpp
index 8f500c7f6..67f9ae2f7 100644
--- a/src/core/metatypes.cpp
+++ b/src/core/metatypes.cpp
@@ -28,7 +28,6 @@
 #  include <gst/gstelement.h>
 #endif
 
-#include <QDataStream>
 #include <QAbstractSocket>
 #include <QMetaType>
 #include <QFileInfo>
diff --git a/src/core/mpris2.cpp b/src/core/mpris2.cpp
index 55cb3ec7d..6a5a8deeb 100644
--- a/src/core/mpris2.cpp
+++ b/src/core/mpris2.cpp
@@ -31,7 +31,6 @@
 #include <QObject>
 #include <QFile>
 #include <QList>
-#include <QJsonArray>
 #include <QVariant>
 #include <QVariantMap>
 #include <QString>
diff --git a/src/core/multisortfilterproxy.cpp b/src/core/multisortfilterproxy.cpp
index fb135d96a..d7d8e4e64 100644
--- a/src/core/multisortfilterproxy.cpp
+++ b/src/core/multisortfilterproxy.cpp
@@ -21,14 +21,12 @@
 #include "config.h"
 
 #include <QtGlobal>
-#include <QObject>
 #include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
 #include <QMetaType>
 #include <QDateTime>
 #include <QVariant>
 #include <QString>
-#include <QChar>
 
 #include "multisortfilterproxy.h"
 
diff --git a/src/core/networkaccessmanager.cpp b/src/core/networkaccessmanager.cpp
index 916bb7ff9..75f475c0a 100644
--- a/src/core/networkaccessmanager.cpp
+++ b/src/core/networkaccessmanager.cpp
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <QtGlobal>
-#include <QObject>
 #include <QCoreApplication>
 #include <QIODevice>
 #include <QByteArray>
diff --git a/src/core/networkaccessmanager.h b/src/core/networkaccessmanager.h
index 2b6e82a59..dd3816b97 100644
--- a/src/core/networkaccessmanager.h
+++ b/src/core/networkaccessmanager.h
@@ -24,7 +24,6 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QObject>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
diff --git a/src/core/networktimeouts.h b/src/core/networktimeouts.h
index 4b83c294a..15ca39af6 100644
--- a/src/core/networktimeouts.h
+++ b/src/core/networktimeouts.h
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QObject>
 #include <QHash>