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/core/filesystemmusicstorage.cpp

@@ -20,13 +20,21 @@
 
 #include "config.h"
 
-#include "filesystemmusicstorage.h"
-#include "core/logging.h"
-#include "core/utilities.h"
+#include <stdbool.h>
 
 #include <QDir>
 #include <QFile>
+#include <QFileInfo>
+#include <QString>
 #include <QUrl>
+#include <QtDebug>
+
+#include "core/logging.h"
+#include "utilities.h"
+#include "song.h"
+#include "musicstorage.h"
+
+#include "filesystemmusicstorage.h"
 
 FilesystemMusicStorage::FilesystemMusicStorage(const QString &root)
     : root_(root) {}