Reduce includes

src/lyrics/auddlyricsprovider.cpp

@@ -20,6 +20,8 @@
 #include "config.h"
 
 #include <QObject>
+#include <QPair>
+#include <QList>
 #include <QByteArray>
 #include <QVariant>
 #include <QString>
@@ -28,16 +30,17 @@
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
+#include <QtDebug>
 
 #include "core/closure.h"
 #include "core/logging.h"
 #include "core/network.h"
 #include "jsonlyricsprovider.h"
 #include "lyricsfetcher.h"
+#include "lyricsprovider.h"
 #include "auddlyricsprovider.h"
 
 const char *AuddLyricsProvider::kUrlSearch = "https://api.audd.io/findLyrics/";

src/lyrics/auddlyricsprovider.h

@@ -22,9 +22,11 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
+#include <QVariant>
 #include <QString>
+#include <QJsonArray>
 
 #include "jsonlyricsprovider.h"
 #include "lyricsfetcher.h"

src/lyrics/jsonlyricsprovider.cpp

@@ -28,7 +28,6 @@
 #include <QJsonObject>
 
 #include "lyricsprovider.h"
-#include "lyricsfetcher.h"
 #include "jsonlyricsprovider.h"
 
 JsonLyricsProvider::JsonLyricsProvider(const QString &name, QObject *parent) : LyricsProvider(name, parent) {}

src/lyrics/jsonlyricsprovider.h

@@ -22,9 +22,11 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QObject>
 #include <QVariant>
 #include <QString>
+#include <QJsonObject>
 
 #include "lyricsprovider.h"
 

src/lyrics/lololyricsprovider.cpp

@@ -20,6 +20,8 @@
 #include "config.h"
 
 #include <QObject>
+#include <QPair>
+#include <QList>
 #include <QByteArray>
 #include <QVariant>
 #include <QString>
@@ -29,6 +31,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QXmlStreamReader>
+#include <QtDebug>
 
 #include "core/closure.h"
 #include "core/logging.h"

src/lyrics/lololyricsprovider.h

@@ -22,13 +22,12 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QVariant>
 #include <QString>
 
 #include "lyricsprovider.h"
-#include "lyricsfetcher.h"
 
 class QNetworkAccessManager;
 class QNetworkReply;

src/lyrics/lyricsfetcher.cpp

@@ -24,7 +24,6 @@
 #include <QTimer>
 #include <QString>
 
-#include "core/logging.h"
 #include "core/song.h"
 #include "lyricsfetcher.h"
 #include "lyricsfetchersearch.h"

src/lyrics/lyricsfetcher.h

@@ -22,16 +22,17 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
+#include <QMetaType>
 #include <QQueue>
-#include <QTimer>
-#include <QHash>
+#include <QSet>
 #include <QList>
+#include <QHash>
 #include <QString>
 #include <QUrl>
 
+class QTimer;
 class LyricsProviders;
 class LyricsFetcherSearch;
 

src/lyrics/lyricsfetchersearch.cpp

@@ -19,16 +19,11 @@
 
 #include "config.h"
 
-#include <algorithm>
-#include <cmath>
-
 #include <QObject>
-#include <QtAlgorithms>
 #include <QTimer>
 #include <QList>
 #include <QtDebug>
 
-#include "core/closure.h"
 #include "core/logging.h"
 #include "lyricsfetcher.h"
 #include "lyricsfetchersearch.h"

src/lyrics/lyricsfetchersearch.h

@@ -22,11 +22,10 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
-#include <QList>
 #include <QMap>
+#include <QString>
 
 #include "lyricsfetcher.h"
 

src/lyrics/lyricsprovider.h

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

src/lyrics/lyricsproviders.cpp

@@ -24,11 +24,9 @@
 #include <QString>
 #include <QtDebug>
 
-#include "core/application.h"
 #include "core/logging.h"
 #include "lyricsprovider.h"
 #include "lyricsproviders.h"
-#include "lyricsfetcher.h"
 
 LyricsProviders::LyricsProviders(QObject *parent) : QObject(parent) {}
 

src/lyrics/lyricsproviders.h

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

src/lyrics/ovhlyricsprovider.cpp

@@ -20,21 +20,19 @@
 #include "config.h"
 
 #include <QObject>
-#include <QByteArray>
 #include <QVariant>
 #include <QString>
 #include <QUrl>
-#include <QUrlQuery>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QJsonObject>
+#include <QJsonValue>
+#include <QtDebug>
 
 #include "core/closure.h"
 #include "core/logging.h"
 #include "core/network.h"
-#include "core/utilities.h"
-#include "lyricsprovider.h"
 #include "lyricsfetcher.h"
 #include "jsonlyricsprovider.h"
 #include "ovhlyricsprovider.h"

src/lyrics/ovhlyricsprovider.h

@@ -22,14 +22,12 @@
 
 #include "config.h"
 
-
+#include <QtGlobal>
 #include <QObject>
 #include <QVariant>
 #include <QString>
 
-#include "lyricsprovider.h"
 #include "jsonlyricsprovider.h"
-#include "lyricsfetcher.h"
 
 class QNetworkAccessManager;
 class QNetworkReply;