Cleanup includes

src/core/mainwindow.cpp

@@ -127,7 +127,6 @@
 #include "collection/collectiondirectorymodel.h"
 #include "collection/collectionfilterwidget.h"
 #include "collection/collectionmodel.h"
-#include "collection/collectionquery.h"
 #include "collection/collectionview.h"
 #include "collection/collectionviewcontainer.h"
 #include "playlist/playlist.h"
@@ -163,6 +162,7 @@
 #include "settings/settingsdialog.h"
 #include "settings/behavioursettingspage.h"
 #include "settings/backendsettingspage.h"
+#include "settings/collectionsettingspage.h"
 #include "settings/playlistsettingspage.h"
 #ifdef HAVE_SUBSONIC
 #  include "settings/subsonicsettingspage.h"
@@ -199,7 +199,6 @@
 #endif
 
 #include "smartplaylists/smartplaylistsviewcontainer.h"
-#include "smartplaylists/smartplaylistsview.h"
 
 #ifdef Q_OS_WIN
 #  include "windows7thumbbar.h"

src/core/mainwindow.h

@@ -54,7 +54,6 @@
 #include "tagreaderclient.h"
 #include "engine/enginebase.h"
 #include "osd/osdbase.h"
-#include "collection/collectionmodel.h"
 #include "playlist/playlist.h"
 #include "playlist/playlistitem.h"
 #include "settings/settingsdialog.h"

src/core/player.cpp

@@ -64,9 +64,6 @@
 #include "settings/backendsettingspage.h"
 #include "settings/behavioursettingspage.h"
 #include "settings/playlistsettingspage.h"
-#include "internet/internetservices.h"
-#include "internet/internetservice.h"
-#include "scrobbler/audioscrobbler.h"
 
 const char *Player::kSettingsGroup = "Player";
 

src/core/tagreaderclient.cpp

@@ -36,7 +36,6 @@
 
 #include "song.h"
 #include "tagreaderclient.h"
-#include "settings/collectionsettingspage.h"
 
 const char *TagReaderClient::kWorkerExecutableName = "strawberry-tagreader";
 TagReaderClient *TagReaderClient::sInstance = nullptr;