diff --git a/src/core/dbusscreensaver.h b/src/core/dbusscreensaver.h
index 99d351bb0..80074e81e 100644
--- a/src/core/dbusscreensaver.h
+++ b/src/core/dbusscreensaver.h
@@ -26,7 +26,6 @@
 #include <QtGlobal>
 #include <QString>
 
-#include "config.h"
 #include "screensaver.h"
 
 class DBusScreensaver : public Screensaver {
diff --git a/src/core/mpris.h b/src/core/mpris.h
index 88a92384a..4b8065b0c 100644
--- a/src/core/mpris.h
+++ b/src/core/mpris.h
@@ -30,7 +30,6 @@ class Application;
 
 namespace mpris {
 
-class Mpris1;
 class Mpris2;
 
 class Mpris : public QObject {
diff --git a/src/core/mpris2.cpp b/src/core/mpris2.cpp
index 510d3d694..ee0b7f789 100644
--- a/src/core/mpris2.cpp
+++ b/src/core/mpris2.cpp
@@ -26,6 +26,7 @@
 
 #include <QApplication>
 #include <QCoreApplication>
+#include <QGuiApplication>
 #include <QObject>
 #include <QFile>
 #include <QList>
@@ -35,6 +36,7 @@
 #include <QString>
 #include <QStringList>
 #include <QUrl>
+#include <QImage>
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <QDBusArgument>
diff --git a/src/core/mpris2.h b/src/core/mpris2.h
index bbe27010f..490adaf44 100644
--- a/src/core/mpris2.h
+++ b/src/core/mpris2.h
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QList>
@@ -34,7 +33,6 @@
 #include <QString>
 #include <QStringList>
 #include <QImage>
-#include <QVector>
 #include <QtDBus>
 #include <QDBusArgument>
 #include <qdbusextratypes.h>
diff --git a/src/covermanager/albumcoverchoicecontroller.cpp b/src/covermanager/albumcoverchoicecontroller.cpp
index c44defefe..54a5545cd 100644
--- a/src/covermanager/albumcoverchoicecontroller.cpp
+++ b/src/covermanager/albumcoverchoicecontroller.cpp
@@ -28,14 +28,13 @@
 #include <QWidget>
 #include <QDialog>
 #include <QDir>
+#include <QFile>
 #include <QFileInfo>
-#include <QList>
-#include <QSet>
 #include <QMimeData>
-#include <QByteArray>
+#include <QSet>
+#include <QList>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QRegExp>
 #include <QUrl>
 #include <QImage>
@@ -43,12 +42,12 @@
 #include <QPixmap>
 #include <QIcon>
 #include <QRect>
-#include <QAction>
 #include <QFileDialog>
 #include <QLabel>
+#include <QAction>
+#include <QSettings>
 #include <QtEvents>
 
-#include "core/utilities.h"
 #include "core/song.h"
 #include "core/iconloader.h"
 #include "core/application.h"
diff --git a/src/covermanager/albumcoverchoicecontroller.h b/src/covermanager/albumcoverchoicecontroller.h
index 1113f1fa0..5bb34531d 100644
--- a/src/covermanager/albumcoverchoicecontroller.h
+++ b/src/covermanager/albumcoverchoicecontroller.h
@@ -24,22 +24,24 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
+#include <QSet>
 #include <QList>
 #include <QMap>
-#include <QSet>
 #include <QString>
+#include <QUrl>
 #include <QImage>
-#include <QAction>
-#include <QFileDialog>
-#include <QtEvents>
 
+#include "core/song.h"
 #include "settings/collectionsettingspage.h"
 
-class Song;
+class QFileDialog;
+class QAction;
+class QDragEnterEvent;
+class QDropEvent;
+
 class Application;
 class AlbumCoverFetcher;
 class AlbumCoverSearcher;
diff --git a/src/covermanager/albumcoverexport.h b/src/covermanager/albumcoverexport.h
index 0774ccf74..6385eeb26 100644
--- a/src/covermanager/albumcoverexport.h
+++ b/src/covermanager/albumcoverexport.h
@@ -23,12 +23,11 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
 #include <QString>
 
+class QWidget;
 class Ui_AlbumCoverExport;
 
 // Controller for the "Export covers" dialog.
diff --git a/src/covermanager/albumcoverexporter.cpp b/src/covermanager/albumcoverexporter.cpp
index cce7746b7..908c4f81e 100644
--- a/src/covermanager/albumcoverexporter.cpp
+++ b/src/covermanager/albumcoverexporter.cpp
@@ -24,6 +24,7 @@
 #include <QThreadPool>
 
 #include "core/song.h"
+#include "albumcoverexport.h"
 #include "albumcoverexporter.h"
 #include "coverexportrunnable.h"
 
diff --git a/src/covermanager/albumcoverexporter.h b/src/covermanager/albumcoverexporter.h
index 0400bc86e..b4325249c 100644
--- a/src/covermanager/albumcoverexporter.h
+++ b/src/covermanager/albumcoverexporter.h
@@ -24,12 +24,12 @@
 #include "config.h"
 
 #include <QObject>
-#include <QThreadPool>
 #include <QQueue>
 #include <QString>
 
 #include "albumcoverexport.h"
 
+class QThreadPool;
 class Song;
 class CoverExportRunnable;
 
diff --git a/src/covermanager/albumcoverfetchersearch.cpp b/src/covermanager/albumcoverfetchersearch.cpp
index f1c202c98..21d328dab 100644
--- a/src/covermanager/albumcoverfetchersearch.cpp
+++ b/src/covermanager/albumcoverfetchersearch.cpp
@@ -24,7 +24,6 @@
 #include <cmath>
 
 #include <QObject>
-#include <QtAlgorithms>
 #include <QTimer>
 #include <QList>
 #include <QString>
@@ -37,7 +36,6 @@
 
 #include "core/closure.h"
 #include "core/logging.h"
-#include "core/network.h"
 #include "core/networktimeouts.h"
 #include "albumcoverfetcher.h"
 #include "albumcoverfetchersearch.h"
diff --git a/src/covermanager/albumcoverfetchersearch.h b/src/covermanager/albumcoverfetchersearch.h
index 23fa82b63..f359b2039 100644
--- a/src/covermanager/albumcoverfetchersearch.h
+++ b/src/covermanager/albumcoverfetchersearch.h
@@ -23,19 +23,18 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
-#include <QList>
-#include <QMap>
 #include <QPair>
+#include <QMap>
 #include <QString>
+#include <QUrl>
 #include <QImage>
-#include <QNetworkAccessManager>
 
 #include "albumcoverfetcher.h"
 #include "coversearchstatistics.h"
 
+class QNetworkAccessManager;
 class QNetworkReply;
 class CoverProvider;
 class CoverProviders;
diff --git a/src/covermanager/albumcoverloader.cpp b/src/covermanager/albumcoverloader.cpp
index 87dfc6ce4..03ea95429 100644
--- a/src/covermanager/albumcoverloader.cpp
+++ b/src/covermanager/albumcoverloader.cpp
@@ -27,18 +27,16 @@
 #include <QDir>
 #include <QThread>
 #include <QMutex>
+#include <QSet>
 #include <QList>
 #include <QQueue>
-#include <QSet>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QUrl>
 #include <QImage>
 #include <QPixmap>
 #include <QPainter>
 #include <QSize>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QSettings>
diff --git a/src/covermanager/albumcoverloader.h b/src/covermanager/albumcoverloader.h
index 801ba3f0e..59e29beb5 100644
--- a/src/covermanager/albumcoverloader.h
+++ b/src/covermanager/albumcoverloader.h
@@ -24,24 +24,22 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QMutex>
-#include <QQueue>
-#include <QMap>
 #include <QSet>
+#include <QMap>
+#include <QQueue>
 #include <QString>
 #include <QImage>
 #include <QPixmap>
-#include <QNetworkReply>
 
 #include "core/song.h"
 #include "settings/collectionsettingspage.h"
 #include "albumcoverloaderoptions.h"
 
 class QThread;
-class Song;
+class QNetworkReply;
 class NetworkAccessManager;
 
 class AlbumCoverLoader : public QObject {
@@ -117,7 +115,7 @@ class AlbumCoverLoader : public QObject {
 
   QMutex mutex_;
   QQueue<Task> tasks_;
-  QMap<QNetworkReply *, Task> remote_tasks_;
+  QMap<QNetworkReply*, Task> remote_tasks_;
   quint64 next_id_;
 
   NetworkAccessManager *network_;
diff --git a/src/covermanager/albumcoversearcher.cpp b/src/covermanager/albumcoversearcher.cpp
index 1da3fd282..93fd9b407 100644
--- a/src/covermanager/albumcoversearcher.cpp
+++ b/src/covermanager/albumcoversearcher.cpp
@@ -20,15 +20,13 @@
 
 #include "config.h"
 
-
 #include <QWidget>
 #include <QDialog>
-#include <QStandardItem>
 #include <QStandardItemModel>
 #include <QAbstractItemModel>
 #include <QStyledItemDelegate>
 #include <QStyleOptionViewItem>
-#include <QSize>
+#include <QStandardItem>
 #include <QList>
 #include <QVariant>
 #include <QString>
@@ -41,6 +39,7 @@
 #include <QFontMetrics>
 #include <QColor>
 #include <QRect>
+#include <QSize>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QKeySequence>
@@ -55,6 +54,7 @@
 #include "albumcoversearcher.h"
 #include "albumcoverfetcher.h"
 #include "albumcoverloader.h"
+#include "albumcoverloaderoptions.h"
 #include "ui_albumcoversearcher.h"
 
 const int SizeOverlayDelegate::kMargin = 4;
diff --git a/src/covermanager/albumcoversearcher.h b/src/covermanager/albumcoversearcher.h
index b2aae56e7..7353dcf12 100644
--- a/src/covermanager/albumcoversearcher.h
+++ b/src/covermanager/albumcoversearcher.h
@@ -25,24 +25,24 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
-#include <QStandardItem>
-#include <QStandardItemModel>
+#include <QStyleOption>
+#include <QStyledItemDelegate>
+#include <QStyleOptionViewItem>
 #include <QMap>
 #include <QString>
 #include <QImage>
 #include <QIcon>
-#include <QPainter>
-#include <QStyleOption>
-#include <QStyledItemDelegate>
-#include <QStyleOptionViewItem>
-#include <QtEvents>
 
 #include "albumcoverfetcher.h"
 #include "albumcoverloaderoptions.h"
 
+class QWidget;
+class QStandardItem;
+class QStandardItemModel;
+class QPainter;
 class QModelIndex;
+class QKeyEvent;
 
 class Application;
 class Ui_AlbumCoverSearcher;
@@ -83,7 +83,7 @@ public:
   QImage Exec(const QString &artist, const QString &album);
 
 protected:
-  void keyPressEvent(QKeyEvent *);
+  void keyPressEvent(QKeyEvent*);
 
 private slots:
   void Search();
diff --git a/src/covermanager/coverexportrunnable.cpp b/src/covermanager/coverexportrunnable.cpp
index a6b776d52..387d51b7a 100644
--- a/src/covermanager/coverexportrunnable.cpp
+++ b/src/covermanager/coverexportrunnable.cpp
@@ -29,6 +29,7 @@
 
 #include "core/song.h"
 #include "core/tagreaderclient.h"
+#include "albumcoverexport.h"
 #include "coverexportrunnable.h"
 
 CoverExportRunnable::CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const Song &song) :
diff --git a/src/covermanager/coverexportrunnable.h b/src/covermanager/coverexportrunnable.h
index 3585c0e40..1f458b3a0 100644
--- a/src/covermanager/coverexportrunnable.h
+++ b/src/covermanager/coverexportrunnable.h
@@ -30,8 +30,6 @@
 #include "core/song.h"
 #include "albumcoverexport.h"
 
-class AlbumCoverExporter;
-
 class CoverExportRunnable : public QObject, public QRunnable {
   Q_OBJECT
 
diff --git a/src/covermanager/coverfromurldialog.h b/src/covermanager/coverfromurldialog.h
index c4655822f..06831d4ce 100644
--- a/src/covermanager/coverfromurldialog.h
+++ b/src/covermanager/coverfromurldialog.h
@@ -24,11 +24,12 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
 #include <QString>
 #include <QImage>
 
+class QWidget;
+
 class NetworkAccessManager;
 class Ui_CoverFromURLDialog;
 
diff --git a/src/covermanager/coverprovider.h b/src/covermanager/coverprovider.h
index bd293177a..5ffc6f8bf 100644
--- a/src/covermanager/coverprovider.h
+++ b/src/covermanager/coverprovider.h
@@ -23,9 +23,8 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QString>
 
 #include "albumcoverfetcher.h"
diff --git a/src/covermanager/coverproviders.h b/src/covermanager/coverproviders.h
index 4eeec967f..01698e161 100644
--- a/src/covermanager/coverproviders.h
+++ b/src/covermanager/coverproviders.h
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QMutex>
diff --git a/src/covermanager/coversearchstatistics.h b/src/covermanager/coversearchstatistics.h
index ad45396af..ff0662aad 100644
--- a/src/covermanager/coversearchstatistics.h
+++ b/src/covermanager/coversearchstatistics.h
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <QtGlobal>
+#include <QList>
 #include <QMap>
 #include <QString>
 
diff --git a/src/covermanager/coversearchstatisticsdialog.cpp b/src/covermanager/coversearchstatisticsdialog.cpp
index b9a7353cc..fe01d6b79 100644
--- a/src/covermanager/coversearchstatisticsdialog.cpp
+++ b/src/covermanager/coversearchstatisticsdialog.cpp
@@ -22,14 +22,15 @@
 
 #include <algorithm>
 
+#include <QtGlobal>
 #include <QWidget>
+#include <QList>
 #include <QMap>
 #include <QString>
 #include <QStringList>
 #include <QBoxLayout>
 #include <QLabel>
 #include <QFrame>
-#include <QtAlgorithms>
 
 #include "core/utilities.h"
 #include "coversearchstatistics.h"
diff --git a/src/covermanager/coversearchstatisticsdialog.h b/src/covermanager/coversearchstatisticsdialog.h
index ce0f5779d..10546934e 100644
--- a/src/covermanager/coversearchstatisticsdialog.h
+++ b/src/covermanager/coversearchstatisticsdialog.h
@@ -25,9 +25,10 @@
 
 #include <QObject>
 #include <QDialog>
-#include <QWidget>
 #include <QString>
-#include <QBoxLayout>
+
+class QWidget;
+class QVBoxLayout;
 
 class Ui_CoverSearchStatisticsDialog;
 struct CoverSearchStatistics;
diff --git a/src/covermanager/currentalbumcoverloader.cpp b/src/covermanager/currentalbumcoverloader.cpp
index c9b428ea6..9ed8dc171 100644
--- a/src/covermanager/currentalbumcoverloader.cpp
+++ b/src/covermanager/currentalbumcoverloader.cpp
@@ -27,12 +27,12 @@
 #include <QString>
 #include <QStringBuilder>
 #include <QImage>
-#include <QStandardPaths>
 #include <QTemporaryFile>
 
 #include "core/application.h"
 #include "playlist/playlistmanager.h"
 #include "albumcoverloader.h"
+#include "albumcoverloaderoptions.h"
 #include "currentalbumcoverloader.h"
 
 CurrentAlbumCoverLoader::CurrentAlbumCoverLoader(Application *app, QObject *parent)
diff --git a/src/covermanager/deezercoverprovider.cpp b/src/covermanager/deezercoverprovider.cpp
index 37939a1ea..7190bde01 100644
--- a/src/covermanager/deezercoverprovider.cpp
+++ b/src/covermanager/deezercoverprovider.cpp
@@ -19,10 +19,10 @@
 
 #include "config.h"
 
-#include <algorithm>
-#include <functional>
-
+#include <QtGlobal>
 #include <QObject>
+#include <QPair>
+#include <QSet>
 #include <QList>
 #include <QVariant>
 #include <QByteArray>
@@ -36,11 +36,13 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
 #include "core/network.h"
 #include "core/logging.h"
+#include "core/song.h"
 #include "albumcoverfetcher.h"
 #include "coverprovider.h"
 #include "deezercoverprovider.h"
diff --git a/src/covermanager/deezercoverprovider.h b/src/covermanager/deezercoverprovider.h
index 5e0051d2c..f44500e3d 100644
--- a/src/covermanager/deezercoverprovider.h
+++ b/src/covermanager/deezercoverprovider.h
@@ -22,19 +22,17 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonValue>
 #include <QJsonObject>
-#include <QJsonArray>
 
 #include "coverprovider.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 
 class DeezerCoverProvider : public CoverProvider {
diff --git a/src/covermanager/discogscoverprovider.cpp b/src/covermanager/discogscoverprovider.cpp
index 5df0c5e6b..7d55af27f 100644
--- a/src/covermanager/discogscoverprovider.cpp
+++ b/src/covermanager/discogscoverprovider.cpp
@@ -21,13 +21,17 @@
 
 #include "config.h"
 
+#include <algorithm>
+#include <type_traits>
+
+#include <QtGlobal>
 #include <QObject>
 #include <QByteArray>
 #include <QList>
 #include <QPair>
+#include <QSet>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QUrl>
 #include <QUrlQuery>
@@ -38,6 +42,7 @@
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
diff --git a/src/covermanager/discogscoverprovider.h b/src/covermanager/discogscoverprovider.h
index 1d445d5c6..83e07b5bb 100644
--- a/src/covermanager/discogscoverprovider.h
+++ b/src/covermanager/discogscoverprovider.h
@@ -24,17 +24,20 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QHash>
 #include <QMetaType>
+#include <QHash>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
+#include <QJsonObject>
+#include <QJsonValue>
 
 #include "coverprovider.h"
 #include "albumcoverfetcher.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 
 // This struct represents a single search-for-cover request. It identifies and describes the request.
diff --git a/src/covermanager/lastfmcoverprovider.cpp b/src/covermanager/lastfmcoverprovider.cpp
index da25546da..7a633c257 100644
--- a/src/covermanager/lastfmcoverprovider.cpp
+++ b/src/covermanager/lastfmcoverprovider.cpp
@@ -19,14 +19,17 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
+#include <QLocale>
 #include <QList>
 #include <QPair>
+#include <QSet>
 #include <QByteArray>
 #include <QString>
-#include <QStringBuilder>
 #include <QUrl>
 #include <QUrlQuery>
+#include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QCryptographicHash>
@@ -34,6 +37,7 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
diff --git a/src/covermanager/lastfmcoverprovider.h b/src/covermanager/lastfmcoverprovider.h
index bbdc7e38b..8acaeeba1 100644
--- a/src/covermanager/lastfmcoverprovider.h
+++ b/src/covermanager/lastfmcoverprovider.h
@@ -22,19 +22,17 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonValue>
 #include <QJsonObject>
-#include <QJsonArray>
 
 #include "coverprovider.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 
 class LastFmCoverProvider : public CoverProvider {
diff --git a/src/covermanager/musicbrainzcoverprovider.cpp b/src/covermanager/musicbrainzcoverprovider.cpp
index 3ad4ae8ee..18dd0840f 100644
--- a/src/covermanager/musicbrainzcoverprovider.cpp
+++ b/src/covermanager/musicbrainzcoverprovider.cpp
@@ -19,11 +19,8 @@
 
 #include "config.h"
 
-#include <algorithm>
-#include <functional>
-
+#include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
@@ -36,6 +33,7 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
diff --git a/src/covermanager/musicbrainzcoverprovider.h b/src/covermanager/musicbrainzcoverprovider.h
index e911b5ca6..972289c51 100644
--- a/src/covermanager/musicbrainzcoverprovider.h
+++ b/src/covermanager/musicbrainzcoverprovider.h
@@ -22,18 +22,16 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QByteArray>
 #include <QVariant>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonObject>
 
 #include "coverprovider.h"
-#include "albumcoverfetcher.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 
 class MusicbrainzCoverProvider : public CoverProvider {
diff --git a/src/covermanager/tidalcoverprovider.cpp b/src/covermanager/tidalcoverprovider.cpp
index af09bc213..562515bbe 100644
--- a/src/covermanager/tidalcoverprovider.cpp
+++ b/src/covermanager/tidalcoverprovider.cpp
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QList>
 #include <QVariant>
@@ -27,19 +27,21 @@
 #include <QString>
 #include <QUrl>
 #include <QUrlQuery>
+#include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonDocument>
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
 #include "core/network.h"
 #include "core/logging.h"
+#include "core/song.h"
 #include "internet/internetservices.h"
-#include "settings/tidalsettingspage.h"
 #include "tidal/tidalservice.h"
 #include "albumcoverfetcher.h"
 #include "coverprovider.h"
diff --git a/src/covermanager/tidalcoverprovider.h b/src/covermanager/tidalcoverprovider.h
index b87db5655..9eb3ee2e4 100644
--- a/src/covermanager/tidalcoverprovider.h
+++ b/src/covermanager/tidalcoverprovider.h
@@ -22,18 +22,20 @@
 
 #include "config.h"
 
-
 #include <QObject>
+#include <QPair>
+#include <QSet>
+#include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonValue>
 #include <QJsonObject>
 
 #include "coverprovider.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 class TidalService;
 
diff --git a/src/device/cddadevice.h b/src/device/cddadevice.h
index 175614b1a..2f3af86df 100644
--- a/src/device/cddadevice.h
+++ b/src/device/cddadevice.h
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QString>
 #include <QStringList>
diff --git a/src/device/cddalister.h b/src/device/cddalister.h
index 17b00bbef..908ea2f93 100644
--- a/src/device/cddalister.h
+++ b/src/device/cddalister.h
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QMetaType>
diff --git a/src/device/connecteddevice.cpp b/src/device/connecteddevice.cpp
index a78f82776..9ffd0da4a 100644
--- a/src/device/connecteddevice.cpp
+++ b/src/device/connecteddevice.cpp
@@ -20,6 +20,7 @@
  */
 
 #include <QObject>
+#include <QThread>
 #include <QAbstractItemModel>
 #include <QVariant>
 #include <QString>
@@ -35,6 +36,7 @@
 #include "connecteddevice.h"
 #include "devicelister.h"
 #include "devicemanager.h"
+#include "deviceinfo.h"
 
 ConnectedDevice::ConnectedDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time)
     : QObject(manager),
diff --git a/src/device/devicedatabasebackend.cpp b/src/device/devicedatabasebackend.cpp
index 7ac76f7eb..2fa921e44 100644
--- a/src/device/devicedatabasebackend.cpp
+++ b/src/device/devicedatabasebackend.cpp
@@ -23,7 +23,6 @@
 #include <assert.h>
 
 #include <QObject>
-#include <QApplication>
 #include <QThread>
 #include <QMutex>
 #include <QIODevice>
@@ -36,7 +35,6 @@
 
 #include "core/database.h"
 #include "core/scopedtransaction.h"
-#include "core/logging.h"
 #include "devicedatabasebackend.h"
 
 const int DeviceDatabaseBackend::kDeviceSchemaVersion = 1;
diff --git a/src/device/devicedatabasebackend.h b/src/device/devicedatabasebackend.h
index ab3e355c7..302ee82ca 100644
--- a/src/device/devicedatabasebackend.h
+++ b/src/device/devicedatabasebackend.h
@@ -25,10 +25,9 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QSet>
+#include <QList>
 #include <QString>
-#include <QVector>
 
 #include "core/song.h"
 #include "core/musicstorage.h"
diff --git a/src/device/deviceinfo.cpp b/src/device/deviceinfo.cpp
index d57f28720..855e77dca 100644
--- a/src/device/deviceinfo.cpp
+++ b/src/device/deviceinfo.cpp
@@ -21,20 +21,18 @@
 
 #include "config.h"
 
-
-#include <QObject>
 #include <QVariant>
+#include <QVariantList>
 #include <QString>
 #include <QStringList>
 #include <QIcon>
 #include <QPixmap>
 
 #include "core/iconloader.h"
-#include "core/logging.h"
-#include "core/simpletreemodel.h"
 
-#include "deviceinfo.h"
+#include "devicelister.h"
 #include "devicedatabasebackend.h"
+#include "deviceinfo.h"
 
 DeviceDatabaseBackend::Device DeviceInfo::SaveToDb() const {
 
diff --git a/src/device/deviceinfo.h b/src/device/deviceinfo.h
index 590d6e225..70f7518ad 100644
--- a/src/device/deviceinfo.h
+++ b/src/device/deviceinfo.h
@@ -27,21 +27,19 @@
 #include <memory>
 
 #include <QtGlobal>
-#include <QObject>
+#include <QMetaType>
 #include <QList>
-#include <QVariant>
+#include <QVariantList>
 #include <QString>
-#include <QStringList>
 #include <QIcon>
 
 #include "core/song.h"
 #include "core/musicstorage.h"
 #include "core/simpletreemodel.h"
 #include "core/simpletreeitem.h"
-#include "collection/collectionmodel.h"
 #include "devicedatabasebackend.h"
-#include "devicelister.h"
 
+class DeviceLister;
 class ConnectedDevice;
 
 // Devices can be in three different states:
diff --git a/src/device/devicelister.h b/src/device/devicelister.h
index 7b3907490..1069f2421 100644
--- a/src/device/devicelister.h
+++ b/src/device/devicelister.h
@@ -26,13 +26,14 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QThread>
 #include <QList>
 #include <QMetaType>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 
+class QThread;
+
 class DeviceLister : public QObject {
   Q_OBJECT
 
diff --git a/src/device/devicemanager.cpp b/src/device/devicemanager.cpp
index a909aacc9..2bd9791fc 100644
--- a/src/device/devicemanager.cpp
+++ b/src/device/devicemanager.cpp
@@ -24,6 +24,7 @@
 #include <memory>
 #include <functional>
 
+#include <QtGlobal>
 #include <QApplication>
 #include <QObject>
 #include <QMetaObject>
diff --git a/src/device/devicemanager.h b/src/device/devicemanager.h
index 30b16c31a..980439b87 100644
--- a/src/device/devicemanager.h
+++ b/src/device/devicemanager.h
@@ -26,7 +26,6 @@
 
 #include <memory>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QMetaObject>
 #include <QThreadPool>
@@ -34,7 +33,6 @@
 #include <QList>
 #include <QMap>
 #include <QMultiMap>
-#include <QMetaType>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
@@ -48,6 +46,9 @@
 #include "devicedatabasebackend.h"
 #include "deviceinfo.h"
 
+class QModelIndex;
+class QPersistentModelIndex;
+
 class Application;
 class ConnectedDevice;
 class DeviceLister;
diff --git a/src/device/deviceproperties.cpp b/src/device/deviceproperties.cpp
index 7b1f2d4d2..bab37523c 100644
--- a/src/device/deviceproperties.cpp
+++ b/src/device/deviceproperties.cpp
@@ -29,7 +29,6 @@
 #include <QDialog>
 #include <QtConcurrentRun>
 #include <QFuture>
-#include <QMetaType>
 #include <QMap>
 #include <QSize>
 #include <QByteArray>
@@ -55,7 +54,6 @@
 #include "connecteddevice.h"
 #include "devicelister.h"
 #include "devicemanager.h"
-#include "deviceinfo.h"
 #include "deviceproperties.h"
 #ifdef HAVE_GSTREAMER
 #  include "transcoder/transcoder.h"
diff --git a/src/device/deviceproperties.h b/src/device/deviceproperties.h
index 140918951..2b2b2c97d 100644
--- a/src/device/deviceproperties.h
+++ b/src/device/deviceproperties.h
@@ -24,18 +24,17 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QDialog>
-#include <QWidget>
 #include <QFuture>
 #include <QAbstractItemModel>
-#include <QPersistentModelIndex>
 #include <QList>
 #include <QString>
 
 #include "core/song.h"
 
+class QWidget;
+
 class DeviceManager;
 class Ui_DeviceProperties;
 
diff --git a/src/device/devicestatefiltermodel.cpp b/src/device/devicestatefiltermodel.cpp
index e688406e8..58c5717cd 100644
--- a/src/device/devicestatefiltermodel.cpp
+++ b/src/device/devicestatefiltermodel.cpp
@@ -20,6 +20,7 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
 #include <QSortFilterProxyModel>
 #include <QAbstractItemModel>
diff --git a/src/device/devicestatefiltermodel.h b/src/device/devicestatefiltermodel.h
index 55afe2ac4..7f9c3b01e 100644
--- a/src/device/devicestatefiltermodel.h
+++ b/src/device/devicestatefiltermodel.h
@@ -23,14 +23,15 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QString>
-#include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
 
 #include "devicemanager.h"
 
+class QAbstractItemModel;
+class QModelIndex;
+
 class DeviceStateFilterModel : public QSortFilterProxyModel {
   Q_OBJECT
 
diff --git a/src/device/deviceview.cpp b/src/device/deviceview.cpp
index a63add191..a91ba1056 100644
--- a/src/device/deviceview.cpp
+++ b/src/device/deviceview.cpp
@@ -50,7 +50,6 @@
 #include <QMessageBox>
 #include <QtEvents>
 
-#include "core/logging.h"
 #include "core/iconloader.h"
 #include "core/application.h"
 #include "core/deletefiles.h"
@@ -65,7 +64,6 @@
 #include "connecteddevice.h"
 #include "devicelister.h"
 #include "devicemanager.h"
-#include "deviceinfo.h"
 #include "deviceproperties.h"
 #include "deviceview.h"
 
diff --git a/src/device/deviceview.h b/src/device/deviceview.h
index 8aea6e4e0..c4fdaf09b 100644
--- a/src/device/deviceview.h
+++ b/src/device/deviceview.h
@@ -27,22 +27,23 @@
 #include <memory>
 
 #include <QObject>
-#include <QWidget>
-#include <QString>
 #include <QStyleOption>
 #include <QStyleOptionViewItem>
-#include <QSortFilterProxyModel>
 #include <QAbstractItemModel>
-#include <QPainter>
-#include <QAction>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QContextMenuEvent>
+#include <QString>
 
 #include "core/song.h"
 #include "collection/collectionitemdelegate.h"
 #include "widgets/autoexpandingtreeview.h"
 
+class QSortFilterProxyModel;
+class QPainter;
+class QWidget;
+class QMenu;
+class QAction;
+class QMouseEvent;
+class QContextMenuEvent;
+
 class Application;
 class DeviceProperties;
 class MergedProxyModel;
diff --git a/src/device/deviceviewcontainer.cpp b/src/device/deviceviewcontainer.cpp
index 56f23fab3..e5582ac63 100644
--- a/src/device/deviceviewcontainer.cpp
+++ b/src/device/deviceviewcontainer.cpp
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QWidget>
 
 #include "deviceviewcontainer.h"
diff --git a/src/device/deviceviewcontainer.h b/src/device/deviceviewcontainer.h
index 19df60cb5..af15e1aef 100644
--- a/src/device/deviceviewcontainer.h
+++ b/src/device/deviceviewcontainer.h
@@ -23,11 +23,9 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QString>
-#include <QShowEvent>
 
 class DeviceView;
 class Ui_DeviceViewContainer;
diff --git a/src/device/filesystemdevice.cpp b/src/device/filesystemdevice.cpp
index 1fba063df..80425b672 100644
--- a/src/device/filesystemdevice.cpp
+++ b/src/device/filesystemdevice.cpp
@@ -23,9 +23,9 @@
 #include <assert.h>
 
 #include <QThread>
-#include <QVariant>
 #include <QString>
 #include <QUrl>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/logging.h"
diff --git a/src/device/filesystemdevice.h b/src/device/filesystemdevice.h
index 09539e5d1..9d21c6b1c 100644
--- a/src/device/filesystemdevice.h
+++ b/src/device/filesystemdevice.h
@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QThread>
 #include <QList>
 #include <QString>
 #include <QStringList>
@@ -34,6 +32,7 @@
 #include "core/filesystemmusicstorage.h"
 #include "connecteddevice.h"
 
+class QThread;
 class Application;
 class CollectionWatcher;
 class DeviceLister;
diff --git a/src/device/gpoddevice.cpp b/src/device/gpoddevice.cpp
index 580159107..6e68dfdf0 100644
--- a/src/device/gpoddevice.cpp
+++ b/src/device/gpoddevice.cpp
@@ -32,6 +32,7 @@
 #include <QList>
 #include <QString>
 #include <QUrl>
+#include <QImage>
 #include <QtDebug>
 
 #include "core/logging.h"
diff --git a/src/device/gpoddevice.h b/src/device/gpoddevice.h
index 7fb39fd91..17cd3942e 100644
--- a/src/device/gpoddevice.h
+++ b/src/device/gpoddevice.h
@@ -27,7 +27,6 @@
 
 #include <QObject>
 #include <QMutex>
-#include <QThread>
 #include <QWaitCondition>
 #include <QList>
 #include <QString>
@@ -39,6 +38,7 @@
 #include "connecteddevice.h"
 #include "gpodloader.h"
 
+class QThread;
 class Application;
 class DeviceLister;
 class DeviceManager;
diff --git a/src/device/gpodloader.h b/src/device/gpodloader.h
index 5680a731f..8d1236483 100644
--- a/src/device/gpodloader.h
+++ b/src/device/gpodloader.h
@@ -27,11 +27,11 @@
 #include <gpod/itdb.h>
 
 #include <QObject>
-#include <QThread>
 #include <QString>
 
 #include "core/song.h"
 
+class QThread;
 class TaskManager;
 class CollectionBackend;
 class ConnectedDevice;
diff --git a/src/device/mtpconnection.cpp b/src/device/mtpconnection.cpp
index 44deb1381..97cc14f74 100644
--- a/src/device/mtpconnection.cpp
+++ b/src/device/mtpconnection.cpp
@@ -22,7 +22,9 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
 
+#include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QRegExp>
diff --git a/src/device/mtpconnection.h b/src/device/mtpconnection.h
index 0a776f378..5695c557e 100644
--- a/src/device/mtpconnection.h
+++ b/src/device/mtpconnection.h
@@ -28,6 +28,7 @@
 #include <libmtp.h>
 
 #include <QtGlobal>
+#include <QObject>
 #include <QList>
 #include <QUrl>
 
diff --git a/src/device/mtpdevice.cpp b/src/device/mtpdevice.cpp
index 42742d638..05bb0b1da 100644
--- a/src/device/mtpdevice.cpp
+++ b/src/device/mtpdevice.cpp
@@ -25,7 +25,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <QtGlobal>
 #include <QThread>
 #include <QMutex>
 #include <QFile>
diff --git a/src/device/mtpdevice.h b/src/device/mtpdevice.h
index 4a0e19dc8..4e6533f33 100644
--- a/src/device/mtpdevice.h
+++ b/src/device/mtpdevice.h
@@ -27,7 +27,6 @@
 #include <memory>
 
 #include <QObject>
-#include <QThread>
 #include <QMutex>
 #include <QList>
 #include <QString>
@@ -36,12 +35,12 @@
 
 #include "core/song.h"
 #include "connecteddevice.h"
-#include "mtploader.h"
 
+class QThread;
 class Application;
 class DeviceLister;
 class DeviceManager;
-class DeviceConnection;
+class MtpLoader;
 class MtpConnection;
 struct LIBMTP_mtpdevice_struct;
 
diff --git a/src/device/mtploader.cpp b/src/device/mtploader.cpp
index 445d610aa..2683091f1 100644
--- a/src/device/mtploader.cpp
+++ b/src/device/mtploader.cpp
@@ -28,10 +28,7 @@
 
 #include "core/taskmanager.h"
 #include "core/song.h"
-#include "core/logging.h"
 #include "collection/collectionbackend.h"
-#include "connecteddevice.h"
-#include "mtpdevice.h"
 #include "mtpconnection.h"
 #include "mtploader.h"
 
diff --git a/src/device/mtploader.h b/src/device/mtploader.h
index a5c431f7f..18a400d92 100644
--- a/src/device/mtploader.h
+++ b/src/device/mtploader.h
@@ -27,14 +27,12 @@
 #include <memory>
 
 #include <QObject>
-#include <QThread>
 #include <QString>
 #include <QUrl>
 
+class QThread;
 class TaskManager;
 class CollectionBackend;
-class ConnectedDevice;
-class MtpDevice;
 class MtpConnection;
 
 class MtpLoader : public QObject {
diff --git a/src/device/udisks2lister.h b/src/device/udisks2lister.h
index 07abeb104..ed6ee007d 100644
--- a/src/device/udisks2lister.h
+++ b/src/device/udisks2lister.h
@@ -30,7 +30,6 @@
 #include <QMutex>
 #include <QList>
 #include <QMap>
-#include <QMetaType>
 #include <QReadWriteLock>
 #include <QString>
 #include <QStringList>
diff --git a/src/dialogs/about.cpp b/src/dialogs/about.cpp
index 24cef1d01..bcb267100 100644
--- a/src/dialogs/about.cpp
+++ b/src/dialogs/about.cpp
@@ -32,6 +32,7 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QKeySequence>
+#include <QTextBrowser>
 
 #include "about.h"
 #include "ui_about.h"
diff --git a/src/dialogs/about.h b/src/dialogs/about.h
index e972409d2..52544d0bf 100644
--- a/src/dialogs/about.h
+++ b/src/dialogs/about.h
@@ -24,15 +24,15 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
 #include <QList>
 #include <QString>
 
 #include "ui_about.h"
 
+class QWidget;
+
 class About : public QDialog {
   Q_OBJECT
 
diff --git a/src/dialogs/edittagdialog.cpp b/src/dialogs/edittagdialog.cpp
index afffd8023..e9f5bd5ba 100644
--- a/src/dialogs/edittagdialog.cpp
+++ b/src/dialogs/edittagdialog.cpp
@@ -85,6 +85,7 @@
 #include "edittagdialog.h"
 #include "trackselectiondialog.h"
 #include "ui_edittagdialog.h"
+#include "tagreadermessages.pb.h"
 
 const char *EditTagDialog::kHintText = QT_TR_NOOP("(different across multiple songs)");
 const char *EditTagDialog::kSettingsGroup = "EditTagDialog";
diff --git a/src/dialogs/edittagdialog.h b/src/dialogs/edittagdialog.h
index b5f6cb379..f4ed83627 100644
--- a/src/dialogs/edittagdialog.h
+++ b/src/dialogs/edittagdialog.h
@@ -23,28 +23,27 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
+#include <QAbstractItemModel>
 #include <QDialog>
-#include <QWidget>
 #include <QFuture>
-#include <QModelIndexList>
 #include <QList>
 #include <QVariant>
 #include <QString>
+#include <QUrl>
 #include <QImage>
-#include <QMenu>
-#include <QAbstractButton>
-#include <QLabel>
-#include <QPushButton>
-#include <QtEvents>
 
 #include "core/song.h"
 #include "core/tagreaderclient.h"
 #include "playlist/playlistitem.h"
 #include "covermanager/albumcoverloaderoptions.h"
 
+class QWidget;
+class QMenu;
+class QLabel;
+class QAbstractButton;
+class QPushButton;
 class QEvent;
 class QShowEvent;
 class QHideEvent;
diff --git a/src/dialogs/trackselectiondialog.h b/src/dialogs/trackselectiondialog.h
index 01f06f74e..94c8ff1a7 100644
--- a/src/dialogs/trackselectiondialog.h
+++ b/src/dialogs/trackselectiondialog.h
@@ -21,18 +21,17 @@
 #ifndef TRACKSELECTIONDIALOG_H
 #define TRACKSELECTIONDIALOG_H
 
-
 #include <QObject>
 #include <QDialog>
-#include <QWidget>
 #include <QList>
 #include <QString>
-#include <QTreeWidget>
-#include <QPushButton>
 
 #include "config.h"
 #include "core/song.h"
 
+class QWidget;
+class QTreeWidget;
+class QPushButton;
 class Ui_TrackSelectionDialog;
 
 class TrackSelectionDialog : public QDialog {
diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp
index 9cc137b15..96489229e 100644
--- a/src/engine/gstengine.cpp
+++ b/src/engine/gstengine.cpp
@@ -43,14 +43,12 @@
 #include <QStringList>
 #include <QUrl>
 #include <QTimeLine>
-#include <QTimerEvent>
 #include <QMetaObject>
 #include <QFlags>
-#include <QSettings>
+#include <QTimerEvent>
 #include <QtDebug>
 
 #include "core/closure.h"
-#include "core/utilities.h"
 #include "core/logging.h"
 #include "core/taskmanager.h"
 #include "core/timeconstants.h"
@@ -60,8 +58,6 @@
 #include "gstenginepipeline.h"
 #include "gstbufferconsumer.h"
 
-#include "settings/backendsettingspage.h"
-
 using std::shared_ptr;
 using std::vector;
 
diff --git a/src/engine/gstengine.h b/src/engine/gstengine.h
index 5c3475b2c..733cb6854 100644
--- a/src/engine/gstengine.h
+++ b/src/engine/gstengine.h
@@ -34,11 +34,8 @@
 #include <QFuture>
 #include <QByteArray>
 #include <QList>
-#include <QVariant>
 #include <QString>
 #include <QUrl>
-#include <QTimer>
-#include <QTimerEvent>
 
 #include "core/timeconstants.h"
 #include "engine_fwd.h"
@@ -46,6 +43,8 @@
 #include "gststartup.h"
 #include "gstbufferconsumer.h"
 
+class QTimer;
+class QTimerEvent;
 class TaskManager;
 class GstEnginePipeline;
 
diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp
index 7b777ff51..d30fe4169 100644
--- a/src/engine/gstenginepipeline.cpp
+++ b/src/engine/gstenginepipeline.cpp
@@ -22,6 +22,8 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
+#include <string>
 #include <glib.h>
 #include <glib-object.h>
 #include <gst/gst.h>
@@ -39,13 +41,14 @@
 #include <QUrl>
 #include <QTimeLine>
 #include <QMetaObject>
-#include <QtDebug>
 #include <QUuid>
+#include <QtDebug>
 
 #include "core/concurrentrun.h"
 #include "core/logging.h"
 #include "core/signalchecker.h"
 #include "core/timeconstants.h"
+#include "core/song.h"
 #include "enginebase.h"
 #include "gstengine.h"
 #include "gstenginepipeline.h"
diff --git a/src/engine/gstenginepipeline.h b/src/engine/gstenginepipeline.h
index c6224ce1d..71ea28664 100644
--- a/src/engine/gstenginepipeline.h
+++ b/src/engine/gstenginepipeline.h
@@ -38,15 +38,15 @@
 #include <QFuture>
 #include <QTimeLine>
 #include <QBasicTimer>
-#include <QByteArray>
 #include <QList>
+#include <QByteArray>
 #include <QVariant>
 #include <QString>
 #include <QUrl>
-#include <QTimerEvent>
 
 using std::unique_ptr;
 
+class QTimerEvent;
 class GstEngine;
 class GstBufferConsumer;
 class GstElementDeleter;
diff --git a/src/engine/gststartup.cpp b/src/engine/gststartup.cpp
index 8f94c4afa..64d1f81da 100644
--- a/src/engine/gststartup.cpp
+++ b/src/engine/gststartup.cpp
@@ -22,7 +22,6 @@
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QCoreApplication>
 #include <QStandardPaths>
diff --git a/src/engine/gststartup.h b/src/engine/gststartup.h
index cce35ba94..b3e45b11f 100644
--- a/src/engine/gststartup.h
+++ b/src/engine/gststartup.h
@@ -24,7 +24,6 @@
 
 #include <gst/gst.h>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QFuture>
 
diff --git a/src/engine/vlcengine.cpp b/src/engine/vlcengine.cpp
index 3cb58c248..68e08e645 100644
--- a/src/engine/vlcengine.cpp
+++ b/src/engine/vlcengine.cpp
@@ -21,12 +21,13 @@
 
 #include "config.h"
 
-#include <stddef.h>
 #include <vlc/vlc.h>
 
 #include <QtGlobal>
+#include <QVariant>
 #include <QByteArray>
 #include <QUrl>
+#include <QtDebug>
 
 #include "core/timeconstants.h"
 #include "core/taskmanager.h"
diff --git a/src/engine/xineengine.cpp b/src/engine/xineengine.cpp
index df7fd5e77..c1fe0cce2 100644
--- a/src/engine/xineengine.cpp
+++ b/src/engine/xineengine.cpp
@@ -27,6 +27,7 @@
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
+#include <errno.h>
 #include <xine.h>
 #ifdef XINE_ANALYZER
 #  include <xine/metronom.h>
@@ -34,20 +35,13 @@
 
 #include <memory>
 #include <cstdlib>
-#include <algorithm>
 #include <climits>
-#include <vector>
 
 #include <QtGlobal>
-#include <QApplication>
-#include <QThread>
 #include <QMutex>
 #include <QByteArray>
 #include <QChar>
-#include <QDir>
-#include <QFile>
 #include <QFileInfo>
-#include <QDateTime>
 #include <QLocale>
 #include <QVariant>
 #include <QString>
@@ -56,7 +50,6 @@
 #include <QUrl>
 #include <QTimer>
 #include <QtDebug>
-#include <QSettings>
 
 #include "core/logging.h"
 #include <core/timeconstants.h>
@@ -68,8 +61,6 @@
 #  include "xinescope.h"
 #endif
 
-#include "settings/backendsettingspage.h"
-
 using std::shared_ptr;
 
 #ifndef LLONG_MAX
diff --git a/src/engine/xineengine.h b/src/engine/xineengine.h
index 2f5d0c177..53c37277f 100644
--- a/src/engine/xineengine.h
+++ b/src/engine/xineengine.h
@@ -31,8 +31,8 @@
 #include <QObject>
 #include <QMutex>
 #include <QThread>
-#include <QEvent>
 #include <QList>
+#include <QVariant>
 #include <QString>
 #include <QUrl>
 
diff --git a/src/globalshortcuts/globalshortcut-win.cpp b/src/globalshortcuts/globalshortcut-win.cpp
index ef0cbfbc9..90622f47c 100644
--- a/src/globalshortcuts/globalshortcut-win.cpp
+++ b/src/globalshortcuts/globalshortcut-win.cpp
@@ -18,16 +18,10 @@
  */
 
 #include <QtGlobal>
-#include <QObject>
-#include <QAbstractEventDispatcher>
 #include <QByteArray>
 
 #include <qt_windows.h>
 
-#include "core/logging.h"
-
-#include "globalshortcuts.h"
-#include "globalshortcutbackend.h"
 #include "globalshortcut.h"
 #include "keymapper_win.h"
 
diff --git a/src/globalshortcuts/globalshortcut-x11.cpp b/src/globalshortcuts/globalshortcut-x11.cpp
index 7d1fbc9d9..b6a7f72fc 100644
--- a/src/globalshortcuts/globalshortcut-x11.cpp
+++ b/src/globalshortcuts/globalshortcut-x11.cpp
@@ -20,20 +20,14 @@
 #include "config.h"
 
 #include <QtGlobal>
-#include <QApplication>
-#include <QObject>
-#include <QAbstractEventDispatcher>
-#include <QDataStream>
+#include <QMap>
 #include <QVector>
 #include <QByteArray>
+#include <QString>
 #include <QX11Info>
 #include <QKeySequence>
-#include <QtAlgorithms>
+#include <QFlags>
 
-#include "core/logging.h"
-
-#include "globalshortcuts.h"
-#include "globalshortcutbackend.h"
 #include "globalshortcut.h"
 #include "keymapper_x11.h"
 
diff --git a/src/globalshortcuts/globalshortcut.cpp b/src/globalshortcuts/globalshortcut.cpp
index 24f7bb641..7bdf85d5f 100644
--- a/src/globalshortcuts/globalshortcut.cpp
+++ b/src/globalshortcuts/globalshortcut.cpp
@@ -21,15 +21,14 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QApplication>
 #include <QAbstractEventDispatcher>
 #include <QPair>
 #include <QHash>
+#include <QFlags>
 #include <QtDebug>
 
 #include "core/logging.h"
 
-#include "globalshortcutbackend.h"
 #include "globalshortcut.h"
 
 GlobalShortcut *GlobalShortcut::initialized_ = nullptr;
diff --git a/src/globalshortcuts/globalshortcut.h b/src/globalshortcuts/globalshortcut.h
index adcb325e9..85f955ab5 100644
--- a/src/globalshortcuts/globalshortcut.h
+++ b/src/globalshortcuts/globalshortcut.h
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractNativeEventFilter>
@@ -31,6 +30,7 @@
 #include <QVector>
 #include <QHash>
 #include <QByteArray>
+#include <QString>
 
 class GlobalShortcutBackend;
 
diff --git a/src/globalshortcuts/globalshortcutbackend-gsd.cpp b/src/globalshortcuts/globalshortcutbackend-gsd.cpp
index 7b084ff4d..f01792e6f 100644
--- a/src/globalshortcuts/globalshortcutbackend-gsd.cpp
+++ b/src/globalshortcuts/globalshortcutbackend-gsd.cpp
@@ -30,6 +30,8 @@
 #include <QDBusMessage>
 #include <QDBusPendingCallWatcher>
 #include <QDBusPendingReply>
+#include <QAction>
+#include <QtDebug>
 
 #include "core/closure.h"
 #include "core/logging.h"
diff --git a/src/globalshortcuts/globalshortcutbackend-gsd.h b/src/globalshortcuts/globalshortcutbackend-gsd.h
index 8c764ffa4..03ce8dc96 100644
--- a/src/globalshortcuts/globalshortcutbackend-gsd.h
+++ b/src/globalshortcuts/globalshortcutbackend-gsd.h
@@ -23,17 +23,12 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QtGlobal>
-#include <QPair>
-#include <QVector>
-#include <QHash>
 #include <QString>
-#include <QDBusPendingCallWatcher>
 
 #include "globalshortcutbackend.h"
 
+class QDBusPendingCallWatcher;
 class GlobalShortcuts;
 class OrgGnomeSettingsDaemonMediaKeysInterface;
 
diff --git a/src/globalshortcuts/globalshortcutbackend-system.cpp b/src/globalshortcuts/globalshortcutbackend-system.cpp
index c72ff9444..aaa0878a1 100644
--- a/src/globalshortcuts/globalshortcutbackend-system.cpp
+++ b/src/globalshortcuts/globalshortcutbackend-system.cpp
@@ -23,9 +23,10 @@
 
 #include "core/logging.h"
 
-#include <QtGlobal>
 #include <QObject>
+#include <QMap>
 #include <QAction>
+#include <QKeySequence>
 #include <QtAlgorithms>
 
 #include "globalshortcuts.h"
diff --git a/src/globalshortcuts/globalshortcutbackend-system.h b/src/globalshortcuts/globalshortcutbackend-system.h
index 7e98d59f9..afd42d8b8 100644
--- a/src/globalshortcuts/globalshortcutbackend-system.h
+++ b/src/globalshortcuts/globalshortcutbackend-system.h
@@ -24,15 +24,13 @@
 
 #include "core/logging.h"
 
-
 #include <QObject>
-#include <QtGlobal>
-#include <QAction>
 #include <QList>
-#include <QKeySequence>
+#include <QString>
 
 #include "globalshortcutbackend.h"
 
+class QAction;
 class GlobalShortcuts;
 class GlobalShortcut;
 
diff --git a/src/globalshortcuts/globalshortcutbackend.h b/src/globalshortcuts/globalshortcutbackend.h
index a842bb3b5..8f4ab98c3 100644
--- a/src/globalshortcuts/globalshortcutbackend.h
+++ b/src/globalshortcuts/globalshortcutbackend.h
@@ -23,11 +23,7 @@
 
 #include "config.h"
 
-
-#include <QtGlobal>
 #include <QObject>
-#include <QPair>
-#include <QHash>
 #include <QString>
 
 class GlobalShortcuts;
diff --git a/src/globalshortcuts/globalshortcutgrabber.cpp b/src/globalshortcuts/globalshortcutgrabber.cpp
index 86862a40c..2ac6af56a 100644
--- a/src/globalshortcuts/globalshortcutgrabber.cpp
+++ b/src/globalshortcuts/globalshortcutgrabber.cpp
@@ -23,18 +23,17 @@
 #include <QDialog>
 #include <QWidget>
 #include <QString>
-#include <QStringBuilder>
 #include <QLabel>
 #include <QKeySequence>
-#include <QtEvents>
+#include <QDialogButtonBox>
+#include <QEvent>
+#include <QShowEvent>
+#include <QHideEvent>
+#include <QKeyEvent>
 
 #include "globalshortcutgrabber.h"
 #include "ui_globalshortcutgrabber.h"
 
-class QShowEvent;
-class QHideEvent;
-class QKeyEvent;
-
 GlobalShortcutGrabber::GlobalShortcutGrabber(QWidget *parent)
     : QDialog(parent), ui_(new Ui::GlobalShortcutGrabber) {
   ui_->setupUi(this);
diff --git a/src/globalshortcuts/globalshortcutgrabber.h b/src/globalshortcuts/globalshortcutgrabber.h
index 7e4aa1dba..9c14dbbc0 100644
--- a/src/globalshortcuts/globalshortcutgrabber.h
+++ b/src/globalshortcuts/globalshortcutgrabber.h
@@ -23,14 +23,12 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QDialog>
 #include <QList>
 #include <QString>
 #include <QKeySequence>
-#include <QtEvents>
 
 class QEvent;
 class QHideEvent;
diff --git a/src/globalshortcuts/globalshortcuts.cpp b/src/globalshortcuts/globalshortcuts.cpp
index ca83bbadc..72c28bb7d 100644
--- a/src/globalshortcuts/globalshortcuts.cpp
+++ b/src/globalshortcuts/globalshortcuts.cpp
@@ -34,8 +34,6 @@
 #include <QX11Info>
 #endif
 
-#include "core/logging.h"
-
 #include "globalshortcuts.h"
 #include "globalshortcutbackend.h"
 
diff --git a/src/globalshortcuts/globalshortcuts.h b/src/globalshortcuts/globalshortcuts.h
index 8ca04a674..7e9ee879f 100644
--- a/src/globalshortcuts/globalshortcuts.h
+++ b/src/globalshortcuts/globalshortcuts.h
@@ -24,18 +24,15 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QMap>
 #include <QString>
-#include <QAction>
-#include <QShortcut>
 #include <QKeySequence>
 #include <QSettings>
 
-#include "globalshortcut.h"
-
+class QShortcut;
+class QAction;
 class GlobalShortcutBackend;
 
 class GlobalShortcuts : public QWidget {
diff --git a/src/internet/internetcollectionview.cpp b/src/internet/internetcollectionview.cpp
index 299593a8e..90b9c134b 100644
--- a/src/internet/internetcollectionview.cpp
+++ b/src/internet/internetcollectionview.cpp
@@ -21,18 +21,21 @@
 
 #include "config.h"
 
-#include <QtGlobal>
+#include <QWidget>
 #include <QTreeView>
 #include <QSortFilterProxyModel>
 #include <QAbstractItemView>
+#include <QItemSelectionModel>
 #include <QVariant>
 #include <QString>
+#include <QUrl>
 #include <QPainter>
 #include <QRect>
 #include <QFont>
 #include <QFontMetrics>
 #include <QMimeData>
 #include <QMenu>
+#include <QAction>
 #include <QtEvents>
 
 #include "core/application.h"
diff --git a/src/internet/internetcollectionview.h b/src/internet/internetcollectionview.h
index 333508286..d9429b5ed 100644
--- a/src/internet/internetcollectionview.h
+++ b/src/internet/internetcollectionview.h
@@ -24,21 +24,20 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
 #include <QSet>
 #include <QString>
 #include <QPixmap>
-#include <QAction>
-#include <QMenu>
-#include <QtEvents>
 
 #include "widgets/autoexpandingtreeview.h"
 #include "core/song.h"
 
+class QWidget;
+class QMenu;
+class QAction;
 class QContextMenuEvent;
-class QHelpEvent;
 class QMouseEvent;
 class QPaintEvent;
 
diff --git a/src/internet/internetcollectionviewcontainer.cpp b/src/internet/internetcollectionviewcontainer.cpp
index c757a25d7..0c8d0f42d 100644
--- a/src/internet/internetcollectionviewcontainer.cpp
+++ b/src/internet/internetcollectionviewcontainer.cpp
@@ -19,19 +19,16 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QWidget>
-#include <QPushButton>
-#include <QLabel>
 #include <QProgressBar>
 #include <QKeyEvent>
 #include <QContextMenuEvent>
 
-#include "core/application.h"
+#include "collection/collectionfilterwidget.h"
 #include "internetcollectionview.h"
 #include "internetcollectionviewcontainer.h"
 #include "ui_internetcollectionviewcontainer.h"
-#include "collection/collectionfilterwidget.h"
-#include "internetservice.h"
 
 InternetCollectionViewContainer::InternetCollectionViewContainer(QWidget *parent) :
   QWidget(parent),
diff --git a/src/internet/internetcollectionviewcontainer.h b/src/internet/internetcollectionviewcontainer.h
index 68a7d22da..9a8a3fbba 100644
--- a/src/internet/internetcollectionviewcontainer.h
+++ b/src/internet/internetcollectionviewcontainer.h
@@ -22,19 +22,21 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QWidget>
+#include <QString>
 
+#include "internetcollectionview.h"
 #include "ui_internetcollectionviewcontainer.h"
 
 class QStackedWidget;
 class QPushButton;
 class QLabel;
 class QProgressBar;
+class QContextMenuEvent;
 class Application;
-class InternetCollectionView;
 class CollectionFilterWidget;
 class InternetService;
-class Ui_InternetCollectionViewContainer;
 
 class InternetCollectionViewContainer : public QWidget {
   Q_OBJECT
diff --git a/src/internet/internetplaylistitem.cpp b/src/internet/internetplaylistitem.cpp
index e663e6275..432d5ab3f 100644
--- a/src/internet/internetplaylistitem.cpp
+++ b/src/internet/internetplaylistitem.cpp
@@ -25,6 +25,7 @@
 #include <QSettings>
 #include <QVariant>
 #include <QString>
+#include <QStringList>
 #include <QtDebug>
 
 #include "internetplaylistitem.h"
diff --git a/src/internet/internetplaylistitem.h b/src/internet/internetplaylistitem.h
index 75b5b93c3..0570a68dc 100644
--- a/src/internet/internetplaylistitem.h
+++ b/src/internet/internetplaylistitem.h
@@ -23,11 +23,11 @@
 
 #include "config.h"
 
-#include <QString>
 #include <QVariant>
 #include <QUrl>
 
 #include "core/song.h"
+#include "collection/sqlrow.h"
 #include "playlist/playlistitem.h"
 
 class InternetService;
diff --git a/src/internet/internetsearch.cpp b/src/internet/internetsearch.cpp
index b95dc39ef..0fe104429 100644
--- a/src/internet/internetsearch.cpp
+++ b/src/internet/internetsearch.cpp
@@ -29,17 +29,16 @@
 #include <QStringList>
 #include <QStringBuilder>
 #include <QUrl>
+#include <QRegExp>
 #include <QImage>
 #include <QPixmap>
-#include <QIcon>
 #include <QPainter>
+#include <QSize>
 #include <QTimerEvent>
-#include <QSettings>
 
 #include "core/application.h"
-#include "core/logging.h"
 #include "core/song.h"
-#include "playlist/songmimedata.h"
+#include "core/mimedata.h"
 #include "covermanager/albumcoverloader.h"
 #include "internet/internetsongmimedata.h"
 #include "internetsearch.h"
diff --git a/src/internet/internetsearch.h b/src/internet/internetsearch.h
index 271755cef..e70293b5a 100644
--- a/src/internet/internetsearch.h
+++ b/src/internet/internetsearch.h
@@ -26,9 +26,13 @@
 
 #include <QtGlobal>
 #include <QObject>
+#include <QMetaType>
+#include <QSet>
+#include <QList>
 #include <QMap>
 #include <QString>
 #include <QStringList>
+#include <QUrl>
 #include <QImage>
 #include <QPixmap>
 #include <QPixmapCache>
@@ -36,6 +40,7 @@
 #include "core/song.h"
 #include "covermanager/albumcoverloaderoptions.h"
 
+class QTimerEvent;
 class Application;
 class MimeData;
 class AlbumCoverLoader;
diff --git a/src/internet/internetsearchitemdelegate.h b/src/internet/internetsearchitemdelegate.h
index 1dc0b30cc..9416151a4 100644
--- a/src/internet/internetsearchitemdelegate.h
+++ b/src/internet/internetsearchitemdelegate.h
@@ -22,10 +22,12 @@
 #define INTERNETSEARCHITEMDELEGATE_H
 
 #include <QStyleOptionViewItem>
+#include <QStyleOption>
 
 #include "collection/collectionitemdelegate.h"
 
 class QPainter;
+class QModelIndex;
 class InternetSearchView;
 
 class InternetSearchItemDelegate : public CollectionItemDelegate {
diff --git a/src/internet/internetsearchmodel.cpp b/src/internet/internetsearchmodel.cpp
index 6fd6ed281..f2120b65b 100644
--- a/src/internet/internetsearchmodel.cpp
+++ b/src/internet/internetsearchmodel.cpp
@@ -21,16 +21,17 @@
 #include "config.h"
 
 #include <QStandardItemModel>
+#include <QSortFilterProxyModel>
 #include <QMimeData>
 #include <QList>
 #include <QSet>
 #include <QVariant>
 #include <QString>
 #include <QPixmap>
+#include <QSize>
 
 #include "core/mimedata.h"
 #include "core/iconloader.h"
-#include "core/logging.h"
 #include "internetsearch.h"
 #include "internetsearchmodel.h"
 
diff --git a/src/internet/internetsearchmodel.h b/src/internet/internetsearchmodel.h
index 11b5d03cb..397c06f54 100644
--- a/src/internet/internetsearchmodel.h
+++ b/src/internet/internetsearchmodel.h
@@ -25,21 +25,23 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QMimeData>
+#include <QAbstractItemModel>
 #include <QStandardItemModel>
 #include <QStandardItem>
-#include <QSortFilterProxyModel>
-#include <QMap>
 #include <QSet>
 #include <QList>
+#include <QMap>
 #include <QString>
-#include <QStringList>
 #include <QIcon>
 #include <QPixmap>
 
+#include "core/song.h"
 #include "collection/collectionmodel.h"
 #include "internetsearch.h"
 
+class QMimeData;
+class QSortFilterProxyModel;
+
 class InternetSearchModel : public QStandardItemModel {
   Q_OBJECT
 
diff --git a/src/internet/internetsearchsortmodel.cpp b/src/internet/internetsearchsortmodel.cpp
index fc2f4a3d5..7bdae7567 100644
--- a/src/internet/internetsearchsortmodel.cpp
+++ b/src/internet/internetsearchsortmodel.cpp
@@ -21,10 +21,14 @@
 #include "config.h"
 
 #include <QObject>
+#include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
+#include <QVariant>
 #include <QString>
 
-#include "core/logging.h"
+#include "core/song.h"
+#include "collection/collectionmodel.h"
+#include "internetsearch.h"
 #include "internetsearchmodel.h"
 #include "internetsearchsortmodel.h"
 
diff --git a/src/internet/internetsearchsortmodel.h b/src/internet/internetsearchsortmodel.h
index 8f59bbedb..6969d5449 100644
--- a/src/internet/internetsearchsortmodel.h
+++ b/src/internet/internetsearchsortmodel.h
@@ -21,9 +21,11 @@
 #ifndef INTERNETSEARCHSORTMODEL_H
 #define INTERNETSEARCHSORTMODEL_H
 
-#include <QObject>
 #include <QSortFilterProxyModel>
 
+class QObject;
+class QModelIndex;
+
 class InternetSearchSortModel : public QSortFilterProxyModel {
  public:
   InternetSearchSortModel(QObject *parent = nullptr);
diff --git a/src/internet/internetsearchview.cpp b/src/internet/internetsearchview.cpp
index 3a47c4301..d9b7a09a9 100644
--- a/src/internet/internetsearchview.cpp
+++ b/src/internet/internetsearchview.cpp
@@ -37,14 +37,12 @@
 #include <QtEvents>
 
 #include "core/application.h"
-#include "core/logging.h"
 #include "core/mimedata.h"
 #include "core/iconloader.h"
 #include "internet/internetsongmimedata.h"
 #include "collection/collectionfilterwidget.h"
 #include "collection/collectionmodel.h"
 #include "collection/groupbydialog.h"
-#include "playlist/songmimedata.h"
 #include "internetsearch.h"
 #include "internetsearchitemdelegate.h"
 #include "internetsearchmodel.h"
diff --git a/src/internet/internetsearchview.h b/src/internet/internetsearchview.h
index 130a0ce4c..00d1c8dfc 100644
--- a/src/internet/internetsearchview.h
+++ b/src/internet/internetsearchview.h
@@ -24,15 +24,17 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QWidget>
 #include <QMap>
 #include <QList>
 #include <QString>
 #include <QPixmap>
+#include <QScopedPointer>
 
+#include "core/song.h"
 #include "collection/collectionmodel.h"
 #include "settings/settingsdialog.h"
-#include "playlist/playlistmanager.h"
 #include "internetsearch.h"
 
 class QSortFilterProxyModel;
@@ -47,7 +49,9 @@ class QShowEvent;
 class QHideEvent;
 class QContextMenuEvent;
 
+class QModelIndex;
 class Application;
+class MimeData;
 class GroupByDialog;
 class InternetSearchModel;
 class Ui_InternetSearchView;
diff --git a/src/internet/internetservice.h b/src/internet/internetservice.h
index b584726b1..df2ae7ab9 100644
--- a/src/internet/internetservice.h
+++ b/src/internet/internetservice.h
@@ -20,15 +20,17 @@
 #ifndef INTERNETSERVICE_H
 #define INTERNETSERVICE_H
 
+#include <QtGlobal>
 #include <QObject>
+#include <QMetaType>
 #include <QString>
 #include <QUrl>
 #include <QIcon>
-#include <QSortFilterProxyModel>
 
 #include "core/song.h"
 #include "internetsearch.h"
 
+class QSortFilterProxyModel;
 class Application;
 class CollectionBackend;
 class CollectionModel;
diff --git a/src/internet/internetservices.h b/src/internet/internetservices.h
index 20927f99b..3cc51306c 100644
--- a/src/internet/internetservices.h
+++ b/src/internet/internetservices.h
@@ -25,7 +25,9 @@
 #include "config.h"
 
 #include <QObject>
+#include <QList>
 #include <QMap>
+#include <QString>
 
 #include "core/song.h"
 
diff --git a/src/internet/internetsongsview.cpp b/src/internet/internetsongsview.cpp
index fa2c82b74..258e8010a 100644
--- a/src/internet/internetsongsview.cpp
+++ b/src/internet/internetsongsview.cpp
@@ -25,12 +25,17 @@
 #include <QStackedWidget>
 #include <QContextMenuEvent>
 #include <QSortFilterProxyModel>
+#include <QLabel>
+#include <QProgressBar>
+#include <QPushButton>
 
 #include "core/application.h"
 #include "collection/collectionbackend.h"
+#include "collection/collectionmodel.h"
 #include "collection/collectionfilterwidget.h"
 #include "internetservice.h"
 #include "internetsongsview.h"
+#include "internetcollectionview.h"
 #include "ui_internetcollectionviewcontainer.h"
 
 InternetSongsView::InternetSongsView(Application *app, InternetService *service, const QString &settings_group, const SettingsDialog::Page settings_page, QWidget *parent)
diff --git a/src/internet/internetsongsview.h b/src/internet/internetsongsview.h
index 07634be35..95c765730 100644
--- a/src/internet/internetsongsview.h
+++ b/src/internet/internetsongsview.h
@@ -22,19 +22,18 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QWidget>
 #include <QString>
 
-#include "settings/settingsdialog.h"
-#include "internetcollectionviewcontainer.h"
-#include "ui_internetcollectionviewcontainer.h"
 #include "core/song.h"
+#include "settings/settingsdialog.h"
+#include "ui_internetcollectionviewcontainer.h"
 
 class QContextMenuEvent;
 
 class Application;
 class InternetService;
-class Ui_InternetCollectionViewContainer;
 class InternetCollectionView;
 
 class InternetSongsView : public QWidget {
diff --git a/src/internet/internettabsview.cpp b/src/internet/internettabsview.cpp
index 03a5385c8..4fcda848d 100644
--- a/src/internet/internettabsview.cpp
+++ b/src/internet/internettabsview.cpp
@@ -21,16 +21,26 @@
 
 #include <QtGlobal>
 #include <QWidget>
+#include <QVariant>
 #include <QString>
+#include <QLabel>
+#include <QProgressBar>
+#include <QPushButton>
+#include <QSortFilterProxyModel>
+#include <QTabWidget>
 #include <QStackedWidget>
 #include <QContextMenuEvent>
 #include <QSettings>
 
 #include "core/application.h"
 #include "collection/collectionbackend.h"
+#include "collection/collectionmodel.h"
 #include "collection/collectionfilterwidget.h"
 #include "internetservice.h"
 #include "internettabsview.h"
+#include "internetcollectionview.h"
+#include "internetcollectionviewcontainer.h"
+#include "internetsearchview.h"
 #include "ui_internettabsview.h"
 
 InternetTabsView::InternetTabsView(Application *app, InternetService *service, InternetSearch *engine, const QString &settings_group, const SettingsDialog::Page settings_page, QWidget *parent)
diff --git a/src/internet/internettabsview.h b/src/internet/internettabsview.h
index 29f0c426b..97675e05c 100644
--- a/src/internet/internettabsview.h
+++ b/src/internet/internettabsview.h
@@ -22,12 +22,12 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QWidget>
 #include <QString>
 
 #include "settings/settingsdialog.h"
 #include "internetcollectionviewcontainer.h"
-#include "internetcollectionview.h"
 #include "ui_internettabsview.h"
 #include "core/song.h"
 
@@ -36,7 +36,6 @@ class QContextMenuEvent;
 class Application;
 class InternetService;
 class InternetSearch;
-class Ui_InternetTabsView;
 class InternetCollectionView;
 class InternetSearchView;
 
diff --git a/src/internet/localredirectserver.cpp b/src/internet/localredirectserver.cpp
index 367aefa0f..eb1247e41 100644
--- a/src/internet/localredirectserver.cpp
+++ b/src/internet/localredirectserver.cpp
@@ -29,23 +29,26 @@
 #include <QIODevice>
 #include <QBuffer>
 #include <QFile>
-#include <QRegExp>
-#include <QStyle>
-#include <QSslKey>
-#include <QSslCertificate>
-#include <QTcpServer>
-#include <QAbstractSocket>
-#include <QTcpSocket>
-#include <QSslSocket>
 #include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QUrl>
+#include <QIcon>
+#include <QImage>
+#include <QPixmap>
+#include <QRegExp>
+#include <QStyle>
+#include <QHostAddress>
+#include <QSsl>
+#include <QSslKey>
+#include <QSslCertificate>
+#include <QSslError>
+#include <QTcpServer>
+#include <QAbstractSocket>
+#include <QTcpSocket>
+#include <QSslSocket>
 #include <QDateTime>
 
-#include "core/logging.h"
-#include "core/closure.h"
-
 LocalRedirectServer::LocalRedirectServer(const bool https, QObject *parent)
     : QTcpServer(parent),
       https_(https),
diff --git a/src/internet/localredirectserver.h b/src/internet/localredirectserver.h
index 237e1de2e..4200fcffe 100644
--- a/src/internet/localredirectserver.h
+++ b/src/internet/localredirectserver.h
@@ -22,16 +22,17 @@
 #ifndef LOCALREDIRECTSERVER_H
 #define LOCALREDIRECTSERVER_H
 
+#include <QtGlobal>
 #include <QByteArray>
 #include <QObject>
-#include <QSslCertificate>
-#include <QSslKey>
-#include <QTcpServer>
-#include <QAbstractSocket>
-#include <QTcpSocket>
-#include <QSslSocket>
+#include <QList>
 #include <QString>
 #include <QUrl>
+#include <QTcpServer>
+#include <QSslCertificate>
+#include <QSslKey>
+
+class QAbstractSocket;
 
 class LocalRedirectServer : public QTcpServer {
   Q_OBJECT
diff --git a/src/lyrics/auddlyricsprovider.cpp b/src/lyrics/auddlyricsprovider.cpp
index cbe372da2..96caeb226 100644
--- a/src/lyrics/auddlyricsprovider.cpp
+++ b/src/lyrics/auddlyricsprovider.cpp
@@ -20,6 +20,8 @@
 #include "config.h"
 
 #include <QObject>
+#include <QPair>
+#include <QList>
 #include <QByteArray>
 #include <QVariant>
 #include <QString>
@@ -28,16 +30,17 @@
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
+#include <QtDebug>
 
 #include "core/closure.h"
 #include "core/logging.h"
 #include "core/network.h"
 #include "jsonlyricsprovider.h"
 #include "lyricsfetcher.h"
+#include "lyricsprovider.h"
 #include "auddlyricsprovider.h"
 
 const char *AuddLyricsProvider::kUrlSearch = "https://api.audd.io/findLyrics/";
diff --git a/src/lyrics/auddlyricsprovider.h b/src/lyrics/auddlyricsprovider.h
index 596aef324..a9cea39f9 100644
--- a/src/lyrics/auddlyricsprovider.h
+++ b/src/lyrics/auddlyricsprovider.h
@@ -22,9 +22,11 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
+#include <QVariant>
 #include <QString>
+#include <QJsonArray>
 
 #include "jsonlyricsprovider.h"
 #include "lyricsfetcher.h"
diff --git a/src/lyrics/jsonlyricsprovider.cpp b/src/lyrics/jsonlyricsprovider.cpp
index e2da3aaa2..26eb777b7 100644
--- a/src/lyrics/jsonlyricsprovider.cpp
+++ b/src/lyrics/jsonlyricsprovider.cpp
@@ -28,7 +28,6 @@
 #include <QJsonObject>
 
 #include "lyricsprovider.h"
-#include "lyricsfetcher.h"
 #include "jsonlyricsprovider.h"
 
 JsonLyricsProvider::JsonLyricsProvider(const QString &name, QObject *parent) : LyricsProvider(name, parent) {}
diff --git a/src/lyrics/jsonlyricsprovider.h b/src/lyrics/jsonlyricsprovider.h
index 173ab07c6..e7a40eec8 100644
--- a/src/lyrics/jsonlyricsprovider.h
+++ b/src/lyrics/jsonlyricsprovider.h
@@ -22,9 +22,11 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
 #include <QVariant>
 #include <QString>
+#include <QJsonObject>
 
 #include "lyricsprovider.h"
 
diff --git a/src/lyrics/lololyricsprovider.cpp b/src/lyrics/lololyricsprovider.cpp
index 2266683dc..84592884b 100644
--- a/src/lyrics/lololyricsprovider.cpp
+++ b/src/lyrics/lololyricsprovider.cpp
@@ -20,6 +20,8 @@
 #include "config.h"
 
 #include <QObject>
+#include <QPair>
+#include <QList>
 #include <QByteArray>
 #include <QVariant>
 #include <QString>
@@ -29,6 +31,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QXmlStreamReader>
+#include <QtDebug>
 
 #include "core/closure.h"
 #include "core/logging.h"
diff --git a/src/lyrics/lololyricsprovider.h b/src/lyrics/lololyricsprovider.h
index 9ab31bead..ec84542f6 100644
--- a/src/lyrics/lololyricsprovider.h
+++ b/src/lyrics/lololyricsprovider.h
@@ -22,13 +22,12 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QVariant>
 #include <QString>
 
 #include "lyricsprovider.h"
-#include "lyricsfetcher.h"
 
 class QNetworkAccessManager;
 class QNetworkReply;
diff --git a/src/lyrics/lyricsfetcher.cpp b/src/lyrics/lyricsfetcher.cpp
index 716b7b237..6fdf18b4d 100644
--- a/src/lyrics/lyricsfetcher.cpp
+++ b/src/lyrics/lyricsfetcher.cpp
@@ -24,7 +24,6 @@
 #include <QTimer>
 #include <QString>
 
-#include "core/logging.h"
 #include "core/song.h"
 #include "lyricsfetcher.h"
 #include "lyricsfetchersearch.h"
diff --git a/src/lyrics/lyricsfetcher.h b/src/lyrics/lyricsfetcher.h
index 5c905f160..3f36f8447 100644
--- a/src/lyrics/lyricsfetcher.h
+++ b/src/lyrics/lyricsfetcher.h
@@ -22,16 +22,17 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
+#include <QMetaType>
 #include <QQueue>
-#include <QTimer>
-#include <QHash>
+#include <QSet>
 #include <QList>
+#include <QHash>
 #include <QString>
 #include <QUrl>
 
+class QTimer;
 class LyricsProviders;
 class LyricsFetcherSearch;
 
diff --git a/src/lyrics/lyricsfetchersearch.cpp b/src/lyrics/lyricsfetchersearch.cpp
index 33465da1b..870352415 100644
--- a/src/lyrics/lyricsfetchersearch.cpp
+++ b/src/lyrics/lyricsfetchersearch.cpp
@@ -19,16 +19,11 @@
 
 #include "config.h"
 
-#include <algorithm>
-#include <cmath>
-
 #include <QObject>
-#include <QtAlgorithms>
 #include <QTimer>
 #include <QList>
 #include <QtDebug>
 
-#include "core/closure.h"
 #include "core/logging.h"
 #include "lyricsfetcher.h"
 #include "lyricsfetchersearch.h"
diff --git a/src/lyrics/lyricsfetchersearch.h b/src/lyrics/lyricsfetchersearch.h
index f9f5a0580..671175ca3 100644
--- a/src/lyrics/lyricsfetchersearch.h
+++ b/src/lyrics/lyricsfetchersearch.h
@@ -22,11 +22,10 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QMap>
+#include <QString>
 
 #include "lyricsfetcher.h"
 
diff --git a/src/lyrics/lyricsprovider.h b/src/lyrics/lyricsprovider.h
index d5165f3fc..0505bb28d 100644
--- a/src/lyrics/lyricsprovider.h
+++ b/src/lyrics/lyricsprovider.h
@@ -22,8 +22,9 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
+#include <QPair>
 #include <QList>
 #include <QString>
 
diff --git a/src/lyrics/lyricsproviders.cpp b/src/lyrics/lyricsproviders.cpp
index 200f936bc..888b88d35 100644
--- a/src/lyrics/lyricsproviders.cpp
+++ b/src/lyrics/lyricsproviders.cpp
@@ -24,11 +24,9 @@
 #include <QString>
 #include <QtDebug>
 
-#include "core/application.h"
 #include "core/logging.h"
 #include "lyricsprovider.h"
 #include "lyricsproviders.h"
-#include "lyricsfetcher.h"
 
 LyricsProviders::LyricsProviders(QObject *parent) : QObject(parent) {}
 
diff --git a/src/lyrics/lyricsproviders.h b/src/lyrics/lyricsproviders.h
index 4d8577b52..8ee945df2 100644
--- a/src/lyrics/lyricsproviders.h
+++ b/src/lyrics/lyricsproviders.h
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QMutex>
diff --git a/src/lyrics/ovhlyricsprovider.cpp b/src/lyrics/ovhlyricsprovider.cpp
index 484cd99a1..2f1e9bd6a 100644
--- a/src/lyrics/ovhlyricsprovider.cpp
+++ b/src/lyrics/ovhlyricsprovider.cpp
@@ -20,21 +20,19 @@
 #include "config.h"
 
 #include <QObject>
-#include <QByteArray>
 #include <QVariant>
 #include <QString>
 #include <QUrl>
-#include <QUrlQuery>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonObject>
+#include <QJsonValue>
+#include <QtDebug>
 
 #include "core/closure.h"
 #include "core/logging.h"
 #include "core/network.h"
-#include "core/utilities.h"
-#include "lyricsprovider.h"
 #include "lyricsfetcher.h"
 #include "jsonlyricsprovider.h"
 #include "ovhlyricsprovider.h"
diff --git a/src/lyrics/ovhlyricsprovider.h b/src/lyrics/ovhlyricsprovider.h
index 74e5faadc..9c5fe9220 100644
--- a/src/lyrics/ovhlyricsprovider.h
+++ b/src/lyrics/ovhlyricsprovider.h
@@ -22,14 +22,12 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QVariant>
 #include <QString>
 
-#include "lyricsprovider.h"
 #include "jsonlyricsprovider.h"
-#include "lyricsfetcher.h"
 
 class QNetworkAccessManager;
 class QNetworkReply;
diff --git a/src/moodbar/moodbarbuilder.cpp b/src/moodbar/moodbarbuilder.cpp
index f1d5370a2..3aaf74908 100644
--- a/src/moodbar/moodbarbuilder.cpp
+++ b/src/moodbar/moodbarbuilder.cpp
@@ -15,6 +15,7 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <algorithm>
 #include <cmath>
 
 #include <QList>
diff --git a/src/moodbar/moodbarbuilder.h b/src/moodbar/moodbarbuilder.h
index f3b203ced..96eb01e0d 100644
--- a/src/moodbar/moodbarbuilder.h
+++ b/src/moodbar/moodbarbuilder.h
@@ -18,6 +18,7 @@
 #ifndef MOODBARBUILDER_H
 #define MOODBARBUILDER_H
 
+#include <QtGlobal>
 #include <QList>
 #include <QByteArray>
 
diff --git a/src/moodbar/moodbarcontroller.cpp b/src/moodbar/moodbarcontroller.cpp
index 82f83f49b..bba16d688 100644
--- a/src/moodbar/moodbarcontroller.cpp
+++ b/src/moodbar/moodbarcontroller.cpp
@@ -15,15 +15,19 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <memory>
+
 #include <QObject>
 #include <QByteArray>
 #include <QUrl>
 
 #include "core/application.h"
 #include "core/closure.h"
-#include "core/logging.h"
 #include "core/player.h"
+#include "core/song.h"
+#include "engine/engine_fwd.h"
 #include "playlist/playlistmanager.h"
+#include "playlist/playlistitem.h"
 
 #include "moodbarcontroller.h"
 #include "moodbarloader.h"
diff --git a/src/moodbar/moodbarcontroller.h b/src/moodbar/moodbarcontroller.h
index b4d45d963..47966cd63 100644
--- a/src/moodbar/moodbarcontroller.h
+++ b/src/moodbar/moodbarcontroller.h
@@ -20,6 +20,7 @@
 
 #include <QObject>
 #include <QByteArray>
+#include <QString>
 #include <QUrl>
 
 class Application;
diff --git a/src/moodbar/moodbaritemdelegate.cpp b/src/moodbar/moodbaritemdelegate.cpp
index eca164b7e..01080539b 100644
--- a/src/moodbar/moodbaritemdelegate.cpp
+++ b/src/moodbar/moodbaritemdelegate.cpp
@@ -18,14 +18,20 @@
 #include <QApplication>
 #include <QtConcurrentRun>
 #include <QFuture>
-#include <QSettings>
+#include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
+#include <QSettings>
 #include <QItemDelegate>
+#include <QList>
+#include <QVector>
+#include <QVariant>
 #include <QByteArray>
 #include <QUrl>
 #include <QImage>
 #include <QPixmap>
 #include <QPainter>
+#include <QPalette>
+#include <QRect>
 
 #include "core/application.h"
 #include "core/closure.h"
diff --git a/src/moodbar/moodbaritemdelegate.h b/src/moodbar/moodbaritemdelegate.h
index 0fb2830b0..30d4e4756 100644
--- a/src/moodbar/moodbaritemdelegate.h
+++ b/src/moodbar/moodbaritemdelegate.h
@@ -26,9 +26,16 @@
 #include <QFuture>
 #include <QSet>
 #include <QByteArray>
+#include <QString>
 #include <QUrl>
-#include <QPainter>
+#include <QImage>
+#include <QPixmap>
+#include <QSize>
+#include <QStyleOption>
 
+class QPainter;
+class QModelIndex;
+class QPersistentModelIndex;
 class Application;
 class MoodbarPipeline;
 class PlaylistView;
diff --git a/src/moodbar/moodbarloader.cpp b/src/moodbar/moodbarloader.cpp
index 3587d283f..25f581f23 100644
--- a/src/moodbar/moodbarloader.cpp
+++ b/src/moodbar/moodbarloader.cpp
@@ -19,17 +19,24 @@
 
 #include <memory>
 
+#include <QtGlobal>
 #include <QObject>
 #include <QThread>
 #include <QCoreApplication>
 #include <QStandardPaths>
 #include <QIODevice>
 #include <QDir>
+#include <QFile>
 #include <QFileInfo>
+#include <QAbstractNetworkCache>
 #include <QNetworkDiskCache>
 #include <QTimer>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QUrl>
+#include <QSettings>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
diff --git a/src/moodbar/moodbarloader.h b/src/moodbar/moodbarloader.h
index f818f2759..3c4a30f17 100644
--- a/src/moodbar/moodbarloader.h
+++ b/src/moodbar/moodbarloader.h
@@ -19,15 +19,16 @@
 #define MOODBARLOADER_H
 
 #include <QObject>
-#include <QThread>
 #include <QList>
 #include <QMap>
 #include <QSet>
-#include <QByteArray>
+#include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QNetworkDiskCache>
 
+class QThread;
+class QByteArray;
+class QNetworkDiskCache;
 class Application;
 class MoodbarPipeline;
 
diff --git a/src/moodbar/moodbarpipeline.cpp b/src/moodbar/moodbarpipeline.cpp
index 44ffea8f4..516052518 100644
--- a/src/moodbar/moodbarpipeline.cpp
+++ b/src/moodbar/moodbarpipeline.cpp
@@ -17,15 +17,18 @@
 
 #include "moodbarpipeline.h"
 
+#include <stdlib.h>
+#include <glib-object.h>
+
 #include <QObject>
 #include <QCoreApplication>
 #include <QThread>
 #include <QString>
 #include <QUrl>
+#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/signalchecker.h"
-#include "core/timeconstants.h"
 #include "core/utilities.h"
 #include "moodbar/moodbarbuilder.h"
 
diff --git a/src/moodbar/moodbarpipeline.h b/src/moodbar/moodbarpipeline.h
index 07e278d25..8c629c7cd 100644
--- a/src/moodbar/moodbarpipeline.h
+++ b/src/moodbar/moodbarpipeline.h
@@ -23,6 +23,7 @@
 #include <QString>
 #include <QUrl>
 
+#include <glib.h>
 #include <gst/gst.h>
 #include <gst/app/gstappsink.h>
 
diff --git a/src/moodbar/moodbarproxystyle.cpp b/src/moodbar/moodbarproxystyle.cpp
index 4b86de184..d8738ff22 100644
--- a/src/moodbar/moodbarproxystyle.cpp
+++ b/src/moodbar/moodbarproxystyle.cpp
@@ -17,21 +17,32 @@
 
 #include <QProxyStyle>
 #include <QSettings>
-#include <QMenu>
+#include <QList>
+#include <QVector>
+#include <QVariant>
 #include <QPixmap>
 #include <QPainter>
+#include <QPen>
+#include <QPoint>
+#include <QPolygon>
+#include <QSize>
+#include <QSizePolicy>
 #include <QSlider>
+#include <QStyleOption>
 #include <QStyleOptionComplex>
 #include <QStyleOptionSlider>
 #include <QTimeLine>
 #include <QStyle>
+#include <QMenu>
+#include <QAction>
+#include <QActionGroup>
 #include <QEvent>
 #include <QContextMenuEvent>
 
 #include "core/application.h"
-#include "core/logging.h"
 
 #include "moodbarproxystyle.h"
+#include "moodbarrenderer.h"
 #include "settings/moodbarsettingspage.h"
 
 const int MoodbarProxyStyle::kMarginSize = 3;
diff --git a/src/moodbar/moodbarproxystyle.h b/src/moodbar/moodbarproxystyle.h
index 520b5d709..69b2e0527 100644
--- a/src/moodbar/moodbarproxystyle.h
+++ b/src/moodbar/moodbarproxystyle.h
@@ -18,19 +18,30 @@
 #ifndef MOODBARPROXYSTYLE_H
 #define MOODBARPROXYSTYLE_H
 
+#include <QtGlobal>
+#include <QObject>
 #include <QProxyStyle>
-#include <QTimeLine>
 #include <QByteArray>
+#include <QString>
 #include <QPixmap>
-#include <QPainter>
-#include <QSlider>
-#include <QMenu>
-#include <QActionGroup>
-#include <QStyleOptionSlider>
-#include <QEvent>
+#include <QPalette>
+#include <QRect>
+#include <QPoint>
+#include <QStyle>
 
 #include "moodbarrenderer.h"
 
+class QAction;
+class QActionGroup;
+class QMenu;
+class QPainter;
+class QSlider;
+class QStyleOptionComplex;
+class QStyleOptionSlider;
+class QTimeLine;
+class QWidget;
+class QEvent;
+
 class Application;
 
 class MoodbarProxyStyle : public QProxyStyle {
diff --git a/src/moodbar/moodbarrenderer.cpp b/src/moodbar/moodbarrenderer.cpp
index 2425e0501..bab241ffe 100644
--- a/src/moodbar/moodbarrenderer.cpp
+++ b/src/moodbar/moodbarrenderer.cpp
@@ -15,16 +15,22 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "moodbarrenderer.h"
+#include <string>
 
+#include <QtGlobal>
+#include <QObject>
+#include <QArrayData>
+#include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QImage>
 #include <QPainter>
 #include <QPalette>
 #include <QColor>
+#include <QRect>
+#include <QSize>
 
-#include "core/arraysize.h"
+#include "moodbarrenderer.h"
 
 const int MoodbarRenderer::kNumHues = 12;
 
diff --git a/src/moodbar/moodbarrenderer.h b/src/moodbar/moodbarrenderer.h
index d543728ee..0b146a056 100644
--- a/src/moodbar/moodbarrenderer.h
+++ b/src/moodbar/moodbarrenderer.h
@@ -18,14 +18,18 @@
 #ifndef MOODBARRENDERER_H
 #define MOODBARRENDERER_H
 
-#include <QByteArray>
-#include <QImage>
-#include <QPixmap>
 #include <QMetaType>
+#include <QList>
+#include <QByteArray>
+#include <QString>
+#include <QImage>
 #include <QVector>
 #include <QColor>
-#include <QPainter>
 #include <QPalette>
+#include <QRect>
+#include <QSize>
+
+class QPainter;
 
 typedef QVector<QColor> ColorVector;
 
diff --git a/src/musicbrainz/acoustidclient.cpp b/src/musicbrainz/acoustidclient.cpp
index d27a58f49..a41b4e8b5 100644
--- a/src/musicbrainz/acoustidclient.cpp
+++ b/src/musicbrainz/acoustidclient.cpp
@@ -22,10 +22,11 @@
 
 #include <algorithm>
 
+#include <QtGlobal>
 #include <QObject>
-#include <QList>
-#include <QByteArray>
 #include <QPair>
+#include <QSet>
+#include <QList>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
diff --git a/src/musicbrainz/acoustidclient.h b/src/musicbrainz/acoustidclient.h
index 796065077..f81f43347 100644
--- a/src/musicbrainz/acoustidclient.h
+++ b/src/musicbrainz/acoustidclient.h
@@ -27,9 +27,9 @@
 #include <QMap>
 #include <QString>
 #include <QStringList>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class NetworkTimeouts;
 
 class AcoustidClient : public QObject {
diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
index 88246e6fc..47b5ef630 100644
--- a/src/musicbrainz/chromaprinter.cpp
+++ b/src/musicbrainz/chromaprinter.cpp
@@ -34,7 +34,6 @@
 #include <QIODevice>
 #include <QBuffer>
 #include <QByteArray>
-#include <QDateTime>
 #include <QString>
 #include <QElapsedTimer>
 #include <QtDebug>
diff --git a/src/musicbrainz/musicbrainzclient.cpp b/src/musicbrainz/musicbrainzclient.cpp
index afa1ff1ef..6f675e624 100644
--- a/src/musicbrainz/musicbrainzclient.cpp
+++ b/src/musicbrainz/musicbrainzclient.cpp
@@ -24,20 +24,21 @@
 #include <algorithm>
 
 #include <QObject>
-#include <QList>
 #include <QSet>
+#include <QList>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QRegExp>
 #include <QUrl>
 #include <QUrlQuery>
+#include <QRegExp>
 #include <QtAlgorithms>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonParseError>
 #include <QJsonDocument>
+#include <QJsonValue>
 #include <QJsonObject>
 #include <QXmlStreamReader>
 #include <QTimer>
diff --git a/src/musicbrainz/musicbrainzclient.h b/src/musicbrainz/musicbrainzclient.h
index 76e2af677..0152d74a1 100644
--- a/src/musicbrainz/musicbrainzclient.h
+++ b/src/musicbrainz/musicbrainzclient.h
@@ -24,19 +24,19 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QList>
 #include <QMap>
 #include <QMultiMap>
+#include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QNetworkReply>
-#include <QXmlStreamReader>
 
 class QNetworkAccessManager;
+class QNetworkReply;
 class QTimer;
+class QXmlStreamReader;
 class NetworkTimeouts;
 
 class MusicBrainzClient : public QObject {
diff --git a/src/organise/organise.cpp b/src/organise/organise.cpp
index 7532556e5..608afc9f1 100644
--- a/src/organise/organise.cpp
+++ b/src/organise/organise.cpp
@@ -26,10 +26,10 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QTimer>
+#include <QDateTime>
 #include <QString>
-#include <QStringBuilder>
 #include <QUrl>
-#include <QStandardPaths>
+#include <QImage>
 #include <QtDebug>
 
 #include "core/logging.h"
diff --git a/src/organise/organise.h b/src/organise/organise.h
index bd6ec29f3..20b8a47ab 100644
--- a/src/organise/organise.h
+++ b/src/organise/organise.h
@@ -27,20 +27,18 @@
 #include <memory>
 
 #include <QObject>
-#include <QThread>
 #include <QBasicTimer>
 #include <QFileInfo>
-#include <QList>
-#include <QVector>
-#include <QMap>
 #include <QSet>
+#include <QList>
+#include <QMap>
 #include <QString>
 #include <QStringList>
-#include <QTemporaryFile>
 
 #include "core/song.h"
 #include "organiseformat.h"
 
+class QThread;
 class QTimerEvent;
 
 class MusicStorage;
diff --git a/src/organise/organisedialog.cpp b/src/organise/organisedialog.cpp
index eeea608d9..1f1f91f52 100644
--- a/src/organise/organisedialog.cpp
+++ b/src/organise/organisedialog.cpp
@@ -26,7 +26,6 @@
 
 #include <QtGlobal>
 #include <QtConcurrentRun>
-#include <QtAlgorithms>
 #include <QAbstractItemModel>
 #include <QDialog>
 #include <QHash>
@@ -49,7 +48,7 @@
 #include <QStackedWidget>
 #include <QToolButton>
 #include <QFlags>
-#include <QtEvents>
+#include <QShowEvent>
 #include <QSettings>
 
 #include "core/closure.h"
@@ -61,6 +60,7 @@
 #include "widgets/linetextedit.h"
 #include "collection/collectionbackend.h"
 #include "organise.h"
+#include "organiseformat.h"
 #include "organisedialog.h"
 #include "organiseerrordialog.h"
 #include "ui_organisedialog.h"
diff --git a/src/organise/organisedialog.h b/src/organise/organisedialog.h
index 766eb8ad4..64e822f04 100644
--- a/src/organise/organisedialog.h
+++ b/src/organise/organisedialog.h
@@ -28,9 +28,7 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
-#include <QAbstractItemModel>
 #include <QFuture>
 #include <QList>
 #include <QSize>
@@ -43,6 +41,8 @@
 #include "organise.h"
 #include "organiseformat.h"
 
+class QAbstractItemModel;
+class QWidget;
 class QResizeEvent;
 class QShowEvent;
 
diff --git a/src/organise/organiseerrordialog.cpp b/src/organise/organiseerrordialog.cpp
index 39d053061..77993e85e 100644
--- a/src/organise/organiseerrordialog.cpp
+++ b/src/organise/organiseerrordialog.cpp
@@ -25,9 +25,9 @@
 
 #include <QWidget>
 #include <QDialog>
-#include <QtAlgorithms>
 #include <QIcon>
 #include <QStyle>
+#include <QList>
 #include <QStringList>
 #include <QUrl>
 #include <QLabel>
diff --git a/src/organise/organiseformat.h b/src/organise/organiseformat.h
index 8dde1ac13..49b22506f 100644
--- a/src/organise/organiseformat.h
+++ b/src/organise/organiseformat.h
@@ -23,16 +23,16 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QColor>
-#include <QTextDocument>
-#include <QTextEdit>
+#include <QRegExp>
+#include <QRgb>
 #include <QSyntaxHighlighter>
 #include <QValidator>
 
+class QTextDocument;
+class QTextEdit;
 class Song;
 
 class OrganiseFormat {
diff --git a/src/qobuz/qobuzbaserequest.cpp b/src/qobuz/qobuzbaserequest.cpp
index fb0688276..dcb74c196 100644
--- a/src/qobuz/qobuzbaserequest.cpp
+++ b/src/qobuz/qobuzbaserequest.cpp
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#include <algorithm>
+
 #include <QObject>
 #include <QByteArray>
 #include <QPair>
@@ -28,13 +30,12 @@
 #include <QUrlQuery>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QJsonParseError>
+#include <QSslError>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
 
-#include "core/logging.h"
 #include "core/network.h"
 #include "qobuzservice.h"
 #include "qobuzbaserequest.h"
diff --git a/src/qobuz/qobuzbaserequest.h b/src/qobuz/qobuzbaserequest.h
index dd9039d16..aea92e31b 100644
--- a/src/qobuz/qobuzbaserequest.h
+++ b/src/qobuz/qobuzbaserequest.h
@@ -24,26 +24,21 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QPair>
+#include <QSet>
+#include <QList>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
-#include <QUrl>
-#include <QNetworkReply>
+#include <QStringList>
 #include <QJsonObject>
-#include <QJsonArray>
 #include <QJsonValue>
 
 #include "core/song.h"
-#include "internet/internetservices.h"
-#include "internet/internetservice.h"
-#include "internet/internetsearch.h"
 #include "qobuzservice.h"
 
-class Application;
+class QNetworkReply;
 class NetworkAccessManager;
-class QobuzUrlHandler;
-class CollectionBackend;
-class CollectionModel;
 
 class QobuzBaseRequest : public QObject {
   Q_OBJECT
diff --git a/src/qobuz/qobuzfavoriterequest.cpp b/src/qobuz/qobuzfavoriterequest.cpp
index 7aaa32aa3..1b479a4b7 100644
--- a/src/qobuz/qobuzfavoriterequest.cpp
+++ b/src/qobuz/qobuzfavoriterequest.cpp
@@ -27,6 +27,7 @@
 #include <QUrl>
 #include <QUrlQuery>
 #include <QNetworkReply>
+#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/network.h"
diff --git a/src/qobuz/qobuzrequest.cpp b/src/qobuz/qobuzrequest.cpp
index 3d3401b8b..f45697567 100644
--- a/src/qobuz/qobuzrequest.cpp
+++ b/src/qobuz/qobuzrequest.cpp
@@ -21,14 +21,15 @@
 
 #include <QObject>
 #include <QByteArray>
-#include <QDir>
 #include <QString>
 #include <QUrl>
 #include <QImage>
+#include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
+#include <QtDebug>
 
 #include "core/closure.h"
 #include "core/logging.h"
@@ -39,6 +40,7 @@
 #include "covermanager/albumcoverloader.h"
 #include "qobuzservice.h"
 #include "qobuzurlhandler.h"
+#include "qobuzbaserequest.h"
 #include "qobuzrequest.h"
 
 const int QobuzRequest::kMaxConcurrentArtistsRequests = 3;
diff --git a/src/qobuz/qobuzrequest.h b/src/qobuz/qobuzrequest.h
index a1589a8ed..ec9a74769 100644
--- a/src/qobuz/qobuzrequest.h
+++ b/src/qobuz/qobuzrequest.h
@@ -25,22 +25,22 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QPair>
+#include <QSet>
 #include <QList>
 #include <QHash>
 #include <QMap>
 #include <QMultiMap>
 #include <QQueue>
+#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QNetworkReply>
 #include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
 
 #include "core/song.h"
 #include "qobuzbaserequest.h"
 
+class QNetworkReply;
 class Application;
 class NetworkAccessManager;
 class QobuzService;
diff --git a/src/qobuz/qobuzservice.cpp b/src/qobuz/qobuzservice.cpp
index 173e6dad9..930ab7958 100644
--- a/src/qobuz/qobuzservice.cpp
+++ b/src/qobuz/qobuzservice.cpp
@@ -22,8 +22,6 @@
 #include <memory>
 
 #include <QObject>
-#include <QDesktopServices>
-#include <QCryptographicHash>
 #include <QByteArray>
 #include <QPair>
 #include <QList>
@@ -33,11 +31,13 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QTimer>
-#include <QJsonParseError>
+#include <QJsonValue>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QSettings>
 #include <QSortFilterProxyModel>
+#include <QSslError>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/player.h"
@@ -52,9 +52,11 @@
 #include "collection/collectionmodel.h"
 #include "qobuzservice.h"
 #include "qobuzurlhandler.h"
+#include "qobuzbaserequest.h"
 #include "qobuzrequest.h"
 #include "qobuzfavoriterequest.h"
 #include "qobuzstreamurlrequest.h"
+#include "settings/settingsdialog.h"
 #include "settings/qobuzsettingspage.h"
 
 using std::shared_ptr;
diff --git a/src/qobuz/qobuzservice.h b/src/qobuz/qobuzservice.h
index 3f71545f9..d45343dfa 100644
--- a/src/qobuz/qobuzservice.h
+++ b/src/qobuz/qobuzservice.h
@@ -27,19 +27,22 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QPair>
+#include <QSet>
 #include <QList>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
+#include <QStringList>
 #include <QUrl>
-#include <QNetworkReply>
-#include <QTimer>
-#include <QSortFilterProxyModel>
+#include <QSslError>
 
 #include "core/song.h"
 #include "internet/internetservice.h"
 #include "internet/internetsearch.h"
-#include "settings/qobuzsettingspage.h"
 
-class QThread;
+class QTimer;
+class QNetworkReply;
+class QSortFilterProxyModel;
 class Application;
 class NetworkAccessManager;
 class QobuzUrlHandler;
diff --git a/src/qobuz/qobuzstreamurlrequest.cpp b/src/qobuz/qobuzstreamurlrequest.cpp
index 752f58850..b8b342541 100644
--- a/src/qobuz/qobuzstreamurlrequest.cpp
+++ b/src/qobuz/qobuzstreamurlrequest.cpp
@@ -19,23 +19,28 @@
 
 #include "config.h"
 
+#include <algorithm>
+
 #include <QObject>
 #include <QMimeDatabase>
-#include <QFile>
-#include <QDir>
+#include <QMimeType>
+#include <QPair>
 #include <QList>
 #include <QByteArray>
 #include <QString>
+#include <QChar>
 #include <QUrl>
 #include <QDateTime>
+#include <QNetworkReply>
+#include <QCryptographicHash>
 #include <QJsonValue>
 #include <QJsonObject>
+#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/network.h"
 #include "core/song.h"
 #include "core/timeconstants.h"
-#include "settings/qobuzsettingspage.h"
 #include "qobuzservice.h"
 #include "qobuzbaserequest.h"
 #include "qobuzstreamurlrequest.h"
diff --git a/src/qobuz/qobuzstreamurlrequest.h b/src/qobuz/qobuzstreamurlrequest.h
index e39225bf4..568d7f537 100644
--- a/src/qobuz/qobuzstreamurlrequest.h
+++ b/src/qobuz/qobuzstreamurlrequest.h
@@ -22,7 +22,9 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
+#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
diff --git a/src/qobuz/qobuzurlhandler.cpp b/src/qobuz/qobuzurlhandler.cpp
index a70596987..e4a3d27c9 100644
--- a/src/qobuz/qobuzurlhandler.cpp
+++ b/src/qobuz/qobuzurlhandler.cpp
@@ -23,8 +23,6 @@
 
 #include "core/application.h"
 #include "core/taskmanager.h"
-#include "core/iconloader.h"
-#include "core/logging.h"
 #include "core/song.h"
 #include "qobuz/qobuzservice.h"
 #include "qobuzurlhandler.h"
diff --git a/src/qobuz/qobuzurlhandler.h b/src/qobuz/qobuzurlhandler.h
index db1e84c3e..2650f5a23 100644
--- a/src/qobuz/qobuzurlhandler.h
+++ b/src/qobuz/qobuzurlhandler.h
@@ -20,6 +20,7 @@
 #ifndef QOBUZURLHANDLER_H
 #define QOBUZURLHANDLER_H
 
+#include <QtGlobal>
 #include <QObject>
 #include <QString>
 #include <QUrl>
@@ -29,7 +30,6 @@
 #include "qobuz/qobuzservice.h"
 
 class Application;
-class QobuzService;
 
 class QobuzUrlHandler : public UrlHandler {
   Q_OBJECT
diff --git a/src/scrobbler/audioscrobbler.cpp b/src/scrobbler/audioscrobbler.cpp
index 473678158..b9d5de01f 100644
--- a/src/scrobbler/audioscrobbler.cpp
+++ b/src/scrobbler/audioscrobbler.cpp
@@ -19,18 +19,15 @@
 
 #include "config.h"
 
-
-#include <algorithm>
-
-#include <QtGlobal>
+#include <QList>
+#include <QVariant>
 #include <QString>
 #include <QSettings>
+#include <QtDebug>
 
 #include "core/application.h"
-#include "core/closure.h"
 #include "core/logging.h"
 #include "core/song.h"
-#include "core/timeconstants.h"
 #include "settings/settingsdialog.h"
 #include "settings/scrobblersettingspage.h"
 
diff --git a/src/scrobbler/audioscrobbler.h b/src/scrobbler/audioscrobbler.h
index 5cecedf78..cbe09ba80 100644
--- a/src/scrobbler/audioscrobbler.h
+++ b/src/scrobbler/audioscrobbler.h
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-
-#include <QtGlobal>
 #include <QObject>
 #include <QString>
 
diff --git a/src/scrobbler/lastfmscrobbler.cpp b/src/scrobbler/lastfmscrobbler.cpp
index c93abe166..d1592fd6a 100644
--- a/src/scrobbler/lastfmscrobbler.cpp
+++ b/src/scrobbler/lastfmscrobbler.cpp
@@ -19,21 +19,11 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QObject>
 
 #include "core/application.h"
-#include "core/closure.h"
 #include "core/network.h"
-#include "core/song.h"
-#include "core/timeconstants.h"
-#include "core/logging.h"
-#include "internet/localredirectserver.h"
-#include "settings/settingsdialog.h"
-#include "settings/scrobblersettingspage.h"
 
-#include "audioscrobbler.h"
-#include "scrobblerservices.h"
 #include "scrobblercache.h"
 #include "scrobblingapi20.h"
 #include "lastfmscrobbler.h"
diff --git a/src/scrobbler/lastfmscrobbler.h b/src/scrobbler/lastfmscrobbler.h
index b0f1039e7..6a13cde48 100644
--- a/src/scrobbler/lastfmscrobbler.h
+++ b/src/scrobbler/lastfmscrobbler.h
@@ -22,13 +22,11 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
 
 #include "core/song.h"
-#include "scrobblerservice.h"
 #include "scrobblingapi20.h"
 
 class Application;
diff --git a/src/scrobbler/librefmscrobbler.cpp b/src/scrobbler/librefmscrobbler.cpp
index fe41615df..54b0620f2 100644
--- a/src/scrobbler/librefmscrobbler.cpp
+++ b/src/scrobbler/librefmscrobbler.cpp
@@ -19,21 +19,11 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QObject>
 
 #include "core/application.h"
-#include "core/closure.h"
 #include "core/network.h"
-#include "core/song.h"
-#include "core/timeconstants.h"
-#include "core/logging.h"
-#include "internet/localredirectserver.h"
-#include "settings/settingsdialog.h"
-#include "settings/scrobblersettingspage.h"
 
-#include "audioscrobbler.h"
-#include "scrobblerservices.h"
 #include "scrobblercache.h"
 #include "scrobblingapi20.h"
 #include "librefmscrobbler.h"
diff --git a/src/scrobbler/librefmscrobbler.h b/src/scrobbler/librefmscrobbler.h
index 256d1b20e..7e44f6a37 100644
--- a/src/scrobbler/librefmscrobbler.h
+++ b/src/scrobbler/librefmscrobbler.h
@@ -22,13 +22,11 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
 
 #include "core/song.h"
-#include "scrobblerservice.h"
 #include "scrobblingapi20.h"
 
 class Application;
diff --git a/src/scrobbler/listenbrainzscrobbler.cpp b/src/scrobbler/listenbrainzscrobbler.cpp
index ec6e20987..148bd1bcc 100644
--- a/src/scrobbler/listenbrainzscrobbler.cpp
+++ b/src/scrobbler/listenbrainzscrobbler.cpp
@@ -32,11 +32,11 @@
 #include <QSettings>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QJsonParseError>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
@@ -45,11 +45,8 @@
 #include "core/timeconstants.h"
 #include "core/logging.h"
 #include "internet/localredirectserver.h"
-#include "settings/settingsdialog.h"
-#include "settings/scrobblersettingspage.h"
 
 #include "audioscrobbler.h"
-#include "scrobblerservices.h"
 #include "scrobblerservice.h"
 #include "scrobblercache.h"
 #include "scrobblercacheitem.h"
diff --git a/src/scrobbler/listenbrainzscrobbler.h b/src/scrobbler/listenbrainzscrobbler.h
index 60d9e08d4..f69e6966e 100644
--- a/src/scrobbler/listenbrainzscrobbler.h
+++ b/src/scrobbler/listenbrainzscrobbler.h
@@ -22,13 +22,13 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
+#include <QUrl>
 #include <QJsonDocument>
 
 #include "core/song.h"
diff --git a/src/scrobbler/scrobblercache.cpp b/src/scrobbler/scrobblercache.cpp
index 27823353c..82af445b1 100644
--- a/src/scrobbler/scrobblercache.cpp
+++ b/src/scrobbler/scrobblercache.cpp
@@ -22,16 +22,17 @@
 
 #include <QObject>
 #include <QStandardPaths>
+#include <QHash>
+#include <QVariant>
 #include <QString>
 #include <QFile>
 #include <QIODevice>
 #include <QTextStream>
-#include <QHash>
 #include <QJsonDocument>
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
-#include <QJsonParseError>
+#include <QtDebug>
 
 #include "core/song.h"
 #include "core/logging.h"
diff --git a/src/scrobbler/scrobblercache.h b/src/scrobbler/scrobblercache.h
index 95187ff97..4ce54413e 100644
--- a/src/scrobbler/scrobblercache.h
+++ b/src/scrobbler/scrobblercache.h
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QList>
 #include <QHash>
diff --git a/src/scrobbler/scrobblercacheitem.cpp b/src/scrobbler/scrobblercacheitem.cpp
index 5c32459b3..bbf0cb07e 100644
--- a/src/scrobbler/scrobblercacheitem.cpp
+++ b/src/scrobbler/scrobblercacheitem.cpp
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <QObject>
 #include <QtGlobal>
 #include <QString>
 
diff --git a/src/scrobbler/scrobblerservice.cpp b/src/scrobbler/scrobblerservice.cpp
index 937b52c35..17fd1c69d 100644
--- a/src/scrobbler/scrobblerservice.cpp
+++ b/src/scrobbler/scrobblerservice.cpp
@@ -19,12 +19,12 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
 #include <QString>
 #include <QByteArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonParseError>
 
 #include "scrobblerservice.h"
 
diff --git a/src/scrobbler/scrobblerservice.h b/src/scrobbler/scrobblerservice.h
index 229ad37a8..b19c9849f 100644
--- a/src/scrobbler/scrobblerservice.h
+++ b/src/scrobbler/scrobblerservice.h
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QPair>
 #include <QList>
diff --git a/src/scrobbler/scrobblerservices.cpp b/src/scrobbler/scrobblerservices.cpp
index 680e0b1c0..e6e973f3c 100644
--- a/src/scrobbler/scrobblerservices.cpp
+++ b/src/scrobbler/scrobblerservices.cpp
@@ -24,7 +24,6 @@
 #include <QString>
 #include <QtDebug>
 
-#include "core/application.h"
 #include "core/logging.h"
 
 #include "scrobblerservices.h"
diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp
index 2823fb27c..cfc7800c2 100644
--- a/src/scrobbler/scrobblingapi20.cpp
+++ b/src/scrobbler/scrobblingapi20.cpp
@@ -19,11 +19,14 @@
 
 #include "config.h"
 
+#include <algorithm>
 
 #include <QtGlobal>
 #include <QApplication>
 #include <QDesktopServices>
+#include <QLocale>
 #include <QClipboard>
+#include <QPair>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
@@ -31,16 +34,16 @@
 #include <QUrlQuery>
 #include <QDateTime>
 #include <QCryptographicHash>
-#include <QMenu>
 #include <QMessageBox>
 #include <QSettings>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QJsonParseError>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
+#include <QFlags>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
@@ -49,11 +52,10 @@
 #include "core/timeconstants.h"
 #include "core/logging.h"
 #include "internet/localredirectserver.h"
-#include "settings/settingsdialog.h"
 #include "settings/scrobblersettingspage.h"
 
 #include "audioscrobbler.h"
-#include "scrobblerservices.h"
+#include "scrobblerservice.h"
 #include "scrobblingapi20.h"
 #include "scrobblercache.h"
 #include "scrobblercacheitem.h"
diff --git a/src/scrobbler/scrobblingapi20.h b/src/scrobbler/scrobblingapi20.h
index aa65661ec..ff2a6cd72 100644
--- a/src/scrobbler/scrobblingapi20.h
+++ b/src/scrobbler/scrobblingapi20.h
@@ -39,8 +39,6 @@ class QNetworkReply;
 class Application;
 class NetworkAccessManager;
 class LocalRedirectServer;
-class ScrobblerService;
-class ScrobblerCache;
 class ScrobblerCacheItem;
 
 class ScrobblingAPI20 : public ScrobblerService {
diff --git a/src/settings/appearancesettingspage.cpp b/src/settings/appearancesettingspage.cpp
index 524e693be..6daa22ad3 100644
--- a/src/settings/appearancesettingspage.cpp
+++ b/src/settings/appearancesettingspage.cpp
@@ -32,13 +32,16 @@
 #include <QPushButton>
 #include <QRadioButton>
 #include <QSlider>
+#include <QBoxLayout>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QSpinBox>
 #include <QSettings>
 
 #include "appearancesettingspage.h"
 #include "core/appearance.h"
 #include "core/iconloader.h"
 #include "core/stylehelper.h"
-#include "playlist/playlistview.h"
 #include "covermanager/albumcoverchoicecontroller.h"
 #include "settingspage.h"
 #include "settingsdialog.h"
diff --git a/src/settings/appearancesettingspage.h b/src/settings/appearancesettingspage.h
index e1e189232..a44b3b6c4 100644
--- a/src/settings/appearancesettingspage.h
+++ b/src/settings/appearancesettingspage.h
@@ -24,14 +24,14 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
 #include <QString>
 #include <QColor>
 
 #include "settingspage.h"
 
+class QWidget;
+
 class SettingsDialog;
 class Ui_AppearanceSettingsPage;
 
diff --git a/src/settings/backendsettingspage.cpp b/src/settings/backendsettingspage.cpp
index 60b3be3cd..d14cc6d8f 100644
--- a/src/settings/backendsettingspage.cpp
+++ b/src/settings/backendsettingspage.cpp
@@ -20,18 +20,23 @@
 #include "config.h"
 
 #include <QtGlobal>
+#include <QWidget>
 #include <QSettings>
+#include <QList>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
+#include <QStringList>
+#include <QRegExp>
 #include <QFontMetrics>
+#include <QAbstractItemView>
+#include <QListView>
 #include <QGroupBox>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QSlider>
 #include <QSpinBox>
 #include <QLabel>
-#include <QListView>
+#include <QRadioButton>
 
 #include "backendsettingspage.h"
 
diff --git a/src/settings/backendsettingspage.h b/src/settings/backendsettingspage.h
index cbc6b6b19..c5d98132e 100644
--- a/src/settings/backendsettingspage.h
+++ b/src/settings/backendsettingspage.h
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QVariant>
 #include <QString>
@@ -31,11 +30,10 @@
 #include "engine/enginetype.h"
 #include "dialogs/errordialog.h"
 #include "settingspage.h"
-#include "settingsdialog.h"
 
 #include "core/application.h"
 #include "core/player.h"
-#include "engine/enginebase.h"
+#include "engine/engine_fwd.h"
 
 class SettingsDialog;
 class Ui_BackendSettingsPage;
diff --git a/src/settings/behavioursettingspage.cpp b/src/settings/behavioursettingspage.cpp
index fa2575af0..f77d6a180 100644
--- a/src/settings/behavioursettingspage.cpp
+++ b/src/settings/behavioursettingspage.cpp
@@ -20,9 +20,13 @@
 
 #include "config.h"
 
+#include <algorithm>
+
+#include <QList>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
+#include <QRegExp>
 #include <QDir>
 #include <QLocale>
 #include <QSettings>
@@ -30,6 +34,8 @@
 #include <QCheckBox>
 #include <QRadioButton>
 #include <QSpinBox>
+#include <QComboBox>
+#include <QGroupBox>
 
 #include "core/iconloader.h"
 #include "core/mainwindow.h"
diff --git a/src/settings/behavioursettingspage.h b/src/settings/behavioursettingspage.h
index 5483c5882..7abc77b4a 100644
--- a/src/settings/behavioursettingspage.h
+++ b/src/settings/behavioursettingspage.h
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QMap>
 #include <QString>
diff --git a/src/settings/collectionsettingspage.cpp b/src/settings/collectionsettingspage.cpp
index 041c13bc8..b8381378b 100644
--- a/src/settings/collectionsettingspage.cpp
+++ b/src/settings/collectionsettingspage.cpp
@@ -32,6 +32,11 @@
 #include <QLineEdit>
 #include <QListView>
 #include <QPushButton>
+#include <QComboBox>
+#include <QGroupBox>
+#include <QLabel>
+#include <QRadioButton>
+#include <QSpinBox>
 #include <QSettings>
 
 #include "core/application.h"
diff --git a/src/settings/collectionsettingspage.h b/src/settings/collectionsettingspage.h
index 6d58420b6..27e89b664 100644
--- a/src/settings/collectionsettingspage.h
+++ b/src/settings/collectionsettingspage.h
@@ -25,9 +25,12 @@
 #include "config.h"
 
 #include <QObject>
+#include <QString>
+#include <QStringList>
 
 #include "settingspage.h"
 
+class QModelIndex;
 class SettingsDialog;
 class Ui_CollectionSettingsPage;
 
diff --git a/src/settings/contextsettingspage.cpp b/src/settings/contextsettingspage.cpp
index b063924d1..8b747641e 100644
--- a/src/settings/contextsettingspage.cpp
+++ b/src/settings/contextsettingspage.cpp
@@ -24,17 +24,12 @@
 #include <QtGlobal>
 #include <QAction>
 #include <QVariant>
-#include <QImage>
 #include <QMenu>
 #include <QCursor>
-#include <QGroupBox>
-#include <QLabel>
 #include <QCheckBox>
-#include <QPushButton>
-#include <QSpinBox>
 #include <QToolButton>
 #include <QToolTip>
-#include <QtEvents>
+#include <QLineEdit>
 #include <QSettings>
 
 #include "core/iconloader.h"
diff --git a/src/settings/contextsettingspage.h b/src/settings/contextsettingspage.h
index 6b9a30151..fe6ab8518 100644
--- a/src/settings/contextsettingspage.h
+++ b/src/settings/contextsettingspage.h
@@ -26,13 +26,12 @@
 
 #include <QObject>
 #include <QString>
-#include <QAction>
-#include <QtEvents>
-#include <QCheckBox>
-#include <QLabel>
 
 #include "settingspage.h"
 
+class QAction;
+class QCheckBox;
+
 class SettingsDialog;
 class Ui_ContextSettingsPage;
 
diff --git a/src/settings/moodbarsettingspage.cpp b/src/settings/moodbarsettingspage.cpp
index 09b3ae463..72ee1b780 100644
--- a/src/settings/moodbarsettingspage.cpp
+++ b/src/settings/moodbarsettingspage.cpp
@@ -22,17 +22,20 @@
 
 #include <QIODevice>
 #include <QFile>
+#include <QVariant>
 #include <QByteArray>
 #include <QPixmap>
 #include <QPainter>
 #include <QSettings>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QSize>
 
-#include "core/application.h"
-#include "core/mainwindow.h"
 #include "core/iconloader.h"
 #include "core/logging.h"
 
 #include "settingsdialog.h"
+#include "settingspage.h"
 
 #ifdef HAVE_MOODBAR
 #  include "moodbar/moodbarrenderer.h"
diff --git a/src/settings/moodbarsettingspage.h b/src/settings/moodbarsettingspage.h
index 05725b619..ed5da9248 100644
--- a/src/settings/moodbarsettingspage.h
+++ b/src/settings/moodbarsettingspage.h
@@ -24,7 +24,9 @@
 #include "settingspage.h"
 
 #include <QObject>
+#include <QString>
 
+class SettingsDialog;
 class Ui_MoodbarSettingsPage;
 
 class MoodbarSettingsPage : public SettingsPage {
diff --git a/src/settings/networkproxysettingspage.cpp b/src/settings/networkproxysettingspage.cpp
index 5722a453b..74fa9f2af 100644
--- a/src/settings/networkproxysettingspage.cpp
+++ b/src/settings/networkproxysettingspage.cpp
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-
 #include <QVariant>
 #include <QSettings>
 #include <QNetworkProxy>
diff --git a/src/settings/notificationssettingspage.cpp b/src/settings/notificationssettingspage.cpp
index 9a614b23a..ef8b203d8 100644
--- a/src/settings/notificationssettingspage.cpp
+++ b/src/settings/notificationssettingspage.cpp
@@ -25,6 +25,7 @@
 #include <QVariant>
 #include <QImage>
 #include <QColor>
+#include <QRgb>
 #include <QMenu>
 #include <QFont>
 #include <QFontDialog>
diff --git a/src/settings/notificationssettingspage.h b/src/settings/notificationssettingspage.h
index 3f47544f3..fc8d0e97c 100644
--- a/src/settings/notificationssettingspage.h
+++ b/src/settings/notificationssettingspage.h
@@ -25,11 +25,10 @@
 
 #include <QObject>
 #include <QString>
-#include <QAction>
-#include <QtEvents>
 
 #include "settingspage.h"
 
+class QAction;
 class QHideEvent;
 class QShowEvent;
 
diff --git a/src/settings/playlistsettingspage.cpp b/src/settings/playlistsettingspage.cpp
index 86a47a9db..3105603bc 100644
--- a/src/settings/playlistsettingspage.cpp
+++ b/src/settings/playlistsettingspage.cpp
@@ -24,11 +24,9 @@
 #include <QVariant>
 #include <QSettings>
 #include <QCheckBox>
-#include <QComboBox>
 #include <QRadioButton>
 
 #include "core/iconloader.h"
-#include "core/mainwindow.h"
 #include "playlist/playlist.h"
 #include "settingspage.h"
 #include "playlistsettingspage.h"
diff --git a/src/settings/qobuzsettingspage.cpp b/src/settings/qobuzsettingspage.cpp
index 09076b251..846df5d2e 100644
--- a/src/settings/qobuzsettingspage.cpp
+++ b/src/settings/qobuzsettingspage.cpp
@@ -20,18 +20,26 @@
 #include "config.h"
 
 #include <QObject>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QSettings>
 #include <QMessageBox>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpinBox>
 #include <QEvent>
 
+#include "settingsdialog.h"
 #include "qobuzsettingspage.h"
 #include "ui_qobuzsettingspage.h"
 #include "core/application.h"
 #include "core/iconloader.h"
+#include "widgets/loginstatewidget.h"
 #include "internet/internetservices.h"
 #include "qobuz/qobuzservice.h"
-#include "qobuz/qobuzstreamurlrequest.h"
 
 const char *QobuzSettingsPage::kSettingsGroup = "Qobuz";
 
diff --git a/src/settings/qobuzsettingspage.h b/src/settings/qobuzsettingspage.h
index 1b4baa926..21db0a4f6 100644
--- a/src/settings/qobuzsettingspage.h
+++ b/src/settings/qobuzsettingspage.h
@@ -22,10 +22,11 @@
 
 #include <QObject>
 #include <QString>
-#include <QEvent>
 
 #include "settings/settingspage.h"
 
+class QEvent;
+class SettingsDialog;
 class QobuzService;
 class Ui_QobuzSettingsPage;
 
diff --git a/src/settings/scrobblersettingspage.cpp b/src/settings/scrobblersettingspage.cpp
index 9dad06799..56a90cff9 100644
--- a/src/settings/scrobblersettingspage.cpp
+++ b/src/settings/scrobblersettingspage.cpp
@@ -23,12 +23,19 @@
 #include <QObject>
 #include <QMessageBox>
 #include <QSettings>
+#include <QCheckBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpinBox>
 
+#include "settingsdialog.h"
+#include "settingspage.h"
 #include "core/application.h"
 #include "core/iconloader.h"
+#include "widgets/loginstatewidget.h"
 
 #include "scrobbler/audioscrobbler.h"
-#include "scrobbler/scrobblerservice.h"
 #include "scrobbler/lastfmscrobbler.h"
 #include "scrobbler/librefmscrobbler.h"
 #include "scrobbler/listenbrainzscrobbler.h"
diff --git a/src/settings/scrobblersettingspage.h b/src/settings/scrobblersettingspage.h
index 2f48b81e1..99125c86e 100644
--- a/src/settings/scrobblersettingspage.h
+++ b/src/settings/scrobblersettingspage.h
@@ -25,6 +25,7 @@
 #include <QObject>
 #include <QString>
 
+class SettingsDialog;
 class Ui_ScrobblerSettingsPage;
 class AudioScrobbler;
 class LastFMScrobbler;
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 8b7256a4d..c68c9c5d7 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -20,13 +20,18 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QDialog>
+#include <QWidget>
 #include <QScreen>
 #include <QWindow>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QTreeWidget>
+#include <QList>
+#include <QVariant>
 #include <QString>
+#include <QIcon>
 #include <QPainter>
 #include <QFrame>
 #include <QKeySequence>
@@ -36,11 +41,13 @@
 #include <QScrollArea>
 #include <QComboBox>
 #include <QPushButton>
+#include <QLabel>
+#include <QLayout>
+#include <QStackedWidget>
+#include <QSettings>
 
 #include "core/application.h"
 #include "core/player.h"
-#include "core/logging.h"
-#include "engine/enginebase.h"
 #include "widgets/groupediconview.h"
 #include "collection/collectionmodel.h"
 
diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h
index 79ea7f8bf..993bfc303 100644
--- a/src/settings/settingsdialog.h
+++ b/src/settings/settingsdialog.h
@@ -23,22 +23,26 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QDialog>
 #include <QStyledItemDelegate>
+#include <QStyleOptionViewItem>
+#include <QStyleOption>
 #include <QMap>
 #include <QSize>
 #include <QString>
-#include <QPainter>
 #include <QSettings>
 
-#include "core/logging.h"
+#include "engine/engine_fwd.h"
 #include "widgets/osd.h"
 
+class QWidget;
+class QModelIndex;
+class QPainter;
 class QTreeWidgetItem;
 class QComboBox;
 class QScrollArea;
 class QAbstractButton;
-class QStyleOptionViewItem;
 class QShowEvent;
 
 class Application;
diff --git a/src/settings/shortcutssettingspage.cpp b/src/settings/shortcutssettingspage.cpp
index 2a4c342ce..260ce2004 100644
--- a/src/settings/shortcutssettingspage.cpp
+++ b/src/settings/shortcutssettingspage.cpp
@@ -21,8 +21,8 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QWidget>
+#include <QList>
 #include <QVariant>
 #include <QStringList>
 #include <QAction>
@@ -37,8 +37,10 @@
 #include <QGroupBox>
 #include <QPushButton>
 #include <QRadioButton>
+#include <QLabel>
 
 #include "core/iconloader.h"
+#include "core/logging.h"
 #include "core/utilities.h"
 #ifdef Q_OS_MACOS
 #  include "core/mac_utilities.h"
diff --git a/src/settings/shortcutssettingspage.h b/src/settings/shortcutssettingspage.h
index 6c25458bd..0d8ed6966 100644
--- a/src/settings/shortcutssettingspage.h
+++ b/src/settings/shortcutssettingspage.h
@@ -26,17 +26,16 @@
 
 #include <memory>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QSettings>
 #include <QMap>
 #include <QString>
 #include <QKeySequence>
-#include <QTreeWidgetItem>
 
 #include "globalshortcuts/globalshortcuts.h"
 #include "settingspage.h"
 
+class QTreeWidgetItem;
 class GlobalShortcutGrabber;
 class SettingsDialog;
 class Ui_GlobalShortcutsSettingsPage;
@@ -66,7 +65,7 @@ class GlobalShortcutsSettingsPage : public SettingsPage {
 #endif
 #endif
 
-  void ItemClicked(QTreeWidgetItem *);
+  void ItemClicked(QTreeWidgetItem*);
   void NoneClicked();
   void DefaultClicked();
   void ChangeClicked();
diff --git a/src/settings/subsonicsettingspage.cpp b/src/settings/subsonicsettingspage.cpp
index 449f302e5..40e5e3571 100644
--- a/src/settings/subsonicsettingspage.cpp
+++ b/src/settings/subsonicsettingspage.cpp
@@ -20,11 +20,18 @@
 #include "config.h"
 
 #include <QObject>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
+#include <QUrl>
 #include <QSettings>
+#include <QCheckBox>
+#include <QLineEdit>
+#include <QPushButton>
 #include <QMessageBox>
 #include <QEvent>
 
+#include "settingsdialog.h"
 #include "subsonicsettingspage.h"
 #include "ui_subsonicsettingspage.h"
 #include "core/application.h"
diff --git a/src/settings/subsonicsettingspage.h b/src/settings/subsonicsettingspage.h
index ee087409b..f58bb408f 100644
--- a/src/settings/subsonicsettingspage.h
+++ b/src/settings/subsonicsettingspage.h
@@ -22,10 +22,12 @@
 
 #include <QObject>
 #include <QString>
-#include <QEvent>
+#include <QUrl>
 
 #include "settings/settingspage.h"
 
+class QEvent;
+class SettingsDialog;
 class SubsonicService;
 class Ui_SubsonicSettingsPage;
 
diff --git a/src/settings/tidalsettingspage.cpp b/src/settings/tidalsettingspage.cpp
index 0d15a9cc1..841cacea7 100644
--- a/src/settings/tidalsettingspage.cpp
+++ b/src/settings/tidalsettingspage.cpp
@@ -20,18 +20,26 @@
 #include "config.h"
 
 #include <QObject>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QSettings>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpinBox>
 #include <QMessageBox>
 #include <QEvent>
 
+#include "settingsdialog.h"
 #include "tidalsettingspage.h"
 #include "ui_tidalsettingspage.h"
 #include "core/application.h"
 #include "core/iconloader.h"
 #include "internet/internetservices.h"
 #include "tidal/tidalservice.h"
-#include "tidal/tidalstreamurlrequest.h"
+#include "widgets/loginstatewidget.h"
 
 const char *TidalSettingsPage::kSettingsGroup = "Tidal";
 
diff --git a/src/settings/tidalsettingspage.h b/src/settings/tidalsettingspage.h
index 550934876..be340539d 100644
--- a/src/settings/tidalsettingspage.h
+++ b/src/settings/tidalsettingspage.h
@@ -22,11 +22,12 @@
 
 #include <QObject>
 #include <QString>
-#include <QEvent>
 
 #include "settings/settingspage.h"
 
+class QEvent;
 class TidalService;
+class SettingsDialog;
 class Ui_TidalSettingsPage;
 
 class TidalSettingsPage : public SettingsPage {
diff --git a/src/subsonic/subsonicbaserequest.cpp b/src/subsonic/subsonicbaserequest.cpp
index e7716e346..fe626c118 100644
--- a/src/subsonic/subsonicbaserequest.cpp
+++ b/src/subsonic/subsonicbaserequest.cpp
@@ -21,6 +21,7 @@
 
 #include <memory>
 
+#include <QtGlobal>
 #include <QObject>
 #include <QByteArray>
 #include <QPair>
@@ -28,17 +29,16 @@
 #include <QString>
 #include <QUrl>
 #include <QUrlQuery>
-#include <QSslConfiguration>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QJsonParseError>
+#include <QSslConfiguration>
+#include <QSslSocket>
+#include <QSslError>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonArray>
 #include <QJsonValue>
 
-#include "core/logging.h"
 #include "subsonicservice.h"
 #include "subsonicbaserequest.h"
 
diff --git a/src/subsonic/subsonicbaserequest.h b/src/subsonic/subsonicbaserequest.h
index 363b1cc73..7ba9e7d56 100644
--- a/src/subsonic/subsonicbaserequest.h
+++ b/src/subsonic/subsonicbaserequest.h
@@ -24,28 +24,23 @@
 
 #include <memory>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QList>
+#include <QSet>
 #include <QPair>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
+#include <QStringList>
 #include <QUrl>
 #include <QSslError>
 #include <QJsonObject>
 
-#include "core/song.h"
-#include "internet/internetservices.h"
-#include "internet/internetservice.h"
-#include "internet/internetsearch.h"
 #include "subsonicservice.h"
 
 class QNetworkAccessManager;
 class QNetworkReply;
 
-class SubsonicUrlHandler;
-class CollectionBackend;
-class CollectionModel;
-
 class SubsonicBaseRequest : public QObject {
   Q_OBJECT
 
diff --git a/src/subsonic/subsonicrequest.cpp b/src/subsonic/subsonicrequest.cpp
index 4536f1f45..3c2e90eaa 100644
--- a/src/subsonic/subsonicrequest.cpp
+++ b/src/subsonic/subsonicrequest.cpp
@@ -22,19 +22,22 @@
 #include <memory>
 
 #include <QObject>
+#include <QMimeType>
+#include <QMimeDatabase>
 #include <QByteArray>
-#include <QDir>
 #include <QString>
 #include <QUrl>
 #include <QRegExp>
 #include <QImage>
 #include <QNetworkAccessManager>
+#include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QSslConfiguration>
+#include <QSslSocket>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-#include <QMimeDatabase>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
@@ -44,6 +47,7 @@
 #include "covermanager/albumcoverloader.h"
 #include "subsonicservice.h"
 #include "subsonicurlhandler.h"
+#include "subsonicbaserequest.h"
 #include "subsonicrequest.h"
 
 const int SubsonicRequest::kMaxConcurrentAlbumsRequests = 3;
diff --git a/src/subsonic/subsonicrequest.h b/src/subsonic/subsonicrequest.h
index d3ea04f4f..b557d9d6c 100644
--- a/src/subsonic/subsonicrequest.h
+++ b/src/subsonic/subsonicrequest.h
@@ -27,21 +27,24 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QPair>
+#include <QSet>
 #include <QList>
 #include <QHash>
+#include <QMap>
 #include <QMultiMap>
 #include <QQueue>
+#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QNetworkReply>
+#include <QNetworkAccessManager>
 #include <QJsonObject>
 
 #include "core/song.h"
 #include "subsonicbaserequest.h"
 
+class QNetworkReply;
 class Application;
-class NetworkAccessManager;
 class SubsonicService;
 class SubsonicUrlHandler;
 
diff --git a/src/subsonic/subsonicservice.cpp b/src/subsonic/subsonicservice.cpp
index 2a0c31f36..22aeeddac 100644
--- a/src/subsonic/subsonicservice.cpp
+++ b/src/subsonic/subsonicservice.cpp
@@ -21,6 +21,7 @@
 
 #include <memory>
 
+#include <QtGlobal>
 #include <QObject>
 #include <QByteArray>
 #include <QPair>
@@ -28,14 +29,18 @@
 #include <QString>
 #include <QUrl>
 #include <QUrlQuery>
+#include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
+#include <QSslConfiguration>
+#include <QSslSocket>
 #include <QSslError>
-#include <QJsonParseError>
+#include <QJsonValue>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QSettings>
 #include <QSortFilterProxyModel>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/player.h"
@@ -44,12 +49,12 @@
 #include "core/network.h"
 #include "core/database.h"
 #include "core/song.h"
-#include "internet/internetsearch.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectionmodel.h"
 #include "subsonicservice.h"
 #include "subsonicurlhandler.h"
 #include "subsonicrequest.h"
+#include "settings/settingsdialog.h"
 #include "settings/subsonicsettingspage.h"
 
 using std::shared_ptr;
diff --git a/src/subsonic/subsonicservice.h b/src/subsonic/subsonicservice.h
index baa9bc1d7..2cf107ab9 100644
--- a/src/subsonic/subsonicservice.h
+++ b/src/subsonic/subsonicservice.h
@@ -24,20 +24,19 @@
 
 #include <memory>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QPair>
+#include <QSet>
 #include <QList>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QTimer>
 #include <QSslError>
 
 #include "core/song.h"
 #include "internet/internetservice.h"
-#include "internet/internetsearch.h"
-#include "settings/subsonicsettingspage.h"
 
 class QSortFilterProxyModel;
 class QNetworkAccessManager;
diff --git a/src/subsonic/subsonicurlhandler.cpp b/src/subsonic/subsonicurlhandler.cpp
index 06bc17fb8..608052973 100644
--- a/src/subsonic/subsonicurlhandler.cpp
+++ b/src/subsonic/subsonicurlhandler.cpp
@@ -17,11 +17,13 @@
  *
  */
 
-#include <QObject>
+#include <QtGlobal>
 #include <QString>
 #include <QUrl>
 #include <QUrlQuery>
 
+#include "core/song.h"
+
 #include "subsonicservice.h"
 #include "subsonicurlhandler.h"
 
diff --git a/src/subsonic/subsonicurlhandler.h b/src/subsonic/subsonicurlhandler.h
index e95268ba8..4bc1ac2f7 100644
--- a/src/subsonic/subsonicurlhandler.h
+++ b/src/subsonic/subsonicurlhandler.h
@@ -22,17 +22,16 @@
 
 #include <QObject>
 #include <QPair>
+#include <QSet>
 #include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QUrl>
 
 #include "core/urlhandler.h"
-#include "core/song.h"
 #include "subsonic/subsonicservice.h"
 
 class Application;
-class SubsonicService;
 
 class SubsonicUrlHandler : public UrlHandler {
   Q_OBJECT
diff --git a/src/tidal/tidalbaserequest.cpp b/src/tidal/tidalbaserequest.cpp
index 36e5ee4c4..57ca9947b 100644
--- a/src/tidal/tidalbaserequest.cpp
+++ b/src/tidal/tidalbaserequest.cpp
@@ -29,11 +29,11 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QSslError>
-#include <QJsonParseError>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
+#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/network.h"
diff --git a/src/tidal/tidalbaserequest.h b/src/tidal/tidalbaserequest.h
index ade3c8a1e..c18c8ddee 100644
--- a/src/tidal/tidalbaserequest.h
+++ b/src/tidal/tidalbaserequest.h
@@ -24,27 +24,22 @@
 
 #include <QtGlobal>
 #include <QObject>
+#include <QSet>
 #include <QList>
 #include <QPair>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
+#include <QStringList>
 #include <QUrl>
-#include <QNetworkReply>
 #include <QSslError>
 #include <QJsonObject>
-#include <QJsonArray>
 #include <QJsonValue>
 
-#include "core/song.h"
-#include "internet/internetservices.h"
-#include "internet/internetservice.h"
-#include "internet/internetsearch.h"
 #include "tidalservice.h"
 
-class Application;
+class QNetworkReply;
 class NetworkAccessManager;
-class TidalUrlHandler;
-class CollectionBackend;
-class CollectionModel;
 
 class TidalBaseRequest : public QObject {
   Q_OBJECT
diff --git a/src/tidal/tidalfavoriterequest.cpp b/src/tidal/tidalfavoriterequest.cpp
index 97457317e..7676f74b2 100644
--- a/src/tidal/tidalfavoriterequest.cpp
+++ b/src/tidal/tidalfavoriterequest.cpp
@@ -19,9 +19,11 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
 #include <QPair>
 #include <QList>
+#include <QMap>
 #include <QMultiMap>
 #include <QByteArray>
 #include <QString>
@@ -30,7 +32,7 @@
 #include <QUrlQuery>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QJsonObject>
+#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/network.h"
diff --git a/src/tidal/tidalfavoriterequest.h b/src/tidal/tidalfavoriterequest.h
index 16e7ae436..34b7994ce 100644
--- a/src/tidal/tidalfavoriterequest.h
+++ b/src/tidal/tidalfavoriterequest.h
@@ -24,8 +24,8 @@
 
 #include <QObject>
 #include <QList>
+#include <QVariant>
 #include <QString>
-#include <QStringList>
 
 #include "tidalbaserequest.h"
 #include "core/song.h"
diff --git a/src/tidal/tidalrequest.cpp b/src/tidal/tidalrequest.cpp
index 05a77d531..ede81c354 100644
--- a/src/tidal/tidalrequest.cpp
+++ b/src/tidal/tidalrequest.cpp
@@ -24,10 +24,12 @@
 #include <QString>
 #include <QUrl>
 #include <QImage>
+#include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
+#include <QtDebug>
 
 #include "core/closure.h"
 #include "core/logging.h"
@@ -38,6 +40,7 @@
 #include "covermanager/albumcoverloader.h"
 #include "tidalservice.h"
 #include "tidalurlhandler.h"
+#include "tidalbaserequest.h"
 #include "tidalrequest.h"
 
 const char *TidalRequest::kResourcesUrl = "https://resources.tidal.com";
diff --git a/src/tidal/tidalrequest.h b/src/tidal/tidalrequest.h
index 5f65beb0c..385f4d479 100644
--- a/src/tidal/tidalrequest.h
+++ b/src/tidal/tidalrequest.h
@@ -25,22 +25,23 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QPair>
+#include <QSet>
 #include <QList>
 #include <QHash>
 #include <QMap>
 #include <QMultiMap>
 #include <QQueue>
+#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QNetworkReply>
 #include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
 
 #include "core/song.h"
 #include "tidalbaserequest.h"
 
+class QNetworkReply;
+class Application;
 class NetworkAccessManager;
 class TidalService;
 class TidalUrlHandler;
diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp
index fa24e2661..1369b62df 100644
--- a/src/tidal/tidalservice.cpp
+++ b/src/tidal/tidalservice.cpp
@@ -28,17 +28,19 @@
 #include <QPair>
 #include <QList>
 #include <QString>
+#include <QChar>
 #include <QUrl>
 #include <QUrlQuery>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QSslError>
 #include <QTimer>
-#include <QJsonParseError>
+#include <QJsonValue>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QSettings>
 #include <QSortFilterProxyModel>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/player.h"
@@ -53,9 +55,11 @@
 #include "collection/collectionmodel.h"
 #include "tidalservice.h"
 #include "tidalurlhandler.h"
+#include "tidalbaserequest.h"
 #include "tidalrequest.h"
 #include "tidalfavoriterequest.h"
 #include "tidalstreamurlrequest.h"
+#include "settings/settingsdialog.h"
 #include "settings/tidalsettingspage.h"
 
 using std::shared_ptr;
diff --git a/src/tidal/tidalservice.h b/src/tidal/tidalservice.h
index 52633c71c..a2a47e477 100644
--- a/src/tidal/tidalservice.h
+++ b/src/tidal/tidalservice.h
@@ -27,19 +27,25 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QPair>
+#include <QSet>
 #include <QList>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QNetworkReply>
-#include <QTimer>
-#include <QSortFilterProxyModel>
+#include <QDateTime>
+#include <QSslError>
 
 #include "core/song.h"
 #include "internet/internetservice.h"
 #include "internet/internetsearch.h"
 #include "settings/tidalsettingspage.h"
 
+class QSortFilterProxyModel;
+class QNetworkReply;
+class QTimer;
+
 class Application;
 class NetworkAccessManager;
 class TidalUrlHandler;
diff --git a/src/tidal/tidalstreamurlrequest.cpp b/src/tidal/tidalstreamurlrequest.cpp
index 857609450..cbbf70abe 100644
--- a/src/tidal/tidalstreamurlrequest.cpp
+++ b/src/tidal/tidalstreamurlrequest.cpp
@@ -22,15 +22,20 @@
 #include <QObject>
 #include <QStandardPaths>
 #include <QMimeDatabase>
+#include <QMimeType>
+#include <QIODevice>
 #include <QFile>
 #include <QDir>
 #include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QUrl>
+#include <QNetworkReply>
 #include <QJsonValue>
 #include <QJsonObject>
+#include <QJsonArray>
 #include <QXmlStreamReader>
+#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/network.h"
diff --git a/src/tidal/tidalstreamurlrequest.h b/src/tidal/tidalstreamurlrequest.h
index 2e043609b..aacb86f0d 100644
--- a/src/tidal/tidalstreamurlrequest.h
+++ b/src/tidal/tidalstreamurlrequest.h
@@ -22,18 +22,20 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
+#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 
 #include "core/song.h"
+#include "tidalservice.h"
 #include "tidalbaserequest.h"
 #include "settings/tidalsettingspage.h"
 
 class QNetworkReply;
 class NetworkAccessManager;
-class TidalService;
 
 class TidalStreamURLRequest : public TidalBaseRequest {
   Q_OBJECT
diff --git a/src/tidal/tidalurlhandler.cpp b/src/tidal/tidalurlhandler.cpp
index 43f5c72b3..b038129a1 100644
--- a/src/tidal/tidalurlhandler.cpp
+++ b/src/tidal/tidalurlhandler.cpp
@@ -23,8 +23,6 @@
 
 #include "core/application.h"
 #include "core/taskmanager.h"
-#include "core/iconloader.h"
-#include "core/logging.h"
 #include "core/song.h"
 #include "tidal/tidalservice.h"
 #include "tidalurlhandler.h"
diff --git a/src/tidal/tidalurlhandler.h b/src/tidal/tidalurlhandler.h
index a1e8b7d6f..7d50b4e32 100644
--- a/src/tidal/tidalurlhandler.h
+++ b/src/tidal/tidalurlhandler.h
@@ -20,6 +20,7 @@
 #ifndef TIDALURLHANDLER_H
 #define TIDALURLHANDLER_H
 
+#include <QtGlobal>
 #include <QObject>
 #include <QString>
 #include <QUrl>
@@ -29,7 +30,6 @@
 #include "tidal/tidalservice.h"
 
 class Application;
-class TidalService;
 
 class TidalUrlHandler : public UrlHandler {
   Q_OBJECT
diff --git a/src/transcoder/transcodedialog.cpp b/src/transcoder/transcodedialog.cpp
index fee7f197f..491c7577e 100644
--- a/src/transcoder/transcodedialog.cpp
+++ b/src/transcoder/transcodedialog.cpp
@@ -34,7 +34,6 @@
 #include <QFileDialog>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QIcon>
 #include <QDateTime>
@@ -49,6 +48,7 @@
 #include <QTreeWidget>
 #include <QDialogButtonBox>
 #include <QSettings>
+#include <QTimerEvent>
 
 #include "core/iconloader.h"
 #include "core/mainwindow.h"
diff --git a/src/transcoder/transcodedialog.h b/src/transcoder/transcodedialog.h
index 9e7b1b998..1990c2e34 100644
--- a/src/transcoder/transcodedialog.h
+++ b/src/transcoder/transcodedialog.h
@@ -23,16 +23,15 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
 #include <QBasicTimer>
 #include <QString>
 #include <QStringList>
-#include <QPushButton>
-#include <QTimerEvent>
 
+class QWidget;
+class QPushButton;
+class QTimerEvent;
 class Transcoder;
 class Ui_TranscodeDialog;
 class Ui_TranscodeLogDialog;
diff --git a/src/transcoder/transcoder.cpp b/src/transcoder/transcoder.cpp
index 1f93a52dc..57b14a7eb 100644
--- a/src/transcoder/transcoder.cpp
+++ b/src/transcoder/transcoder.cpp
@@ -34,20 +34,16 @@
 #include <QStandardPaths>
 #include <QByteArray>
 #include <QDir>
-#include <QFile>
 #include <QFileInfo>
 #include <QList>
 #include <QMap>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
-#include <QtAlgorithms>
 #include <QSettings>
 #include <QtDebug>
 
 #include "core/logging.h"
 #include "core/signalchecker.h"
-#include "core/utilities.h"
 #include "transcoder.h"
 
 using std::shared_ptr;
diff --git a/src/transcoder/transcoder.h b/src/transcoder/transcoder.h
index 52fc41cae..eca2e0ead 100644
--- a/src/transcoder/transcoder.h
+++ b/src/transcoder/transcoder.h
@@ -36,7 +36,6 @@
 #include <QSet>
 #include <QString>
 #include <QEvent>
-#include <QVector>
 
 #include "core/song.h"
 
diff --git a/src/transcoder/transcoderoptionsaac.cpp b/src/transcoder/transcoderoptionsaac.cpp
index 6e12f07be..ab085cdcc 100644
--- a/src/transcoder/transcoderoptionsaac.cpp
+++ b/src/transcoder/transcoderoptionsaac.cpp
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-
 #include <QVariant>
 #include <QString>
 #include <QStringBuilder>
diff --git a/src/transcoder/transcoderoptionsdialog.cpp b/src/transcoder/transcoderoptionsdialog.cpp
index cd7a028f4..9ece593be 100644
--- a/src/transcoder/transcoderoptionsdialog.cpp
+++ b/src/transcoder/transcoderoptionsdialog.cpp
@@ -20,6 +20,7 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QWidget>
 #include <QDialog>
 #include <QString>
diff --git a/src/transcoder/transcoderoptionsdialog.h b/src/transcoder/transcoderoptionsdialog.h
index 18df69198..c3ba257b4 100644
--- a/src/transcoder/transcoderoptionsdialog.h
+++ b/src/transcoder/transcoderoptionsdialog.h
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QDialog>
 #include <QWidget>
 #include <QObject>
diff --git a/src/transcoder/transcoderoptionsmp3.cpp b/src/transcoder/transcoderoptionsmp3.cpp
index 2d34fdae0..c90b75537 100644
--- a/src/transcoder/transcoderoptionsmp3.cpp
+++ b/src/transcoder/transcoderoptionsmp3.cpp
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-
 #include <QWidget>
 #include <QVariant>
 #include <QStringBuilder>
diff --git a/src/transcoder/transcoderoptionsspeex.cpp b/src/transcoder/transcoderoptionsspeex.cpp
index 3a9f147a2..1eb2aee29 100644
--- a/src/transcoder/transcoderoptionsspeex.cpp
+++ b/src/transcoder/transcoderoptionsspeex.cpp
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-
 #include <QWidget>
 #include <QVariant>
 #include <QString>
diff --git a/src/transcoder/transcoderoptionsvorbis.cpp b/src/transcoder/transcoderoptionsvorbis.cpp
index 197ad4a69..61c7aff06 100644
--- a/src/transcoder/transcoderoptionsvorbis.cpp
+++ b/src/transcoder/transcoderoptionsvorbis.cpp
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-
 #include <QWidget>
 #include <QVariant>
 #include <QString>
diff --git a/src/transcoder/transcoderoptionswavpack.cpp b/src/transcoder/transcoderoptionswavpack.cpp
index 96b101f46..15547d110 100644
--- a/src/transcoder/transcoderoptionswavpack.cpp
+++ b/src/transcoder/transcoderoptionswavpack.cpp
@@ -20,10 +20,7 @@
 #include "config.h"
 
 #include <QWidget>
-#include <QVariant>
 #include <QString>
-#include <QStringBuilder>
-#include <QSlider>
 #include <QSettings>
 
 #include "transcoderoptionsinterface.h"
diff --git a/src/widgets/autoexpandingtreeview.h b/src/widgets/autoexpandingtreeview.h
index 93de709c7..2c7bdf4df 100644
--- a/src/widgets/autoexpandingtreeview.h
+++ b/src/widgets/autoexpandingtreeview.h
@@ -23,15 +23,16 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
-#include <QWidget>
 #include <QString>
-#include <QMimeData>
 #include <QTreeView>
-#include <QtEvents>
 
+class QMimeData;
+class QWidget;
 class QModelIndex;
+class QKeyEvent;
+class QMouseEvent;
 
 class AutoExpandingTreeView : public QTreeView {
   Q_OBJECT
diff --git a/src/widgets/busyindicator.cpp b/src/widgets/busyindicator.cpp
index cbdab077b..6211ca44e 100644
--- a/src/widgets/busyindicator.cpp
+++ b/src/widgets/busyindicator.cpp
@@ -27,7 +27,6 @@
 #include <QLabel>
 #include <QSizePolicy>
 #include <QBoxLayout>
-#include <QtEvents>
 
 #include "busyindicator.h"
 
@@ -70,11 +69,11 @@ BusyIndicator::~BusyIndicator() {
   delete movie_;
 }
 
-void BusyIndicator::showEvent(QShowEvent *) {
+void BusyIndicator::showEvent(QShowEvent*) {
   movie_->start();
 }
 
-void BusyIndicator::hideEvent(QHideEvent *) {
+void BusyIndicator::hideEvent(QHideEvent*) {
   movie_->stop();
 }
 
diff --git a/src/widgets/busyindicator.h b/src/widgets/busyindicator.h
index 3d68d2a40..cb8525996 100644
--- a/src/widgets/busyindicator.h
+++ b/src/widgets/busyindicator.h
@@ -23,17 +23,18 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QWidget>
 #include <QString>
-#include <QMovie>
-#include <QLabel>
-#include <QtEvents>
 
+class QMovie;
+class QLabel;
 class QShowEvent;
 class QHideEvent;
 
 class BusyIndicator : public QWidget {
   Q_OBJECT
+
   Q_PROPERTY(QString text READ text WRITE set_text)
 
  public:
diff --git a/src/widgets/clickablelabel.h b/src/widgets/clickablelabel.h
index 306a8230d..b5da3c85c 100644
--- a/src/widgets/clickablelabel.h
+++ b/src/widgets/clickablelabel.h
@@ -21,11 +21,10 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QString>
 #include <QLabel>
-#include <QtEvents>
 
+class QWidget;
 class QMouseEvent;
 
 class ClickableLabel : public QLabel {
diff --git a/src/widgets/fancytabwidget.cpp b/src/widgets/fancytabwidget.cpp
index a7decd58c..cb29dfa27 100644
--- a/src/widgets/fancytabwidget.cpp
+++ b/src/widgets/fancytabwidget.cpp
@@ -19,37 +19,40 @@
  *
  */
 
-#include "fancytabwidget.h"
-#include "core/stylehelper.h"
-#include "core/logging.h"
-#include "settings/appearancesettingspage.h"
-
-#include <QDebug>
+#include <algorithm>
 
+#include <QtGlobal>
 #include <QObject>
 #include <QTabBar>
 #include <QWidget>
+#include <QTimer>
+#include <QList>
 #include <QMap>
-#include <QHash>
+#include <QVariant>
 #include <QString>
 #include <QIcon>
 #include <QPainter>
+#include <QStylePainter>
 #include <QColor>
 #include <QRect>
 #include <QFont>
-#include <QStylePainter>
-#include <QTimer>
-#include <QLayout>
-#include <QVBoxLayout>
 #include <QSize>
 #include <QPoint>
+#include <QBrush>
+#include <QPen>
 #include <QTransform>
 #include <QMenu>
 #include <QAction>
 #include <QActionGroup>
 #include <QSettings>
-#include <QMouseEvent>
 #include <QPixmapCache>
+#include <QLayout>
+#include <QBoxLayout>
+#include <QtEvents>
+
+#include "fancytabwidget.h"
+#include "core/stylehelper.h"
+#include "settings/appearancesettingspage.h"
 
 const QSize FancyTabWidget::IconSize_LargeSidebar = QSize(24, 24);
 const QSize FancyTabWidget::IconSize_SmallSidebar = QSize(22, 22);
diff --git a/src/widgets/fancytabwidget.h b/src/widgets/fancytabwidget.h
index c7081f9a6..b106327de 100644
--- a/src/widgets/fancytabwidget.h
+++ b/src/widgets/fancytabwidget.h
@@ -22,18 +22,19 @@
 #ifndef FANCYTABWIDGET_H
 #define FANCYTABWIDGET_H
 
-#include <memory>
-
+#include <QObject>
 #include <QTabWidget>
 #include <QMap>
 #include <QString>
 #include <QIcon>
 #include <QPixmap>
 #include <QSize>
-#include <QtEvents>
+#include <QColor>
 
 class QMenu;
 class QActionGroup;
+class QContextMenuEvent;
+class QPaintEvent;
 class TabData;
 
 namespace Core {
diff --git a/src/widgets/favoritewidget.cpp b/src/widgets/favoritewidget.cpp
index 43ff91407..79552e823 100644
--- a/src/widgets/favoritewidget.cpp
+++ b/src/widgets/favoritewidget.cpp
@@ -20,12 +20,13 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QWidget>
 #include <QSize>
 #include <QStyle>
 #include <QStylePainter>
-#include <QtEvents>
+#include <QPaintEvent>
+#include <QMouseEvent>
 
 #include "favoritewidget.h"
 
diff --git a/src/widgets/favoritewidget.h b/src/widgets/favoritewidget.h
index caf175d25..94f69d53f 100644
--- a/src/widgets/favoritewidget.h
+++ b/src/widgets/favoritewidget.h
@@ -20,14 +20,12 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QString>
 #include <QPixmap>
 #include <QRect>
 #include <QSize>
-#include <QtEvents>
 
 class QMouseEvent;
 class QPaintEvent;
diff --git a/src/widgets/fileview.cpp b/src/widgets/fileview.cpp
index 152221cc7..f5615254b 100644
--- a/src/widgets/fileview.cpp
+++ b/src/widgets/fileview.cpp
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-
 #include <QWidget>
 #include <QUndoStack>
 #include <QDir>
diff --git a/src/widgets/fileview.h b/src/widgets/fileview.h
index 089c2bf46..0a57d83f5 100644
--- a/src/widgets/fileview.h
+++ b/src/widgets/fileview.h
@@ -27,20 +27,18 @@
 
 #include <QObject>
 #include <QWidget>
-#include <QFileSystemModel>
 #include <QAbstractItemModel>
 #include <QList>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QMimeData>
-#include <QUndoStack>
 #include <QUndoCommand>
-#include <QtEvents>
 
 #include "core/song.h"
 
-class QModelIndex;
+class QMimeData;
+class QFileSystemModel;
+class QUndoStack;
 class QKeyEvent;
 class QShowEvent;
 
diff --git a/src/widgets/fileviewlist.h b/src/widgets/fileviewlist.h
index b21b09d05..6d07b16ba 100644
--- a/src/widgets/fileviewlist.h
+++ b/src/widgets/fileviewlist.h
@@ -24,17 +24,16 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
-#include <QMimeData>
 #include <QListView>
+#include <QItemSelectionModel>
 #include <QList>
 #include <QUrl>
 #include <QString>
 #include <QStringList>
-#include <QMenu>
-#include <QItemSelectionModel>
-#include <QtEvents>
 
+class QWidget;
+class QMimeData;
+class QMenu;
 class QMouseEvent;
 class QContextMenuEvent;
 
diff --git a/src/widgets/forcescrollperpixel.cpp b/src/widgets/forcescrollperpixel.cpp
index 9fd252bc7..1db8d4aae 100644
--- a/src/widgets/forcescrollperpixel.cpp
+++ b/src/widgets/forcescrollperpixel.cpp
@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QAbstractItemView>
 #include <QScrollBar>
-#include <QtEvents>
+#include <QEvent>
 
 #include "forcescrollperpixel.h"
 
diff --git a/src/widgets/forcescrollperpixel.h b/src/widgets/forcescrollperpixel.h
index 8ef640170..018c80607 100644
--- a/src/widgets/forcescrollperpixel.h
+++ b/src/widgets/forcescrollperpixel.h
@@ -24,9 +24,8 @@
 #include "config.h"
 
 #include <QObject>
-#include <QtEvents>
-#include <QAbstractItemView>
 
+class QAbstractItemView;
 class QEvent;
 
 // Some KDE styles override the ScrollMode property of QAbstractItemViews.
diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
index d44162513..fb4229dfb 100644
--- a/src/widgets/freespacebar.cpp
+++ b/src/widgets/freespacebar.cpp
@@ -39,7 +39,6 @@
 #include <QSize>
 #include <QTransform>
 #include <QLinearGradient>
-#include <QtEvents>
 
 #include "core/utilities.h"
 #include "freespacebar.h"
@@ -78,7 +77,7 @@ QSize FreeSpaceBar::sizeHint() const {
   return QSize(150, kBarHeight + kLabelBoxPadding + fontMetrics().height());
 }
 
-void FreeSpaceBar::paintEvent(QPaintEvent *) {
+void FreeSpaceBar::paintEvent(QPaintEvent*) {
 
   // Geometry
   QRect bar_rect(rect());
diff --git a/src/widgets/freespacebar.h b/src/widgets/freespacebar.h
index 2ac595af4..0a37ee4ac 100644
--- a/src/widgets/freespacebar.h
+++ b/src/widgets/freespacebar.h
@@ -27,12 +27,12 @@
 #include <QObject>
 #include <QWidget>
 #include <QString>
-#include <QPainter>
 #include <QColor>
+#include <QRgb>
 #include <QRect>
 #include <QSize>
-#include <QtEvents>
 
+class QPainter;
 class QPaintEvent;
 
 class FreeSpaceBar : public QWidget {
diff --git a/src/widgets/groupediconview.cpp b/src/widgets/groupediconview.cpp
index 1295b73d2..c2c396530 100644
--- a/src/widgets/groupediconview.cpp
+++ b/src/widgets/groupediconview.cpp
@@ -49,9 +49,6 @@
 #include "core/multisortfilterproxy.h"
 #include "groupediconview.h"
 
-class QModelIndex;
-class QResizeEvent;
-
 const int GroupedIconView::kBarThickness = 2;
 const int GroupedIconView::kBarMarginTop = 3;
 
diff --git a/src/widgets/groupediconview.h b/src/widgets/groupediconview.h
index e6fe1949b..488a930c3 100644
--- a/src/widgets/groupediconview.h
+++ b/src/widgets/groupediconview.h
@@ -24,21 +24,20 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QListView>
 #include <QAbstractItemModel>
 #include <QAbstractItemView>
 #include <QItemSelectionModel>
 #include <QString>
 #include <QFont>
-#include <QPainter>
 #include <QPalette>
 #include <QPoint>
 #include <QRect>
 #include <QRegion>
 #include <QVector>
-#include <QtEvents>
 
+class QWidget;
+class QPainter;
 class QModelIndex;
 class QPaintEvent;
 class QResizeEvent;
diff --git a/src/widgets/lineedit.cpp b/src/widgets/lineedit.cpp
index 69448dc53..6eff359c3 100644
--- a/src/widgets/lineedit.cpp
+++ b/src/widgets/lineedit.cpp
@@ -37,14 +37,12 @@
 #include <QPlainTextEdit>
 #include <QSpinBox>
 #include <QFlags>
-#include <QtEvents>
+#include <QPaintEvent>
+#include <QResizeEvent>
 
 #include "core/iconloader.h"
 #include "lineedit.h"
 
-class QPaintEvent;
-class QResizeEvent;
-
 ExtendedEditor::ExtendedEditor(QWidget *widget, int extra_right_padding, bool draw_hint)
     : LineEditInterface(widget),
       has_clear_button_(true),
diff --git a/src/widgets/lineedit.h b/src/widgets/lineedit.h
index d885cc9c9..08c2b9156 100644
--- a/src/widgets/lineedit.h
+++ b/src/widgets/lineedit.h
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
@@ -31,15 +30,14 @@
 #include <QLineEdit>
 #include <QPlainTextEdit>
 #include <QSpinBox>
-#include <QToolButton>
-#include <QPaintDevice>
-#include <QtEvents>
 
+class QToolButton;
+class QPaintDevice;
 class QPaintEvent;
 class QResizeEvent;
 
 class LineEditInterface {
-public:
+ public:
   LineEditInterface(QWidget *widget) : widget_(widget) {}
 
   QWidget *widget() const { return widget_; }
@@ -62,7 +60,7 @@ protected:
 };
 
 class ExtendedEditor : public LineEditInterface {
-public:
+ public:
   ExtendedEditor(QWidget *widget, int extra_right_padding = 0, bool draw_hint = true);
   virtual ~ExtendedEditor() {}
 
@@ -81,14 +79,14 @@ public:
   qreal font_point_size() const { return font_point_size_; }
   void set_font_point_size(qreal size) { font_point_size_ = size; }
 
-protected:
+ protected:
   void Paint(QPaintDevice *device);
   void Resize();
 
-private:
+ private:
   void UpdateButtonGeometry();
 
-protected:
+ protected:
   QString hint_;
 
   bool has_clear_button_;
@@ -118,7 +116,7 @@ class LineEdit : public QLineEdit, public ExtendedEditor {
   void set_text(const QString& text) { QLineEdit::setText(text); }
   void set_enabled(bool enabled) { QLineEdit::setEnabled(enabled); }
 
-protected:
+ protected:
   void paintEvent(QPaintEvent*);
   void resizeEvent(QResizeEvent*);
 
@@ -129,7 +127,7 @@ protected:
  private slots:
   void text_changed(const QString& text);
 
-signals:
+ signals:
   void Reset();
 };
 
@@ -148,11 +146,11 @@ class TextEdit : public QPlainTextEdit, public ExtendedEditor {
   void set_text(const QString& text) { QPlainTextEdit::setPlainText(text); }
   void set_enabled(bool enabled) { QPlainTextEdit::setEnabled(enabled); }
 
-protected:
+ protected:
   void paintEvent(QPaintEvent*);
   void resizeEvent(QResizeEvent*);
 
-signals:
+ signals:
   void Reset();
 };
 
@@ -175,11 +173,11 @@ class SpinBox : public QSpinBox, public ExtendedEditor {
   void set_text(const QString& text) { QSpinBox::setValue(text.toInt()); }
   void set_enabled(bool enabled) { QSpinBox::setEnabled(enabled); }
 
-protected:
+ protected:
   void paintEvent(QPaintEvent*);
   void resizeEvent(QResizeEvent*);
 
-signals:
+ signals:
   void Reset();
 };
 
diff --git a/src/widgets/linetextedit.h b/src/widgets/linetextedit.h
index 94529d550..893e932fa 100644
--- a/src/widgets/linetextedit.h
+++ b/src/widgets/linetextedit.h
@@ -24,12 +24,11 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QSize>
 #include <QString>
 #include <QTextEdit>
-#include <QtEvents>
 
+class QWidget;
 class QKeyEvent;
 
 class LineTextEdit : public QTextEdit {
diff --git a/src/widgets/loginstatewidget.cpp b/src/widgets/loginstatewidget.cpp
index 16fad3272..7af32ac38 100644
--- a/src/widgets/loginstatewidget.cpp
+++ b/src/widgets/loginstatewidget.cpp
@@ -26,7 +26,8 @@
 #include <QDate>
 #include <QString>
 #include <QLineEdit>
-#include <QtEvents>
+#include <QEvent>
+#include <QKeyEvent>
 
 LoginStateWidget::LoginStateWidget(QWidget *parent)
     : QWidget(parent), ui_(new Ui_LoginStateWidget), state_(LoggedOut) {
diff --git a/src/widgets/loginstatewidget.h b/src/widgets/loginstatewidget.h
index a55ccf6ef..1136b8428 100644
--- a/src/widgets/loginstatewidget.h
+++ b/src/widgets/loginstatewidget.h
@@ -25,7 +25,8 @@
 #include <QList>
 #include <QString>
 #include <QDate>
-#include <QtEvents>
+
+class QEvent;
 
 class Ui_LoginStateWidget;
 
diff --git a/src/widgets/multiloadingindicator.cpp b/src/widgets/multiloadingindicator.cpp
index 25bec27f8..98185d7b9 100644
--- a/src/widgets/multiloadingindicator.cpp
+++ b/src/widgets/multiloadingindicator.cpp
@@ -31,14 +31,12 @@
 #include <QSizePolicy>
 #include <QStringList>
 #include <QFontMetrics>
-#include <QtEvents>
+#include <QPaintEvent>
 
 #include "core/taskmanager.h"
 #include "multiloadingindicator.h"
 #include "widgets/busyindicator.h"
 
-class QPaintEvent;
-
 const int MultiLoadingIndicator::kVerticalPadding = 4;
 const int MultiLoadingIndicator::kHorizontalPadding = 6;
 const int MultiLoadingIndicator::kSpacing = 6;
diff --git a/src/widgets/multiloadingindicator.h b/src/widgets/multiloadingindicator.h
index 12c061f6c..5cace5df1 100644
--- a/src/widgets/multiloadingindicator.h
+++ b/src/widgets/multiloadingindicator.h
@@ -27,7 +27,6 @@
 #include <QWidget>
 #include <QSize>
 #include <QString>
-#include <QtEvents>
 
 class QPaintEvent;
 
diff --git a/src/widgets/osd.cpp b/src/widgets/osd.cpp
index ba55f024b..b0b530458 100644
--- a/src/widgets/osd.cpp
+++ b/src/widgets/osd.cpp
@@ -26,11 +26,9 @@
 
 #include <QObject>
 #include <QCoreApplication>
-#include <QList>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QRegExp>
 #include <QImage>
 #include <QSettings>
 #ifdef HAVE_DBUS
diff --git a/src/widgets/osd.h b/src/widgets/osd.h
index ea68871a3..0fcb7ad22 100644
--- a/src/widgets/osd.h
+++ b/src/widgets/osd.h
@@ -28,6 +28,7 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
+#include <QUrl>
 #include <QDateTime>
 #include <QImage>
 #ifdef HAVE_DBUS
@@ -36,7 +37,6 @@
 #endif
 
 #include "core/song.h"
-#include "engine/engine_fwd.h"
 #include "playlist/playlistsequence.h"
 
 class Application;
diff --git a/src/widgets/osd_x11.cpp b/src/widgets/osd_x11.cpp
index e23fde4e6..7c97bc9c9 100644
--- a/src/widgets/osd_x11.cpp
+++ b/src/widgets/osd_x11.cpp
@@ -35,7 +35,6 @@
 #include <QString>
 #include <QStringList>
 #include <QImage>
-#include <QColor>
 #ifdef HAVE_DBUS
 #  include <QCoreApplication>
 #  include <QDBusArgument>
diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp
index 18ef01af2..567f5d6ba 100644
--- a/src/widgets/osdpretty.cpp
+++ b/src/widgets/osdpretty.cpp
@@ -27,6 +27,7 @@
 #include <QWindow>
 #include <QScreen>
 #include <QWidget>
+#include <QList>
 #include <QVariant>
 #include <QString>
 #include <QImage>
@@ -59,7 +60,6 @@
 # include <QtWin>
 #endif
 
-#include "core/logging.h"
 #include "osdpretty.h"
 #include "ui_osdpretty.h"
 
diff --git a/src/widgets/osdpretty.h b/src/widgets/osdpretty.h
index fd46f280d..b74e0af88 100644
--- a/src/widgets/osdpretty.h
+++ b/src/widgets/osdpretty.h
@@ -24,11 +24,10 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
+#include <QObject>
 #include <QWidget>
 #include <QMap>
-#include <QScreen>
 #include <QString>
 #include <QImage>
 #include <QPixmap>
@@ -36,8 +35,9 @@
 #include <QFont>
 #include <QPoint>
 #include <QRect>
-#include <QtEvents>
+#include <QRgb>
 
+class QScreen;
 class QTimer;
 class QTimeLine;
 class QEvent;
diff --git a/src/widgets/playingwidget.cpp b/src/widgets/playingwidget.cpp
index 5341612a1..25260f13e 100644
--- a/src/widgets/playingwidget.cpp
+++ b/src/widgets/playingwidget.cpp
@@ -27,6 +27,7 @@
 #include <QByteArray>
 #include <QVariant>
 #include <QString>
+#include <QUrl>
 #include <QImage>
 #include <QPixmap>
 #include <QSize>
@@ -45,7 +46,6 @@
 #include "core/application.h"
 #include "covermanager/albumcoverchoicecontroller.h"
 #include "covermanager/albumcoverloader.h"
-#include "covermanager/currentalbumcoverloader.h"
 #include "playingwidget.h"
 
 using std::unique_ptr;
diff --git a/src/widgets/playingwidget.h b/src/widgets/playingwidget.h
index dcb8968cf..41f0756a2 100644
--- a/src/widgets/playingwidget.h
+++ b/src/widgets/playingwidget.h
@@ -34,7 +34,7 @@
 #include <QImage>
 #include <QPixmap>
 #include <QSize>
-#include <QMenu>
+#include <QAction>
 #include <QMovie>
 
 #include "core/song.h"
@@ -46,7 +46,6 @@ class QTimeLine;
 class QTextDocument;
 class QPainter;
 class QMenu;
-class QAction;
 class QActionGroup;
 class QContextMenuEvent;
 class QDragEnterEvent;
diff --git a/src/widgets/qsearchfield_nonmac.cpp b/src/widgets/qsearchfield_nonmac.cpp
index 56b5687ee..a283f7bba 100644
--- a/src/widgets/qsearchfield_nonmac.cpp
+++ b/src/widgets/qsearchfield_nonmac.cpp
@@ -22,16 +22,20 @@ THE SOFTWARE.
 
 #include "qsearchfield.h"
 
+#include <QtGlobal>
+#include <QObject>
+#include <QWidget>
 #include <QApplication>
+#include <QString>
+#include <QIcon>
 #include <QPointer>
 #include <QLineEdit>
-#include <QVBoxLayout>
 #include <QToolButton>
 #include <QStyle>
+#include <QSize>
+#include <QBoxLayout>
 #include <QEvent>
-
-#include <QDir>
-#include <QDebug>
+#include <QResizeEvent>
 
 #include "core/iconloader.h"
 
diff --git a/src/widgets/renametablineedit.cpp b/src/widgets/renametablineedit.cpp
index dcc27db05..fdd9ad701 100644
--- a/src/widgets/renametablineedit.cpp
+++ b/src/widgets/renametablineedit.cpp
@@ -20,16 +20,18 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QWidget>
 #include <QLineEdit>
-#include <QtEvents>
+#include <QKeyEvent>
+#include <QFocusEvent>
 
 #include "renametablineedit.h"
 
 RenameTabLineEdit::RenameTabLineEdit(QWidget *parent) :
     QLineEdit(parent) {}
 
-void RenameTabLineEdit::keyPressEvent (QKeyEvent *e) {
+void RenameTabLineEdit::keyPressEvent(QKeyEvent *e) {
 
   if (e->key() == Qt::Key_Escape) {
     e->accept();
diff --git a/src/widgets/renametablineedit.h b/src/widgets/renametablineedit.h
index 2154b9316..d2edbfb09 100644
--- a/src/widgets/renametablineedit.h
+++ b/src/widgets/renametablineedit.h
@@ -27,7 +27,6 @@
 #include <QWidget>
 #include <QString>
 #include <QLineEdit>
-#include <QtEvents>
 
 class QFocusEvent;
 class QKeyEvent;
diff --git a/src/widgets/stickyslider.cpp b/src/widgets/stickyslider.cpp
index 87f25d771..bddb3932b 100644
--- a/src/widgets/stickyslider.cpp
+++ b/src/widgets/stickyslider.cpp
@@ -22,11 +22,10 @@
 
 #include <QWidget>
 #include <QSlider>
+#include <QMouseEvent>
 
 #include "stickyslider.h"
 
-class QMouseEvent;
-
 StickySlider::StickySlider(QWidget *parent)
   : QSlider(parent),
     sticky_center_(-1),
diff --git a/src/widgets/stretchheaderview.cpp b/src/widgets/stretchheaderview.cpp
index 78113b946..a75258bf9 100644
--- a/src/widgets/stretchheaderview.cpp
+++ b/src/widgets/stretchheaderview.cpp
@@ -32,7 +32,8 @@
 #include <QByteArray>
 #include <QDataStream>
 #include <QList>
-#include <QtEvents>
+#include <QResizeEvent>
+#include <QMouseEvent>
 
 #include "stretchheaderview.h"
 
diff --git a/src/widgets/stretchheaderview.h b/src/widgets/stretchheaderview.h
index f504cd00a..a22d3e384 100644
--- a/src/widgets/stretchheaderview.h
+++ b/src/widgets/stretchheaderview.h
@@ -23,17 +23,15 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
-#include <QAbstractItemModel>
 #include <QByteArray>
 #include <QHeaderView>
 #include <QList>
 #include <QString>
 #include <QVector>
-#include <QtEvents>
 
+class QWidget;
+class QAbstractItemModel;
 class QMouseEvent;
 class QResizeEvent;
 
diff --git a/src/widgets/trackslider.cpp b/src/widgets/trackslider.cpp
index af3849733..11bb7eb59 100644
--- a/src/widgets/trackslider.cpp
+++ b/src/widgets/trackslider.cpp
@@ -26,7 +26,7 @@
 #include <QSize>
 #include <QLabel>
 #include <QSettings>
-#include <QtEvents>
+#include <QEvent>
 
 #include "core/timeconstants.h"
 #include "core/utilities.h"
diff --git a/src/widgets/trackslider.h b/src/widgets/trackslider.h
index 20d73eeac..9564b8da9 100644
--- a/src/widgets/trackslider.h
+++ b/src/widgets/trackslider.h
@@ -28,8 +28,8 @@
 #include <QWidget>
 #include <QString>
 #include <QSize>
-#include <QLabel>
 
+class QLabel;
 class QEvent;
 
 class Application;
diff --git a/src/widgets/tracksliderpopup.cpp b/src/widgets/tracksliderpopup.cpp
index 379178611..b2b3ede97 100644
--- a/src/widgets/tracksliderpopup.cpp
+++ b/src/widgets/tracksliderpopup.cpp
@@ -35,13 +35,11 @@
 #include <QVector>
 #include <QPoint>
 #include <QPolygon>
-#include <QtEvents>
+#include <QPaintEvent>
 
 #include "core/qt_blurimage.h"
 #include "tracksliderpopup.h"
 
-class QPaintEvent;
-
 const int TrackSliderPopup::kTextMargin = 4;
 const int TrackSliderPopup::kPointLength = 16;
 const int TrackSliderPopup::kPointWidth = 4;
diff --git a/src/widgets/tracksliderpopup.h b/src/widgets/tracksliderpopup.h
index 44fa84822..1413bacf6 100644
--- a/src/widgets/tracksliderpopup.h
+++ b/src/widgets/tracksliderpopup.h
@@ -31,7 +31,6 @@
 #include <QFont>
 #include <QFontMetrics>
 #include <QPoint>
-#include <QtEvents>
 
 class QMouseEvent;
 class QPaintEvent;
diff --git a/src/widgets/tracksliderslider.cpp b/src/widgets/tracksliderslider.cpp
index 7360d37b0..9da43c466 100644
--- a/src/widgets/tracksliderslider.cpp
+++ b/src/widgets/tracksliderslider.cpp
@@ -27,7 +27,10 @@
 #include <QRect>
 #include <QStyle>
 #include <QStyleOption>
-#include <QtEvents>
+#include <QEvent>
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QWheelEvent>
 
 #include "core/timeconstants.h"
 #include "core/utilities.h"
diff --git a/src/widgets/tracksliderslider.h b/src/widgets/tracksliderslider.h
index a912a53e7..e69169365 100644
--- a/src/widgets/tracksliderslider.h
+++ b/src/widgets/tracksliderslider.h
@@ -24,11 +24,10 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QString>
 #include <QSlider>
-#include <QtEvents>
 
+class QWidget;
 class QEvent;
 class QKeyEvent;
 class QMouseEvent;
diff --git a/src/widgets/volumeslider.h b/src/widgets/volumeslider.h
index 621015bdf..e3f89b76e 100644
--- a/src/widgets/volumeslider.h
+++ b/src/widgets/volumeslider.h
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
@@ -32,9 +31,8 @@
 #include <QColor>
 #include <QPalette>
 #include <QSlider>
-#include <QTimer>
-#include <QtEvents>
 
+class QTimer;
 class QEvent;
 class QMouseEvent;
 class QPaintEvent;