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/sqlrow.cpp

@@ -20,12 +20,14 @@
 
 #include "config.h"
 
-#include "collectionquery.h"
-#include "sqlrow.h"
-
+#include <QVariant>
 #include <QSqlQuery>
 #include <QSqlRecord>
 
+#include "sqlrow.h"
+
+#include "collectionquery.h"
+
 SqlRow::SqlRow(const QSqlQuery &query) { Init(query); }
 
 SqlRow::SqlRow(const CollectionQuery &query) { Init(query); }