Reduce includes

src/subsonic/subsonicbaserequest.cpp

@@ -21,6 +21,7 @@
 
 #include <memory>
 
+#include <QtGlobal>
 #include <QObject>
 #include <QByteArray>
 #include <QPair>
@@ -28,17 +29,16 @@
 #include <QString>
 #include <QUrl>
 #include <QUrlQuery>
-#include <QSslConfiguration>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QJsonParseError>
+#include <QSslConfiguration>
+#include <QSslSocket>
+#include <QSslError>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonArray>
 #include <QJsonValue>
 
-#include "core/logging.h"
 #include "subsonicservice.h"
 #include "subsonicbaserequest.h"
 

src/subsonic/subsonicbaserequest.h

@@ -24,28 +24,23 @@
 
 #include <memory>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QList>
+#include <QSet>
 #include <QPair>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
+#include <QStringList>
 #include <QUrl>
 #include <QSslError>
 #include <QJsonObject>
 
-#include "core/song.h"
-#include "internet/internetservices.h"
-#include "internet/internetservice.h"
-#include "internet/internetsearch.h"
 #include "subsonicservice.h"
 
 class QNetworkAccessManager;
 class QNetworkReply;
 
-class SubsonicUrlHandler;
-class CollectionBackend;
-class CollectionModel;
-
 class SubsonicBaseRequest : public QObject {
   Q_OBJECT
 

src/subsonic/subsonicrequest.cpp

@@ -22,19 +22,22 @@
 #include <memory>
 
 #include <QObject>
+#include <QMimeType>
+#include <QMimeDatabase>
 #include <QByteArray>
-#include <QDir>
 #include <QString>
 #include <QUrl>
 #include <QRegExp>
 #include <QImage>
 #include <QNetworkAccessManager>
+#include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QSslConfiguration>
+#include <QSslSocket>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-#include <QMimeDatabase>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/closure.h"
@@ -44,6 +47,7 @@
 #include "covermanager/albumcoverloader.h"
 #include "subsonicservice.h"
 #include "subsonicurlhandler.h"
+#include "subsonicbaserequest.h"
 #include "subsonicrequest.h"
 
 const int SubsonicRequest::kMaxConcurrentAlbumsRequests = 3;

src/subsonic/subsonicrequest.h

@@ -27,21 +27,24 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QPair>
+#include <QSet>
 #include <QList>
 #include <QHash>
+#include <QMap>
 #include <QMultiMap>
 #include <QQueue>
+#include <QVariant>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QNetworkReply>
+#include <QNetworkAccessManager>
 #include <QJsonObject>
 
 #include "core/song.h"
 #include "subsonicbaserequest.h"
 
+class QNetworkReply;
 class Application;
-class NetworkAccessManager;
 class SubsonicService;
 class SubsonicUrlHandler;
 

src/subsonic/subsonicservice.cpp

@@ -21,6 +21,7 @@
 
 #include <memory>
 
+#include <QtGlobal>
 #include <QObject>
 #include <QByteArray>
 #include <QPair>
@@ -28,14 +29,18 @@
 #include <QString>
 #include <QUrl>
 #include <QUrlQuery>
+#include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
+#include <QSslConfiguration>
+#include <QSslSocket>
 #include <QSslError>
-#include <QJsonParseError>
+#include <QJsonValue>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QSettings>
 #include <QSortFilterProxyModel>
+#include <QtDebug>
 
 #include "core/application.h"
 #include "core/player.h"
@@ -44,12 +49,12 @@
 #include "core/network.h"
 #include "core/database.h"
 #include "core/song.h"
-#include "internet/internetsearch.h"
 #include "collection/collectionbackend.h"
 #include "collection/collectionmodel.h"
 #include "subsonicservice.h"
 #include "subsonicurlhandler.h"
 #include "subsonicrequest.h"
+#include "settings/settingsdialog.h"
 #include "settings/subsonicsettingspage.h"
 
 using std::shared_ptr;

src/subsonic/subsonicservice.h

@@ -24,20 +24,19 @@
 
 #include <memory>
 
-#include <QtGlobal>
 #include <QObject>
 #include <QPair>
+#include <QSet>
 #include <QList>
+#include <QVariant>
+#include <QByteArray>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QTimer>
 #include <QSslError>
 
 #include "core/song.h"
 #include "internet/internetservice.h"
-#include "internet/internetsearch.h"
-#include "settings/subsonicsettingspage.h"
 
 class QSortFilterProxyModel;
 class QNetworkAccessManager;

src/subsonic/subsonicurlhandler.cpp

@@ -17,11 +17,13 @@
  *
  */
 
-#include <QObject>
+#include <QtGlobal>
 #include <QString>
 #include <QUrl>
 #include <QUrlQuery>
 
+#include "core/song.h"
+
 #include "subsonicservice.h"
 #include "subsonicurlhandler.h"
 

src/subsonic/subsonicurlhandler.h

@@ -22,17 +22,16 @@
 
 #include <QObject>
 #include <QPair>
+#include <QSet>
 #include <QList>
 #include <QByteArray>
 #include <QString>
 #include <QUrl>
 
 #include "core/urlhandler.h"
-#include "core/song.h"
 #include "subsonic/subsonicservice.h"
 
 class Application;
-class SubsonicService;
 
 class SubsonicUrlHandler : public UrlHandler {
   Q_OBJECT