Cleanup includes

src/collection/collection.cpp

@@ -31,7 +31,6 @@
 #include "core/application.h"
 #include "core/taskmanager.h"
 #include "core/database.h"
-#include "core/player.h"
 #include "core/tagreaderclient.h"
 #include "core/thread.h"
 #include "core/song.h"
@@ -41,7 +40,6 @@
 #include "collectionwatcher.h"
 #include "collectionbackend.h"
 #include "collectionmodel.h"
-#include "playlist/playlistmanager.h"
 #include "scrobbler/lastfmimport.h"
 #include "settings/collectionsettingspage.h"
 

src/collection/collectionbackend.h

@@ -34,10 +34,8 @@
 #include <QStringList>
 #include <QUrl>
 #include <QSqlDatabase>
-#include <QSqlQuery>
 
 #include "core/song.h"
-#include "core/sqlquery.h"
 #include "collectionfilteroptions.h"
 #include "collectionquery.h"
 #include "collectiondirectory.h"

src/collection/collectionfilterwidget.cpp

@@ -48,7 +48,6 @@
 #include "core/logging.h"
 #include "collectionfilteroptions.h"
 #include "collectionmodel.h"
-#include "collectionquery.h"
 #include "savedgroupingmanager.h"
 #include "collectionfilterwidget.h"
 #include "groupbydialog.h"

src/collection/collectionfilterwidget.h

@@ -31,8 +31,6 @@
 #include <QHash>
 #include <QString>
 
-#include "collectionquery.h"
-#include "collectionqueryoptions.h"
 #include "collectionmodel.h"
 
 class QTimer;
@@ -135,7 +133,6 @@ class CollectionFilterWidget : public QWidget {
   QString settings_group_;
   QString saved_groupings_settings_group_;
   QString settings_prefix_;
-
 };
 
 #endif  // COLLECTIONFILTERWIDGET_H

src/collection/collectionmodel.cpp

@@ -68,10 +68,10 @@
 #include "collectionmodel.h"
 #include "playlist/playlistmanager.h"
 #include "playlist/songmimedata.h"
-#include "covermanager/albumcoverloader.h"
+#include "covermanager/albumcoverloaderoptions.h"
 #include "covermanager/albumcoverloaderresult.h"
+#include "covermanager/albumcoverloader.h"
 #include "settings/collectionsettingspage.h"
-#include "settings/coverssettingspage.h"
 
 const int CollectionModel::kPrettyCoverSize = 32;
 const char *CollectionModel::kPixmapDiskCacheDir = "pixmapcache";

src/collection/collectionmodel.h

@@ -48,10 +48,9 @@
 #include "core/simpletreemodel.h"
 #include "core/song.h"
 #include "core/sqlrow.h"
-#include "covermanager/albumcoverloader.h"
 #include "covermanager/albumcoverloaderoptions.h"
+#include "covermanager/albumcoverloaderresult.h"
 #include "collectionfilteroptions.h"
-#include "collectionquery.h"
 #include "collectionqueryoptions.h"
 #include "collectionitem.h"
 

src/collection/collectionquery.cpp

@@ -32,13 +32,10 @@
 #include <QSqlDatabase>
 #include <QSqlQuery>
 
-#include "core/logging.h"
-#include "core/sqlquery.h"
 #include "core/song.h"
 
 #include "collectionquery.h"
 #include "collectionfilteroptions.h"
-#include "collectionqueryoptions.h"
 
 CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const QString &fts_table, const CollectionFilterOptions &filter_options)
     : QSqlQuery(db),

src/collection/collectionquery.h

@@ -32,7 +32,6 @@
 #include <QSqlQuery>
 
 #include "collectionfilteroptions.h"
-#include "collectionqueryoptions.h"
 
 class CollectionQuery : public QSqlQuery {
  public:

src/collection/collectionqueryoptions.cpp

@@ -21,7 +21,6 @@
 #include <QString>
 
 #include "collectionqueryoptions.h"
-#include "collectionfilteroptions.h"
 
 CollectionQueryOptions::CollectionQueryOptions()
     : compilation_requirement_(CollectionQueryOptions::CompilationRequirement::None),