diff --git a/src/collection/collection.cpp b/src/collection/collection.cpp
index 4d2a0ae66..6dd10890a 100644
--- a/src/collection/collection.cpp
+++ b/src/collection/collection.cpp
@@ -31,7 +31,6 @@
 #include "core/application.h"
 #include "core/taskmanager.h"
 #include "core/database.h"
-#include "core/player.h"
 #include "core/tagreaderclient.h"
 #include "core/thread.h"
 #include "core/song.h"
@@ -41,7 +40,6 @@
 #include "collectionwatcher.h"
 #include "collectionbackend.h"
 #include "collectionmodel.h"
-#include "playlist/playlistmanager.h"
 #include "scrobbler/lastfmimport.h"
 #include "settings/collectionsettingspage.h"
 
diff --git a/src/collection/collectionbackend.h b/src/collection/collectionbackend.h
index c0da9ea25..f21e38959 100644
--- a/src/collection/collectionbackend.h
+++ b/src/collection/collectionbackend.h
@@ -34,10 +34,8 @@
 #include <QStringList>
 #include <QUrl>
 #include <QSqlDatabase>
-#include <QSqlQuery>
 
 #include "core/song.h"
-#include "core/sqlquery.h"
 #include "collectionfilteroptions.h"
 #include "collectionquery.h"
 #include "collectiondirectory.h"
diff --git a/src/collection/collectionfilterwidget.cpp b/src/collection/collectionfilterwidget.cpp
index a701f9a7b..15a69c748 100644
--- a/src/collection/collectionfilterwidget.cpp
+++ b/src/collection/collectionfilterwidget.cpp
@@ -48,7 +48,6 @@
 #include "core/logging.h"
 #include "collectionfilteroptions.h"
 #include "collectionmodel.h"
-#include "collectionquery.h"
 #include "savedgroupingmanager.h"
 #include "collectionfilterwidget.h"
 #include "groupbydialog.h"
diff --git a/src/collection/collectionfilterwidget.h b/src/collection/collectionfilterwidget.h
index 31708aaa8..fd07b84de 100644
--- a/src/collection/collectionfilterwidget.h
+++ b/src/collection/collectionfilterwidget.h
@@ -31,8 +31,6 @@
 #include <QHash>
 #include <QString>
 
-#include "collectionquery.h"
-#include "collectionqueryoptions.h"
 #include "collectionmodel.h"
 
 class QTimer;
@@ -135,7 +133,6 @@ class CollectionFilterWidget : public QWidget {
   QString settings_group_;
   QString saved_groupings_settings_group_;
   QString settings_prefix_;
-
 };
 
 #endif  // COLLECTIONFILTERWIDGET_H
diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp
index 136ec252b..a99d84aff 100644
--- a/src/collection/collectionmodel.cpp
+++ b/src/collection/collectionmodel.cpp
@@ -68,10 +68,10 @@
 #include "collectionmodel.h"
 #include "playlist/playlistmanager.h"
 #include "playlist/songmimedata.h"
-#include "covermanager/albumcoverloader.h"
+#include "covermanager/albumcoverloaderoptions.h"
 #include "covermanager/albumcoverloaderresult.h"
+#include "covermanager/albumcoverloader.h"
 #include "settings/collectionsettingspage.h"
-#include "settings/coverssettingspage.h"
 
 const int CollectionModel::kPrettyCoverSize = 32;
 const char *CollectionModel::kPixmapDiskCacheDir = "pixmapcache";
diff --git a/src/collection/collectionmodel.h b/src/collection/collectionmodel.h
index c60f6b604..be41faa6f 100644
--- a/src/collection/collectionmodel.h
+++ b/src/collection/collectionmodel.h
@@ -48,10 +48,9 @@
 #include "core/simpletreemodel.h"
 #include "core/song.h"
 #include "core/sqlrow.h"
-#include "covermanager/albumcoverloader.h"
 #include "covermanager/albumcoverloaderoptions.h"
+#include "covermanager/albumcoverloaderresult.h"
 #include "collectionfilteroptions.h"
-#include "collectionquery.h"
 #include "collectionqueryoptions.h"
 #include "collectionitem.h"
 
diff --git a/src/collection/collectionquery.cpp b/src/collection/collectionquery.cpp
index 14458cc8b..ced0980b4 100644
--- a/src/collection/collectionquery.cpp
+++ b/src/collection/collectionquery.cpp
@@ -32,13 +32,10 @@
 #include <QSqlDatabase>
 #include <QSqlQuery>
 
-#include "core/logging.h"
-#include "core/sqlquery.h"
 #include "core/song.h"
 
 #include "collectionquery.h"
 #include "collectionfilteroptions.h"
