From 2b24ac54a08952c82a76143ab44fc6cb53455cbc Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 28 Aug 2022 03:09:33 +0200
Subject: [PATCH] Remove unused includes

---
 src/analyzer/analyzercontainer.cpp                    |  1 -
 src/collection/collection.cpp                         |  1 -
 src/collection/collectionmodel.cpp                    |  1 -
 src/collection/collectionwatcher.cpp                  | 10 ++++------
 src/core/appearance.cpp                               |  1 -
 src/core/application.cpp                              |  2 --
 src/core/commandlineoptions.cpp                       |  1 -
 src/core/database.cpp                                 |  6 ------
 src/core/filesystemmusicstorage.cpp                   |  3 ---
 src/core/imageutils.cpp                               |  2 --
 src/core/mpris2.cpp                                   |  3 ---
 src/core/networkproxyfactory.cpp                      |  2 --
 src/core/networktimeouts.cpp                          |  1 -
 src/core/player.cpp                                   |  2 --
 src/core/qtsystemtrayicon.cpp                         |  2 --
 src/core/scopedgobject.h                              |  2 --
 src/core/song.cpp                                     |  6 +-----
 src/core/songloader.cpp                               |  3 ---
 src/core/sqlquery.cpp                                 |  2 --
 src/core/standarditemiconloader.cpp                   |  1 -
 src/core/stylesheetloader.cpp                         |  2 --
 src/core/tagreaderclient.cpp                          |  1 -
 src/core/threadsafenetworkdiskcache.cpp               |  1 -
 src/core/utilities.cpp                                |  4 ----
 src/core/windows7thumbbar.cpp                         |  1 -
 src/covermanager/albumcoverfetcher.cpp                |  1 -
 src/covermanager/albumcoverfetchersearch.cpp          |  4 ----
 src/covermanager/albumcoverloader.cpp                 |  2 --
 src/covermanager/albumcovermanager.cpp                |  3 ---
 src/covermanager/albumcoversearcher.cpp               |  2 --
 src/covermanager/coverexportrunnable.cpp              |  2 --
 src/covermanager/coverfromurldialog.cpp               |  1 -
 src/covermanager/coverfromurldialog.h                 |  1 -
 src/covermanager/coverproviders.cpp                   |  3 ---
 src/covermanager/coversearchstatisticsdialog.cpp      |  2 --
 src/covermanager/currentalbumcoverloader.cpp          |  3 ---
 src/covermanager/deezercoverprovider.cpp              |  2 --
 src/covermanager/discogscoverprovider.cpp             |  6 ------
 src/covermanager/jsoncoverprovider.cpp                |  2 --
 src/covermanager/lastfmcoverprovider.cpp              |  3 ---
 src/covermanager/musicbrainzcoverprovider.cpp         |  2 --
 src/covermanager/musixmatchcoverprovider.cpp          |  1 -
 src/covermanager/qobuzcoverprovider.cpp               |  3 ---
 src/covermanager/spotifycoverprovider.cpp             |  2 --
 src/covermanager/tidalcoverprovider.cpp               |  3 ---
 src/device/cddalister.cpp                             |  1 -
 src/device/cddasongloader.cpp                         |  1 -
 src/device/connecteddevice.cpp                        |  3 ---
 src/device/devicedatabasebackend.cpp                  |  2 --
 src/device/devicemanager.cpp                          |  2 --
 src/device/deviceproperties.cpp                       |  2 --
 src/device/devicestatefiltermodel.cpp                 |  2 --
 src/device/deviceview.cpp                             |  2 --
 src/device/filesystemdevice.cpp                       |  1 -
 src/device/giolister.cpp                              |  4 ++--
 src/device/gpoddevice.cpp                             |  1 -
 src/device/gpodloader.cpp                             |  1 -
 src/device/mtpconnection.cpp                          |  2 --
 src/device/mtpdevice.cpp                              |  1 -
 src/device/udisks2lister.cpp                          |  5 ++---
 src/dialogs/about.cpp                                 |  1 -
 src/dialogs/console.cpp                               |  2 --
 src/dialogs/edittagdialog.cpp                         |  1 -
 src/dialogs/trackselectiondialog.cpp                  |  3 ---
 src/engine/alsadevicefinder.cpp                       |  2 --
 src/engine/alsapcmdevicefinder.cpp                    |  4 ----
 src/engine/chromaprinter.cpp                          |  4 ----
 src/engine/devicefinders.cpp                          |  1 -
 src/engine/gstengine.cpp                              |  5 -----
 src/engine/gstenginepipeline.cpp                      |  3 ---
 src/engine/gststartup.cpp                             |  2 --
 src/engine/pulsedevicefinder.cpp                      |  1 -
 src/engine/vlcengine.cpp                              |  1 -
 src/equalizer/equalizer.cpp                           |  1 -
 src/globalshortcuts/globalshortcut-x11.cpp            |  3 ---
 src/globalshortcuts/globalshortcut.cpp                |  1 -
 src/globalshortcuts/globalshortcutsbackend-gnome.cpp  |  1 -
 src/globalshortcuts/globalshortcutsbackend-macos.mm   |  1 -
 src/globalshortcuts/globalshortcutsbackend-mate.cpp   |  1 -
 src/globalshortcuts/globalshortcutsbackend-x11.cpp    |  1 -
 src/globalshortcuts/globalshortcutsmanager.cpp        |  2 --
 src/internet/internetcollectionview.cpp               |  3 ---
 src/internet/internetplaylistitem.cpp                 |  4 ----
 src/internet/internetsearchmodel.cpp                  |  2 --
 src/internet/internetsearchsortmodel.cpp              |  2 --
 src/internet/internetsearchview.cpp                   |  6 ------
 src/internet/internetservices.cpp                     |  1 -
 src/internet/internetsongsview.cpp                    |  2 --
 src/internet/internettabsview.cpp                     |  1 -
 src/internet/localredirectserver.cpp                  |  3 ---
 src/lyrics/auddlyricsprovider.cpp                     |  2 --
 src/lyrics/chartlyricsprovider.cpp                    |  2 --
 src/lyrics/geniuslyricsprovider.cpp                   |  1 -
 src/lyrics/lololyricsprovider.cpp                     |  2 --
 src/lyrics/lyricsfetchersearch.cpp                    |  1 -
 src/lyrics/lyricsproviders.cpp                        |  3 ---
 src/lyrics/musixmatchlyricsprovider.cpp               |  2 --
 src/lyrics/ovhlyricsprovider.cpp                      |  2 --
 src/main.cpp                                          |  2 --
 src/moodbar/moodbarcontroller.cpp                     |  2 --
 src/moodbar/moodbaritemdelegate.cpp                   |  4 ----
 src/moodbar/moodbarloader.cpp                         |  2 --
 src/moodbar/moodbarpipeline.cpp                       |  1 -
 src/moodbar/moodbarproxystyle.cpp                     |  3 ---
 src/moodbar/moodbarrenderer.cpp                       |  2 --
 src/musicbrainz/acoustidclient.cpp                    |  3 ---
 src/musicbrainz/musicbrainzclient.cpp                 |  2 --
 src/musicbrainz/tagfetcher.cpp                        |  1 -
 src/organize/organize.cpp                             |  2 --
 src/organize/organizedialog.cpp                       |  2 --
 src/organize/organizeerrordialog.cpp                  |  1 -
 src/organize/organizeformat.cpp                       |  3 ---
 src/osd/osddbus.cpp                                   |  4 ----
 src/osd/osdmac.mm                                     |  1 -
 src/osd/osdpretty.cpp                                 |  5 -----
 src/playlist/playlist.cpp                             |  6 ------
 src/playlist/playlistbackend.cpp                      |  7 +------
 src/playlist/playlistcontainer.cpp                    |  3 ---
 src/playlist/playlistdelegates.cpp                    |  6 ------
 src/playlist/playlistfilterparser.cpp                 |  1 -
 src/playlist/playlistheader.cpp                       |  2 +-
 src/playlist/playlistitem.cpp                         |  4 ----
 src/playlist/playlistlistcontainer.cpp                |  1 -
 src/playlist/playlistlistview.cpp                     |  3 +--
 src/playlist/playlistmanager.cpp                      |  8 --------
 src/playlist/playlistsequence.cpp                     |  1 -
 src/playlist/playlisttabbar.cpp                       |  3 ---
 src/playlist/playlistundocommands.cpp                 |  4 ----
 src/playlist/playlistview.cpp                         |  2 --
 src/playlistparsers/asxparser.cpp                     |  2 --
 src/playlistparsers/cueparser.cpp                     |  1 -
 src/playlistparsers/m3uparser.cpp                     |  4 ----
 src/playlistparsers/playlistparser.cpp                |  2 --
 src/playlistparsers/xspfparser.cpp                    |  2 --
 src/qobuz/qobuzfavoriterequest.cpp                    |  2 --
 src/qobuz/qobuzfavoriterequest.h                      |  1 -
 src/qobuz/qobuzrequest.cpp                            |  2 --
 src/qobuz/qobuzservice.cpp                            |  2 --
 src/qobuz/qobuzstreamurlrequest.cpp                   |  4 ----
 src/queue/queue.cpp                                   |  4 ----
 src/queue/queueview.cpp                               |  1 -
 src/radios/radiobackend.cpp                           |  2 --
 src/radios/radiomodel.cpp                             |  1 -
 src/radios/radioplaylistitem.cpp                      |  3 ---
 src/radios/radioservice.cpp                           |  2 --
 src/radios/radioservices.h                            |  1 -
 src/radios/somafmservice.cpp                          |  2 --
 src/scrobbler/audioscrobbler.cpp                      |  3 ---
 src/scrobbler/lastfmimport.cpp                        |  2 --
 src/scrobbler/listenbrainzscrobbler.cpp               |  1 -
 src/scrobbler/scrobblercache.cpp                      |  2 --
 src/scrobbler/scrobblerservices.cpp                   |  1 -
 src/scrobbler/scrobblingapi20.cpp                     |  3 ---
 src/scrobbler/subsonicscrobbler.cpp                   |  2 --
 src/settings/appearancesettingspage.cpp               |  1 -
 src/settings/backendsettingspage.cpp                  |  2 --
 src/settings/behavioursettingspage.cpp                |  1 -
 src/settings/collectionsettingspage.cpp               |  1 -
 src/settings/contextsettingspage.cpp                  |  1 -
 src/settings/coverssettingspage.cpp                   |  1 -
 src/settings/globalshortcutssettingspage.cpp          |  1 -
 src/settings/lyricssettingspage.cpp                   |  1 -
 src/settings/moodbarsettingspage.cpp                  |  1 -
 src/settings/notificationssettingspage.cpp            |  1 -
 src/settings/qobuzsettingspage.cpp                    |  1 -
 src/settings/settingsdialog.cpp                       |  2 --
 src/settings/tidalsettingspage.cpp                    |  1 -
 src/smartplaylists/playlistgenerator.cpp              |  2 --
 src/smartplaylists/playlistquerygenerator.cpp         |  1 -
 src/smartplaylists/smartplaylistquerywizardplugin.cpp |  1 -
 src/smartplaylists/smartplaylistsearch.cpp            |  2 --
 src/smartplaylists/smartplaylistsearchtermwidget.cpp  |  1 -
 src/smartplaylists/smartplaylistsmodel.cpp            |  3 ---
 src/smartplaylists/smartplaylistsview.cpp             |  2 --
 src/smartplaylists/smartplaylistsviewcontainer.cpp    |  2 --
 src/subsonic/subsonicbaserequest.cpp                  |  1 -
 src/subsonic/subsonicrequest.cpp                      |  3 ---
 src/subsonic/subsonicscrobblerequest.cpp              |  2 --
 src/subsonic/subsonicscrobblerequest.h                |  1 -
 src/subsonic/subsonicservice.cpp                      |  3 ---
 src/subsonic/subsonicurlhandler.cpp                   |  3 ---
 src/subsonic/subsonicurlhandler.h                     |  2 --
 src/tidal/tidalbaserequest.cpp                        |  1 -
 src/tidal/tidalfavoriterequest.cpp                    |  3 ---
 src/tidal/tidalfavoriterequest.h                      |  1 -
 src/tidal/tidalrequest.cpp                            |  2 --
 src/tidal/tidalservice.cpp                            |  3 ---
 src/tidal/tidalstreamurlrequest.cpp                   |  5 -----
 src/transcoder/transcodedialog.cpp                    |  1 -
 src/transcoder/transcoder.cpp                         |  2 --
 src/transcoder/transcoderoptionsaac.cpp               |  2 --
 src/transcoder/transcoderoptionsasf.cpp               |  2 --
 src/transcoder/transcoderoptionsdialog.cpp            |  1 -
 src/transcoder/transcoderoptionsflac.cpp              |  2 --
 src/transcoder/transcoderoptionsmp3.cpp               |  1 -
 src/transcoder/transcoderoptionsopus.cpp              |  2 --
 src/transcoder/transcoderoptionsspeex.cpp             |  2 --
 src/transcoder/transcoderoptionsvorbis.cpp            |  2 --
 src/widgets/autoexpandingtreeview.cpp                 |  2 --
 src/widgets/autoexpandingtreeview.h                   |  2 --
 src/widgets/busyindicator.cpp                         |  2 --
 src/widgets/busyindicator.h                           |  2 --
 src/widgets/clickablelabel.cpp                        |  2 --
 src/widgets/clickablelabel.h                          |  2 --
 src/widgets/fancytabwidget.cpp                        |  3 ---
 src/widgets/fancytabwidget.h                          |  2 --
 src/widgets/favoritewidget.cpp                        |  2 --
 src/widgets/favoritewidget.h                          |  2 --
 src/widgets/fileview.cpp                              |  2 --
 src/widgets/fileview.h                                |  2 --
 src/widgets/fileviewlist.cpp                          |  2 --
 src/widgets/fileviewlist.h                            |  2 --
 src/widgets/forcescrollperpixel.cpp                   |  2 --
 src/widgets/forcescrollperpixel.h                     |  2 --
 src/widgets/freespacebar.cpp                          |  2 --
 src/widgets/freespacebar.h                            |  2 --
 src/widgets/groupediconview.cpp                       |  5 -----
 src/widgets/groupediconview.h                         |  2 --
 src/widgets/lineedit.cpp                              |  3 ---
 src/widgets/lineedit.h                                |  2 --
 src/widgets/linetextedit.cpp                          |  2 --
 src/widgets/linetextedit.h                            |  2 --
 src/widgets/loginstatewidget.cpp                      |  2 --
 src/widgets/loginstatewidget.h                        |  2 --
 src/widgets/multiloadingindicator.cpp                 |  4 ----
 src/widgets/multiloadingindicator.h                   |  2 --
 src/widgets/playingwidget.cpp                         |  6 ------
 src/widgets/playingwidget.h                           |  3 ---
 src/widgets/renametablineedit.cpp                     |  2 --
 src/widgets/renametablineedit.h                       |  2 --
 src/widgets/stickyslider.cpp                          |  2 --
 src/widgets/stickyslider.h                            |  2 --
 src/widgets/stretchheaderview.cpp                     |  3 ---
 src/widgets/stretchheaderview.h                       |  2 --
 src/widgets/trackslider.cpp                           |  1 -
 src/widgets/tracksliderpopup.cpp                      |  3 ---
 src/widgets/tracksliderpopup.h                        |  2 --
 src/widgets/tracksliderslider.cpp                     |  2 --
 src/widgets/tracksliderslider.h                       |  2 --
 src/widgets/volumeslider.cpp                          |  4 ----
 src/widgets/volumeslider.h                            |  2 --
 241 files changed, 12 insertions(+), 527 deletions(-)

diff --git a/src/analyzer/analyzercontainer.cpp b/src/analyzer/analyzercontainer.cpp
index 2c095a8ea..0bcf1e5a4 100644
--- a/src/analyzer/analyzercontainer.cpp
+++ b/src/analyzer/analyzercontainer.cpp
@@ -33,7 +33,6 @@
 #include <QActionGroup>
 #include <QSettings>
 #include <QtEvents>
-#include <QtDebug>
 
 #include "analyzercontainer.h"
 
diff --git a/src/collection/collection.cpp b/src/collection/collection.cpp
index fc9c72220..d4fefb9bd 100644
--- a/src/collection/collection.cpp
+++ b/src/collection/collection.cpp
@@ -27,7 +27,6 @@
 #include <QList>
 #include <QSettings>
 #include <QtConcurrentRun>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/taskmanager.h"
diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp
index ce3aebcf3..b94491f13 100644
--- a/src/collection/collectionmodel.cpp
+++ b/src/collection/collectionmodel.cpp
@@ -53,7 +53,6 @@
 #include <QNetworkDiskCache>
 #include <QSettings>
 #include <QStandardPaths>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/database.h"
diff --git a/src/collection/collectionwatcher.cpp b/src/collection/collectionwatcher.cpp
index 8e57a1428..6a4ff49d0 100644
--- a/src/collection/collectionwatcher.cpp
+++ b/src/collection/collectionwatcher.cpp
@@ -38,13 +38,11 @@
 #include <QList>
 #include <QSet>
 #include <QTimer>
-#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QImage>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/filesystemwatcherinterface.h"
 #include "core/logging.h"
@@ -444,7 +442,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const Subdirectory
   QStringList files_on_disk;
   SubdirectoryList my_new_subdirs;
 
