Includes, comments and bugfixes

- Fix includes
- Use common regex (Song::kCoverRemoveDisc) for removing Disc/CD from album
- Remove Disc/CD from album when creating hash
- Make imobiledevice support compile
- Fix setting device on windows

src/collection/collection.h

@@ -23,19 +23,18 @@
 
 #include "config.h"
 
-#include <QHash>
 #include <QObject>
+#include <QHash>
+#include <QString>
 #include <QUrl>
 
 #include "core/song.h"
 
 class Application;
-class Database;
+class Thread;
 class CollectionBackend;
 class CollectionModel;
 class CollectionWatcher;
-class TaskManager;
-class Thread;
 
 class Collection : public QObject {
   Q_OBJECT
@@ -85,13 +84,11 @@ class Collection : public QObject {
   CollectionWatcher *watcher_;
   Thread *watcher_thread_;
 
-  // Hack: Gstreamer doesn't cope well with WMA files being rewritten while
-  // being played, so we delay statistics and rating changes until the current
-  // song has finished playing.
+  // Hack: Gstreamer doesn't cope well with WMA files being rewritten while being played,
+  // so we delay statistics and rating changes until the current song has finished playing.
   QUrl current_wma_song_url_;
 
-  // DB schema versions which should trigger a full collection rescan (each of
-  // those with a short reason why).
+  // DB schema versions which should trigger a full collection rescan (each of those with a short reason why).
   QHash<int, QString> full_rescan_revisions_;
 };