-#include "collectionqueryoptions.h"
 
 CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const QString &fts_table, const CollectionFilterOptions &filter_options)
     : QSqlQuery(db),
diff --git a/src/collection/collectionquery.h b/src/collection/collectionquery.h
index 7a7319158..a2f3d9cbd 100644
--- a/src/collection/collectionquery.h
+++ b/src/collection/collectionquery.h
@@ -32,7 +32,6 @@
 #include <QSqlQuery>
 
 #include "collectionfilteroptions.h"
-#include "collectionqueryoptions.h"
 
 class CollectionQuery : public QSqlQuery {
  public:
diff --git a/src/collection/collectionqueryoptions.cpp b/src/collection/collectionqueryoptions.cpp
index 6e0d72dbc..c3ad1bc65 100644
--- a/src/collection/collectionqueryoptions.cpp
+++ b/src/collection/collectionqueryoptions.cpp
@@ -21,7 +21,6 @@
 #include <QString>
 
 #include "collectionqueryoptions.h"
-#include "collectionfilteroptions.h"
 
 CollectionQueryOptions::CollectionQueryOptions()
     : compilation_requirement_(CollectionQueryOptions::CompilationRequirement::None),
diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp
index 39f4ab19c..ec174c23e 100644
--- a/src/core/mainwindow.cpp
+++ b/src/core/mainwindow.cpp
@@ -127,7 +127,6 @@
 #include "collection/collectiondirectorymodel.h"
 #include "collection/collectionfilterwidget.h"
 #include "collection/collectionmodel.h"
-#include "collection/collectionquery.h"
 #include "collection/collectionview.h"
 #include "collection/collectionviewcontainer.h"
 #include "playlist/playlist.h"
@@ -163,6 +162,7 @@
 #include "settings/settingsdialog.h"
 #include "settings/behavioursettingspage.h"
 #include "settings/backendsettingspage.h"
+#include "settings/collectionsettingspage.h"
 #include "settings/playlistsettingspage.h"
 #ifdef HAVE_SUBSONIC
 #  include "settings/subsonicsettingspage.h"
@@ -199,7 +199,6 @@
 #endif
 
 #include "smartplaylists/smartplaylistsviewcontainer.h"
-#include "smartplaylists/smartplaylistsview.h"
 
 #ifdef Q_OS_WIN
 #  include "windows7thumbbar.h"
diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h
index 12f1e2e6f..1c53ae40e 100644
--- a/src/core/mainwindow.h
+++ b/src/core/mainwindow.h
@@ -54,7 +54,6 @@
 #include "tagreaderclient.h"
 #include "engine/enginebase.h"
 #include "osd/osdbase.h"
-#include "collection/collectionmodel.h"
 #include "playlist/playlist.h"
 #include "playlist/playlistitem.h"
 #include "settings/settingsdialog.h"
diff --git a/src/core/player.cpp b/src/core/player.cpp
index 5b9832cd2..406e15a57 100644
--- a/src/core/player.cpp
+++ b/src/core/player.cpp
@@ -64,9 +64,6 @@
 #include "settings/backendsettingspage.h"
 #include "settings/behavioursettingspage.h"
 #include "settings/playlistsettingspage.h"
-#include "internet/internetservices.h"
-#include "internet/internetservice.h"
-#include "scrobbler/audioscrobbler.h"
 
 const char *Player::kSettingsGroup = "Player";
 
diff --git a/src/core/tagreaderclient.cpp b/src/core/tagreaderclient.cpp
index f261cca2e..62c287b5c 100644
--- a/src/core/tagreaderclient.cpp
+++ b/src/core/tagreaderclient.cpp
@@ -36,7 +36,6 @@
 
 #include "song.h"
 #include "tagreaderclient.h"
-#include "settings/collectionsettingspage.h"
 
 const char *TagReaderClient::kWorkerExecutableName = "strawberry-tagreader";
 TagReaderClient *TagReaderClient::sInstance = nullptr;
diff --git a/src/covermanager/albumcoverchoicecontroller.cpp b/src/covermanager/albumcoverchoicecontroller.cpp
index 36cd88c71..f29ad53fa 100644
--- a/src/covermanager/albumcoverchoicecontroller.cpp
+++ b/src/covermanager/albumcoverchoicecontroller.cpp
@@ -55,7 +55,6 @@
 #include "utilities/filenameconstants.h"
 #include "utilities/strutils.h"
 #include "utilities/mimeutils.h"
-#include "utilities/imageutils.h"
 #include "utilities/coveroptions.h"
 #include "utilities/coverutils.h"
 #include "utilities/screenutils.h"
diff --git a/src/covermanager/albumcoverchoicecontroller.h b/src/covermanager/albumcoverchoicecontroller.h
index ddfdbaa9b..8b124a3a9 100644
--- a/src/covermanager/albumcoverchoicecontroller.h
+++ b/src/covermanager/albumcoverchoicecontroller.h
@@ -40,7 +40,6 @@
 #include "core/song.h"
 #include "core/tagreaderclient.h"
 #include "utilities/coveroptions.h"
-#include "settings/collectionsettingspage.h"
 #include "albumcoverloaderoptions.h"
 #include "albumcoverimageresult.h"
 
diff --git a/src/covermanager/albumcoverfetchersearch.cpp b/src/covermanager/albumcoverfetchersearch.cpp
index cc2f6ae3e..051cf6b0e 100644
--- a/src/covermanager/albumcoverfetchersearch.cpp
+++ b/src/covermanager/albumcoverfetchersearch.cpp
@@ -21,8 +21,8 @@
 
 #include "config.h"
 
-#include <algorithm>
 #include <cmath>
+#include <algorithm>
 
 #include <QObject>
 #include <QCoreApplication>
diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp
index 021663bd2..8ca3e4f25 100644
--- a/src/covermanager/albumcovermanager.cpp
+++ b/src/covermanager/albumcovermanager.cpp
@@ -64,22 +64,21 @@
 #include <QSize>
 #include <QtEvents>
 
-#include "utilities/strutils.h"
-#include "utilities/fileutils.h"
-#include "utilities/imageutils.h"
-#include "utilities/mimeutils.h"
-#include "utilities/screenutils.h"
 #include "core/application.h"
 #include "core/iconloader.h"
 #include "core/tagreaderclient.h"
 #include "core/database.h"
 #include "core/sqlrow.h"
+#include "utilities/strutils.h"
+#include "utilities/fileutils.h"
+#include "utilities/imageutils.h"
+#include "utilities/mimeutils.h"
+#include "utilities/screenutils.h"
 #include "widgets/forcescrollperpixel.h"
 #include "widgets/qsearchfield.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectionquery.h"
 #include "playlist/songmimedata.h"
-#include "settings/collectionsettingspage.h"
 #include "coverproviders.h"
 #include "albumcovermanager.h"
 #include "albumcoversearcher.h"
diff --git a/src/covermanager/albumcovermanager.h b/src/covermanager/albumcovermanager.h
index 205cce469..19e9a9b87 100644
--- a/src/covermanager/albumcovermanager.h
+++ b/src/covermanager/albumcovermanager.h
@@ -42,7 +42,6 @@
 #include "albumcoverloaderresult.h"
 #include "albumcoverchoicecontroller.h"
 #include "coversearchstatistics.h"
-#include "settings/collectionsettingspage.h"
 
 class QWidget;
 class QMimeData;
diff --git a/src/covermanager/coverfromurldialog.cpp b/src/covermanager/coverfromurldialog.cpp
index 016f39f3a..4d873a66d 100644
--- a/src/covermanager/coverfromurldialog.cpp
+++ b/src/covermanager/coverfromurldialog.cpp
@@ -31,8 +31,8 @@
 #include <QNetworkRequest>
 #include <QUrl>
 
-#include "utilities/mimeutils.h"
 #include "core/networkaccessmanager.h"
+#include "utilities/mimeutils.h"
 #include "widgets/busyindicator.h"
 #include "albumcoverimageresult.h"
 #include "coverfromurldialog.h"
diff --git a/src/covermanager/qobuzcoverprovider.cpp b/src/covermanager/qobuzcoverprovider.cpp
index b0e67afc1..6e35c6872 100644
--- a/src/covermanager/qobuzcoverprovider.cpp
+++ b/src/covermanager/qobuzcoverprovider.cpp
@@ -41,7 +41,6 @@
 #include "core/song.h"
 #include "internet/internetservices.h"
 #include "qobuz/qobuzservice.h"
-#include "qobuz/qobuzbaserequest.h"
 #include "albumcoverfetcher.h"
 #include "jsoncoverprovider.h"
 #include "qobuzcoverprovider.h"
diff --git a/src/covermanager/qobuzcoverprovider.h b/src/covermanager/qobuzcoverprovider.h
index 88c9d03ee..a0e4e5cc9 100644
--- a/src/covermanager/qobuzcoverprovider.h
+++ b/src/covermanager/qobuzcoverprovider.h
@@ -36,7 +36,6 @@
 class QNetworkReply;
 class Application;
 class NetworkAccessManager;
-class QobuzService;
 
 class QobuzCoverProvider : public JsonCoverProvider {
   Q_OBJECT
diff --git a/src/device/devicemanager.cpp b/src/device/devicemanager.cpp
index 08a58d2ae..98fa1ca97 100644
--- a/src/device/devicemanager.cpp
+++ b/src/device/devicemanager.cpp
@@ -44,10 +44,10 @@
 
 #include "devicemanager.h"
 
+#include "core/logging.h"
 #include "core/application.h"
 #include "core/database.h"
 #include "core/iconloader.h"
-#include "core/logging.h"
 #include "core/musicstorage.h"
 #include "core/taskmanager.h"
 #include "core/simpletreemodel.h"
diff --git a/src/device/filesystemdevice.cpp b/src/device/filesystemdevice.cpp
index 9a685b86f..38d6146bc 100644
--- a/src/device/filesystemdevice.cpp
+++ b/src/device/filesystemdevice.cpp
@@ -25,8 +25,8 @@
 #include <QString>
 #include <QUrl>
 
-#include "core/application.h"
 #include "core/logging.h"
+#include "core/application.h"
 #include "core/song.h"
 
 #include "collection/collectionbackend.h"
diff --git a/src/device/gpodloader.cpp b/src/device/gpodloader.cpp
index 517c7962a..6dec0a90b 100644
--- a/src/device/gpodloader.cpp
+++ b/src/device/gpodloader.cpp
@@ -29,10 +29,10 @@
 #include <QByteArray>
 #include <QString>
 
-#include "collection/collectionbackend.h"
 #include "core/logging.h"
 #include "core/song.h"
 #include "core/taskmanager.h"
+#include "collection/collectionbackend.h"
 #include "gpodloader.h"
 
 GPodLoader::GPodLoader(const QString &mount_point, TaskManager *task_manager, CollectionBackend *backend, std::shared_ptr<ConnectedDevice> device, QObject *parent)
diff --git a/src/device/mtpconnection.h b/src/device/mtpconnection.h
index 8fb558a7a..5be0d2269 100644
--- a/src/device/mtpconnection.h
+++ b/src/device/mtpconnection.h
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include <memory>
+
 #include <libmtp.h>
 
 #include <QtGlobal>
diff --git a/src/device/mtpdevice.cpp b/src/device/mtpdevice.cpp
index 117b0e49c..2d46d9200 100644
--- a/src/device/mtpdevice.cpp
+++ b/src/device/mtpdevice.cpp
@@ -33,11 +33,11 @@
 #include <QString>
 #include <QUrl>
 
-#include "collection/collectionmodel.h"
-#include "collection/collectionbackend.h"
 #include "core/logging.h"
 #include "core/application.h"
 #include "core/musicstorage.h"
+#include "collection/collectionmodel.h"
+#include "collection/collectionbackend.h"
 #include "connecteddevice.h"
 #include "mtpdevice.h"
 #include "mtploader.h"
diff --git a/src/engine/ebur128analysis.cpp b/src/engine/ebur128analysis.cpp
index 66c5d99a5..3771041a6 100644
--- a/src/engine/ebur128analysis.cpp
+++ b/src/engine/ebur128analysis.cpp
@@ -22,15 +22,17 @@
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include <memory>
 #include <optional>
+#include <tuple>
+#include <vector>
+#include <memory>
 
-#include <ebur128.h>
 #include <glib-object.h>
 #include <glib.h>
-#include <gst/app/gstappsink.h>
-#include <gst/audio/audio-channels.h>
 #include <gst/gst.h>
+#include <gst/audio/audio-channels.h>
+#include <gst/app/gstappsink.h>
+#include <ebur128.h>
 
 #include <QCoreApplication>
 #include <QElapsedTimer>
diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp
index f84e38b9c..f6304a786 100644
--- a/src/engine/gstengine.cpp
+++ b/src/engine/gstengine.cpp
@@ -22,12 +22,13 @@
 
 #include "config.h"
 
+#include <cmath>
+#include <algorithm>
+#include <optional>
+#include <memory>
+
 #include <glib.h>
 #include <glib-object.h>
-#include <memory>
-#include <algorithm>
-#include <vector>
-#include <cmath>
 
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
diff --git a/src/engine/gstengine.h b/src/engine/gstengine.h
index 1a39a392d..91bd5a059 100644
--- a/src/engine/gstengine.h
+++ b/src/engine/gstengine.h
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <memory>
+#include <optional>
 
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
@@ -38,7 +39,6 @@
 #include <QString>
 #include <QUrl>
 
-#include "utilities/timeconstants.h"
 #include "enginebase.h"
 #include "gststartup.h"
 #include "gstbufferconsumer.h"
diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp
index 83a30ce4b..3355065d2 100644
--- a/src/engine/gstenginepipeline.cpp
+++ b/src/engine/gstenginepipeline.cpp
@@ -51,7 +51,6 @@
 #include "core/signalchecker.h"
 #include "utilities/timeconstants.h"
 #include "settings/backendsettingspage.h"
-#include "enginebase.h"
 #include "gstengine.h"
 #include "gstenginepipeline.h"
 #include "gstbufferconsumer.h"
diff --git a/src/engine/vlcengine.cpp b/src/engine/vlcengine.cpp
index 3a129058d..3ba6eccf5 100644
--- a/src/engine/vlcengine.cpp
+++ b/src/engine/vlcengine.cpp
@@ -21,6 +21,9 @@
 
 #include "config.h"
 
+#include <algorithm>
+#include <optional>
+
 #include <vlc/vlc.h>
 
 #include <QtGlobal>
diff --git a/src/engine/vlcengine.h b/src/engine/vlcengine.h
index 20d06a64a..e09ff00c9 100644
--- a/src/engine/vlcengine.h
+++ b/src/engine/vlcengine.h
@@ -24,6 +24,8 @@
 
 #include "config.h"
 
+#include <optional>
+
 #include <vlc/vlc.h>
 
 #include <QtGlobal>
diff --git a/src/internet/internetcollectionview.h b/src/internet/internetcollectionview.h
index e0191df1f..1476c53ff 100644
--- a/src/internet/internetcollectionview.h
+++ b/src/internet/internetcollectionview.h
@@ -32,9 +32,10 @@
 #include <QString>
 #include <QPixmap>
 
-#include "widgets/autoexpandingtreeview.h"
 #include "core/song.h"
 
+#include "widgets/autoexpandingtreeview.h"
+
 class QWidget;
 class QMenu;
 class QAction;
diff --git a/src/internet/internetplaylistitem.cpp b/src/internet/internetplaylistitem.cpp
index 81f38311f..ae46c41b8 100644
--- a/src/internet/internetplaylistitem.cpp
+++ b/src/internet/internetplaylistitem.cpp
@@ -25,11 +25,8 @@
 #include <QVariant>
 
 #include "internetplaylistitem.h"
-#include "internetservices.h"
 #include "internetservice.h"
-#include "core/settingsprovider.h"
 #include "core/sqlrow.h"
-#include "playlist/playlistbackend.h"
 
 InternetPlaylistItem::InternetPlaylistItem(const Song::Source source)
     : PlaylistItem(source),
diff --git a/src/internet/internetsearchview.h b/src/internet/internetsearchview.h
index 19dbdf549..2b3977c82 100644
--- a/src/internet/internetsearchview.h
+++ b/src/internet/internetsearchview.h
@@ -43,7 +43,6 @@
 #include "core/song.h"
 #include "collection/collectionmodel.h"
 #include "covermanager/albumcoverloaderresult.h"
-#include "settings/settingsdialog.h"
 
 class QSortFilterProxyModel;
 class QMimeData;
diff --git a/src/lyrics/geniuslyricsprovider.cpp b/src/lyrics/geniuslyricsprovider.cpp
index fc34d9837..60a3a6076 100644
--- a/src/lyrics/geniuslyricsprovider.cpp
+++ b/src/lyrics/geniuslyricsprovider.cpp
@@ -44,11 +44,9 @@
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
-#include "utilities/strutils.h"
 #include "utilities/randutils.h"
 #include "internet/localredirectserver.h"
 #include "jsonlyricsprovider.h"
-#include "lyricsfetcher.h"
 #include "geniuslyricsprovider.h"
 
 const char *GeniusLyricsProvider::kSettingsGroup = "GeniusLyrics";
diff --git a/src/lyrics/lyricscomlyricsprovider.cpp b/src/lyrics/lyricscomlyricsprovider.cpp
index 0c90682ad..8afea3e51 100644
--- a/src/lyrics/lyricscomlyricsprovider.cpp
+++ b/src/lyrics/lyricscomlyricsprovider.cpp
@@ -34,7 +34,6 @@
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
-#include "utilities/strutils.h"
 #include "lyricssearchrequest.h"
 #include "lyricssearchresult.h"
 #include "lyricscomlyricsprovider.h"
diff --git a/src/lyrics/lyricsfetchersearch.cpp b/src/lyrics/lyricsfetchersearch.cpp
index 313f4484f..35d082d0d 100644
--- a/src/lyrics/lyricsfetchersearch.cpp
+++ b/src/lyrics/lyricsfetchersearch.cpp
@@ -26,7 +26,6 @@
 #include <QList>
 
 #include "core/logging.h"
-#include "lyricsfetcher.h"
 #include "lyricsfetchersearch.h"
 #include "lyricssearchrequest.h"
 #include "lyricssearchresult.h"
diff --git a/src/lyrics/lyricsfetchersearch.h b/src/lyrics/lyricsfetchersearch.h
index 0f2619c2a..c9995225b 100644
--- a/src/lyrics/lyricsfetchersearch.h
+++ b/src/lyrics/lyricsfetchersearch.h
@@ -27,7 +27,6 @@
 #include <QMap>
 #include <QString>
 
-#include "lyricsfetcher.h"
 #include "lyricssearchrequest.h"
 #include "lyricssearchresult.h"
 
diff --git a/src/moodbar/moodbarpipeline.cpp b/src/moodbar/moodbarpipeline.cpp
index 044056e43..badcc20f1 100644
--- a/src/moodbar/moodbarpipeline.cpp
+++ b/src/moodbar/moodbarpipeline.cpp
@@ -17,8 +17,10 @@
 
 #include "moodbarpipeline.h"
 
-#include <memory>
 #include <cstdlib>
+
+#include <memory>
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gst/gst.h>
diff --git a/src/organize/organize.cpp b/src/organize/organize.cpp
index 1557de86a..9550361b5 100644
--- a/src/organize/organize.cpp
+++ b/src/organize/organize.cpp
@@ -19,10 +19,11 @@
  *
  */
 
+#include <QtGlobal>
+
 #include <functional>
 #include <chrono>
 
-#include <QtGlobal>
 #include <QThread>
 #include <QFile>
 #include <QFileInfo>
diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index ca48580d8..0a09fbab2 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -67,7 +67,7 @@
 #include "collection/collection.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectionplaylistitem.h"
-#include "covermanager/albumcoverloader.h"
+#include "covermanager/albumcoverloaderresult.h"
 #include "queue/queue.h"
 #include "playlist.h"
 #include "playlistitem.h"
@@ -87,6 +87,7 @@
 
 #include "internet/internetplaylistitem.h"
 #include "internet/internetsongmimedata.h"
+#include "internet/internetservice.h"
 
 #include "radios/radiomimedata.h"
 #include "radios/radioplaylistitem.h"
diff --git a/src/playlist/playlistitem.cpp b/src/playlist/playlistitem.cpp
index 29b24489f..d4d90854c 100644
--- a/src/playlist/playlistitem.cpp
+++ b/src/playlist/playlistitem.cpp
@@ -30,7 +30,6 @@
 #include "core/sqlquery.h"
 #include "core/song.h"
 
-#include "collection/collection.h"
 #include "collection/collectionplaylistitem.h"
 #include "playlistitem.h"
 #include "songplaylistitem.h"
diff --git a/src/playlist/playlistlistcontainer.cpp b/src/playlist/playlistlistcontainer.cpp
index e209e8081..d772168ee 100644
--- a/src/playlist/playlistlistcontainer.cpp
+++ b/src/playlist/playlistlistcontainer.cpp
@@ -21,8 +21,8 @@
 
 #include "config.h"
 
-#include <memory>
 #include <utility>
+#include <memory>
 
 #include <QObject>
 #include <QWidget>
diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp
index 7d2c1daaa..226ad70d0 100644
--- a/src/playlist/playlistmanager.cpp
+++ b/src/playlist/playlistmanager.cpp
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <functional>
 #include <utility>
 
 #include <QtGlobal>
diff --git a/src/playlist/playlisttabbar.cpp b/src/playlist/playlisttabbar.cpp
index 3225a32ba..9072bf0bf 100644
--- a/src/playlist/playlisttabbar.cpp
+++ b/src/playlist/playlisttabbar.cpp
@@ -43,8 +43,8 @@
 #include <QtEvents>
 #include <QSettings>
 
-#include "core/iconloader.h"
 #include "core/logging.h"
+#include "core/iconloader.h"
 #include "core/mimedata.h"
 #include "widgets/favoritewidget.h"
 #include "widgets/renametablineedit.h"
diff --git a/src/playlistparsers/asxiniparser.h b/src/playlistparsers/asxiniparser.h
index 20aec7836..05d2014e8 100644
--- a/src/playlistparsers/asxiniparser.h
+++ b/src/playlistparsers/asxiniparser.h
@@ -21,13 +21,14 @@
 #ifndef ASXINIPARSER_H
 #define ASXINIPARSER_H
 
+#include "config.h"
+
 #include <QObject>
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
 #include <QDir>
 
-#include "config.h"
 #include "core/song.h"
 #include "settings/playlistsettingspage.h"
 #include "parserbase.h"
diff --git a/src/playlistparsers/asxparser.h b/src/playlistparsers/asxparser.h
index 887bbde83..ad0b74122 100644
--- a/src/playlistparsers/asxparser.h
+++ b/src/playlistparsers/asxparser.h
@@ -21,13 +21,14 @@
 #ifndef ASXPARSER_H
 #define ASXPARSER_H
 
+#include "config.h"
+
 #include <QObject>
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
 #include <QDir>
 
-#include "config.h"
 #include "core/song.h"
 #include "settings/playlistsettingspage.h"
 #include "xmlparser.h"
diff --git a/src/providers/musixmatchprovider.h b/src/providers/musixmatchprovider.h
index d3a4f5acf..50f781a31 100644
--- a/src/providers/musixmatchprovider.h
+++ b/src/providers/musixmatchprovider.h
@@ -21,7 +21,6 @@
 #define MUSIXMATCHPROVIDER_H
 
 #include <QString>
-#include <QRegularExpression>
 
 class MusixmatchProvider {
 
diff --git a/src/radios/radioservice.cpp b/src/radios/radioservice.cpp
index c252f7144..16005feb4 100644
--- a/src/radios/radioservice.cpp
+++ b/src/radios/radioservice.cpp
@@ -26,8 +26,8 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 
-#include "core/application.h"
 #include "core/logging.h"
+#include "core/application.h"
 #include "radioservice.h"
 
 RadioService::RadioService(const Song::Source source, const QString &name, const QIcon &icon, Application *app, NetworkAccessManager *network, QObject *parent)
diff --git a/src/smartplaylists/smartplaylistsearchtermwidget.cpp b/src/smartplaylists/smartplaylistsearchtermwidget.cpp
index 7bdf1839b..0441e4c12 100644
--- a/src/smartplaylists/smartplaylistsearchtermwidget.cpp
+++ b/src/smartplaylists/smartplaylistsearchtermwidget.cpp
@@ -34,8 +34,8 @@
 #include <QKeyEvent>
 #include <QEnterEvent>
 
-#include "utilities/colorutils.h"
 #include "core/iconloader.h"
+#include "utilities/colorutils.h"
 #include "playlist/playlist.h"
 #include "playlist/playlistdelegates.h"
 #include "smartplaylistsearchterm.h"
diff --git a/src/smartplaylists/smartplaylistsmodel.cpp b/src/smartplaylists/smartplaylistsmodel.cpp
index bf00cbee7..782675614 100644
--- a/src/smartplaylists/smartplaylistsmodel.cpp
+++ b/src/smartplaylists/smartplaylistsmodel.cpp
@@ -27,15 +27,14 @@
 #include <QMimeData>
 #include <QSettings>
 
+#include "core/logging.h"
 #include "core/application.h"
-#include "core/database.h"
 #include "core/iconloader.h"
 #include "core/simpletreemodel.h"
 #include "collection/collectionbackend.h"
 
 #include "smartplaylistsitem.h"
 #include "smartplaylistsmodel.h"
-#include "smartplaylistsview.h"
 #include "smartplaylistsearch.h"
 #include "playlistgenerator.h"
 #include "playlistgeneratormimedata.h"
diff --git a/src/smartplaylists/smartplaylistsviewcontainer.cpp b/src/smartplaylists/smartplaylistsviewcontainer.cpp
index eb098b741..4bae06c8a 100644
--- a/src/smartplaylists/smartplaylistsviewcontainer.cpp
+++ b/src/smartplaylists/smartplaylistsviewcontainer.cpp
@@ -33,9 +33,7 @@
 #include "smartplaylistsviewcontainer.h"
 #include "smartplaylistsmodel.h"
 #include "smartplaylistsview.h"
-#include "smartplaylistsearchterm.h"
 #include "smartplaylistwizard.h"
-#include "playlistquerygenerator.h"
 #include "playlistgenerator_fwd.h"
 
 #include "ui_smartplaylistsviewcontainer.h"
diff --git a/src/smartplaylists/smartplaylistsviewcontainer.h b/src/smartplaylists/smartplaylistsviewcontainer.h
index c0bdd5af8..f00816e16 100644
--- a/src/smartplaylists/smartplaylistsviewcontainer.h
+++ b/src/smartplaylists/smartplaylistsviewcontainer.h
@@ -94,7 +94,6 @@ class SmartPlaylistsViewContainer : public QWidget {
   QAction *action_add_to_playlist_enqueue_;
   QAction *action_add_to_playlist_enqueue_next_;
   QModelIndex context_menu_index_;
-
 };
 
 #endif  // SMARTPLAYLISTSVIEWCONTAINER_H
diff --git a/src/subsonic/subsonicrequest.h b/src/subsonic/subsonicrequest.h
index 0df57e08f..f150f0164 100644
--- a/src/subsonic/subsonicrequest.h
+++ b/src/subsonic/subsonicrequest.h
@@ -146,7 +146,6 @@ class SubsonicRequest : public SubsonicBaseRequest {
   bool no_results_;
   QList<QNetworkReply*> replies_;
   QList<QNetworkReply*> album_cover_replies_;
-
 };
 
 #endif  // SUBSONICREQUEST_H
diff --git a/src/subsonic/subsonicscrobblerequest.h b/src/subsonic/subsonicscrobblerequest.h
index f8f57e508..dc37eb1cc 100644
--- a/src/subsonic/subsonicscrobblerequest.h
+++ b/src/subsonic/subsonicscrobblerequest.h
@@ -81,7 +81,6 @@ class SubsonicScrobbleRequest : public SubsonicBaseRequest {
 
   QStringList errors_;
   QList<QNetworkReply*> replies_;
-
 };
 
 #endif  // SUBSONICSCROBBLEREQUEST_H
diff --git a/src/subsonic/subsonicurlhandler.h b/src/subsonic/subsonicurlhandler.h
index ae4f91153..9229616f2 100644
--- a/src/subsonic/subsonicurlhandler.h
+++ b/src/subsonic/subsonicurlhandler.h
@@ -49,7 +49,6 @@ class SubsonicUrlHandler : public UrlHandler {
 
  private:
   SubsonicService *service_;
-
 };
 
 #endif  // SUBSONICURLHANDLER_H
diff --git a/src/tidal/tidalrequest.h b/src/tidal/tidalrequest.h
index be80f340b..db3964bf0 100644
--- a/src/tidal/tidalrequest.h
+++ b/src/tidal/tidalrequest.h
@@ -38,6 +38,7 @@
 #include <QJsonObject>
 
 #include "core/song.h"
+
 #include "tidalbaserequest.h"
 
 class QNetworkReply;
diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp
index 2bcc5b415..9c2c9b404 100644
--- a/src/tidal/tidalservice.cpp
+++ b/src/tidal/tidalservice.cpp
@@ -41,9 +41,9 @@
 #include <QSettings>
 #include <QSortFilterProxyModel>
 
+#include "core/logging.h"
 #include "core/application.h"
 #include "core/player.h"
-#include "core/logging.h"
 #include "core/networkaccessmanager.h"
 #include "core/database.h"
 #include "core/song.h"
diff --git a/src/tidal/tidalurlhandler.h b/src/tidal/tidalurlhandler.h
index 1c4a85790..6cbb3e31b 100644
--- a/src/tidal/tidalurlhandler.h
+++ b/src/tidal/tidalurlhandler.h
@@ -59,7 +59,6 @@ class TidalUrlHandler : public UrlHandler {
   Application *app_;
   TidalService *service_;
   QMap<uint, Request> requests_;
-
 };
 
 #endif  // TIDALURLHANDLER_H
diff --git a/src/transcoder/transcoder.cpp b/src/transcoder/transcoder.cpp
index ed4cb88e1..9d1444250 100644
--- a/src/transcoder/transcoder.cpp
+++ b/src/transcoder/transcoder.cpp
@@ -21,13 +21,15 @@
 
 #include "config.h"
 
-#include <memory>
+#include <QtGlobal>
+
 #include <algorithm>
+#include <memory>
+
 #include <glib.h>
 #include <glib/gtypes.h>
 #include <gst/gst.h>
 
-#include <QtGlobal>
 #include <QThread>
 #include <QCoreApplication>
 #include <QStandardPaths>
diff --git a/src/utilities/fileutils.cpp b/src/utilities/fileutils.cpp
index d263f371a..a7db99fb2 100644
--- a/src/utilities/fileutils.cpp
+++ b/src/utilities/fileutils.cpp
@@ -18,10 +18,10 @@
  *
  */
 
-#include <memory>
-
 #include <QtGlobal>
 
+#include <memory>
+
 #include <QByteArray>
 #include <QString>
 #include <QIODevice>
diff --git a/src/utilities/transliterate.cpp b/src/utilities/transliterate.cpp
index c413ac6c5..02887f76e 100644
--- a/src/utilities/transliterate.cpp
+++ b/src/utilities/transliterate.cpp
@@ -19,9 +19,9 @@
 
 #include "config.h"
 
-#include <string>
 #include <memory>
 #include <cstdio>
+#include <string>
 
 #ifdef HAVE_ICU
 #  include <unicode/translit.h>