Reduce includes

src/scrobbler/audioscrobbler.cpp

@@ -19,18 +19,15 @@
 
 #include "config.h"
 
-
-#include <algorithm>
-
-#include <QtGlobal>
+#include <QList>
+#include <QVariant>
 #include <QString>
 #include <QSettings>
+#include <QtDebug>
 
 #include "core/application.h"
-#include "core/closure.h"
 #include "core/logging.h"
 #include "core/song.h"
-#include "core/timeconstants.h"
 #include "settings/settingsdialog.h"
 #include "settings/scrobblersettingspage.h"
 

src/scrobbler/audioscrobbler.h

@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-
-#include <QtGlobal>
 #include <QObject>
 #include <QString>
 

src/scrobbler/lastfmscrobbler.cpp

@@ -19,21 +19,11 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QObject>
 
 #include "core/application.h"
-#include "core/closure.h"
 #include "core/network.h"
-#include "core/song.h"
-#include "core/timeconstants.h"
-#include "core/logging.h"
-#include "internet/localredirectserver.h"
-#include "settings/settingsdialog.h"
-#include "settings/scrobblersettingspage.h"
 
-#include "audioscrobbler.h"
-#include "scrobblerservices.h"
 #include "scrobblercache.h"
 #include "scrobblingapi20.h"
 #include "lastfmscrobbler.h"

src/scrobbler/lastfmscrobbler.h

@@ -22,13 +22,11 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
 
 #include "core/song.h"
-#include "scrobblerservice.h"
 #include "scrobblingapi20.h"
 
 class Application;

src/scrobbler/librefmscrobbler.cpp

@@ -19,21 +19,11 @@
 
 #include "config.h"
 
-#include <QtGlobal>
 #include <QObject>
 
 #include "core/application.h"
-#include "core/closure.h"
 #include "core/network.h"
-#include "core/song.h"
-#include "core/timeconstants.h"
-#include "core/logging.h"
-#include "internet/localredirectserver.h"
-#include "settings/settingsdialog.h"
-#include "settings/scrobblersettingspage.h"
 
-#include "audioscrobbler.h"
-#include "scrobblerservices.h"
 #include "scrobblercache.h"
 #include "scrobblingapi20.h"
 #include "librefmscrobbler.h"

src/scrobbler/librefmscrobbler.h

@@ -22,13 +22,11 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
 
 #include "core/song.h"
-#include "scrobblerservice.h"
 #include "scrobblingapi20.h"
 
 class Application;

src/scrobbler/listenbrainzscrobbler.cpp

@@ -32,11 +32,11 @@
 #include <QSettings>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QJsonParseError>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
@@ -45,11 +45,8 @@
 #include "core/timeconstants.h"
 #include "core/logging.h"
 #include "internet/localredirectserver.h"
-#include "settings/settingsdialog.h"
-#include "settings/scrobblersettingspage.h"
 
 #include "audioscrobbler.h"
-#include "scrobblerservices.h"
 #include "scrobblerservice.h"
 #include "scrobblercache.h"
 #include "scrobblercacheitem.h"

src/scrobbler/listenbrainzscrobbler.h

@@ -22,13 +22,13 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
 #include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
+#include <QUrl>
 #include <QJsonDocument>
 
 #include "core/song.h"

src/scrobbler/scrobblercache.cpp

@@ -22,16 +22,17 @@
 
 #include <QObject>
 #include <QStandardPaths>
+#include <QHash>
+#include <QVariant>
 #include <QString>
 #include <QFile>
 #include <QIODevice>
 #include <QTextStream>
-#include <QHash>
 #include <QJsonDocument>
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
-#include <QJsonParseError>
+#include <QtDebug>
 
 #include "core/song.h"
 #include "core/logging.h"

src/scrobbler/scrobblercache.h

@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QList>
 #include <QHash>

src/scrobbler/scrobblercacheitem.cpp

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

src/scrobbler/scrobblerservice.cpp

@@ -19,12 +19,12 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
 #include <QString>
 #include <QByteArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonParseError>
 
 #include "scrobblerservice.h"
 

src/scrobbler/scrobblerservice.h

@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-
 #include <QObject>
 #include <QPair>
 #include <QList>

src/scrobbler/scrobblerservices.cpp

@@ -24,7 +24,6 @@
 #include <QString>
 #include <QtDebug>
 
-#include "core/application.h"
 #include "core/logging.h"
 
 #include "scrobblerservices.h"

src/scrobbler/scrobblingapi20.cpp

@@ -19,11 +19,14 @@
 
 #include "config.h"
 
+#include <algorithm>
 
 #include <QtGlobal>
 #include <QApplication>
 #include <QDesktopServices>
+#include <QLocale>
 #include <QClipboard>
+#include <QPair>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
@@ -31,16 +34,16 @@
 #include <QUrlQuery>
 #include <QDateTime>
 #include <QCryptographicHash>
-#include <QMenu>
 #include <QMessageBox>
 #include <QSettings>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QJsonParseError>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
+#include <QFlags>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
@@ -49,11 +52,10 @@
 #include "core/timeconstants.h"
 #include "core/logging.h"
 #include "internet/localredirectserver.h"
-#include "settings/settingsdialog.h"
 #include "settings/scrobblersettingspage.h"
 
 #include "audioscrobbler.h"
-#include "scrobblerservices.h"
+#include "scrobblerservice.h"
 #include "scrobblingapi20.h"
 #include "scrobblercache.h"
 #include "scrobblercacheitem.h"

src/scrobbler/scrobblingapi20.h

@@ -39,8 +39,6 @@ class QNetworkReply;
 class Application;
 class NetworkAccessManager;
 class LocalRedirectServer;
-class ScrobblerService;
-class ScrobblerCache;
 class ScrobblerCacheItem;
 
 class ScrobblingAPI20 : public ScrobblerService {