Reduce includes

src/core/dbusscreensaver.h

@@ -26,7 +26,6 @@
 #include <QtGlobal>
 #include <QString>
 
-#include "config.h"
 #include "screensaver.h"
 
 class DBusScreensaver : public Screensaver {

src/core/mpris.h

@@ -30,7 +30,6 @@ class Application;
 
 namespace mpris {
 
-class Mpris1;
 class Mpris2;
 
 class Mpris : public QObject {

src/core/mpris2.cpp

@@ -26,6 +26,7 @@
 
 #include <QApplication>
 #include <QCoreApplication>
+#include <QGuiApplication>
 #include <QObject>
 #include <QFile>
 #include <QList>
@@ -35,6 +36,7 @@
 #include <QString>
 #include <QStringList>
 #include <QUrl>
+#include <QImage>
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <QDBusArgument>

src/core/mpris2.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QList>
@@ -34,7 +33,6 @@
 #include <QString>
 #include <QStringList>
 #include <QImage>
-#include <QVector>
 #include <QtDBus>
 #include <QDBusArgument>
 #include <qdbusextratypes.h>

src/covermanager/albumcoverchoicecontroller.cpp

@@ -28,14 +28,13 @@
 #include <QWidget>
 #include <QDialog>
 #include <QDir>
+#include <QFile>
 #include <QFileInfo>
-#include <QList>
-#include <QSet>
 #include <QMimeData>
-#include <QByteArray>
+#include <QSet>
+#include <QList>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QRegExp>
 #include <QUrl>
 #include <QImage>
@@ -43,12 +42,12 @@
 #include <QPixmap>
 #include <QIcon>
 #include <QRect>
-#include <QAction>
 #include <QFileDialog>
 #include <QLabel>
+#include <QAction>
+#include <QSettings>
 #include <QtEvents>
 
-#include "core/utilities.h"
 #include "core/song.h"
 #include "core/iconloader.h"
 #include "core/application.h"

src/covermanager/albumcoverchoicecontroller.h

@@ -24,22 +24,24 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
+#include <QSet>
 #include <QList>
 #include <QMap>
-#include <QSet>
 #include <QString>
+#include <QUrl>
 #include <QImage>
-#include <QAction>
-#include <QFileDialog>
-#include <QtEvents>
 
+#include "core/song.h"
 #include "settings/collectionsettingspage.h"
 
-class Song;
+class QFileDialog;
+class QAction;
+class QDragEnterEvent;
+class QDropEvent;
+
 class Application;
 class AlbumCoverFetcher;
 class AlbumCoverSearcher;

src/covermanager/albumcoverexport.h

@@ -23,12 +23,11 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
 #include <QString>
 
+class QWidget;
 class Ui_AlbumCoverExport;
 
 // Controller for the "Export covers" dialog.

src/covermanager/albumcoverexporter.cpp

@@ -24,6 +24,7 @@
 #include <QThreadPool>
 
 #include "core/song.h"
+#include "albumcoverexport.h"
 #include "albumcoverexporter.h"
 #include "coverexportrunnable.h"
 

src/covermanager/albumcoverexporter.h

@@ -24,12 +24,12 @@
 #include "config.h"
 
 #include <QObject>
-#include <QThreadPool>
 #include <QQueue>
 #include <QString>
 
 #include "albumcoverexport.h"
 
+class QThreadPool;
 class Song;
 class CoverExportRunnable;
 

src/covermanager/albumcoverfetchersearch.cpp

@@ -24,7 +24,6 @@
 #include <cmath>
 
 #include <QObject>
-#include <QtAlgorithms>
 #include <QTimer>
 #include <QList>
 #include <QString>
@@ -37,7 +36,6 @@
 
 #include "core/closure.h"
 #include "core/logging.h"
-#include "core/network.h"
 #include "core/networktimeouts.h"
 #include "albumcoverfetcher.h"
 #include "albumcoverfetchersearch.h"

src/covermanager/albumcoverfetchersearch.h

@@ -23,19 +23,18 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
-#include <QList>
-#include <QMap>
 #include <QPair>
+#include <QMap>
 #include <QString>
+#include <QUrl>
 #include <QImage>
-#include <QNetworkAccessManager>
 
 #include "albumcoverfetcher.h"
 #include "coversearchstatistics.h"
 
+class QNetworkAccessManager;
 class QNetworkReply;
 class CoverProvider;
 class CoverProviders;

src/covermanager/albumcoverloader.cpp

@@ -27,18 +27,16 @@
 #include <QDir>
 #include <QThread>
 #include <QMutex>
+#include <QSet>
 #include <QList>
 #include <QQueue>
-#include <QSet>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QUrl>
 #include <QImage>
 #include <QPixmap>
 #include <QPainter>
 #include <QSize>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QSettings>

src/covermanager/albumcoverloader.h

@@ -24,24 +24,22 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QMutex>
-#include <QQueue>
-#include <QMap>
 #include <QSet>
+#include <QMap>
+#include <QQueue>
 #include <QString>
 #include <QImage>
 #include <QPixmap>
-#include <QNetworkReply>
 
 #include "core/song.h"
 #include "settings/collectionsettingspage.h"
 #include "albumcoverloaderoptions.h"
 
 class QThread;
-class Song;
+class QNetworkReply;
 class NetworkAccessManager;
 
 class AlbumCoverLoader : public QObject {
@@ -117,7 +115,7 @@ class AlbumCoverLoader : public QObject {
 
   QMutex mutex_;
   QQueue<Task> tasks_;
-  QMap<QNetworkReply *, Task> remote_tasks_;
+  QMap<QNetworkReply*, Task> remote_tasks_;
   quint64 next_id_;
 
   NetworkAccessManager *network_;

src/covermanager/albumcoversearcher.cpp

@@ -20,15 +20,13 @@
 
 #include "config.h"
 
-
 #include <QWidget>
 #include <QDialog>
-#include <QStandardItem>
 #include <QStandardItemModel>
 #include <QAbstractItemModel>
 #include <QStyledItemDelegate>
 #include <QStyleOptionViewItem>
-#include <QSize>
+#include <QStandardItem>
 #include <QList>
 #include <QVariant>
 #include <QString>
@@ -41,6 +39,7 @@
 #include <QFontMetrics>
 #include <QColor>
 #include <QRect>
+#include <QSize>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QKeySequence>
@@ -55,6 +54,7 @@
 #include "albumcoversearcher.h"
 #include "albumcoverfetcher.h"
 #include "albumcoverloader.h"
+#include "albumcoverloaderoptions.h"
 #include "ui_albumcoversearcher.h"
 
 const int SizeOverlayDelegate::kMargin = 4;

src/covermanager/albumcoversearcher.h

@@ -25,24 +25,24 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
-#include <QStandardItem>
-#include <QStandardItemModel>
+#include <QStyleOption>
+#include <QStyledItemDelegate>
+#include <QStyleOptionViewItem>
 #include <QMap>
 #include <QString>
 #include <QImage>
 #include <QIcon>
-#include <QPainter>
-#include <QStyleOption>
-#include <QStyledItemDelegate>
-#include <QStyleOptionViewItem>
-#include <QtEvents>
 
 #include "albumcoverfetcher.h"
 #include "albumcoverloaderoptions.h"
 
+class QWidget;
+class QStandardItem;
+class QStandardItemModel;
+class QPainter;
 class QModelIndex;
+class QKeyEvent;
 
 class Application;
 class Ui_AlbumCoverSearcher;
@@ -83,7 +83,7 @@ public:
   QImage Exec(const QString &artist, const QString &album);
 
 protected:
-  void keyPressEvent(QKeyEvent *);
+  void keyPressEvent(QKeyEvent*);
 
 private slots:
   void Search();

src/covermanager/coverexportrunnable.cpp

@@ -29,6 +29,7 @@
 
 #include "core/song.h"
 #include "core/tagreaderclient.h"
+#include "albumcoverexport.h"
 #include "coverexportrunnable.h"
 
 CoverExportRunnable::CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const Song &song) :

src/covermanager/coverexportrunnable.h

@@ -30,8 +30,6 @@
 #include "core/song.h"
 #include "albumcoverexport.h"
 
-class AlbumCoverExporter;
-
 class CoverExportRunnable : public QObject, public QRunnable {
   Q_OBJECT
 

src/covermanager/coverfromurldialog.h

@@ -24,11 +24,12 @@
 #include "config.h"
 
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
 #include <QString>
 #include <QImage>
 
+class QWidget;
+
 class NetworkAccessManager;
 class Ui_CoverFromURLDialog;
 

src/covermanager/coverprovider.h

@@ -23,9 +23,8 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QString>
 
 #include "albumcoverfetcher.h"

src/covermanager/coverproviders.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QMutex>

src/covermanager/coversearchstatistics.h

@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <QtGlobal>
+#include <QList>
 #include <QMap>
 #include <QString>
 

src/covermanager/coversearchstatisticsdialog.cpp

@@ -22,14 +22,15 @@
 
 #include <algorithm>
 
+#include <QtGlobal>
 #include <QWidget>
+#include <QList>
 #include <QMap>
 #include <QString>
 #include <QStringList>
 #include <QBoxLayout>
 #include <QLabel>
 #include <QFrame>
-#include <QtAlgorithms>
 
 #include "core/utilities.h"
 #include "coversearchstatistics.h"

src/covermanager/coversearchstatisticsdialog.h

@@ -25,9 +25,10 @@
 
 #include <QObject>
 #include <QDialog>
-#include <QWidget>
 #include <QString>
-#include <QBoxLayout>
+
+class QWidget;
+class QVBoxLayout;
 
 class Ui_CoverSearchStatisticsDialog;
 struct CoverSearchStatistics;

src/covermanager/currentalbumcoverloader.cpp

@@ -27,12 +27,12 @@
 #include <QString>
 #include <QStringBuilder>
 #include <QImage>
-#include <QStandardPaths>
 #include <QTemporaryFile>
 
 #include "core/application.h"
 #include "playlist/playlistmanager.h"
 #include "albumcoverloader.h"
+#include "albumcoverloaderoptions.h"
 #include "currentalbumcoverloader.h"
 
 CurrentAlbumCoverLoader::CurrentAlbumCoverLoader(Application *app, QObject *parent)

src/covermanager/deezercoverprovider.cpp

@@ -19,10 +19,10 @@
 
 #include "config.h"
 
-#include <algorithm>
-#include <functional>
-
+#include <QtGlobal>
 #include <QObject>
+#include <QPair>
+#include <QSet>
 #include <QList>
 #include <QVariant>
 #include <QByteArray>
@@ -36,11 +36,13 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
 #include "core/network.h"
 #include "core/logging.h"
+#include "core/song.h"
 #include "albumcoverfetcher.h"
 #include "coverprovider.h"
 #include "deezercoverprovider.h"

src/covermanager/deezercoverprovider.h

@@ -22,19 +22,17 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonValue>
 #include <QJsonObject>
-#include <QJsonArray>
 
 #include "coverprovider.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 
 class DeezerCoverProvider : public CoverProvider {

src/covermanager/discogscoverprovider.cpp

@@ -21,13 +21,17 @@
 
 #include "config.h"
 
+#include <algorithm>
+#include <type_traits>
+
+#include <QtGlobal>
 #include <QObject>
 #include <QByteArray>
 #include <QList>
 #include <QPair>
+#include <QSet>
 #include <QVariant>
 #include <QString>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QUrl>
 #include <QUrlQuery>
@@ -38,6 +42,7 @@
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"

src/covermanager/discogscoverprovider.h

@@ -24,17 +24,20 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QHash>
 #include <QMetaType>
+#include <QHash>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
+#include <QJsonObject>
+#include <QJsonValue>
 
 #include "coverprovider.h"
 #include "albumcoverfetcher.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 
 // This struct represents a single search-for-cover request. It identifies and describes the request.

src/covermanager/lastfmcoverprovider.cpp

@@ -19,14 +19,17 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
+#include <QLocale>
 #include <QList>
 #include <QPair>
+#include <QSet>
 #include <QByteArray>
 #include <QString>
-#include <QStringBuilder>
 #include <QUrl>
 #include <QUrlQuery>
+#include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QCryptographicHash>
@@ -34,6 +37,7 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"

src/covermanager/lastfmcoverprovider.h

@@ -22,19 +22,17 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonValue>
 #include <QJsonObject>
-#include <QJsonArray>
 
 #include "coverprovider.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 
 class LastFmCoverProvider : public CoverProvider {

src/covermanager/musicbrainzcoverprovider.cpp

@@ -19,11 +19,8 @@
 
 #include "config.h"
 
-#include <algorithm>
-#include <functional>
-
+#include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
@@ -36,6 +33,7 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"

src/covermanager/musicbrainzcoverprovider.h

@@ -22,18 +22,16 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QByteArray>
 #include <QVariant>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonObject>
 
 #include "coverprovider.h"
-#include "albumcoverfetcher.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 
 class MusicbrainzCoverProvider : public CoverProvider {

src/covermanager/tidalcoverprovider.cpp

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QList>
 #include <QVariant>
@@ -27,19 +27,21 @@
 #include <QString>
 #include <QUrl>
 #include <QUrlQuery>
+#include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonDocument>
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
 #include "core/network.h"
 #include "core/logging.h"
+#include "core/song.h"
 #include "internet/internetservices.h"
-#include "settings/tidalsettingspage.h"
 #include "tidal/tidalservice.h"
 #include "albumcoverfetcher.h"
 #include "coverprovider.h"

src/covermanager/tidalcoverprovider.h

@@ -22,18 +22,20 @@
 
 #include "config.h"
 
-
 #include <QObject>
+#include <QPair>
+#include <QSet>
+#include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QJsonValue>
 #include <QJsonObject>
 
 #include "coverprovider.h"
 
+class QNetworkAccessManager;
+class QNetworkReply;
 class Application;
 class TidalService;
 

src/device/cddadevice.h

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QString>
 #include <QStringList>

src/device/cddalister.h

@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QMetaType>

src/device/connecteddevice.cpp

@@ -20,6 +20,7 @@
  */
 
 #include <QObject>
+#include <QThread>
 #include <QAbstractItemModel>
 #include <QVariant>
 #include <QString>
@@ -35,6 +36,7 @@
 #include "connecteddevice.h"
 #include "devicelister.h"
 #include "devicemanager.h"
+#include "deviceinfo.h"
 
 ConnectedDevice::ConnectedDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time)
     : QObject(manager),

src/device/devicedatabasebackend.cpp

@@ -23,7 +23,6 @@
 #include <assert.h>
 
 #include <QObject>
-#include <QApplication>
 #include <QThread>
 #include <QMutex>
 #include <QIODevice>
@@ -36,7 +35,6 @@
 
 #include "core/database.h"
 #include "core/scopedtransaction.h"
-#include "core/logging.h"
 #include "devicedatabasebackend.h"
 
 const int DeviceDatabaseBackend::kDeviceSchemaVersion = 1;

src/device/devicedatabasebackend.h

@@ -25,10 +25,9 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QSet>
+#include <QList>
 #include <QString>
-#include <QVector>
 
 #include "core/song.h"
 #include "core/musicstorage.h"

src/device/deviceinfo.cpp

@@ -21,20 +21,18 @@
 
 #include "config.h"
 
-
-#include <QObject>
 #include <QVariant>
+#include <QVariantList>
 #include <QString>
 #include <QStringList>
 #include <QIcon>
 #include <QPixmap>
 
 #include "core/iconloader.h"
-#include "core/logging.h"
-#include "core/simpletreemodel.h"
 
-#include "deviceinfo.h"
+#include "devicelister.h"
 #include "devicedatabasebackend.h"
+#include "deviceinfo.h"
 
 DeviceDatabaseBackend::Device DeviceInfo::SaveToDb() const {
 

src/device/deviceinfo.h

@@ -27,21 +27,19 @@
 #include <memory>
 
 #include <QtGlobal>
-#include <QObject>
+#include <QMetaType>
 #include <QList>
-#include <QVariant>
+#include <QVariantList>
 #include <QString>
-#include <QStringList>
 #include <QIcon>
 
 #include "core/song.h"
 #include "core/musicstorage.h"
 #include "core/simpletreemodel.h"
 #include "core/simpletreeitem.h"
-#include "collection/collectionmodel.h"
 #include "devicedatabasebackend.h"
-#include "devicelister.h"
 
+class DeviceLister;
 class ConnectedDevice;
 
 // Devices can be in three different states:

src/device/devicelister.h

@@ -26,13 +26,14 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QThread>
 #include <QList>
 #include <QMetaType>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 
+class QThread;
+
 class DeviceLister : public QObject {
   Q_OBJECT
 

src/device/devicemanager.cpp

@@ -24,6 +24,7 @@
 #include <memory>
 #include <functional>
 
+#include <QtGlobal>
 #include <QApplication>
 #include <QObject>
 #include <QMetaObject>

src/device/devicemanager.h

@@ -26,7 +26,6 @@
 
 #include <memory>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QMetaObject>
 #include <QThreadPool>
@@ -34,7 +33,6 @@
 #include <QList>
 #include <QMap>
 #include <QMultiMap>
-#include <QMetaType>
 #include <QVariant>
 #include <QString>
 #include <QStringList>
@@ -48,6 +46,9 @@
 #include "devicedatabasebackend.h"
 #include "deviceinfo.h"
 
+class QModelIndex;
+class QPersistentModelIndex;
+
 class Application;
 class ConnectedDevice;
 class DeviceLister;

src/device/deviceproperties.cpp

@@ -29,7 +29,6 @@
 #include <QDialog>
 #include <QtConcurrentRun>
 #include <QFuture>
-#include <QMetaType>
 #include <QMap>
 #include <QSize>
 #include <QByteArray>
@@ -55,7 +54,6 @@
 #include "connecteddevice.h"
 #include "devicelister.h"
 #include "devicemanager.h"
-#include "deviceinfo.h"
 #include "deviceproperties.h"
 #ifdef HAVE_GSTREAMER
 #  include "transcoder/transcoder.h"

src/device/deviceproperties.h

@@ -24,18 +24,17 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QDialog>
-#include <QWidget>
 #include <QFuture>
 #include <QAbstractItemModel>
-#include <QPersistentModelIndex>
 #include <QList>
 #include <QString>
 
 #include "core/song.h"
 
+class QWidget;
+
 class DeviceManager;
 class Ui_DeviceProperties;
 

src/device/devicestatefiltermodel.cpp

@@ -20,6 +20,7 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
 #include <QSortFilterProxyModel>
 #include <QAbstractItemModel>

src/device/devicestatefiltermodel.h

@@ -23,14 +23,15 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QString>
-#include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
 
 #include "devicemanager.h"
 
+class QAbstractItemModel;
+class QModelIndex;
+
 class DeviceStateFilterModel : public QSortFilterProxyModel {
   Q_OBJECT
 

src/device/deviceview.cpp

@@ -50,7 +50,6 @@
 #include <QMessageBox>
 #include <QtEvents>
 
-#include "core/logging.h"
 #include "core/iconloader.h"
 #include "core/application.h"
 #include "core/deletefiles.h"
@@ -65,7 +64,6 @@
 #include "connecteddevice.h"
 #include "devicelister.h"
 #include "devicemanager.h"
-#include "deviceinfo.h"
 #include "deviceproperties.h"
 #include "deviceview.h"
 

src/device/deviceview.h

@@ -27,22 +27,23 @@
 #include <memory>
 
 #include <QObject>
-#include <QWidget>
-#include <QString>
 #include <QStyleOption>
 #include <QStyleOptionViewItem>
-#include <QSortFilterProxyModel>
 #include <QAbstractItemModel>
-#include <QPainter>
-#include <QAction>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QContextMenuEvent>
+#include <QString>
 
 #include "core/song.h"
 #include "collection/collectionitemdelegate.h"
 #include "widgets/autoexpandingtreeview.h"
 
+class QSortFilterProxyModel;
+class QPainter;
+class QWidget;
+class QMenu;
+class QAction;
+class QMouseEvent;
+class QContextMenuEvent;
+
 class Application;
 class DeviceProperties;
 class MergedProxyModel;

src/device/deviceviewcontainer.cpp

@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QWidget>
 
 #include "deviceviewcontainer.h"

src/device/deviceviewcontainer.h

@@ -23,11 +23,9 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QString>
-#include <QShowEvent>
 
 class DeviceView;
 class Ui_DeviceViewContainer;

src/device/filesystemdevice.cpp

@@ -23,9 +23,9 @@
 #include <assert.h>
 
 #include <QThread>
-#include <QVariant>
 #include <QString>
 #include <QUrl>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/logging.h"

src/device/filesystemdevice.h

@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QThread>
 #include <QList>
 #include <QString>
 #include <QStringList>
@@ -34,6 +32,7 @@
 #include "core/filesystemmusicstorage.h"
 #include "connecteddevice.h"
 
+class QThread;
 class Application;
 class CollectionWatcher;
 class DeviceLister;

src/device/gpoddevice.cpp

@@ -32,6 +32,7 @@
 #include <QList>
 #include <QString>
 #include <QUrl>
+#include <QImage>
 #include <QtDebug>
 
 #include "core/logging.h"

src/device/gpoddevice.h

@@ -27,7 +27,6 @@
 
 #include <QObject>
 #include <QMutex>
-#include <QThread>
 #include <QWaitCondition>
 #include <QList>
 #include <QString>
@@ -39,6 +38,7 @@
 #include "connecteddevice.h"
 #include "gpodloader.h"
 
+class QThread;
 class Application;
 class DeviceLister;
 class DeviceManager;

src/device/gpodloader.h

@@ -27,11 +27,11 @@
 #include <gpod/itdb.h>
 
 #include <QObject>
-#include <QThread>
 #include <QString>
 
 #include "core/song.h"
 
+class QThread;
 class TaskManager;
 class CollectionBackend;
 class ConnectedDevice;

src/device/mtpconnection.cpp

@@ -22,7 +22,9 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
 
+#include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QRegExp>

src/device/mtpconnection.h

@@ -28,6 +28,7 @@
 #include <libmtp.h>
 
 #include <QtGlobal>
+#include <QObject>
 #include <QList>
 #include <QUrl>
 

src/device/mtpdevice.cpp

@@ -25,7 +25,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <QtGlobal>
 #include <QThread>
 #include <QMutex>
 #include <QFile>

src/device/mtpdevice.h

@@ -27,7 +27,6 @@
 #include <memory>
 
 #include <QObject>
-#include <QThread>
 #include <QMutex>
 #include <QList>
 #include <QString>
@@ -36,12 +35,12 @@
 
 #include "core/song.h"
 #include "connecteddevice.h"
-#include "mtploader.h"
 
+class QThread;
 class Application;
 class DeviceLister;
 class DeviceManager;
-class DeviceConnection;
+class MtpLoader;
 class MtpConnection;
 struct LIBMTP_mtpdevice_struct;
 

src/device/mtploader.cpp

@@ -28,10 +28,7 @@
 
 #include "core/taskmanager.h"
 #include "core/song.h"
-#include "core/logging.h"
 #include "collection/collectionbackend.h"
-#include "connecteddevice.h"
-#include "mtpdevice.h"
 #include "mtpconnection.h"
 #include "mtploader.h"
 

src/device/mtploader.h

@@ -27,14 +27,12 @@
 #include <memory>
 
 #include <QObject>
-#include <QThread>
 #include <QString>
 #include <QUrl>
 
+class QThread;
 class TaskManager;
 class CollectionBackend;
-class ConnectedDevice;
-class MtpDevice;
 class MtpConnection;
 
 class MtpLoader : public QObject {

src/device/udisks2lister.h

@@ -30,7 +30,6 @@
 #include <QMutex>
 #include <QList>
 #include <QMap>
-#include <QMetaType>
 #include <QReadWriteLock>
 #include <QString>
 #include <QStringList>

src/dialogs/about.cpp

@@ -32,6 +32,7 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QKeySequence>
+#include <QTextBrowser>
 
 #include "about.h"
 #include "ui_about.h"

src/dialogs/about.h

@@ -24,15 +24,15 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
 #include <QDialog>
 #include <QList>
 #include <QString>
 
 #include "ui_about.h"
 
+class QWidget;
+
 class About : public QDialog {
   Q_OBJECT
 

src/dialogs/edittagdialog.cpp

@@ -85,6 +85,7 @@
 #include "edittagdialog.h"
 #include "trackselectiondialog.h"
 #include "ui_edittagdialog.h"
+#include "tagreadermessages.pb.h"
 
 const char *EditTagDialog::kHintText = QT_TR_NOOP("(different across multiple songs)");
 const char *EditTagDialog::kSettingsGroup = "EditTagDialog";

src/dialogs/edittagdialog.h

@@ -23,28 +23,27 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
+#include <QAbstractItemModel>
 #include <QDialog>
-#include <QWidget>
 #include <QFuture>
-#include <QModelIndexList>
 #include <QList>
 #include <QVariant>
 #include <QString>
+#include <QUrl>
 #include <QImage>
-#include <QMenu>
-#include <QAbstractButton>
-#include <QLabel>
-#include <QPushButton>
-#include <QtEvents>
 
 #include "core/song.h"
 #include "core/tagreaderclient.h"
 #include "playlist/playlistitem.h"
 #include "covermanager/albumcoverloaderoptions.h"
 
+class QWidget;
+class QMenu;
+class QLabel;
+class QAbstractButton;
+class QPushButton;
 class QEvent;
 class QShowEvent;
 class QHideEvent;

src/dialogs/trackselectiondialog.h

@@ -21,18 +21,17 @@
 #ifndef TRACKSELECTIONDIALOG_H
 #define TRACKSELECTIONDIALOG_H
 
-
 #include <QObject>
 #include <QDialog>
-#include <QWidget>
 #include <QList>
 #include <QString>
-#include <QTreeWidget>
-#include <QPushButton>
 
 #include "config.h"
 #include "core/song.h"
 
+class QWidget;
+class QTreeWidget;
+class QPushButton;
 class Ui_TrackSelectionDialog;
 
 class TrackSelectionDialog : public QDialog {

src/engine/gstengine.cpp

@@ -43,14 +43,12 @@
 #include <QStringList>
 #include <QUrl>
 #include <QTimeLine>
-#include <QTimerEvent>
 #include <QMetaObject>
 #include <QFlags>
-#include <QSettings>
+#include <QTimerEvent>
 #include <QtDebug>
 
 #include "core/closure.h"
-#include "core/utilities.h"
 #include "core/logging.h"
 #include "core/taskmanager.h"
 #include "core/timeconstants.h"
@@ -60,8 +58,6 @@
 #include "gstenginepipeline.h"
 #include "gstbufferconsumer.h"
 
-#include "settings/backendsettingspage.h"
-
 using std::shared_ptr;
 using std::vector;
 

src/engine/gstengine.h

@@ -34,11 +34,8 @@
 #include <QFuture>
 #include <QByteArray>
 #include <QList>
-#include <QVariant>
 #include <QString>
 #include <QUrl>
-#include <QTimer>
-#include <QTimerEvent>
 
 #include "core/timeconstants.h"
 #include "engine_fwd.h"
@@ -46,6 +43,8 @@
 #include "gststartup.h"
 #include "gstbufferconsumer.h"
 
+class QTimer;
+class QTimerEvent;
 class TaskManager;
 class GstEnginePipeline;
 

src/engine/gstenginepipeline.cpp

@@ -22,6 +22,8 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
+#include <string>
 #include <glib.h>
 #include <glib-object.h>
 #include <gst/gst.h>
@@ -39,13 +41,14 @@
 #include <QUrl>
 #include <QTimeLine>
 #include <QMetaObject>
-#include <QtDebug>
 #include <QUuid>
+#include <QtDebug>
 
 #include "core/concurrentrun.h"
 #include "core/logging.h"
 #include "core/signalchecker.h"
 #include "core/timeconstants.h"
+#include "core/song.h"
 #include "enginebase.h"
 #include "gstengine.h"
 #include "gstenginepipeline.h"

src/engine/gstenginepipeline.h

@@ -38,15 +38,15 @@
 #include <QFuture>
 #include <QTimeLine>
 #include <QBasicTimer>
-#include <QByteArray>
 #include <QList>
+#include <QByteArray>
 #include <QVariant>
 #include <QString>
 #include <QUrl>
-#include <QTimerEvent>
 
 using std::unique_ptr;
 
+class QTimerEvent;
 class GstEngine;
 class GstBufferConsumer;
 class GstElementDeleter;

src/engine/gststartup.cpp

@@ -22,7 +22,6 @@
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QCoreApplication>
 #include <QStandardPaths>

src/engine/gststartup.h

@@ -24,7 +24,6 @@
 
 #include <gst/gst.h>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QFuture>
 

src/engine/vlcengine.cpp

@@ -21,12 +21,13 @@
 
 #include "config.h"
 
-#include <stddef.h>
 #include <vlc/vlc.h>
 
 #include <QtGlobal>
+#include <QVariant>
 #include <QByteArray>
 #include <QUrl>
+#include <QtDebug>
 
 #include "core/timeconstants.h"
 #include "core/taskmanager.h"

src/engine/xineengine.cpp

@@ -27,6 +27,7 @@
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
+#include <errno.h>
 #include <xine.h>
 #ifdef XINE_ANALYZER
 #  include <xine/metronom.h>
@@ -34,20 +35,13 @@
 
 #include <memory>
 #include <cstdlib>
-#include <algorithm>
 #include <climits>
-#include <vector>
 
 #include <QtGlobal>
-#include <QApplication>
-#include <QThread>
 #include <QMutex>
 #include <QByteArray>
 #include <QChar>
-#include <QDir>
-#include <QFile>
 #include <QFileInfo>
-#include <QDateTime>
 #include <QLocale>
 #include <QVariant>
 #include <QString>
@@ -56,7 +50,6 @@
 #include <QUrl>
 #include <QTimer>
 #include <QtDebug>
-#include <QSettings>
 
 #include "core/logging.h"
 #include <core/timeconstants.h>
@@ -68,8 +61,6 @@
 #  include "xinescope.h"
 #endif
 
-#include "settings/backendsettingspage.h"
-
 using std::shared_ptr;
 
 #ifndef LLONG_MAX

src/engine/xineengine.h

@@ -31,8 +31,8 @@
 #include <QObject>
 #include <QMutex>
 #include <QThread>
-#include <QEvent>
 #include <QList>
+#include <QVariant>
 #include <QString>
 #include <QUrl>
 

src/globalshortcuts/globalshortcut-win.cpp

@@ -18,16 +18,10 @@
  */
 
 #include <QtGlobal>
-#include <QObject>
-#include <QAbstractEventDispatcher>
 #include <QByteArray>
 
 #include <qt_windows.h>
 
-#include "core/logging.h"
-
-#include "globalshortcuts.h"
-#include "globalshortcutbackend.h"
 #include "globalshortcut.h"
 #include "keymapper_win.h"
 

src/globalshortcuts/globalshortcut-x11.cpp

@@ -20,20 +20,14 @@
 #include "config.h"
 
 #include <QtGlobal>
-#include <QApplication>
-#include <QObject>
-#include <QAbstractEventDispatcher>
-#include <QDataStream>
+#include <QMap>
 #include <QVector>
 #include <QByteArray>
+#include <QString>
 #include <QX11Info>
 #include <QKeySequence>
-#include <QtAlgorithms>
+#include <QFlags>
 
-#include "core/logging.h"
-
-#include "globalshortcuts.h"
-#include "globalshortcutbackend.h"
 #include "globalshortcut.h"
 #include "keymapper_x11.h"
 

src/globalshortcuts/globalshortcut.cpp

@@ -21,15 +21,14 @@
 
 #include <QtGlobal>
 #include <QObject>
-#include <QApplication>
 #include <QAbstractEventDispatcher>
 #include <QPair>
 #include <QHash>
+#include <QFlags>
 #include <QtDebug>
 
 #include "core/logging.h"
 
-#include "globalshortcutbackend.h"
 #include "globalshortcut.h"
 
 GlobalShortcut *GlobalShortcut::initialized_ = nullptr;

src/globalshortcuts/globalshortcut.h

@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QAbstractNativeEventFilter>
@@ -31,6 +30,7 @@
 #include <QVector>
 #include <QHash>
 #include <QByteArray>
+#include <QString>
 
 class GlobalShortcutBackend;
 

src/globalshortcuts/globalshortcutbackend-gsd.cpp

@@ -30,6 +30,8 @@
 #include <QDBusMessage>
 #include <QDBusPendingCallWatcher>
 #include <QDBusPendingReply>
+#include <QAction>
+#include <QtDebug>
 
 #include "core/closure.h"
 #include "core/logging.h"

src/globalshortcuts/globalshortcutbackend-gsd.h

@@ -23,17 +23,12 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QtGlobal>
-#include <QPair>
-#include <QVector>
-#include <QHash>
 #include <QString>
-#include <QDBusPendingCallWatcher>
 
 #include "globalshortcutbackend.h"
 
+class QDBusPendingCallWatcher;
 class GlobalShortcuts;
 class OrgGnomeSettingsDaemonMediaKeysInterface;
 

src/globalshortcuts/globalshortcutbackend-system.cpp

@@ -23,9 +23,10 @@
 
 #include "core/logging.h"
 
-#include <QtGlobal>
 #include <QObject>
+#include <QMap>
 #include <QAction>
+#include <QKeySequence>
 #include <QtAlgorithms>
 
 #include "globalshortcuts.h"

src/globalshortcuts/globalshortcutbackend-system.h

@@ -24,15 +24,13 @@
 
 #include "core/logging.h"
 
-
 #include <QObject>
-#include <QtGlobal>
-#include <QAction>
 #include <QList>
-#include <QKeySequence>
+#include <QString>
 
 #include "globalshortcutbackend.h"
 
+class QAction;
 class GlobalShortcuts;
 class GlobalShortcut;
 

src/globalshortcuts/globalshortcutbackend.h

@@ -23,11 +23,7 @@
 
 #include "config.h"
 
-
-#include <QtGlobal>
 #include <QObject>
-#include <QPair>
-#include <QHash>
 #include <QString>
 
 class GlobalShortcuts;

src/globalshortcuts/globalshortcutgrabber.cpp

@@ -23,18 +23,17 @@
 #include <QDialog>
 #include <QWidget>
 #include <QString>
-#include <QStringBuilder>
 #include <QLabel>
 #include <QKeySequence>
-#include <QtEvents>
+#include <QDialogButtonBox>
+#include <QEvent>
+#include <QShowEvent>
+#include <QHideEvent>
+#include <QKeyEvent>
 
 #include "globalshortcutgrabber.h"
 #include "ui_globalshortcutgrabber.h"
 
-class QShowEvent;
-class QHideEvent;
-class QKeyEvent;
-
 GlobalShortcutGrabber::GlobalShortcutGrabber(QWidget *parent)
     : QDialog(parent), ui_(new Ui::GlobalShortcutGrabber) {
   ui_->setupUi(this);

src/globalshortcuts/globalshortcutgrabber.h

@@ -23,14 +23,12 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QDialog>
 #include <QList>
 #include <QString>
 #include <QKeySequence>
-#include <QtEvents>
 
 class QEvent;
 class QHideEvent;

src/globalshortcuts/globalshortcuts.cpp

@@ -34,8 +34,6 @@
 #include <QX11Info>
 #endif
 
-#include "core/logging.h"
-
 #include "globalshortcuts.h"
 #include "globalshortcutbackend.h"
 

src/globalshortcuts/globalshortcuts.h

@@ -24,18 +24,15 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QWidget>
 #include <QMap>
 #include <QString>
-#include <QAction>
-#include <QShortcut>
 #include <QKeySequence>
 #include <QSettings>
 
-#include "globalshortcut.h"
-
+class QShortcut;
+class QAction;
 class GlobalShortcutBackend;
 
 class GlobalShortcuts : public QWidget {

src/internet/internetcollectionview.cpp

@@ -21,18 +21,21 @@
 
 #include "config.h"
 
-#include <QtGlobal>
+#include <QWidget>
 #include <QTreeView>
 #include <QSortFilterProxyModel>
 #include <QAbstractItemView>
+#include <QItemSelectionModel>
 #include <QVariant>
 #include <QString>
+#include <QUrl>
 #include <QPainter>
 #include <QRect>
 #include <QFont>
 #include <QFontMetrics>
 #include <QMimeData>
 #include <QMenu>
+#include <QAction>
 #include <QtEvents>
 
 #include "core/application.h"

src/internet/internetcollectionview.h

@@ -24,21 +24,20 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QWidget>
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
 #include <QSet>
 #include <QString>
 #include <QPixmap>
-#include <QAction>
-#include <QMenu>
-#include <QtEvents>
 
 #include "widgets/autoexpandingtreeview.h"
 #include "core/song.h"
 
+class QWidget;
+class QMenu;
+class QAction;
 class QContextMenuEvent;
-class QHelpEvent;
 class QMouseEvent;
 class QPaintEvent;
 

src/internet/internetcollectionviewcontainer.cpp

@@ -19,19 +19,16 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QWidget>
-#include <QPushButton>
-#include <QLabel>
 #include <QProgressBar>
 #include <QKeyEvent>
 #include <QContextMenuEvent>
 
-#include "core/application.h"
+#include "collection/collectionfilterwidget.h"
 #include "internetcollectionview.h"
 #include "internetcollectionviewcontainer.h"
 #include "ui_internetcollectionviewcontainer.h"
-#include "collection/collectionfilterwidget.h"
-#include "internetservice.h"
 
 InternetCollectionViewContainer::InternetCollectionViewContainer(QWidget *parent) :
   QWidget(parent),

src/internet/internetcollectionviewcontainer.h

@@ -22,19 +22,21 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QWidget>
+#include <QString>
 
+#include "internetcollectionview.h"
 #include "ui_internetcollectionviewcontainer.h"
 
 class QStackedWidget;
 class QPushButton;
 class QLabel;
 class QProgressBar;
+class QContextMenuEvent;
 class Application;
-class InternetCollectionView;
 class CollectionFilterWidget;
 class InternetService;
-class Ui_InternetCollectionViewContainer;
 
 class InternetCollectionViewContainer : public QWidget {
   Q_OBJECT

src/internet/internetplaylistitem.cpp

@@ -25,6 +25,7 @@
 #include <QSettings>
 #include <QVariant>
 #include <QString>
+#include <QStringList>
 #include <QtDebug>
 
 #include "internetplaylistitem.h"

src/internet/internetplaylistitem.h

@@ -23,11 +23,11 @@
 
 #include "config.h"
 
-#include <QString>
 #include <QVariant>
 #include <QUrl>
 
 #include "core/song.h"
+#include "collection/sqlrow.h"
 #include "playlist/playlistitem.h"
 
 class InternetService;

src/internet/internetsearch.cpp

@@ -29,17 +29,16 @@
 #include <QStringList>
 #include <QStringBuilder>
 #include <QUrl>
+#include <QRegExp>
 #include <QImage>
 #include <QPixmap>
-#include <QIcon>
 #include <QPainter>
+#include <QSize>
 #include <QTimerEvent>
-#include <QSettings>
 
 #include "core/application.h"
-#include "core/logging.h"
 #include "core/song.h"
-#include "playlist/songmimedata.h"
+#include "core/mimedata.h"
 #include "covermanager/albumcoverloader.h"
 #include "internet/internetsongmimedata.h"
 #include "internetsearch.h"

src/internet/internetsearch.h

@@ -26,9 +26,13 @@
 
 #include <QtGlobal>
 #include <QObject>
+#include <QMetaType>
+#include <QSet>
+#include <QList>
 #include <QMap>
 #include <QString>
 #include <QStringList>
+#include <QUrl>
 #include <QImage>
 #include <QPixmap>
 #include <QPixmapCache>
@@ -36,6 +40,7 @@
 #include "core/song.h"
 #include "covermanager/albumcoverloaderoptions.h"
 
+class QTimerEvent;
 class Application;
 class MimeData;
 class AlbumCoverLoader;

src/internet/internetsearchitemdelegate.h

@@ -22,10 +22,12 @@
 #define INTERNETSEARCHITEMDELEGATE_H
 
 #include <QStyleOptionViewItem>
+#include <QStyleOption>
 
 #include "collection/collectionitemdelegate.h"
 
 class QPainter;
+class QModelIndex;
 class InternetSearchView;
 
 class InternetSearchItemDelegate : public CollectionItemDelegate {