-  // If a directory is moved then only its parent gets a changed notification, so we need to look and see if any of our children don't exist any more.
+  // If a directory is moved then only its parent gets a changed notification, so we need to look and see if any of our children don't exist anymore.
   // If one has been removed, "rescan" it to get the deleted songs
   SubdirectoryList previous_subdirs = t->GetImmediateSubdirs(path);
   for (const Subdirectory &prev_subdir : previous_subdirs) {
@@ -464,7 +462,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const Subdirectory
 
     if (child_info.isDir()) {
       if (!t->HasSeenSubdir(child)) {
-        // We haven't seen this subdirectory before - add it to a list and later we'll tell the backend about it and scan it.
+        // We haven't seen this subdirectory before - add it to a list, and later we'll tell the backend about it and scan it.
         Subdirectory new_subdir;
         new_subdir.directory_id = -1;
         new_subdir.path = child;
@@ -761,7 +759,7 @@ void CollectionWatcher::UpdateNonCueAssociatedSong(const QString &file,
                                                    const bool cue_deleted,
                                                    ScanTransaction *t) {
 
-  // If a CUE got deleted, we turn it's first section into the new 'raw' (cueless) song and we just remove the rest of the sections from the collection
+  // If a CUE got deleted, we turn it's first section into the new 'raw' (cueless) song, and we just remove the rest of the sections from the collection
   const Song &matching_song = matching_songs.first();
   if (cue_deleted) {
     for (const Song &song : matching_songs) {
@@ -805,7 +803,7 @@ SongList CollectionWatcher::ScanNewFile(const QString &file, const QString &path
 
     // Ignore FILEs pointing to other media files.
     // Also, watch out for incorrect media files.
-    // Playlist parser for CUEs considers every entry in sheet valid and we don't want invalid media getting into collection!
+    // Playlist parser for CUEs considers every entry in sheet valid, and we don't want invalid media getting into collection!
     QString file_nfd = file.normalized(QString::NormalizationForm_D);
     SongList cue_congs = cue_parser_->Load(&cue_file, matching_cue, path, false);
     cue_file.close();
diff --git a/src/core/appearance.cpp b/src/core/appearance.cpp
index 6d15a3da7..4327e62a2 100644
--- a/src/core/appearance.cpp
+++ b/src/core/appearance.cpp
@@ -22,7 +22,6 @@
 
 #include <QApplication>
 #include <QObject>
-#include <QVariant>
 #include <QPalette>
 #include <QColor>
 #include <QSettings>
diff --git a/src/core/application.cpp b/src/core/application.cpp
index 0795acf7f..a6a6cc098 100644
--- a/src/core/application.cpp
+++ b/src/core/application.cpp
@@ -29,12 +29,10 @@
 
 #include <QObject>
 #include <QThread>
-#include <QVariant>
 #include <QString>
 
 #include "core/lazy.h"
 #include "core/tagreaderclient.h"
-#include "core/song.h"
 #include "core/logging.h"
 
 #include "database.h"
diff --git a/src/core/commandlineoptions.cpp b/src/core/commandlineoptions.cpp
index 93d50528b..bc7f47313 100644
--- a/src/core/commandlineoptions.cpp
+++ b/src/core/commandlineoptions.cpp
@@ -24,7 +24,6 @@
 #include <cstdlib>
 #include <getopt.h>
 #include <iostream>
-#include <type_traits>
 
 #include <QtGlobal>
 #include <QObject>
diff --git a/src/core/database.cpp b/src/core/database.cpp
index 427841f89..94da3e1cb 100644
--- a/src/core/database.cpp
+++ b/src/core/database.cpp
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <cstddef>
 #include <sqlite3.h>
 #include <boost/scope_exit.hpp>
 
@@ -31,20 +30,15 @@
 #include <QIODevice>
 #include <QDir>
 #include <QFile>
-#include <QList>
 #include <QByteArray>
-#include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QRegularExpression>
 #include <QUrl>
 #include <QSqlDriver>
 #include <QSqlDatabase>
-#include <QSqlQuery>
 #include <QSqlError>
 #include <QStandardPaths>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "taskmanager.h"
diff --git a/src/core/filesystemmusicstorage.cpp b/src/core/filesystemmusicstorage.cpp
index fb82926ba..230b676b9 100644
--- a/src/core/filesystemmusicstorage.cpp
+++ b/src/core/filesystemmusicstorage.cpp
@@ -27,12 +27,9 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QString>
-#include <QUrl>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "utilities.h"
-#include "song.h"
 #include "musicstorage.h"
 
 #include "filesystemmusicstorage.h"
diff --git a/src/core/imageutils.cpp b/src/core/imageutils.cpp
index ba7f2db3b..297625e35 100644
--- a/src/core/imageutils.cpp
+++ b/src/core/imageutils.cpp
@@ -21,7 +21,6 @@
 
 #include <QList>
 #include <QBuffer>
-#include <QVariant>
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
@@ -31,7 +30,6 @@
 #include <QPixmap>
 #include <QPainter>
 #include <QSize>
-#include <QSettings>
 
 #include "imageutils.h"
 #include "core/utilities.h"
diff --git a/src/core/mpris2.cpp b/src/core/mpris2.cpp
index 87feb782e..8e78e0af9 100644
--- a/src/core/mpris2.cpp
+++ b/src/core/mpris2.cpp
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#include <cstdlib>
-#include <memory>
 #include <algorithm>
 
 #include <QApplication>
@@ -41,7 +39,6 @@
 #include <QDBusMessage>
 #include <QDBusArgument>
 #include <QDBusObjectPath>
-#include <QtDebug>
 
 #include "core/logging.h"
 
diff --git a/src/core/networkproxyfactory.cpp b/src/core/networkproxyfactory.cpp
index 97465af1f..8b6620c38 100644
--- a/src/core/networkproxyfactory.cpp
+++ b/src/core/networkproxyfactory.cpp
@@ -22,12 +22,10 @@
 
 #include <QtGlobal>
 #include <QMutex>
-#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QNetworkProxy>
-#include <QtDebug>
 #include <QSettings>
 
 #include "core/logging.h"
diff --git a/src/core/networktimeouts.cpp b/src/core/networktimeouts.cpp
index 22f475e48..2c9017b3c 100644
--- a/src/core/networktimeouts.cpp
+++ b/src/core/networktimeouts.cpp
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QObject>
 #include <QNetworkReply>
 #include <QTimerEvent>
diff --git a/src/core/player.cpp b/src/core/player.cpp
index fedb9dd88..77cac78c7 100644
--- a/src/core/player.cpp
+++ b/src/core/player.cpp
@@ -28,14 +28,12 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QUrl>
 #include <QDateTime>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/logging.h"
 
diff --git a/src/core/qtsystemtrayicon.cpp b/src/core/qtsystemtrayicon.cpp
index ba1363830..aceaaea17 100644
--- a/src/core/qtsystemtrayicon.cpp
+++ b/src/core/qtsystemtrayicon.cpp
@@ -29,12 +29,10 @@
 #include <QIcon>
 #include <QString>
 #include <QUrl>
-#include <QSettings>
 
 #include "song.h"
 #include "iconloader.h"
 #include "qtsystemtrayicon.h"
-#include "settings/behavioursettingspage.h"
 
 SystemTrayIcon::SystemTrayIcon(QObject *parent)
     : QSystemTrayIcon(parent),
diff --git a/src/core/scopedgobject.h b/src/core/scopedgobject.h
index e63e088da..c3dedfee5 100644
--- a/src/core/scopedgobject.h
+++ b/src/core/scopedgobject.h
@@ -25,8 +25,6 @@
 
 #include <glib-object.h>
 
-#include <QtDebug>
-
 template<typename T>
 class ScopedGObject {
  public:
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 1fda707c2..8a1e745d3 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -38,20 +38,16 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QSharedData>
-#include <QHash>
 #include <QByteArray>
-#include <QVariant>
+#include <QVariantMap>
 #include <QString>
 #include <QStringList>
 #include <QRegularExpression>
 #include <QUrl>
 #include <QImage>
 #include <QIcon>
-#include <QSqlQuery>
 #include <QStandardPaths>
-#include <QtDebug>
 
-#include "core/logging.h"
 #include "core/iconloader.h"
 
 #include "engine/enginebase.h"
diff --git a/src/core/songloader.cpp b/src/core/songloader.cpp
index 16c207d04..42fc654a3 100644
--- a/src/core/songloader.cpp
+++ b/src/core/songloader.cpp
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <cstdlib>
 #include <memory>
 #include <algorithm>
 
@@ -37,13 +36,11 @@
 #include <QDirIterator>
 #include <QFile>
 #include <QFileInfo>
-#include <QList>
 #include <QSet>
 #include <QTimer>
 #include <QString>
 #include <QUrl>
 #include <QEventLoop>
-#include <QtDebug>
 
 #include "core/logging.h"
 
diff --git a/src/core/sqlquery.cpp b/src/core/sqlquery.cpp
index 2713ba447..a55ddeadd 100644
--- a/src/core/sqlquery.cpp
+++ b/src/core/sqlquery.cpp
@@ -19,10 +19,8 @@
 
 #include "config.h"
 
-#include <QSqlQuery>
 #include <QMap>
 #include <QVariant>
-#include <QVariantList>
 #include <QString>
 #include <QUrl>
 
diff --git a/src/core/standarditemiconloader.cpp b/src/core/standarditemiconloader.cpp
index aa4068312..ed34500c8 100644
--- a/src/core/standarditemiconloader.cpp
+++ b/src/core/standarditemiconloader.cpp
@@ -26,7 +26,6 @@
 #include <QStandardItem>
 #include <QMap>
 #include <QSet>
-#include <QImage>
 #include <QPixmap>
 #include <QIcon>
 
diff --git a/src/core/stylesheetloader.cpp b/src/core/stylesheetloader.cpp
index 5f2306bf9..af1fd2bb2 100644
--- a/src/core/stylesheetloader.cpp
+++ b/src/core/stylesheetloader.cpp
@@ -26,7 +26,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
-#include <QHash>
 #include <QTimer>
 #include <QIODevice>
 #include <QTextStream>
@@ -35,7 +34,6 @@
 #include <QColor>
 #include <QPalette>
 #include <QEvent>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "stylesheetloader.h"
diff --git a/src/core/tagreaderclient.cpp b/src/core/tagreaderclient.cpp
index 72e097906..676e8edba 100644
--- a/src/core/tagreaderclient.cpp
+++ b/src/core/tagreaderclient.cpp
@@ -30,7 +30,6 @@
 #include <QString>
 #include <QImage>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/workerpool.h"
diff --git a/src/core/threadsafenetworkdiskcache.cpp b/src/core/threadsafenetworkdiskcache.cpp
index 766d66e99..077d6bbbe 100644
--- a/src/core/threadsafenetworkdiskcache.cpp
+++ b/src/core/threadsafenetworkdiskcache.cpp
@@ -32,7 +32,6 @@
 #include <QAbstractNetworkCache>
 #include <QUrl>
 
-#include "core/logging.h"
 #include "threadsafenetworkdiskcache.h"
 
 QMutex ThreadSafeNetworkDiskCache::sMutex;
diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index 741daaf72..1b381413b 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -34,8 +34,6 @@
 #include <QApplication>
 #include <QCoreApplication>
 #include <QWindow>
-#include <QWidget>
-#include <QObject>
 #include <QIODevice>
 #include <QByteArray>
 #include <QMetaObject>
@@ -61,11 +59,9 @@
 #include <QMetaEnum>
 #include <QXmlStreamReader>
 #include <QSettings>
-#include <QtEvents>
 #include <QMessageBox>
 #include <QNetworkInterface>
 #include <QMimeDatabase>
-#include <QtDebug>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #  include <QRandomGenerator>
 #endif
diff --git a/src/core/windows7thumbbar.cpp b/src/core/windows7thumbbar.cpp
index 2a6969656..0983ea914 100644
--- a/src/core/windows7thumbbar.cpp
+++ b/src/core/windows7thumbbar.cpp
@@ -27,7 +27,6 @@
 #include <QPixmap>
 #include <QAction>
 #include <QTimer>
-#include <QtDebug>
 
 #include <windows.h>
 #include <commctrl.h>
diff --git a/src/covermanager/albumcoverfetcher.cpp b/src/covermanager/albumcoverfetcher.cpp
index 305b55b35..8a7fb7d8a 100644
--- a/src/covermanager/albumcoverfetcher.cpp
+++ b/src/covermanager/albumcoverfetcher.cpp
@@ -27,7 +27,6 @@
 #include <QObject>
 #include <QTimer>
 #include <QString>
-#include <QImage>
 
 #include "core/networkaccessmanager.h"
 #include "core/song.h"
diff --git a/src/covermanager/albumcoverfetchersearch.cpp b/src/covermanager/albumcoverfetchersearch.cpp
index b0d9628e4..a40ec0a79 100644
--- a/src/covermanager/albumcoverfetchersearch.cpp
+++ b/src/covermanager/albumcoverfetchersearch.cpp
@@ -28,16 +28,12 @@
 #include <QCoreApplication>
 #include <QTimer>
 #include <QList>
-#include <QMap>
-#include <QMultiMap>
-#include <QHash>
 #include <QString>
 #include <QUrl>
 #include <QImage>
 #include <QImageReader>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/utilities.h"
diff --git a/src/covermanager/albumcoverloader.cpp b/src/covermanager/albumcoverloader.cpp
index c6ea91fa7..76423788e 100644
--- a/src/covermanager/albumcoverloader.cpp
+++ b/src/covermanager/albumcoverloader.cpp
@@ -38,9 +38,7 @@
 #include <QUrl>
 #include <QFile>
 #include <QImage>
-#include <QPixmap>
 #include <QPainter>
-#include <QSize>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QSettings>
diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp
index 8fc43f1cc..e63301f00 100644
--- a/src/covermanager/albumcovermanager.cpp
+++ b/src/covermanager/albumcovermanager.cpp
@@ -24,7 +24,6 @@
 #include <memory>
 #include <algorithm>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QMainWindow>
 #include <QWidget>
@@ -86,9 +85,7 @@
 #include "albumcoverexporter.h"
 #include "albumcoverfetcher.h"
 #include "albumcoverloader.h"
-#include "albumcoverloaderoptions.h"
 #include "albumcoverloaderresult.h"
-#include "albumcovermanagerlist.h"
 #include "coversearchstatistics.h"
 #include "coversearchstatisticsdialog.h"
 #include "albumcoverimageresult.h"
diff --git a/src/covermanager/albumcoversearcher.cpp b/src/covermanager/albumcoversearcher.cpp
index 8f5991e26..7c49f8bf4 100644
--- a/src/covermanager/albumcoversearcher.cpp
+++ b/src/covermanager/albumcoversearcher.cpp
@@ -49,7 +49,6 @@
 
 #include "core/application.h"
 #include "core/utilities.h"
-#include "core/logging.h"
 #include "widgets/busyindicator.h"
 #include "widgets/forcescrollperpixel.h"
 #include "widgets/groupediconview.h"
@@ -57,7 +56,6 @@
 #include "albumcoversearcher.h"
 #include "albumcoverfetcher.h"
 #include "albumcoverloader.h"
-#include "albumcoverloaderoptions.h"
 #include "albumcoverloaderresult.h"
 #include "albumcoverimageresult.h"
 #include "ui_albumcoversearcher.h"
diff --git a/src/covermanager/coverexportrunnable.cpp b/src/covermanager/coverexportrunnable.cpp
index 4243d20d6..b1ace8c6b 100644
--- a/src/covermanager/coverexportrunnable.cpp
+++ b/src/covermanager/coverexportrunnable.cpp
@@ -24,8 +24,6 @@
 #include <QFile>
 #include <QSize>
 #include <QString>
-#include <QStringBuilder>
-#include <QUrl>
 #include <QImage>
 
 #include "core/song.h"
diff --git a/src/covermanager/coverfromurldialog.cpp b/src/covermanager/coverfromurldialog.cpp
index ac074fb03..881f9a313 100644
--- a/src/covermanager/coverfromurldialog.cpp
+++ b/src/covermanager/coverfromurldialog.cpp
@@ -25,7 +25,6 @@
 #include <QDialog>
 #include <QApplication>
 #include <QClipboard>
-#include <QImage>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QNetworkReply>
diff --git a/src/covermanager/coverfromurldialog.h b/src/covermanager/coverfromurldialog.h
index 2c9728446..fc02d8b24 100644
--- a/src/covermanager/coverfromurldialog.h
+++ b/src/covermanager/coverfromurldialog.h
@@ -27,7 +27,6 @@
 #include <QObject>
 #include <QDialog>
 #include <QString>
-#include <QImage>
 
 #include "albumcoverimageresult.h"
 
diff --git a/src/covermanager/coverproviders.cpp b/src/covermanager/coverproviders.cpp
index 2500fcfc7..651718c23 100644
--- a/src/covermanager/coverproviders.cpp
+++ b/src/covermanager/coverproviders.cpp
@@ -25,12 +25,9 @@
 #include <QMutex>
 #include <QList>
 #include <QMap>
-#include <QVariant>
-#include <QVariantList>
 #include <QString>
 #include <QStringList>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/covermanager/coversearchstatisticsdialog.cpp b/src/covermanager/coversearchstatisticsdialog.cpp
index f01266b6c..eaefd9b16 100644
--- a/src/covermanager/coversearchstatisticsdialog.cpp
+++ b/src/covermanager/coversearchstatisticsdialog.cpp
@@ -24,8 +24,6 @@
 
 #include <QtGlobal>
 #include <QWidget>
-#include <QList>
-#include <QMap>
 #include <QString>
 #include <QStringList>
 #include <QBoxLayout>
diff --git a/src/covermanager/currentalbumcoverloader.cpp b/src/covermanager/currentalbumcoverloader.cpp
index c801c4ebf..f48799b5f 100644
--- a/src/covermanager/currentalbumcoverloader.cpp
+++ b/src/covermanager/currentalbumcoverloader.cpp
@@ -26,8 +26,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QDir>
-#include <QString>
-#include <QStringBuilder>
 #include <QImage>
 #include <QTemporaryFile>
 
@@ -35,7 +33,6 @@
 #include "core/song.h"
 #include "playlist/playlistmanager.h"
 #include "albumcoverloader.h"
-#include "albumcoverloaderoptions.h"
 #include "albumcoverloaderresult.h"
 #include "currentalbumcoverloader.h"
 
diff --git a/src/covermanager/deezercoverprovider.cpp b/src/covermanager/deezercoverprovider.cpp
index a3b9d6d52..94058c6f6 100644
--- a/src/covermanager/deezercoverprovider.cpp
+++ b/src/covermanager/deezercoverprovider.cpp
@@ -24,7 +24,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QPair>
-#include <QSet>
 #include <QList>
 #include <QMap>
 #include <QVariant>
@@ -38,7 +37,6 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/covermanager/discogscoverprovider.cpp b/src/covermanager/discogscoverprovider.cpp
index f40b46da8..757a285e3 100644
--- a/src/covermanager/discogscoverprovider.cpp
+++ b/src/covermanager/discogscoverprovider.cpp
@@ -23,16 +23,11 @@
 
 #include <memory>
 #include <algorithm>
-#include <type_traits>
 
 #include <QtGlobal>
 #include <QObject>
 #include <QByteArray>
-#include <QList>
 #include <QPair>
-#include <QSet>
-#include <QMap>
-#include <QQueue>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
@@ -45,7 +40,6 @@
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QJsonArray>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/logging.h"
diff --git a/src/covermanager/jsoncoverprovider.cpp b/src/covermanager/jsoncoverprovider.cpp
index cd89bb9a0..df6d05001 100644
--- a/src/covermanager/jsoncoverprovider.cpp
+++ b/src/covermanager/jsoncoverprovider.cpp
@@ -19,12 +19,10 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QObject>
 #include <QByteArray>
 #include <QString>
 #include <QJsonDocument>
-#include <QJsonValue>
 #include <QJsonObject>
 
 #include "core/application.h"
diff --git a/src/covermanager/lastfmcoverprovider.cpp b/src/covermanager/lastfmcoverprovider.cpp
index d01c1e984..282ac9e12 100644
--- a/src/covermanager/lastfmcoverprovider.cpp
+++ b/src/covermanager/lastfmcoverprovider.cpp
@@ -21,12 +21,10 @@
 
 #include <algorithm>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QLocale>
 #include <QList>
 #include <QPair>
-#include <QSet>
 #include <QByteArray>
 #include <QString>
 #include <QUrl>
@@ -38,7 +36,6 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/covermanager/musicbrainzcoverprovider.cpp b/src/covermanager/musicbrainzcoverprovider.cpp
index eed2d8cdf..42b7702e6 100644
--- a/src/covermanager/musicbrainzcoverprovider.cpp
+++ b/src/covermanager/musicbrainzcoverprovider.cpp
@@ -23,7 +23,6 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QQueue>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
@@ -36,7 +35,6 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/covermanager/musixmatchcoverprovider.cpp b/src/covermanager/musixmatchcoverprovider.cpp
index 6df4759ed..e6760b24b 100644
--- a/src/covermanager/musixmatchcoverprovider.cpp
+++ b/src/covermanager/musixmatchcoverprovider.cpp
@@ -31,7 +31,6 @@
 #include <QJsonDocument>
 #include <QJsonParseError>
 #include <QJsonObject>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/covermanager/qobuzcoverprovider.cpp b/src/covermanager/qobuzcoverprovider.cpp
index 69d668bab..e8e9e2176 100644
--- a/src/covermanager/qobuzcoverprovider.cpp
+++ b/src/covermanager/qobuzcoverprovider.cpp
@@ -23,8 +23,6 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QPair>
-#include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
@@ -36,7 +34,6 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/covermanager/spotifycoverprovider.cpp b/src/covermanager/spotifycoverprovider.cpp
index 9aed35ed7..115448b0b 100644
--- a/src/covermanager/spotifycoverprovider.cpp
+++ b/src/covermanager/spotifycoverprovider.cpp
@@ -40,12 +40,10 @@
 #include <QJsonArray>
 #include <QDesktopServices>
 #include <QMessageBox>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/networkaccessmanager.h"
 #include "core/logging.h"
-#include "core/song.h"
 #include "core/utilities.h"
 #include "core/timeconstants.h"
 #include "internet/localredirectserver.h"
diff --git a/src/covermanager/tidalcoverprovider.cpp b/src/covermanager/tidalcoverprovider.cpp
index 52f7f29c3..c61ac4784 100644
--- a/src/covermanager/tidalcoverprovider.cpp
+++ b/src/covermanager/tidalcoverprovider.cpp
@@ -19,8 +19,6 @@
 
 #include "config.h"
 
-#include <algorithm>
-
 #include <QtGlobal>
 #include <QObject>
 #include <QList>
@@ -35,7 +33,6 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/device/cddalister.cpp b/src/device/cddalister.cpp
index 520da7f43..02f9a6e8a 100644
--- a/src/device/cddalister.cpp
+++ b/src/device/cddalister.cpp
@@ -26,7 +26,6 @@
 #include <QByteArray>
 #include <QList>
 #include <QString>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QRegularExpression>
 #include <QUrl>
diff --git a/src/device/cddasongloader.cpp b/src/device/cddasongloader.cpp
index 88879eba9..939dfecac 100644
--- a/src/device/cddasongloader.cpp
+++ b/src/device/cddasongloader.cpp
@@ -32,7 +32,6 @@
 #include <QByteArray>
 #include <QString>
 #include <QUrl>
-#include <QtDebug>
 
 #include <cdio/cdio.h>
 #include <gst/gst.h>
diff --git a/src/device/connecteddevice.cpp b/src/device/connecteddevice.cpp
index b2c5d8071..63029a1ee 100644
--- a/src/device/connecteddevice.cpp
+++ b/src/device/connecteddevice.cpp
@@ -20,12 +20,9 @@
  */
 
 #include <QObject>
-#include <QThread>
 #include <QAbstractItemModel>
-#include <QVariant>
 #include <QString>
 #include <QUrl>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/application.h"
diff --git a/src/device/devicedatabasebackend.cpp b/src/device/devicedatabasebackend.cpp
index 118459c1d..48a6dd133 100644
--- a/src/device/devicedatabasebackend.cpp
+++ b/src/device/devicedatabasebackend.cpp
@@ -27,10 +27,8 @@
 #include <QIODevice>
 #include <QFile>
 #include <QByteArray>
-#include <QVariant>
 #include <QString>
 #include <QSqlDatabase>
-#include <QSqlQuery>
 
 #include "core/database.h"
 #include "core/sqlquery.h"
diff --git a/src/device/devicemanager.cpp b/src/device/devicemanager.cpp
index c562402bf..3c5ea1f82 100644
--- a/src/device/devicemanager.cpp
+++ b/src/device/devicemanager.cpp
@@ -36,13 +36,11 @@
 #include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QStringBuilder>
 #include <QUrl>
 #include <QPixmap>
 #include <QPainter>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QtDebug>
 
 #include "devicemanager.h"
 
diff --git a/src/device/deviceproperties.cpp b/src/device/deviceproperties.cpp
index b85ee6d80..8d18fbd58 100644
--- a/src/device/deviceproperties.cpp
+++ b/src/device/deviceproperties.cpp
@@ -30,8 +30,6 @@
 #include <QtConcurrentRun>
 #include <QFuture>
 #include <QFutureWatcher>
-#include <QMap>
-#include <QSize>
 #include <QByteArray>
 #include <QVariant>
 #include <QString>
diff --git a/src/device/devicestatefiltermodel.cpp b/src/device/devicestatefiltermodel.cpp
index b9e5eeb1f..cf146c3bd 100644
--- a/src/device/devicestatefiltermodel.cpp
+++ b/src/device/devicestatefiltermodel.cpp
@@ -21,11 +21,9 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QObject>
 #include <QSortFilterProxyModel>
 #include <QAbstractItemModel>
-#include <QVariant>
 
 #include "devicemanager.h"
 #include "devicestatefiltermodel.h"
diff --git a/src/device/deviceview.cpp b/src/device/deviceview.cpp
index 48fd389e3..848ad0512 100644
--- a/src/device/deviceview.cpp
+++ b/src/device/deviceview.cpp
@@ -23,7 +23,6 @@
 
 #include <memory>
 
-#include <QtGlobal>
 #include <QApplication>
 #include <QObject>
 #include <QWidget>
@@ -34,7 +33,6 @@
 #include <QMimeData>
 #include <QAction>
 #include <QVariant>
-#include <QUrl>
 #include <QFont>
 #include <QFontMetrics>
 #include <QString>
diff --git a/src/device/filesystemdevice.cpp b/src/device/filesystemdevice.cpp
index 7bb49ce2f..53557e1e1 100644
--- a/src/device/filesystemdevice.cpp
+++ b/src/device/filesystemdevice.cpp
@@ -24,7 +24,6 @@
 #include <QThread>
 #include <QString>
 #include <QUrl>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/logging.h"
diff --git a/src/device/giolister.cpp b/src/device/giolister.cpp
index c469ce2d4..cf9c1ed84 100644
--- a/src/device/giolister.cpp
+++ b/src/device/giolister.cpp
@@ -30,10 +30,10 @@
 #endif
 
 #include <QtGlobal>
-#include <QObject>
 #include <QMutex>
 #include <QList>
-#include <QVariant>
+#include <QVariantList>
+#include <QVariantMap>
 #include <QString>
 #include <QStringList>
 #include <QRegularExpression>
diff --git a/src/device/gpoddevice.cpp b/src/device/gpoddevice.cpp
index 863743f7d..6a04163cc 100644
--- a/src/device/gpoddevice.cpp
+++ b/src/device/gpoddevice.cpp
@@ -36,7 +36,6 @@
 #include <QString>
 #include <QUrl>
 #include <QImage>
-#include <QtDebug>
 #include <QTemporaryFile>
 #include <QStandardPaths>
 
diff --git a/src/device/gpodloader.cpp b/src/device/gpodloader.cpp
index 6ae155280..91ddcf136 100644
--- a/src/device/gpodloader.cpp
+++ b/src/device/gpodloader.cpp
@@ -28,7 +28,6 @@
 #include <QDir>
 #include <QByteArray>
 #include <QString>
-#include <QtDebug>
 
 #include "collection/collectionbackend.h"
 #include "core/logging.h"
diff --git a/src/device/mtpconnection.cpp b/src/device/mtpconnection.cpp
index 0c55b0275..3f6312e48 100644
--- a/src/device/mtpconnection.cpp
+++ b/src/device/mtpconnection.cpp
@@ -25,13 +25,11 @@
 #include <cstdint>
 
 #include <QList>
-#include <QByteArray>
 #include <QString>
 #include <QUrl>
 #include <QUrlQuery>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "mtpconnection.h"
diff --git a/src/device/mtpdevice.cpp b/src/device/mtpdevice.cpp
index f85193186..13c315d54 100644
--- a/src/device/mtpdevice.cpp
+++ b/src/device/mtpdevice.cpp
@@ -32,7 +32,6 @@
 #include <QList>
 #include <QString>
 #include <QUrl>
-#include <QtDebug>
 
 #include "collection/collectionmodel.h"
 #include "collection/collectionbackend.h"
diff --git a/src/device/udisks2lister.cpp b/src/device/udisks2lister.cpp
index 509d6390b..cc23684fe 100644
--- a/src/device/udisks2lister.cpp
+++ b/src/device/udisks2lister.cpp
@@ -33,7 +33,8 @@
 #include <QtGlobal>
 #include <QMutex>
 #include <QList>
-#include <QVariant>
+#include <QVariantList>
+#include <QVariantMap>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
@@ -45,8 +46,6 @@
 #include <QDBusPendingReply>
 #include <QDBusArgument>
 #include <QJsonArray>
-#include <QJsonObject>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/utilities.h"
diff --git a/src/dialogs/about.cpp b/src/dialogs/about.cpp
index 7fa85aa05..ed6cbcf53 100644
--- a/src/dialogs/about.cpp
+++ b/src/dialogs/about.cpp
@@ -26,7 +26,6 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QString>
-#include <QStringBuilder>
 #include <QFlags>
 #include <QFont>
 #include <QLabel>
diff --git a/src/dialogs/console.cpp b/src/dialogs/console.cpp
index 002c6471e..bb9c8ede0 100644
--- a/src/dialogs/console.cpp
+++ b/src/dialogs/console.cpp
@@ -23,10 +23,8 @@
 
 #include <QWidget>
 #include <QDialog>
-#include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QStringBuilder>
 #include <QFont>
 #include <QSqlDatabase>
 #include <QSqlQuery>
diff --git a/src/dialogs/edittagdialog.cpp b/src/dialogs/edittagdialog.cpp
index 240586e77..ba6b6ff28 100644
--- a/src/dialogs/edittagdialog.cpp
+++ b/src/dialogs/edittagdialog.cpp
@@ -68,7 +68,6 @@
 #include <QAbstractButton>
 #include <QtEvents>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/iconloader.h"
diff --git a/src/dialogs/trackselectiondialog.cpp b/src/dialogs/trackselectiondialog.cpp
index abdd3aef7..99ec36ab1 100644
--- a/src/dialogs/trackselectiondialog.cpp
+++ b/src/dialogs/trackselectiondialog.cpp
@@ -31,10 +31,8 @@
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QVariant>
-#include <QUrl>
 #include <QString>
 #include <QStringList>
-#include <QStringBuilder>
 #include <QPalette>
 #include <QFont>
 #include <QKeySequence>
@@ -45,7 +43,6 @@
 #include <QSplitter>
 #include <QStackedWidget>
 #include <QTreeWidget>
-#include <QtDebug>
 
 #include "core/iconloader.h"
 #include "core/logging.h"
diff --git a/src/engine/alsadevicefinder.cpp b/src/engine/alsadevicefinder.cpp
index ca9337ce8..76ca7dcce 100644
--- a/src/engine/alsadevicefinder.cpp
+++ b/src/engine/alsadevicefinder.cpp
@@ -25,9 +25,7 @@
 #include <boost/scope_exit.hpp>
 
 #include <QList>
-#include <QVariant>
 #include <QString>
-#include <QtDebug>
 
 #include <core/logging.h>
 
diff --git a/src/engine/alsapcmdevicefinder.cpp b/src/engine/alsapcmdevicefinder.cpp
index 1811d649f..1ea391868 100644
--- a/src/engine/alsapcmdevicefinder.cpp
+++ b/src/engine/alsapcmdevicefinder.cpp
@@ -19,14 +19,10 @@
 
 #include "config.h"
 
-#include <cstdio>
-#include <cerrno>
 #include <alsa/asoundlib.h>
 
 #include <QList>
-#include <QVariant>
 #include <QString>
-#include <QtDebug>
 
 #include <core/logging.h>
 
diff --git a/src/engine/chromaprinter.cpp b/src/engine/chromaprinter.cpp
index c2dd32a4d..27ac6814c 100644
--- a/src/engine/chromaprinter.cpp
+++ b/src/engine/chromaprinter.cpp
@@ -22,10 +22,8 @@
 #include "config.h"
 
 #include <glib-object.h>
-#include <cstdint>
 #include <cstdlib>
 #include <cstring>
-#include <sys/types.h>
 #include <chromaprint.h>
 #include <gst/gst.h>
 
@@ -33,11 +31,9 @@
 #include <QCoreApplication>
 #include <QThread>
 #include <QIODevice>
-#include <QBuffer>
 #include <QByteArray>
 #include <QString>
 #include <QElapsedTimer>
-#include <QtDebug>
 
 #include "chromaprinter.h"
 #include "core/logging.h"
diff --git a/src/engine/devicefinders.cpp b/src/engine/devicefinders.cpp
index 39382d709..2ee37a981 100644
--- a/src/engine/devicefinders.cpp
+++ b/src/engine/devicefinders.cpp
@@ -22,7 +22,6 @@
 #include <QtAlgorithms>
 #include <QObject>
 #include <QList>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "devicefinders.h"
diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp
index 667e562e8..50c4227a7 100644
--- a/src/engine/gstengine.cpp
+++ b/src/engine/gstengine.cpp
@@ -24,12 +24,10 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gio/gio.h>
 #include <memory>
 #include <algorithm>
 #include <vector>
 #include <cmath>
-#include <string>
 
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
@@ -42,15 +40,12 @@
 #include <QByteArray>
 #include <QChar>
 #include <QString>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QUrl>
 #include <QTimeLine>
 #include <QEasingCurve>
 #include <QMetaObject>
-#include <QFlags>
 #include <QTimerEvent>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/taskmanager.h"
diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp
index e7bbdffe6..b14696384 100644
--- a/src/engine/gstenginepipeline.cpp
+++ b/src/engine/gstenginepipeline.cpp
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <memory>
-#include <cstdlib>
 #include <cstdint>
 #include <cstring>
 #include <glib.h>
@@ -45,12 +44,10 @@
 #include <QEasingCurve>
 #include <QMetaObject>
 #include <QUuid>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/signalchecker.h"
 #include "core/timeconstants.h"
-#include "core/song.h"
 #include "settings/backendsettingspage.h"
 #include "enginebase.h"
 #include "gstengine.h"
diff --git a/src/engine/gststartup.cpp b/src/engine/gststartup.cpp
index d491a1671..3b1287106 100644
--- a/src/engine/gststartup.cpp
+++ b/src/engine/gststartup.cpp
@@ -25,13 +25,11 @@
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QMetaObject>
 #include <QCoreApplication>
 #include <QStandardPaths>
 #include <QtConcurrent>
-#include <QFuture>
 #include <QString>
 #include <QDir>
 #include <QFile>
diff --git a/src/engine/pulsedevicefinder.cpp b/src/engine/pulsedevicefinder.cpp
index 7a12dfafa..984e1f107 100644
--- a/src/engine/pulsedevicefinder.cpp
+++ b/src/engine/pulsedevicefinder.cpp
@@ -24,7 +24,6 @@
 #include <pulse/def.h>
 #include <pulse/introspect.h>
 #include <pulse/mainloop.h>
-#include <pulse/proplist.h>
 
 #include <QtGlobal>
 #include <QVariant>
diff --git a/src/engine/vlcengine.cpp b/src/engine/vlcengine.cpp
index 1b5c1ce9b..cbca11565 100644
--- a/src/engine/vlcengine.cpp
+++ b/src/engine/vlcengine.cpp
@@ -28,7 +28,6 @@
 #include <QVariant>
 #include <QByteArray>
 #include <QUrl>
-#include <QtDebug>
 
 #include "core/timeconstants.h"
 #include "core/taskmanager.h"
diff --git a/src/equalizer/equalizer.cpp b/src/equalizer/equalizer.cpp
index 939bff9ba..3a62f20ef 100644
--- a/src/equalizer/equalizer.cpp
+++ b/src/equalizer/equalizer.cpp
@@ -26,7 +26,6 @@
 #include <QWidget>
 #include <QDialog>
 #include <QDataStream>
-#include <QByteArray>
 #include <QList>
 #include <QVariant>
 #include <QString>
diff --git a/src/globalshortcuts/globalshortcut-x11.cpp b/src/globalshortcuts/globalshortcut-x11.cpp
index b7b4eb753..446535178 100644
--- a/src/globalshortcuts/globalshortcut-x11.cpp
+++ b/src/globalshortcuts/globalshortcut-x11.cpp
@@ -19,13 +19,10 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QApplication>
 #include <QGuiApplication>
-#include <QMap>
 #include <QVector>
 #include <QByteArray>
-#include <QString>
 #include <QKeySequence>
 #include <QFlags>
 #include <QScreen>
diff --git a/src/globalshortcuts/globalshortcut.cpp b/src/globalshortcuts/globalshortcut.cpp
index a0f31871d..4bb40a9ca 100644
--- a/src/globalshortcuts/globalshortcut.cpp
+++ b/src/globalshortcuts/globalshortcut.cpp
@@ -25,7 +25,6 @@
 #include <QPair>
 #include <QHash>
 #include <QFlags>
-#include <QtDebug>
 #include <QKeySequence>
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #  include <QKeyCombination>
diff --git a/src/globalshortcuts/globalshortcutsbackend-gnome.cpp b/src/globalshortcuts/globalshortcutsbackend-gnome.cpp
index 1f86e8a79..6a7525e9c 100644
--- a/src/globalshortcuts/globalshortcutsbackend-gnome.cpp
+++ b/src/globalshortcuts/globalshortcutsbackend-gnome.cpp
@@ -31,7 +31,6 @@
 #include <QDBusPendingCallWatcher>
 #include <QDBusPendingReply>
 #include <QAction>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "globalshortcutsmanager.h"
diff --git a/src/globalshortcuts/globalshortcutsbackend-macos.mm b/src/globalshortcuts/globalshortcutsbackend-macos.mm
index 9c9d23f02..ffbc9ee21 100644
--- a/src/globalshortcuts/globalshortcutsbackend-macos.mm
+++ b/src/globalshortcuts/globalshortcutsbackend-macos.mm
@@ -35,7 +35,6 @@
 #include <QList>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QtDebug>
 
 #include "config.h"
 #include "globalshortcutsmanager.h"
diff --git a/src/globalshortcuts/globalshortcutsbackend-mate.cpp b/src/globalshortcuts/globalshortcutsbackend-mate.cpp
index dd728d3de..ded77936c 100644
--- a/src/globalshortcuts/globalshortcutsbackend-mate.cpp
+++ b/src/globalshortcuts/globalshortcutsbackend-mate.cpp
@@ -29,7 +29,6 @@
 #include <QDBusPendingCallWatcher>
 #include <QDBusPendingReply>
 #include <QAction>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "globalshortcutsmanager.h"
diff --git a/src/globalshortcuts/globalshortcutsbackend-x11.cpp b/src/globalshortcuts/globalshortcutsbackend-x11.cpp
index d9d6bf359..622f91b1f 100644
--- a/src/globalshortcuts/globalshortcutsbackend-x11.cpp
+++ b/src/globalshortcuts/globalshortcutsbackend-x11.cpp
@@ -27,7 +27,6 @@
 #include <QApplication>
 #include <QMap>
 #include <QAction>
-#include <QKeySequence>
 #include <QtAlgorithms>
 
 #include "globalshortcutsmanager.h"
diff --git a/src/globalshortcuts/globalshortcutsmanager.cpp b/src/globalshortcuts/globalshortcutsmanager.cpp
index 8421d19ca..0f7e4c1ef 100644
--- a/src/globalshortcuts/globalshortcutsmanager.cpp
+++ b/src/globalshortcuts/globalshortcutsmanager.cpp
@@ -25,12 +25,10 @@
 
 #include <QApplication>
 #include <QWidget>
-#include <QVariant>
 #include <QString>
 #include <QAction>
 #include <QShortcut>
 #include <QKeySequence>
-#include <QSettings>
 
 #include "globalshortcutsmanager.h"
 #include "globalshortcutsbackend.h"
diff --git a/src/internet/internetcollectionview.cpp b/src/internet/internetcollectionview.cpp
index 2ae024a5a..6eba9a442 100644
--- a/src/internet/internetcollectionview.cpp
+++ b/src/internet/internetcollectionview.cpp
@@ -26,17 +26,14 @@
 #include <QSortFilterProxyModel>
 #include <QAbstractItemView>
 #include <QItemSelectionModel>
-#include <QMap>
 #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/internetplaylistitem.cpp b/src/internet/internetplaylistitem.cpp
index 63c81bc72..da732f3ea 100644
--- a/src/internet/internetplaylistitem.cpp
+++ b/src/internet/internetplaylistitem.cpp
@@ -22,11 +22,7 @@
 #include "config.h"
 
 #include <QApplication>
-#include <QSettings>
 #include <QVariant>
-#include <QString>
-#include <QStringList>
-#include <QtDebug>
 
 #include "internetplaylistitem.h"
 #include "internetservices.h"
diff --git a/src/internet/internetsearchmodel.cpp b/src/internet/internetsearchmodel.cpp
index 28945c0e2..7da5fd050 100644
--- a/src/internet/internetsearchmodel.cpp
+++ b/src/internet/internetsearchmodel.cpp
@@ -26,10 +26,8 @@
 #include <QMimeData>
 #include <QList>
 #include <QSet>
-#include <QMap>
 #include <QVariant>
 #include <QString>
-#include <QPixmap>
 #include <QSize>
 
 #include "core/mimedata.h"
diff --git a/src/internet/internetsearchsortmodel.cpp b/src/internet/internetsearchsortmodel.cpp
index 7dd7bede0..e893ea89e 100644
--- a/src/internet/internetsearchsortmodel.cpp
+++ b/src/internet/internetsearchsortmodel.cpp
@@ -23,10 +23,8 @@
 #include <QObject>
 #include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
-#include <QVariant>
 #include <QString>
 
-#include "core/song.h"
 #include "collection/collectionmodel.h"
 #include "internetsearchmodel.h"
 #include "internetsearchsortmodel.h"
diff --git a/src/internet/internetsearchview.cpp b/src/internet/internetsearchview.cpp
index 3ed2fe2ca..ebe83b1a9 100644
--- a/src/internet/internetsearchview.cpp
+++ b/src/internet/internetsearchview.cpp
@@ -36,12 +36,9 @@
 #include <QPair>
 #include <QList>
 #include <QMap>
-#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QRegularExpression>
-#include <QUrl>
-#include <QImage>
 #include <QPixmap>
 #include <QPixmapCache>
 #include <QPainter>
@@ -66,19 +63,16 @@
 #include <QContextMenuEvent>
 #include <QShowEvent>
 #include <QHideEvent>
-#include <QtGlobal>
 
 #include "core/application.h"
 #include "core/mimedata.h"
 #include "core/iconloader.h"
 #include "core/song.h"
-#include "core/logging.h"
 #include "collection/collectionfilterwidget.h"
 #include "collection/collectionmodel.h"
 #include "collection/groupbydialog.h"
 #include "collection/savedgroupingmanager.h"
 #include "covermanager/albumcoverloader.h"
-#include "covermanager/albumcoverloaderoptions.h"
 #include "covermanager/albumcoverloaderresult.h"
 #include "internetsongmimedata.h"
 #include "internetservice.h"
diff --git a/src/internet/internetservices.cpp b/src/internet/internetservices.cpp
index a8de20dcc..df97b0ec6 100644
--- a/src/internet/internetservices.cpp
+++ b/src/internet/internetservices.cpp
@@ -24,7 +24,6 @@
 #include <QObject>
 #include <QMap>
 #include <QString>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "internetservices.h"
diff --git a/src/internet/internetsongsview.cpp b/src/internet/internetsongsview.cpp
index ff75d6a71..b768e5ea7 100644
--- a/src/internet/internetsongsview.cpp
+++ b/src/internet/internetsongsview.cpp
@@ -21,7 +21,6 @@
 
 #include <QtGlobal>
 #include <QWidget>
-#include <QMap>
 #include <QString>
 #include <QStackedWidget>
 #include <QContextMenuEvent>
@@ -35,7 +34,6 @@
 #include "core/iconloader.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectionmodel.h"
-#include "collection/collectionfilterwidget.h"
 #include "internetservice.h"
 #include "internetsongsview.h"
 #include "internetcollectionview.h"
diff --git a/src/internet/internettabsview.cpp b/src/internet/internettabsview.cpp
index 3897292eb..9f096b1cd 100644
--- a/src/internet/internettabsview.cpp
+++ b/src/internet/internettabsview.cpp
@@ -21,7 +21,6 @@
 
 #include <QtGlobal>
 #include <QWidget>
-#include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QLabel>
diff --git a/src/internet/localredirectserver.cpp b/src/internet/localredirectserver.cpp
index 649a36e42..0cb3dc2b1 100644
--- a/src/internet/localredirectserver.cpp
+++ b/src/internet/localredirectserver.cpp
@@ -33,9 +33,6 @@
 #include <QByteArray>
 #include <QString>
 #include <QUrl>
-#include <QIcon>
-#include <QImage>
-#include <QPixmap>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
 #include <QStyle>
diff --git a/src/lyrics/auddlyricsprovider.cpp b/src/lyrics/auddlyricsprovider.cpp
index 0c5373ef3..88f383fd2 100644
--- a/src/lyrics/auddlyricsprovider.cpp
+++ b/src/lyrics/auddlyricsprovider.cpp
@@ -21,7 +21,6 @@
 
 #include <QObject>
 #include <QPair>
-#include <QList>
 #include <QByteArray>
 #include <QVariant>
 #include <QString>
@@ -32,7 +31,6 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/lyrics/chartlyricsprovider.cpp b/src/lyrics/chartlyricsprovider.cpp
index f3a123a4e..7d7233919 100644
--- a/src/lyrics/chartlyricsprovider.cpp
+++ b/src/lyrics/chartlyricsprovider.cpp
@@ -21,8 +21,6 @@
 
 #include <QObject>
 #include <QByteArray>
-#include <QList>
-#include <QPair>
 #include <QVariant>
 #include <QString>
 #include <QUrl>
diff --git a/src/lyrics/geniuslyricsprovider.cpp b/src/lyrics/geniuslyricsprovider.cpp
index 082ab00fe..fe608873f 100644
--- a/src/lyrics/geniuslyricsprovider.cpp
+++ b/src/lyrics/geniuslyricsprovider.cpp
@@ -42,7 +42,6 @@
 #include <QJsonValue>
 #include <QJsonParseError>
 #include <QMessageBox>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/utilities.h"
diff --git a/src/lyrics/lololyricsprovider.cpp b/src/lyrics/lololyricsprovider.cpp
index 1fa083658..1b725cee7 100644
--- a/src/lyrics/lololyricsprovider.cpp
+++ b/src/lyrics/lololyricsprovider.cpp
@@ -21,7 +21,6 @@
 
 #include <QObject>
 #include <QPair>
-#include <QList>
 #include <QByteArray>
 #include <QVariant>
 #include <QString>
@@ -30,7 +29,6 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QXmlStreamReader>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/lyrics/lyricsfetchersearch.cpp b/src/lyrics/lyricsfetchersearch.cpp
index e285808a3..5c66fd5a1 100644
--- a/src/lyrics/lyricsfetchersearch.cpp
+++ b/src/lyrics/lyricsfetchersearch.cpp
@@ -24,7 +24,6 @@
 #include <QObject>
 #include <QTimer>
 #include <QList>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "lyricsfetcher.h"
diff --git a/src/lyrics/lyricsproviders.cpp b/src/lyrics/lyricsproviders.cpp
index cdb9d7b8f..e572a45bd 100644
--- a/src/lyrics/lyricsproviders.cpp
+++ b/src/lyrics/lyricsproviders.cpp
@@ -23,12 +23,9 @@
 #include <QMutex>
 #include <QList>
 #include <QMap>
-#include <QVariant>
-#include <QVariantList>
 #include <QString>
 #include <QStringList>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/lyrics/musixmatchlyricsprovider.cpp b/src/lyrics/musixmatchlyricsprovider.cpp
index 2356cc551..8431d5257 100644
--- a/src/lyrics/musixmatchlyricsprovider.cpp
+++ b/src/lyrics/musixmatchlyricsprovider.cpp
@@ -29,14 +29,12 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonObject>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
 #include "core/utilities.h"
 #include "jsonlyricsprovider.h"
 #include "lyricsfetcher.h"
-#include "lyricsprovider.h"
 #include "musixmatchlyricsprovider.h"
 
 MusixmatchLyricsProvider::MusixmatchLyricsProvider(NetworkAccessManager *network, QObject *parent) : JsonLyricsProvider("Musixmatch", true, false, network, parent) {}
diff --git a/src/lyrics/ovhlyricsprovider.cpp b/src/lyrics/ovhlyricsprovider.cpp
index 1c5d019e5..9a4142595 100644
--- a/src/lyrics/ovhlyricsprovider.cpp
+++ b/src/lyrics/ovhlyricsprovider.cpp
@@ -26,8 +26,6 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonObject>
-#include <QJsonValue>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/main.cpp b/src/main.cpp
index 9a563aa3b..fb52ec6bf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -56,10 +56,8 @@
 #include <QFile>
 #include <QDir>
 #include <QString>
-#include <QImage>
 #include <QSettings>
 #include <QLoggingCategory>
-#include <QtDebug>
 #ifdef HAVE_TRANSLATIONS
 #  include <QTranslator>
 #endif
diff --git a/src/moodbar/moodbarcontroller.cpp b/src/moodbar/moodbarcontroller.cpp
index 5191bc285..6e6286ad1 100644
--- a/src/moodbar/moodbarcontroller.cpp
+++ b/src/moodbar/moodbarcontroller.cpp
@@ -15,8 +15,6 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <memory>
-
 #include <QObject>
 #include <QByteArray>
 #include <QUrl>
diff --git a/src/moodbar/moodbaritemdelegate.cpp b/src/moodbar/moodbaritemdelegate.cpp
index f8b1141ce..0e6bbe39b 100644
--- a/src/moodbar/moodbaritemdelegate.cpp
+++ b/src/moodbar/moodbaritemdelegate.cpp
@@ -24,15 +24,11 @@
 #include <QAbstractItemModel>
 #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"
diff --git a/src/moodbar/moodbarloader.cpp b/src/moodbar/moodbarloader.cpp
index 52dd6aa05..63981e65a 100644
--- a/src/moodbar/moodbarloader.cpp
+++ b/src/moodbar/moodbarloader.cpp
@@ -32,12 +32,10 @@
 #include <QAbstractNetworkCache>
 #include <QNetworkDiskCache>
 #include <QTimer>
-#include <QVariant>
 #include <QByteArray>
 #include <QString>
 #include <QUrl>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/logging.h"
diff --git a/src/moodbar/moodbarpipeline.cpp b/src/moodbar/moodbarpipeline.cpp
index b731f3655..e2ec6fbd2 100644
--- a/src/moodbar/moodbarpipeline.cpp
+++ b/src/moodbar/moodbarpipeline.cpp
@@ -26,7 +26,6 @@
 #include <QThread>
 #include <QString>
 #include <QUrl>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/signalchecker.h"
diff --git a/src/moodbar/moodbarproxystyle.cpp b/src/moodbar/moodbarproxystyle.cpp
index 675605a5d..83d5eaf5d 100644
--- a/src/moodbar/moodbarproxystyle.cpp
+++ b/src/moodbar/moodbarproxystyle.cpp
@@ -17,9 +17,6 @@
 
 #include <QProxyStyle>
 #include <QSettings>
-#include <QList>
-#include <QVector>
-#include <QVariant>
 #include <QPixmap>
 #include <QPainter>
 #include <QPen>
diff --git a/src/moodbar/moodbarrenderer.cpp b/src/moodbar/moodbarrenderer.cpp
index d46df2f79..d585bab47 100644
--- a/src/moodbar/moodbarrenderer.cpp
+++ b/src/moodbar/moodbarrenderer.cpp
@@ -15,8 +15,6 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <string>
-
 #include <QtGlobal>
 #include <QObject>
 #include <QArrayData>
diff --git a/src/musicbrainz/acoustidclient.cpp b/src/musicbrainz/acoustidclient.cpp
index 2a6837fad..2a7a83551 100644
--- a/src/musicbrainz/acoustidclient.cpp
+++ b/src/musicbrainz/acoustidclient.cpp
@@ -26,15 +26,12 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QPair>
-#include <QSet>
 #include <QList>
-#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QUrlQuery>
 #include <QtAlgorithms>
-#include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonParseError>
diff --git a/src/musicbrainz/musicbrainzclient.cpp b/src/musicbrainz/musicbrainzclient.cpp
index 814401249..2829497a6 100644
--- a/src/musicbrainz/musicbrainzclient.cpp
+++ b/src/musicbrainz/musicbrainzclient.cpp
@@ -39,11 +39,9 @@
 #include <QNetworkReply>
 #include <QJsonParseError>
 #include <QJsonDocument>
-#include <QJsonValue>
 #include <QJsonObject>
 #include <QXmlStreamReader>
 #include <QTimer>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/musicbrainz/tagfetcher.cpp b/src/musicbrainz/tagfetcher.cpp
index a47809059..ac35e7cdd 100644
--- a/src/musicbrainz/tagfetcher.cpp
+++ b/src/musicbrainz/tagfetcher.cpp
@@ -28,7 +28,6 @@
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QString>
-#include <QUrl>
 
 #include "core/timeconstants.h"
 #include "engine/chromaprinter.h"
diff --git a/src/organize/organize.cpp b/src/organize/organize.cpp
index 5d857d7cc..69491c2e5 100644
--- a/src/organize/organize.cpp
+++ b/src/organize/organize.cpp
@@ -29,11 +29,9 @@
 #include <QTimer>
 #include <QDateTime>
 #include <QList>
-#include <QVector>
 #include <QString>
 #include <QUrl>
 #include <QImage>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/utilities.h"
diff --git a/src/organize/organizedialog.cpp b/src/organize/organizedialog.cpp
index aa44db3b7..9acc18037 100644
--- a/src/organize/organizedialog.cpp
+++ b/src/organize/organizedialog.cpp
@@ -38,7 +38,6 @@
 #include <QMap>
 #include <QDir>
 #include <QFileInfo>
-#include <QVariant>
 #include <QString>
 #include <QStringBuilder>
 #include <QStringList>
@@ -53,7 +52,6 @@
 #include <QPushButton>
 #include <QStackedWidget>
 #include <QToolButton>
-#include <QFlags>
 #include <QShowEvent>
 #include <QCloseEvent>
 #include <QSettings>
diff --git a/src/organize/organizeerrordialog.cpp b/src/organize/organizeerrordialog.cpp
index 4f43f66eb..647742dc7 100644
--- a/src/organize/organizeerrordialog.cpp
+++ b/src/organize/organizeerrordialog.cpp
@@ -29,7 +29,6 @@
 #include <QStyle>
 #include <QList>
 #include <QStringList>
-#include <QUrl>
 #include <QLabel>
 #include <QListWidget>
 
diff --git a/src/organize/organizeformat.cpp b/src/organize/organizeformat.cpp
index 1effd740a..07396dda0 100644
--- a/src/organize/organizeformat.cpp
+++ b/src/organize/organizeformat.cpp
@@ -23,14 +23,11 @@
 
 #include <QObject>
 #include <QApplication>
-#include <QList>
 #include <QChar>
 #include <QString>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
-#include <QUrl>
 #include <QFileInfo>
 #include <QDir>
 #include <QColor>
diff --git a/src/osd/osddbus.cpp b/src/osd/osddbus.cpp
index 38fe8619f..4b310304d 100644
--- a/src/osd/osddbus.cpp
+++ b/src/osd/osddbus.cpp
@@ -29,13 +29,11 @@
 #include <QObject>
 #include <QByteArray>
 #include <QDateTime>
-#include <QMap>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QRegularExpression>
 #include <QImage>
-#include <QCoreApplication>
 #include <QVersionNumber>
 #include <QDBusArgument>
 #include <QDBusConnection>
@@ -43,8 +41,6 @@
 #include <QDBusPendingCall>
 #include <QDBusPendingReply>
 #include <QDBusPendingCallWatcher>
-#include <QJsonObject>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "osddbus.h"
diff --git a/src/osd/osdmac.mm b/src/osd/osdmac.mm
index bc4839cb5..f038f955c 100644
--- a/src/osd/osdmac.mm
+++ b/src/osd/osdmac.mm
@@ -26,7 +26,6 @@
 #include <QBuffer>
 #include <QByteArray>
 #include <QFile>
-#include <QtDebug>
 
 #include "core/scoped_nsobject.h"
 
diff --git a/src/osd/osdpretty.cpp b/src/osd/osdpretty.cpp
index fe57333d2..2b6760edc 100644
--- a/src/osd/osdpretty.cpp
+++ b/src/osd/osdpretty.cpp
@@ -23,19 +23,15 @@
 
 #include <chrono>
 
-#include <QtGlobal>
 #include <QApplication>
 #include <QGuiApplication>
 #include <QWindow>
 #include <QScreen>
 #include <QWidget>
-#include <QList>
-#include <QVariant>
 #include <QString>
 #include <QImage>
 #include <QPixmap>
 #include <QBitmap>
-#include <QLabel>
 #include <QPainter>
 #include <QPainterPath>
 #include <QPalette>
@@ -49,7 +45,6 @@
 #include <QTimer>
 #include <QTimeLine>
 #include <QTransform>
-#include <QLayout>
 #include <QBoxLayout>
 #include <QLinearGradient>
 #include <QSettings>
diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index fa6aa0743..164536efe 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -26,13 +26,10 @@
 #include <utility>
 #include <algorithm>
 #include <functional>
-#include <iterator>
-#include <type_traits>
 #include <unordered_map>
 #include <random>
 #include <chrono>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QCoreApplication>
 #include <QtConcurrent>
@@ -59,7 +56,6 @@
 #include <QMutableListIterator>
 #include <QFlags>
 #include <QSettings>
-#include <QtDebug>
 #include <QTimer>
 
 #include "core/application.h"
@@ -84,7 +80,6 @@
 #include "songloaderinserter.h"
 #include "songmimedata.h"
 #include "songplaylistitem.h"
-#include "tagreadermessages.pb.h"
 
 #include "smartplaylists/playlistgenerator.h"
 #include "smartplaylists/playlistgeneratorinserter.h"
@@ -93,7 +88,6 @@
 #include "internet/internetplaylistitem.h"
 #include "internet/internetsongmimedata.h"
 
-#include "radios/radioservice.h"
 #include "radios/radiomimedata.h"
 #include "radios/radioplaylistitem.h"
 
diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp
index 3fe6a88f6..ba10b1829 100644
--- a/src/playlist/playlistbackend.cpp
+++ b/src/playlist/playlistbackend.cpp
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <memory>
-#include <functional>
 
 #include <QObject>
 #include <QApplication>
@@ -32,22 +31,18 @@
 #include <QDir>
 #include <QFile>
 #include <QByteArray>
-#include <QHash>
 #include <QList>
-#include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QUrl>
 #include <QSqlDatabase>
-#include <QSqlQuery>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/database.h"
 #include "core/logging.h"
 #include "core/scopedtransaction.h"
 #include "core/song.h"
+#include "core/sqlquery.h"
 #include "core/sqlrow.h"
 #include "collection/collectionbackend.h"
 #include "playlistitem.h"
diff --git a/src/playlist/playlistcontainer.cpp b/src/playlist/playlistcontainer.cpp
index 1d7876827..ba4df7872 100644
--- a/src/playlist/playlistcontainer.cpp
+++ b/src/playlist/playlistcontainer.cpp
@@ -28,11 +28,8 @@
 #include <QSortFilterProxyModel>
 #include <QScrollBar>
 #include <QAction>
-#include <QList>
-#include <QVariant>
 #include <QPoint>
 #include <QString>
-#include <QRegularExpression>
 #include <QSize>
 #include <QFont>
 #include <QIcon>
diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates.cpp
index ed2565c77..97dfcb58c 100644
--- a/src/playlist/playlistdelegates.cpp
+++ b/src/playlist/playlistdelegates.cpp
@@ -43,7 +43,6 @@
 #include <QMetaType>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QUrl>
 #include <QIcon>
 #include <QPixmap>
@@ -51,7 +50,6 @@
 #include <QPainter>
 #include <QColor>
 #include <QPen>
-#include <QBrush>
 #include <QPoint>
 #include <QRect>
 #include <QSize>
@@ -62,15 +60,11 @@
 #include <QWhatsThis>
 #include <QStyledItemDelegate>
 #include <QStyleOptionViewItem>
-#include <QtDebug>
 #include <QtEvents>
 #include <QLinearGradient>
 
-#include "core/iconloader.h"
 #include "core/logging.h"
-#include "core/player.h"
 #include "core/song.h"
-#include "core/urlhandler.h"
 #include "core/utilities.h"
 #include "collection/collectionbackend.h"
 #include "playlist/playlist.h"
diff --git a/src/playlist/playlistfilterparser.cpp b/src/playlist/playlistfilterparser.cpp
index e124855a2..1d17af295 100644
--- a/src/playlist/playlistfilterparser.cpp
+++ b/src/playlist/playlistfilterparser.cpp
@@ -28,7 +28,6 @@
 #include <QSet>
 #include <QChar>
 #include <QScopedPointer>
-#include <QVariant>
 #include <QString>
 #include <QtAlgorithms>
 #include <QAbstractItemModel>
diff --git a/src/playlist/playlistheader.cpp b/src/playlist/playlistheader.cpp
index b26acd5a8..d75f65e0b 100644
--- a/src/playlist/playlistheader.cpp
+++ b/src/playlist/playlistheader.cpp
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <QAbstractItemModel>
 #include <QWidget>
 #include <QFlags>
 #include <QVariant>
@@ -38,6 +37,7 @@
 #include "playlistheader.h"
 #include "playlistview.h"
 
+#include "widgets/stretchheaderview.h"
 #include "settings/playlistsettingspage.h"
 
 PlaylistHeader::PlaylistHeader(Qt::Orientation orientation, PlaylistView *view, QWidget *parent)
diff --git a/src/playlist/playlistitem.cpp b/src/playlist/playlistitem.cpp
index ec00542db..bd7c78acf 100644
--- a/src/playlist/playlistitem.cpp
+++ b/src/playlist/playlistitem.cpp
@@ -25,12 +25,8 @@
 
 #include <QtConcurrentRun>
 #include <QFuture>
-#include <QString>
 #include <QColor>
-#include <QSqlQuery>
-#include <QtDebug>
 
-#include "core/logging.h"
 #include "core/sqlquery.h"
 #include "core/song.h"
 
diff --git a/src/playlist/playlistlistcontainer.cpp b/src/playlist/playlistlistcontainer.cpp
index 9878f126a..e209e8081 100644
--- a/src/playlist/playlistlistcontainer.cpp
+++ b/src/playlist/playlistlistcontainer.cpp
@@ -31,7 +31,6 @@
 #include <QItemSelectionModel>
 #include <QSet>
 #include <QList>
-#include <QVariant>
 #include <QString>
 #include <QPixmap>
 #include <QPainter>
diff --git a/src/playlist/playlistlistview.cpp b/src/playlist/playlistlistview.cpp
index 1da2e6229..2ed71401f 100644
--- a/src/playlist/playlistlistview.cpp
+++ b/src/playlist/playlistlistview.cpp
@@ -21,15 +21,14 @@
 
 #include "config.h"
 
-#include <QAbstractItemModel>
 #include <QWidget>
-#include <QFlags>
 #include <QFont>
 #include <QPainter>
 #include <QPalette>
 #include <QRect>
 #include <QPaintEvent>
 
+#include "widgets/autoexpandingtreeview.h"
 #include "playlistlistview.h"
 
 PlaylistListView::PlaylistListView(QWidget *parent) : AutoExpandingTreeView(parent) {}
diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp
index fae137c82..9f3128232 100644
--- a/src/playlist/playlistmanager.cpp
+++ b/src/playlist/playlistmanager.cpp
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <memory>
 #include <functional>
 #include <utility>
 
@@ -36,24 +35,17 @@
 #include <QFileInfo>
 #include <QList>
 #include <QSet>
-#include <QVariant>
 #include <QString>
-#include <QStringBuilder>
-#include <QRegularExpression>
 #include <QUrl>
 #include <QAbstractItemModel>
 #include <QScrollBar>
 #include <QSettings>
-#include <QtDebug>
 #include <QMessageBox>
 
 #include "core/application.h"
-#include "core/logging.h"
 #include "core/player.h"
 #include "core/utilities.h"
 #include "collection/collectionbackend.h"
-#include "collection/collectionplaylistitem.h"
-#include "covermanager/albumcoverloaderresult.h"
 #include "covermanager/currentalbumcoverloader.h"
 #include "organize/organizeformat.h"
 #include "settings/playlistsettingspage.h"
diff --git a/src/playlist/playlistsequence.cpp b/src/playlist/playlistsequence.cpp
index 5946ee100..3ef931cfe 100644
--- a/src/playlist/playlistsequence.cpp
+++ b/src/playlist/playlistsequence.cpp
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <QWidget>
-#include <QList>
 #include <QVariant>
 #include <QIcon>
 #include <QPixmap>
diff --git a/src/playlist/playlisttabbar.cpp b/src/playlist/playlisttabbar.cpp
index 94de4e2df..3225a32ba 100644
--- a/src/playlist/playlisttabbar.cpp
+++ b/src/playlist/playlisttabbar.cpp
@@ -30,9 +30,7 @@
 #include <QAction>
 #include <QGridLayout>
 #include <QInputDialog>
-#include <QLayout>
 #include <QLineEdit>
-#include <QMimeData>
 #include <QRect>
 #include <QSize>
 #include <QToolTip>
@@ -48,7 +46,6 @@
 #include "core/iconloader.h"
 #include "core/logging.h"
 #include "core/mimedata.h"
-#include "core/song.h"
 #include "widgets/favoritewidget.h"
 #include "widgets/renametablineedit.h"
 #include "playlist.h"
diff --git a/src/playlist/playlistundocommands.cpp b/src/playlist/playlistundocommands.cpp
index a18888636..d25de15cd 100644
--- a/src/playlist/playlistundocommands.cpp
+++ b/src/playlist/playlistundocommands.cpp
@@ -20,14 +20,10 @@
 
 #include "config.h"
 
-#include <memory>
-
 #include <QtGlobal>
 #include <QList>
-#include <QUrl>
 #include <QUndoStack>
 
-#include "core/song.h"
 #include "playlist.h"
 #include "playlistitem.h"
 #include "playlistundocommands.h"
diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index 123fb51d8..c7071d5f5 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -31,7 +31,6 @@
 #include <QItemSelectionModel>
 #include <QTreeView>
 #include <QHeaderView>
-#include <QByteArray>
 #include <QClipboard>
 #include <QCommonStyle>
 #include <QFontMetrics>
@@ -45,7 +44,6 @@
 #include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QStringBuilder>
 #include <QUrl>
 #include <QImage>
 #include <QPixmap>
diff --git a/src/playlistparsers/asxparser.cpp b/src/playlistparsers/asxparser.cpp
index dd481245f..e83c64278 100644
--- a/src/playlistparsers/asxparser.cpp
+++ b/src/playlistparsers/asxparser.cpp
@@ -25,10 +25,8 @@
 #include <QDir>
 #include <QByteArray>
 #include <QString>
-#include <QStringBuilder>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
-#include <QUrl>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 
diff --git a/src/playlistparsers/cueparser.cpp b/src/playlistparsers/cueparser.cpp
index ffdbc18fe..37c8ae876 100644
--- a/src/playlistparsers/cueparser.cpp
+++ b/src/playlistparsers/cueparser.cpp
@@ -31,7 +31,6 @@
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
 #include <QTextStream>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/timeconstants.h"
diff --git a/src/playlistparsers/m3uparser.cpp b/src/playlistparsers/m3uparser.cpp
index 81d8138ef..33d2771b9 100644
--- a/src/playlistparsers/m3uparser.cpp
+++ b/src/playlistparsers/m3uparser.cpp
@@ -23,13 +23,9 @@
 #include <QDir>
 #include <QBuffer>
 #include <QByteArray>
-#include <QList>
-#include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QUrl>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/timeconstants.h"
diff --git a/src/playlistparsers/playlistparser.cpp b/src/playlistparsers/playlistparser.cpp
index 2aaa2aba9..b7f917f68 100644
--- a/src/playlistparsers/playlistparser.cpp
+++ b/src/playlistparsers/playlistparser.cpp
@@ -27,9 +27,7 @@
 #include <QFileInfo>
 #include <QByteArray>
 #include <QString>
-#include <QStringBuilder>
 #include <QStringList>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "settings/playlistsettingspage.h"
diff --git a/src/playlistparsers/xspfparser.cpp b/src/playlistparsers/xspfparser.cpp
index a587dcf63..806d4360e 100644
--- a/src/playlistparsers/xspfparser.cpp
+++ b/src/playlistparsers/xspfparser.cpp
@@ -22,9 +22,7 @@
 #include <QObject>
 #include <QIODevice>
 #include <QDir>
-#include <QFileInfo>
 #include <QByteArray>
-#include <QVariant>
 #include <QString>
 #include <QUrl>
 #include <QSettings>
diff --git a/src/qobuz/qobuzfavoriterequest.cpp b/src/qobuz/qobuzfavoriterequest.cpp
index 41f814333..c5cab180c 100644
--- a/src/qobuz/qobuzfavoriterequest.cpp
+++ b/src/qobuz/qobuzfavoriterequest.cpp
@@ -21,14 +21,12 @@
 
 #include <QObject>
 #include <QPair>
-#include <QMap>
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QUrlQuery>
 #include <QNetworkReply>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/qobuz/qobuzfavoriterequest.h b/src/qobuz/qobuzfavoriterequest.h
index d99c4e742..81a8b23a1 100644
--- a/src/qobuz/qobuzfavoriterequest.h
+++ b/src/qobuz/qobuzfavoriterequest.h
@@ -24,7 +24,6 @@
 
 #include <QObject>
 #include <QList>
-#include <QMap>
 #include <QVariant>
 #include <QString>
 
diff --git a/src/qobuz/qobuzrequest.cpp b/src/qobuz/qobuzrequest.cpp
index 6b8b0a88a..5e9e02761 100644
--- a/src/qobuz/qobuzrequest.cpp
+++ b/src/qobuz/qobuzrequest.cpp
@@ -30,7 +30,6 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
@@ -38,7 +37,6 @@
 #include "core/timeconstants.h"
 #include "core/application.h"
 #include "core/imageutils.h"
-#include "covermanager/albumcoverloader.h"
 #include "qobuzservice.h"
 #include "qobuzurlhandler.h"
 #include "qobuzbaserequest.h"
diff --git a/src/qobuz/qobuzservice.cpp b/src/qobuz/qobuzservice.cpp
index 642de0a2a..d1145208e 100644
--- a/src/qobuz/qobuzservice.cpp
+++ b/src/qobuz/qobuzservice.cpp
@@ -25,7 +25,6 @@
 #include <QByteArray>
 #include <QPair>
 #include <QList>
-#include <QMap>
 #include <QString>
 #include <QUrl>
 #include <QUrlQuery>
@@ -38,7 +37,6 @@
 #include <QSettings>
 #include <QSortFilterProxyModel>
 #include <QSslError>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/player.h"
diff --git a/src/qobuz/qobuzstreamurlrequest.cpp b/src/qobuz/qobuzstreamurlrequest.cpp
index 5a52b637f..8cd811da0 100644
--- a/src/qobuz/qobuzstreamurlrequest.cpp
+++ b/src/qobuz/qobuzstreamurlrequest.cpp
@@ -23,9 +23,7 @@
 
 #include <QObject>
 #include <QMimeDatabase>
-#include <QMimeType>
 #include <QPair>
-#include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QChar>
@@ -33,9 +31,7 @@
 #include <QDateTime>
 #include <QNetworkReply>
 #include <QCryptographicHash>
-#include <QJsonValue>
 #include <QJsonObject>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/queue/queue.cpp b/src/queue/queue.cpp
index 898f2836f..f9725e70d 100644
--- a/src/queue/queue.cpp
+++ b/src/queue/queue.cpp
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <memory>
 #include <algorithm>
 
 #include <QObject>
@@ -32,15 +31,12 @@
 #include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QStringBuilder>
 #include <QMimeData>
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
 
 #include "core/utilities.h"
-#include "core/song.h"
 #include "playlist/playlist.h"
-#include "playlist/playlistitem.h"
 #include "queue.h"
 
 const char *Queue::kRowsMimetype = "application/x-strawberry-queue-rows";
diff --git a/src/queue/queueview.cpp b/src/queue/queueview.cpp
index adc9396d6..4f2445cde 100644
--- a/src/queue/queueview.cpp
+++ b/src/queue/queueview.cpp
@@ -26,7 +26,6 @@
 #include <QWidget>
 #include <QAbstractItemModel>
 #include <QItemSelectionModel>
-#include <QTreeView>
 #include <QList>
 #include <QTimer>
 #include <QSettings>
diff --git a/src/radios/radiobackend.cpp b/src/radios/radiobackend.cpp
index 15090a946..4bfa55d29 100644
--- a/src/radios/radiobackend.cpp
+++ b/src/radios/radiobackend.cpp
@@ -22,9 +22,7 @@
 #include <QThread>
 #include <QMutexLocker>
 #include <QSqlDatabase>
-#include <QSqlQuery>
 
-#include "core/logging.h"
 #include "core/database.h"
 #include "core/sqlquery.h"
 #include "core/song.h"
diff --git a/src/radios/radiomodel.cpp b/src/radios/radiomodel.cpp
index f316041fc..184ff6dab 100644
--- a/src/radios/radiomodel.cpp
+++ b/src/radios/radiomodel.cpp
@@ -32,7 +32,6 @@
 #include "core/simpletreemodel.h"
 #include "playlist/playlistmanager.h"
 #include "covermanager/albumcoverloader.h"
-#include "covermanager/albumcoverloaderoptions.h"
 #include "covermanager/albumcoverloaderresult.h"
 #include "radiomodel.h"
 #include "radioservices.h"
diff --git a/src/radios/radioplaylistitem.cpp b/src/radios/radioplaylistitem.cpp
index 009631f5c..b12811f44 100644
--- a/src/radios/radioplaylistitem.cpp
+++ b/src/radios/radioplaylistitem.cpp
@@ -20,10 +20,7 @@
 #include "config.h"
 
 #include <QApplication>
-#include <QSettings>
 #include <QVariant>
-#include <QString>
-#include <QStringList>
 #include <QUrl>
 
 #include "radioplaylistitem.h"
diff --git a/src/radios/radioservice.cpp b/src/radios/radioservice.cpp
index 5608b2ea5..c252f7144 100644
--- a/src/radios/radioservice.cpp
+++ b/src/radios/radioservice.cpp
@@ -21,11 +21,9 @@
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QUrl>
 #include <QIcon>
 #include <QNetworkReply>
 #include <QJsonDocument>
-#include <QJsonValue>
 #include <QJsonObject>
 
 #include "core/application.h"
diff --git a/src/radios/radioservices.h b/src/radios/radioservices.h
index 9189607f5..102f86e65 100644
--- a/src/radios/radioservices.h
+++ b/src/radios/radioservices.h
@@ -54,7 +54,6 @@ class RadioServices : public QObject {
   void ReloadSettings();
 
   RadioBackend *radio_backend() const { return backend_; }
-  RadioModel *radio_model() const { return model_; }
   QSortFilterProxyModel *sort_model() const { return sort_model_; }
 
  private slots:
diff --git a/src/radios/somafmservice.cpp b/src/radios/somafmservice.cpp
index c47e9bb31..f98a02f93 100644
--- a/src/radios/somafmservice.cpp
+++ b/src/radios/somafmservice.cpp
@@ -18,7 +18,6 @@
  */
 
 #include <QObject>
-#include <QList>
 #include <QString>
 #include <QUrl>
 #include <QNetworkRequest>
@@ -28,7 +27,6 @@
 #include <QJsonArray>
 
 #include "core/application.h"
-#include "core/logging.h"
 #include "core/networkaccessmanager.h"
 #include "core/taskmanager.h"
 #include "core/iconloader.h"
diff --git a/src/scrobbler/audioscrobbler.cpp b/src/scrobbler/audioscrobbler.cpp
index 1022c6497..f4ecc3aef 100644
--- a/src/scrobbler/audioscrobbler.cpp
+++ b/src/scrobbler/audioscrobbler.cpp
@@ -19,11 +19,8 @@
 
 #include "config.h"
 
-#include <QList>
-#include <QVariant>
 #include <QString>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/logging.h"
diff --git a/src/scrobbler/lastfmimport.cpp b/src/scrobbler/lastfmimport.cpp
index d683adbc8..806489f98 100644
--- a/src/scrobbler/lastfmimport.cpp
+++ b/src/scrobbler/lastfmimport.cpp
@@ -21,7 +21,6 @@
 
 #include <algorithm>
 
-#include <QtGlobal>
 #include <QApplication>
 #include <QLocale>
 #include <QVariant>
@@ -40,7 +39,6 @@
 #include <QJsonValue>
 
 #include "core/networkaccessmanager.h"
-#include "core/timeconstants.h"
 #include "core/logging.h"
 
 #include "lastfmimport.h"
diff --git a/src/scrobbler/listenbrainzscrobbler.cpp b/src/scrobbler/listenbrainzscrobbler.cpp
index 5563e98b4..59788cbfa 100644
--- a/src/scrobbler/listenbrainzscrobbler.cpp
+++ b/src/scrobbler/listenbrainzscrobbler.cpp
@@ -39,7 +39,6 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/scrobbler/scrobblercache.cpp b/src/scrobbler/scrobblercache.cpp
index 282875c18..b540b9748 100644
--- a/src/scrobbler/scrobblercache.cpp
+++ b/src/scrobbler/scrobblercache.cpp
@@ -26,7 +26,6 @@
 #include <QObject>
 #include <QStandardPaths>
 #include <QHash>
-#include <QVariant>
 #include <QString>
 #include <QFile>
 #include <QIODevice>
@@ -36,7 +35,6 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
-#include <QtDebug>
 
 #include "core/song.h"
 #include "core/logging.h"
diff --git a/src/scrobbler/scrobblerservices.cpp b/src/scrobbler/scrobblerservices.cpp
index 2c0c33f17..0939f191a 100644
--- a/src/scrobbler/scrobblerservices.cpp
+++ b/src/scrobbler/scrobblerservices.cpp
@@ -22,7 +22,6 @@
 #include <QObject>
 #include <QMutexLocker>
 #include <QString>
-#include <QtDebug>
 
 #include "core/logging.h"
 
diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp
index 8ee9d0524..7b18aa08e 100644
--- a/src/scrobbler/scrobblingapi20.cpp
+++ b/src/scrobbler/scrobblingapi20.cpp
@@ -21,7 +21,6 @@
 
 #include <algorithm>
 
-#include <QtGlobal>
 #include <QApplication>
 #include <QDesktopServices>
 #include <QLocale>
@@ -44,7 +43,6 @@
 #include <QJsonArray>
 #include <QJsonValue>
 #include <QFlags>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/networkaccessmanager.h"
@@ -57,7 +55,6 @@
 #include "audioscrobbler.h"
 #include "scrobblerservice.h"
 #include "scrobblingapi20.h"
-#include "scrobblercache.h"
 #include "scrobblercacheitem.h"
 
 const char *ScrobblingAPI20::kApiKey = "211990b4c96782c05d1536e7219eb56e";
diff --git a/src/scrobbler/subsonicscrobbler.cpp b/src/scrobbler/subsonicscrobbler.cpp
index 1456aa58d..7b9e5434d 100644
--- a/src/scrobbler/subsonicscrobbler.cpp
+++ b/src/scrobbler/subsonicscrobbler.cpp
@@ -20,12 +20,10 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QVariant>
 #include <QString>
 #include <QDateTime>
 #include <QTimer>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/song.h"
diff --git a/src/settings/appearancesettingspage.cpp b/src/settings/appearancesettingspage.cpp
index a560b7aad..52d5ce9d9 100644
--- a/src/settings/appearancesettingspage.cpp
+++ b/src/settings/appearancesettingspage.cpp
@@ -26,7 +26,6 @@
 #include <QStyleFactory>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QPalette>
 #include <QColorDialog>
 #include <QFileDialog>
diff --git a/src/settings/backendsettingspage.cpp b/src/settings/backendsettingspage.cpp
index 86a11f646..e0bf84859 100644
--- a/src/settings/backendsettingspage.cpp
+++ b/src/settings/backendsettingspage.cpp
@@ -23,10 +23,8 @@
 #include <QWidget>
 #include <QSettings>
 #include <QMetaType>
-#include <QList>
 #include <QVariant>
 #include <QString>
-#include <QStringList>
 #include <QRegularExpression>
 #include <QFontMetrics>
 #include <QAbstractItemView>
diff --git a/src/settings/behavioursettingspage.cpp b/src/settings/behavioursettingspage.cpp
index dc0ae8107..901f2ce22 100644
--- a/src/settings/behavioursettingspage.cpp
+++ b/src/settings/behavioursettingspage.cpp
@@ -23,7 +23,6 @@
 
 #include <algorithm>
 
-#include <QList>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
diff --git a/src/settings/collectionsettingspage.cpp b/src/settings/collectionsettingspage.cpp
index 84931a322..7ea2b2a4b 100644
--- a/src/settings/collectionsettingspage.cpp
+++ b/src/settings/collectionsettingspage.cpp
@@ -27,7 +27,6 @@
 #include <QStandardPaths>
 #include <QAbstractItemModel>
 #include <QItemSelectionModel>
-#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QFileDialog>
diff --git a/src/settings/contextsettingspage.cpp b/src/settings/contextsettingspage.cpp
index 52496a1d8..9f3e463bc 100644
--- a/src/settings/contextsettingspage.cpp
+++ b/src/settings/contextsettingspage.cpp
@@ -23,7 +23,6 @@
 
 #include <QtGlobal>
 #include <QAction>
-#include <QVariant>
 #include <QIODevice>
 #include <QFile>
 #include <QFont>
diff --git a/src/settings/coverssettingspage.cpp b/src/settings/coverssettingspage.cpp
index 241d00673..0cfb0fdcc 100644
--- a/src/settings/coverssettingspage.cpp
+++ b/src/settings/coverssettingspage.cpp
@@ -23,7 +23,6 @@
 
 #include <QObject>
 #include <QList>
-#include <QVariant>
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
diff --git a/src/settings/globalshortcutssettingspage.cpp b/src/settings/globalshortcutssettingspage.cpp
index 19190bf33..0523642ef 100644
--- a/src/settings/globalshortcutssettingspage.cpp
+++ b/src/settings/globalshortcutssettingspage.cpp
@@ -23,7 +23,6 @@
 
 #include <QWidget>
 #include <QList>
-#include <QVariant>
 #include <QStringList>
 #include <QAction>
 #include <QHeaderView>
diff --git a/src/settings/lyricssettingspage.cpp b/src/settings/lyricssettingspage.cpp
index ba5890970..8ce68b8ca 100644
--- a/src/settings/lyricssettingspage.cpp
+++ b/src/settings/lyricssettingspage.cpp
@@ -23,7 +23,6 @@
 
 #include <QObject>
 #include <QList>
-#include <QVariant>
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
diff --git a/src/settings/moodbarsettingspage.cpp b/src/settings/moodbarsettingspage.cpp
index ddc93901c..0e09004ea 100644
--- a/src/settings/moodbarsettingspage.cpp
+++ b/src/settings/moodbarsettingspage.cpp
@@ -23,7 +23,6 @@
 
 #include <QIODevice>
 #include <QFile>
-#include <QVariant>
 #include <QByteArray>
 #include <QPixmap>
 #include <QPainter>
diff --git a/src/settings/notificationssettingspage.cpp b/src/settings/notificationssettingspage.cpp
index c6ae7c1d7..a7f884fd3 100644
--- a/src/settings/notificationssettingspage.cpp
+++ b/src/settings/notificationssettingspage.cpp
@@ -23,7 +23,6 @@
 
 #include <QtGlobal>
 #include <QAction>
-#include <QVariant>
 #include <QImage>
 #include <QColor>
 #include <QRgb>
diff --git a/src/settings/qobuzsettingspage.cpp b/src/settings/qobuzsettingspage.cpp
index e19ed7a55..503062520 100644
--- a/src/settings/qobuzsettingspage.cpp
+++ b/src/settings/qobuzsettingspage.cpp
@@ -20,7 +20,6 @@
 #include "config.h"
 
 #include <QObject>
-#include <QVariant>
 #include <QByteArray>
 #include <QString>
 #include <QSettings>
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 7697858d6..998ced4e9 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -31,9 +31,7 @@
 #include <QAbstractItemView>
 #include <QTreeWidget>
 #include <QList>
-#include <QVariant>
 #include <QString>
-#include <QIcon>
 #include <QPainter>
 #include <QFrame>
 #include <QKeySequence>
diff --git a/src/settings/tidalsettingspage.cpp b/src/settings/tidalsettingspage.cpp
index 3eaece9d3..59992cf36 100644
--- a/src/settings/tidalsettingspage.cpp
+++ b/src/settings/tidalsettingspage.cpp
@@ -20,7 +20,6 @@
 #include "config.h"
 
 #include <QObject>
-#include <QVariant>
 #include <QByteArray>
 #include <QString>
 #include <QSettings>
diff --git a/src/smartplaylists/playlistgenerator.cpp b/src/smartplaylists/playlistgenerator.cpp
index 12dfe5f54..af872ec5d 100644
--- a/src/smartplaylists/playlistgenerator.cpp
+++ b/src/smartplaylists/playlistgenerator.cpp
@@ -23,8 +23,6 @@
 #include <QObject>
 #include <QString>
 
-#include "core/logging.h"
-
 #include "playlistgenerator.h"
 #include "playlistquerygenerator.h"
 
diff --git a/src/smartplaylists/playlistquerygenerator.cpp b/src/smartplaylists/playlistquerygenerator.cpp
index 0533cf48a..06a6a31da 100644
--- a/src/smartplaylists/playlistquerygenerator.cpp
+++ b/src/smartplaylists/playlistquerygenerator.cpp
@@ -25,7 +25,6 @@
 #include <QByteArray>
 #include <QString>
 
-#include "core/logging.h"
 #include "playlistquerygenerator.h"
 #include "collection/collectionbackend.h"
 
diff --git a/src/smartplaylists/smartplaylistquerywizardplugin.cpp b/src/smartplaylists/smartplaylistquerywizardplugin.cpp
index 716f6af99..9848dacbd 100644
--- a/src/smartplaylists/smartplaylistquerywizardplugin.cpp
+++ b/src/smartplaylists/smartplaylistquerywizardplugin.cpp
@@ -29,7 +29,6 @@
 #include <QVBoxLayout>
 #include <QScrollBar>
 
-#include "core/logging.h"
 #include "playlistquerygenerator.h"
 #include "smartplaylistquerywizardplugin.h"
 #include "smartplaylistsearchtermwidget.h"
diff --git a/src/smartplaylists/smartplaylistsearch.cpp b/src/smartplaylists/smartplaylistsearch.cpp
index a28e0d7ce..837e889f2 100644
--- a/src/smartplaylists/smartplaylistsearch.cpp
+++ b/src/smartplaylists/smartplaylistsearch.cpp
@@ -24,8 +24,6 @@
 #include <QStringList>
 #include <QDataStream>
 
-#include "search.h"
-#include "core/logging.h"
 #include "core/song.h"
 
 #include "smartplaylistsearch.h"
diff --git a/src/smartplaylists/smartplaylistsearchtermwidget.cpp b/src/smartplaylists/smartplaylistsearchtermwidget.cpp
index f843b5fa2..56cf8edf0 100644
--- a/src/smartplaylists/smartplaylistsearchtermwidget.cpp
+++ b/src/smartplaylists/smartplaylistsearchtermwidget.cpp
@@ -31,7 +31,6 @@
 #include <QPalette>
 #include <QDateTime>
 #include <QPropertyAnimation>
-#include <QtDebug>
 #include <QKeyEvent>
 #include <QEnterEvent>
 
diff --git a/src/smartplaylists/smartplaylistsmodel.cpp b/src/smartplaylists/smartplaylistsmodel.cpp
index 6942884a3..13bd5596f 100644
--- a/src/smartplaylists/smartplaylistsmodel.cpp
+++ b/src/smartplaylists/smartplaylistsmodel.cpp
@@ -24,17 +24,14 @@
 #include <QAbstractListModel>
 #include <QVariant>
 #include <QStringList>
-#include <QUrl>
 #include <QMimeData>
 #include <QSettings>
 
 #include "core/application.h"
 #include "core/database.h"
-#include "core/logging.h"
 #include "core/iconloader.h"
 #include "core/simpletreemodel.h"
 #include "collection/collectionbackend.h"
-#include "playlist/songmimedata.h"
 
 #include "smartplaylistsitem.h"
 #include "smartplaylistsmodel.h"
diff --git a/src/smartplaylists/smartplaylistsview.cpp b/src/smartplaylists/smartplaylistsview.cpp
index 64cd41a36..2270dedc8 100644
--- a/src/smartplaylists/smartplaylistsview.cpp
+++ b/src/smartplaylists/smartplaylistsview.cpp
@@ -22,10 +22,8 @@
 #include <QListView>
 #include <QContextMenuEvent>
 
-#include "core/application.h"
 #include "core/logging.h"
 #include "core/mimedata.h"
-#include "core/iconloader.h"
 #include "smartplaylistsmodel.h"
 #include "smartplaylistsview.h"
 #include "smartplaylistwizard.h"
diff --git a/src/smartplaylists/smartplaylistsviewcontainer.cpp b/src/smartplaylists/smartplaylistsviewcontainer.cpp
index 04e843e58..eb098b741 100644
--- a/src/smartplaylists/smartplaylistsviewcontainer.cpp
+++ b/src/smartplaylists/smartplaylistsviewcontainer.cpp
@@ -23,10 +23,8 @@
 #include <QMenu>
 #include <QSettings>
 #include <QShowEvent>
-#include <QContextMenuEvent>
 
 #include "core/application.h"
-#include "core/logging.h"
 #include "core/iconloader.h"
 #include "core/mimedata.h"
 #include "collection/collectionbackend.h"
diff --git a/src/subsonic/subsonicbaserequest.cpp b/src/subsonic/subsonicbaserequest.cpp
index 58e044e80..41551fdde 100644
--- a/src/subsonic/subsonicbaserequest.cpp
+++ b/src/subsonic/subsonicbaserequest.cpp
@@ -24,7 +24,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QByteArray>
-#include <QPair>
 #include <QList>
 #include <QString>
 #include <QUrl>
diff --git a/src/subsonic/subsonicrequest.cpp b/src/subsonic/subsonicrequest.cpp
index fc29b56fb..2ca9e7374 100644
--- a/src/subsonic/subsonicrequest.cpp
+++ b/src/subsonic/subsonicrequest.cpp
@@ -21,7 +21,6 @@
 
 #include <QObject>
 #include <QDir>
-#include <QMimeType>
 #include <QMimeDatabase>
 #include <QByteArray>
 #include <QString>
@@ -38,7 +37,6 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/logging.h"
@@ -46,7 +44,6 @@
 #include "core/timeconstants.h"
 #include "core/imageutils.h"
 #include "core/networktimeouts.h"
-#include "covermanager/albumcoverloader.h"
 #include "subsonicservice.h"
 #include "subsonicurlhandler.h"
 #include "subsonicbaserequest.h"
diff --git a/src/subsonic/subsonicscrobblerequest.cpp b/src/subsonic/subsonicscrobblerequest.cpp
index 3379cc702..54f72bc65 100644
--- a/src/subsonic/subsonicscrobblerequest.cpp
+++ b/src/subsonic/subsonicscrobblerequest.cpp
@@ -24,12 +24,10 @@
 #include <QByteArray>
 #include <QString>
 #include <QDateTime>
-#include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/logging.h"
diff --git a/src/subsonic/subsonicscrobblerequest.h b/src/subsonic/subsonicscrobblerequest.h
index 5ca068846..f8f57e508 100644
--- a/src/subsonic/subsonicscrobblerequest.h
+++ b/src/subsonic/subsonicscrobblerequest.h
@@ -28,7 +28,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QDateTime>
-#include <QPair>
 #include <QQueue>
 #include <QVariant>
 #include <QString>
diff --git a/src/subsonic/subsonicservice.cpp b/src/subsonic/subsonicservice.cpp
index cce44724d..f04c8fbdc 100644
--- a/src/subsonic/subsonicservice.cpp
+++ b/src/subsonic/subsonicservice.cpp
@@ -24,9 +24,7 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QByteArray>
-#include <QPair>
 #include <QList>
-#include <QMap>
 #include <QString>
 #include <QVariant>
 #include <QUrl>
@@ -43,7 +41,6 @@
 #include <QJsonObject>
 #include <QSettings>
 #include <QSortFilterProxyModel>
-#include <QtDebug>
 
 #include "core/utilities.h"
 #include "core/application.h"
diff --git a/src/subsonic/subsonicurlhandler.cpp b/src/subsonic/subsonicurlhandler.cpp
index 6410cdbce..feb44b420 100644
--- a/src/subsonic/subsonicurlhandler.cpp
+++ b/src/subsonic/subsonicurlhandler.cpp
@@ -20,12 +20,9 @@
 #include "config.h"
 
 #include <QtGlobal>
-#include <QString>
 #include <QUrl>
 #include <QUrlQuery>
 
-#include "core/song.h"
-
 #include "subsonicservice.h"
 #include "subsonicbaserequest.h"
 #include "subsonicurlhandler.h"
diff --git a/src/subsonic/subsonicurlhandler.h b/src/subsonic/subsonicurlhandler.h
index 8086178a1..25d2e1ff0 100644
--- a/src/subsonic/subsonicurlhandler.h
+++ b/src/subsonic/subsonicurlhandler.h
@@ -24,9 +24,7 @@
 
 #include <QObject>
 #include <QPair>
-#include <QSet>
 #include <QList>
-#include <QByteArray>
 #include <QString>
 #include <QUrl>
 
diff --git a/src/tidal/tidalbaserequest.cpp b/src/tidal/tidalbaserequest.cpp
index 55d70f59f..25efc1852 100644
--- a/src/tidal/tidalbaserequest.cpp
+++ b/src/tidal/tidalbaserequest.cpp
@@ -33,7 +33,6 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/tidal/tidalfavoriterequest.cpp b/src/tidal/tidalfavoriterequest.cpp
index 380fa0cdc..56eb9670b 100644
--- a/src/tidal/tidalfavoriterequest.cpp
+++ b/src/tidal/tidalfavoriterequest.cpp
@@ -21,8 +21,6 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QPair>
-#include <QList>
 #include <QMap>
 #include <QMultiMap>
 #include <QByteArray>
@@ -32,7 +30,6 @@
 #include <QUrlQuery>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/tidal/tidalfavoriterequest.h b/src/tidal/tidalfavoriterequest.h
index e337c1c4f..c95d3d5fc 100644
--- a/src/tidal/tidalfavoriterequest.h
+++ b/src/tidal/tidalfavoriterequest.h
@@ -24,7 +24,6 @@
 
 #include <QObject>
 #include <QList>
-#include <QMap>
 #include <QVariant>
 #include <QString>
 
diff --git a/src/tidal/tidalrequest.cpp b/src/tidal/tidalrequest.cpp
index af2dbbef8..74829bca8 100644
--- a/src/tidal/tidalrequest.cpp
+++ b/src/tidal/tidalrequest.cpp
@@ -30,7 +30,6 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
@@ -38,7 +37,6 @@
 #include "core/timeconstants.h"
 #include "core/application.h"
 #include "core/imageutils.h"
-#include "covermanager/albumcoverloader.h"
 #include "tidalservice.h"
 #include "tidalurlhandler.h"
 #include "tidalbaserequest.h"
diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp
index 95fbc26af..9ffedf5c9 100644
--- a/src/tidal/tidalservice.cpp
+++ b/src/tidal/tidalservice.cpp
@@ -26,9 +26,7 @@
 #include <QDesktopServices>
 #include <QCryptographicHash>
 #include <QByteArray>
-#include <QPair>
 #include <QList>
-#include <QMap>
 #include <QString>
 #include <QChar>
 #include <QUrl>
@@ -42,7 +40,6 @@
 #include <QJsonObject>
 #include <QSettings>
 #include <QSortFilterProxyModel>
-#include <QtDebug>
 
 #include "core/application.h"
 #include "core/player.h"
diff --git a/src/tidal/tidalstreamurlrequest.cpp b/src/tidal/tidalstreamurlrequest.cpp
index 1bcfd983c..cbbad6d6f 100644
--- a/src/tidal/tidalstreamurlrequest.cpp
+++ b/src/tidal/tidalstreamurlrequest.cpp
@@ -20,11 +20,7 @@
 #include "config.h"
 
 #include <QObject>
-#include <QStandardPaths>
 #include <QMimeDatabase>
-#include <QMimeType>
-#include <QIODevice>
-#include <QFile>
 #include <QFileInfo>
 #include <QDir>
 #include <QList>
@@ -36,7 +32,6 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QXmlStreamReader>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/networkaccessmanager.h"
diff --git a/src/transcoder/transcodedialog.cpp b/src/transcoder/transcodedialog.cpp
index 6dfa9a2a4..78d4034c8 100644
--- a/src/transcoder/transcodedialog.cpp
+++ b/src/transcoder/transcodedialog.cpp
@@ -28,7 +28,6 @@
 #include <QDialog>
 #include <QScreen>
 #include <QWindow>
-#include <QGuiApplication>
 #include <QMainWindow>
 #include <QAbstractItemModel>
 #include <QtAlgorithms>
diff --git a/src/transcoder/transcoder.cpp b/src/transcoder/transcoder.cpp
index c6d6773a0..2c42aea07 100644
--- a/src/transcoder/transcoder.cpp
+++ b/src/transcoder/transcoder.cpp
@@ -23,7 +23,6 @@
 
 #include <glib.h>
 #include <glib/gtypes.h>
-#include <cstdlib>
 #include <memory>
 #include <algorithm>
 #include <gst/gst.h>
@@ -40,7 +39,6 @@
 #include <QVariant>
 #include <QString>
 #include <QSettings>
-#include <QtDebug>
 
 #include "core/logging.h"
 #include "core/signalchecker.h"
diff --git a/src/transcoder/transcoderoptionsaac.cpp b/src/transcoder/transcoderoptionsaac.cpp
index 2d35bedbb..a2646f3c4 100644
--- a/src/transcoder/transcoderoptionsaac.cpp
+++ b/src/transcoder/transcoderoptionsaac.cpp
@@ -20,9 +20,7 @@
 
 #include "config.h"
 
-#include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QSlider>
diff --git a/src/transcoder/transcoderoptionsasf.cpp b/src/transcoder/transcoderoptionsasf.cpp
index debb868bd..51a5fd4f6 100644
--- a/src/transcoder/transcoderoptionsasf.cpp
+++ b/src/transcoder/transcoderoptionsasf.cpp
@@ -21,9 +21,7 @@
 #include "config.h"
 
 #include <QWidget>
-#include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QSlider>
 #include <QSettings>
 
diff --git a/src/transcoder/transcoderoptionsdialog.cpp b/src/transcoder/transcoderoptionsdialog.cpp
index cd71b14af..cc4b923b2 100644
--- a/src/transcoder/transcoderoptionsdialog.cpp
+++ b/src/transcoder/transcoderoptionsdialog.cpp
@@ -24,7 +24,6 @@
 #include <QWidget>
 #include <QDialog>
 #include <QString>
-#include <QStringBuilder>
 #include <QBoxLayout>
 #include <QLayout>
 
diff --git a/src/transcoder/transcoderoptionsflac.cpp b/src/transcoder/transcoderoptionsflac.cpp
index 51856f538..5c6e5f2b7 100644
--- a/src/transcoder/transcoderoptionsflac.cpp
+++ b/src/transcoder/transcoderoptionsflac.cpp
@@ -21,9 +21,7 @@
 #include "config.h"
 
 #include <QWidget>
-#include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QSlider>
 #include <QSettings>
 
diff --git a/src/transcoder/transcoderoptionsmp3.cpp b/src/transcoder/transcoderoptionsmp3.cpp
index fcf22c945..d47c236d2 100644
--- a/src/transcoder/transcoderoptionsmp3.cpp
+++ b/src/transcoder/transcoderoptionsmp3.cpp
@@ -22,7 +22,6 @@
 
 #include <QWidget>
 #include <QVariant>
-#include <QStringBuilder>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QRadioButton>
diff --git a/src/transcoder/transcoderoptionsopus.cpp b/src/transcoder/transcoderoptionsopus.cpp
index f3ad9126a..ae9c39735 100644
--- a/src/transcoder/transcoderoptionsopus.cpp
+++ b/src/transcoder/transcoderoptionsopus.cpp
@@ -21,9 +21,7 @@
 #include "config.h"
 
 #include <QWidget>
-#include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QSlider>
 #include <QSettings>
 
diff --git a/src/transcoder/transcoderoptionsspeex.cpp b/src/transcoder/transcoderoptionsspeex.cpp
index 534dfece7..2c15fbb85 100644
--- a/src/transcoder/transcoderoptionsspeex.cpp
+++ b/src/transcoder/transcoderoptionsspeex.cpp
@@ -21,9 +21,7 @@
 #include "config.h"
 
 #include <QWidget>
-#include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QSlider>
diff --git a/src/transcoder/transcoderoptionsvorbis.cpp b/src/transcoder/transcoderoptionsvorbis.cpp
index e0bb96d32..0c7e0d750 100644
--- a/src/transcoder/transcoderoptionsvorbis.cpp
+++ b/src/transcoder/transcoderoptionsvorbis.cpp
@@ -21,9 +21,7 @@
 #include "config.h"
 
 #include <QWidget>
-#include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QCheckBox>
 #include <QSlider>
 #include <QSettings>
diff --git a/src/widgets/autoexpandingtreeview.cpp b/src/widgets/autoexpandingtreeview.cpp
index 7b1baae96..ba7c02810 100644
--- a/src/widgets/autoexpandingtreeview.cpp
+++ b/src/widgets/autoexpandingtreeview.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#include "config.h"
-
 #include <QWidget>
 #include <QMimeData>
 #include <QTreeView>
diff --git a/src/widgets/autoexpandingtreeview.h b/src/widgets/autoexpandingtreeview.h
index 8a6e00540..752386f95 100644
--- a/src/widgets/autoexpandingtreeview.h
+++ b/src/widgets/autoexpandingtreeview.h
@@ -22,8 +22,6 @@
 #ifndef AUTOEXPANDINGTREEVIEW_H
 #define AUTOEXPANDINGTREEVIEW_H
 
-#include "config.h"
-
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
diff --git a/src/widgets/busyindicator.cpp b/src/widgets/busyindicator.cpp
index 613b5ea01..4d490bd75 100644
--- a/src/widgets/busyindicator.cpp
+++ b/src/widgets/busyindicator.cpp
@@ -18,8 +18,6 @@
  *
  */
 
-#include "config.h"
-
 #include <QWidget>
 #include <QString>
 #include <QMovie>
diff --git a/src/widgets/busyindicator.h b/src/widgets/busyindicator.h
index 30860e156..8e7007fe3 100644
--- a/src/widgets/busyindicator.h
+++ b/src/widgets/busyindicator.h
@@ -21,8 +21,6 @@
 #ifndef BUSYINDICATOR_H
 #define BUSYINDICATOR_H
 
-#include "config.h"
-
 #include <QObject>
 #include <QWidget>
 #include <QString>
diff --git a/src/widgets/clickablelabel.cpp b/src/widgets/clickablelabel.cpp
index 026fbcb9b..ba4b2bd67 100644
--- a/src/widgets/clickablelabel.cpp
+++ b/src/widgets/clickablelabel.cpp
@@ -15,8 +15,6 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "config.h"
-
 #include "clickablelabel.h"
 
 #include <QWidget>
diff --git a/src/widgets/clickablelabel.h b/src/widgets/clickablelabel.h
index 97b827641..031423ed4 100644
--- a/src/widgets/clickablelabel.h
+++ b/src/widgets/clickablelabel.h
@@ -18,8 +18,6 @@
 #ifndef CLICKABLELABEL_H
 #define CLICKABLELABEL_H
 
-#include "config.h"
-
 #include <QObject>
 #include <QString>
 #include <QLabel>
diff --git a/src/widgets/fancytabwidget.cpp b/src/widgets/fancytabwidget.cpp
index 68a90b4ed..c622978e9 100644
--- a/src/widgets/fancytabwidget.cpp
+++ b/src/widgets/fancytabwidget.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#include "config.h"
-
 #include <algorithm>
 #include <utility>
 #include <chrono>
@@ -54,7 +52,6 @@
 #include <QSettings>
 #include <QPixmapCache>
 #include <QLayout>
-#include <QBoxLayout>
 #include <QtEvents>
 #include <QStyle>
 #include <QCommonStyle>
diff --git a/src/widgets/fancytabwidget.h b/src/widgets/fancytabwidget.h
index 82697e27d..b5d49e29a 100644
--- a/src/widgets/fancytabwidget.h
+++ b/src/widgets/fancytabwidget.h
@@ -22,8 +22,6 @@
 #ifndef FANCYTABWIDGET_H
 #define FANCYTABWIDGET_H
 
-#include "config.h"
-
 #include <QObject>
 #include <QTabWidget>
 #include <QHash>
diff --git a/src/widgets/favoritewidget.cpp b/src/widgets/favoritewidget.cpp
index d68a76671..f78d00caa 100644
--- a/src/widgets/favoritewidget.cpp
+++ b/src/widgets/favoritewidget.cpp
@@ -18,8 +18,6 @@
  *
  */
 
-#include "config.h"
-
 #include <QtGlobal>
 #include <QWidget>
 #include <QSize>
diff --git a/src/widgets/favoritewidget.h b/src/widgets/favoritewidget.h
index 54c7bf562..1d780a329 100644
--- a/src/widgets/favoritewidget.h
+++ b/src/widgets/favoritewidget.h
@@ -21,8 +21,6 @@
 #ifndef FAVORITEWIDGET_H
 #define FAVORITEWIDGET_H
 
-#include "config.h"
-
 #include <QObject>
 #include <QWidget>
 #include <QString>
diff --git a/src/widgets/fileview.cpp b/src/widgets/fileview.cpp
index 826a29036..0b94fe6ec 100644
--- a/src/widgets/fileview.cpp
+++ b/src/widgets/fileview.cpp
@@ -18,8 +18,6 @@
  *
  */
 
-#include "config.h"
-
 #include <QWidget>
 #include <QUndoStack>
 #include <QDir>
diff --git a/src/widgets/fileview.h b/src/widgets/fileview.h
index e786ae52d..e81ada981 100644
--- a/src/widgets/fileview.h
+++ b/src/widgets/fileview.h
@@ -21,8 +21,6 @@
 #ifndef FILEVIEW_H
 #define FILEVIEW_H
 
-#include "config.h"
-
 #include <memory>
 
 #include <QObject>
diff --git a/src/widgets/fileviewlist.cpp b/src/widgets/fileviewlist.cpp
index 5f4d49520..6c803df4d 100644
--- a/src/widgets/fileviewlist.cpp
+++ b/src/widgets/fileviewlist.cpp
@@ -18,8 +18,6 @@
  *
  */
 
-#include "config.h"
-
 #include <algorithm>
 
 #include <QWidget>
diff --git a/src/widgets/fileviewlist.h b/src/widgets/fileviewlist.h
index aec2c3ad9..925ca9728 100644
--- a/src/widgets/fileviewlist.h
+++ b/src/widgets/fileviewlist.h
@@ -21,8 +21,6 @@
 #ifndef FILEVIEWLIST_H
 #define FILEVIEWLIST_H
 
-#include "config.h"
-
 #include <QObject>
 #include <QListView>
 #include <QItemSelectionModel>
diff --git a/src/widgets/forcescrollperpixel.cpp b/src/widgets/forcescrollperpixel.cpp
index b6a22bcd3..3e365318d 100644
--- a/src/widgets/forcescrollperpixel.cpp
+++ b/src/widgets/forcescrollperpixel.cpp
@@ -18,8 +18,6 @@
  *
  */
 
-#include "config.h"
-
 #include <QObject>
 #include <QAbstractItemView>
 #include <QScrollBar>
diff --git a/src/widgets/forcescrollperpixel.h b/src/widgets/forcescrollperpixel.h
index e85ff3d28..26870e689 100644
--- a/src/widgets/forcescrollperpixel.h
+++ b/src/widgets/forcescrollperpixel.h
@@ -21,8 +21,6 @@
 #ifndef FORCESCROLLPERPIXEL_H
 #define FORCESCROLLPERPIXEL_H
 
-#include "config.h"
-
 #include <QObject>
 
 class QAbstractItemView;
diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
index c91352b79..41e400fde 100644
--- a/src/widgets/freespacebar.cpp
+++ b/src/widgets/freespacebar.cpp
@@ -18,8 +18,6 @@
  *
  */
 
-#include "config.h"
-
 #include <QtGlobal>
 #include <QWidget>
 #include <QList>
diff --git a/src/widgets/freespacebar.h b/src/widgets/freespacebar.h
index a9a9546fc..3481564ad 100644
--- a/src/widgets/freespacebar.h
+++ b/src/widgets/freespacebar.h
@@ -21,8 +21,6 @@
 #ifndef FREESPACEBAR_H
 #define FREESPACEBAR_H
 
-#include "config.h"
-
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
diff --git a/src/widgets/groupediconview.cpp b/src/widgets/groupediconview.cpp
index 9b9612ef6..5dc322038 100644
--- a/src/widgets/groupediconview.cpp
+++ b/src/widgets/groupediconview.cpp
@@ -18,9 +18,6 @@
  *
  */
 
-#include "config.h"
-
-#include <QtGlobal>
 #include <QWidget>
 #include <QListView>
 #include <QAbstractItemModel>
@@ -28,8 +25,6 @@
 #include <QAbstractItemDelegate>
 #include <QItemSelectionModel>
 #include <QList>
-#include <QArrayData>
-#include <QVariant>
 #include <QString>
 #include <QFont>
 #include <QFontMetrics>
diff --git a/src/widgets/groupediconview.h b/src/widgets/groupediconview.h
index 4558c887c..20aa0343a 100644
--- a/src/widgets/groupediconview.h
+++ b/src/widgets/groupediconview.h
@@ -21,8 +21,6 @@
 #ifndef GROUPEDICONVIEW_H
 #define GROUPEDICONVIEW_H
 
-#include "config.h"
-
 #include <QObject>
 #include <QListView>
 #include <QAbstractItemModel>
diff --git a/src/widgets/lineedit.cpp b/src/widgets/lineedit.cpp
index 39c658407..068ad0297 100644
--- a/src/widgets/lineedit.cpp
+++ b/src/widgets/lineedit.cpp
@@ -19,9 +19,6 @@
  *
  */
 
-#include "config.h"
-
-#include <QtGlobal>
 #include <QWidget>
 #include <QString>
 #include <QFont>
diff --git a/src/widgets/lineedit.h b/src/widgets/lineedit.h
index 670d1a36e..056cc34ab 100644
--- a/src/widgets/lineedit.h
+++ b/src/widgets/lineedit.h
@@ -22,8 +22,6 @@
 #ifndef LINEEDIT_H
 #define LINEEDIT_H
 
-#include "config.h"
-
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
diff --git a/src/widgets/linetextedit.cpp b/src/widgets/linetextedit.cpp
index f74053dff..120ee5881 100644
--- a/src/widgets/linetextedit.cpp
+++ b/src/widgets/linetextedit.cpp
@@ -18,8 +18,6 @@
 
  */
 
-#include "config.h"
-
 #include <QtGlobal>
 #include <QWidget>
 #include <QSize>
diff --git a/src/widgets/linetextedit.h b/src/widgets/linetextedit.h
index aa26dba14..9109030d2 100644
--- a/src/widgets/linetextedit.h
+++ b/src/widgets/linetextedit.h
@@ -21,8 +21,6 @@
 #ifndef LINETEXTEDIT_H
 #define LINETEXTEDIT_H
 
-#include "config.h"
-
 #include <QObject>
 #include <QSize>
 #include <QString>
diff --git a/src/widgets/loginstatewidget.cpp b/src/widgets/loginstatewidget.cpp
index 2564dbae2..b8b34f947 100644
--- a/src/widgets/loginstatewidget.cpp
+++ b/src/widgets/loginstatewidget.cpp
@@ -18,8 +18,6 @@
 
 */
 
-#include "config.h"
-
 #include "loginstatewidget.h"
 #include "ui_loginstatewidget.h"
 #include "core/iconloader.h"
diff --git a/src/widgets/loginstatewidget.h b/src/widgets/loginstatewidget.h
index 4c31763a9..113cffb62 100644
--- a/src/widgets/loginstatewidget.h
+++ b/src/widgets/loginstatewidget.h
@@ -21,8 +21,6 @@
 #ifndef LOGINSTATEWIDGET_H
 #define LOGINSTATEWIDGET_H
 
-#include "config.h"
-
 #include <QWidget>
 #include <QObject>
 #include <QList>
diff --git a/src/widgets/multiloadingindicator.cpp b/src/widgets/multiloadingindicator.cpp
index d2eb079ab..55ff8c9b9 100644
--- a/src/widgets/multiloadingindicator.cpp
+++ b/src/widgets/multiloadingindicator.cpp
@@ -18,8 +18,6 @@
  *
  */
 
-#include "config.h"
-
 #include <QtGlobal>
 #include <QWidget>
 #include <QList>
@@ -29,8 +27,6 @@
 #include <QSize>
 #include <QRect>
 #include <QSizePolicy>
-#include <QStringList>
-#include <QFontMetrics>
 #include <QPaintEvent>
 
 #include "core/taskmanager.h"
diff --git a/src/widgets/multiloadingindicator.h b/src/widgets/multiloadingindicator.h
index 79fd58e4b..ccd1ea711 100644
--- a/src/widgets/multiloadingindicator.h
+++ b/src/widgets/multiloadingindicator.h
@@ -21,8 +21,6 @@
 #ifndef MULTILOADINGINDICATOR_H
 #define MULTILOADINGINDICATOR_H
 
-#include "config.h"
-
 #include <QObject>
 #include <QWidget>
 #include <QSize>
diff --git a/src/widgets/playingwidget.cpp b/src/widgets/playingwidget.cpp
index 0ba3bf64d..535bd3694 100644
--- a/src/widgets/playingwidget.cpp
+++ b/src/widgets/playingwidget.cpp
@@ -19,25 +19,19 @@
  *
  */
 
-#include "config.h"
-
 #include <memory>
 
 #include <QtGlobal>
 #include <QWidget>
 #include <QList>
 #include <QByteArray>
-#include <QVariant>
 #include <QString>
-#include <QUrl>
 #include <QImage>
 #include <QPixmap>
 #include <QSize>
 #include <QMenu>
 #include <QMovie>
 #include <QPainter>
-#include <QPalette>
-#include <QBrush>
 #include <QTextDocument>
 #include <QTimeLine>
 #include <QAction>
diff --git a/src/widgets/playingwidget.h b/src/widgets/playingwidget.h
index df024c9a0..ee17259d5 100644
--- a/src/widgets/playingwidget.h
+++ b/src/widgets/playingwidget.h
@@ -22,15 +22,12 @@
 #ifndef PLAYINGWIDGET_H
 #define PLAYINGWIDGET_H
 
-#include "config.h"
-
 #include <memory>
 
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
 #include <QString>
-#include <QUrl>
 #include <QImage>
 #include <QPixmap>
 #include <QSize>
diff --git a/src/widgets/renametablineedit.cpp b/src/widgets/renametablineedit.cpp
index 8b1ec377b..c84ebfdd8 100644
--- a/src/widgets/renametablineedit.cpp
+++ b/src/widgets/renametablineedit.cpp
@@ -18,8 +18,6 @@
  *
  */
 
-#include "config.h"
-
 #include <QtGlobal>
 #include <QWidget>
 #include <QLineEdit>
diff --git a/src/widgets/renametablineedit.h b/src/widgets/renametablineedit.h
index 6a97a2c01..51df74110 100644
--- a/src/widgets/renametablineedit.h
+++ b/src/widgets/renametablineedit.h
@@ -21,8 +21,6 @@
 #ifndef RENAMETABLINEEDIT_H
 #define RENAMETABLINEEDIT_H
 
-#include "config.h"
-
 #include <QObject>
 #include <QWidget>
 #include <QString>
diff --git a/src/widgets/stickyslider.cpp b/src/widgets/stickyslider.cpp
index 12604d860..d7d31c9ff 100644
--- a/src/widgets/stickyslider.cpp
+++ b/src/widgets/stickyslider.cpp
@@ -18,8 +18,6 @@
  *
  */
 
-#include "config.h"
-
 #include <QWidget>
 #include <QSlider>
 #include <QMouseEvent>
diff --git a/src/widgets/stickyslider.h b/src/widgets/stickyslider.h
index f40f5ef5f..4dd9cc7c9 100644
--- a/src/widgets/stickyslider.h
+++ b/src/widgets/stickyslider.h
@@ -21,8 +21,6 @@
 #ifndef STICKYSLIDER_H
 #define STICKYSLIDER_H
 
-#include "config.h"
-
 #include <QObject>
 #include <QWidget>
 #include <QSlider>
diff --git a/src/widgets/stretchheaderview.cpp b/src/widgets/stretchheaderview.cpp
index e74da201e..6093daed4 100644
--- a/src/widgets/stretchheaderview.cpp
+++ b/src/widgets/stretchheaderview.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#include "config.h"
-
 #include <algorithm>
 #include <numeric>
 
@@ -29,7 +27,6 @@
 #include <QHeaderView>
 #include <QAbstractItemModel>
 #include <QIODevice>
-#include <QArrayData>
 #include <QByteArray>
 #include <QDataStream>
 #include <QList>
diff --git a/src/widgets/stretchheaderview.h b/src/widgets/stretchheaderview.h
index 3350441d8..ff0e3ae3a 100644
--- a/src/widgets/stretchheaderview.h
+++ b/src/widgets/stretchheaderview.h
@@ -22,8 +22,6 @@
 #ifndef STRETCHHEADERVIEW_H
 #define STRETCHHEADERVIEW_H
 
-#include "config.h"
-
 #include <QObject>
 #include <QByteArray>
 #include <QHeaderView>
diff --git a/src/widgets/trackslider.cpp b/src/widgets/trackslider.cpp
index e17f75331..fd7e438b6 100644
--- a/src/widgets/trackslider.cpp
+++ b/src/widgets/trackslider.cpp
@@ -24,7 +24,6 @@
 #include <QWidget>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QSize>
 #include <QLabel>
 #include <QSettings>
diff --git a/src/widgets/tracksliderpopup.cpp b/src/widgets/tracksliderpopup.cpp
index 7aaaa0155..f2cb219f6 100644
--- a/src/widgets/tracksliderpopup.cpp
+++ b/src/widgets/tracksliderpopup.cpp
@@ -18,8 +18,6 @@
  *
  */
 
-#include "config.h"
-
 #include <QtGlobal>
 #include <QWidget>
 #include <QString>
@@ -31,7 +29,6 @@
 #include <QPalette>
 #include <QBrush>
 #include <QRect>
-#include <QVector>
 #include <QPoint>
 #include <QPolygon>
 #include <QPaintEvent>
diff --git a/src/widgets/tracksliderpopup.h b/src/widgets/tracksliderpopup.h
index d11b924c2..3cdbc6ede 100644
--- a/src/widgets/tracksliderpopup.h
+++ b/src/widgets/tracksliderpopup.h
@@ -21,8 +21,6 @@
 #ifndef TRACKSLIDERPOPUP_H
 #define TRACKSLIDERPOPUP_H
 
-#include "config.h"
-
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
diff --git a/src/widgets/tracksliderslider.cpp b/src/widgets/tracksliderslider.cpp
index c2820c61b..cd91f7b0e 100644
--- a/src/widgets/tracksliderslider.cpp
+++ b/src/widgets/tracksliderslider.cpp
@@ -18,8 +18,6 @@
  *
  */
 
-#include "config.h"
-
 #include <QWidget>
 #include <QSlider>
 #include <QPoint>
diff --git a/src/widgets/tracksliderslider.h b/src/widgets/tracksliderslider.h
index a1560a0a3..68003613c 100644
--- a/src/widgets/tracksliderslider.h
+++ b/src/widgets/tracksliderslider.h
@@ -21,8 +21,6 @@
 #ifndef TRACKSLIDERSLIDER_H
 #define TRACKSLIDERSLIDER_H
 
-#include "config.h"
-
 #include <QObject>
 #include <QString>
 #include <QSlider>
diff --git a/src/widgets/volumeslider.cpp b/src/widgets/volumeslider.cpp
index 946ddc15b..a21693caa 100644
--- a/src/widgets/volumeslider.cpp
+++ b/src/widgets/volumeslider.cpp
@@ -17,15 +17,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "config.h"
-
 #include "volumeslider.h"
 
 #include <QApplication>
 #include <QWidget>
 #include <QHash>
 #include <QString>
-#include <QStringBuilder>
 #include <QImage>
 #include <QPainter>
 #include <QPainterPath>
@@ -36,7 +33,6 @@
 #include <QPoint>
 #include <QPolygon>
 #include <QRect>
-#include <QVector>
 #include <QMenu>
 #include <QStyle>
 #include <QStyleOption>
diff --git a/src/widgets/volumeslider.h b/src/widgets/volumeslider.h
index cf356eb35..a8630c1e3 100644
--- a/src/widgets/volumeslider.h
+++ b/src/widgets/volumeslider.h
@@ -20,8 +20,6 @@
 #ifndef VOLUMESLIDER_H
 #define VOLUMESLIDER_H
 
-#include "config.h"
-
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>