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

@@ -20,22 +20,19 @@
 
 #include "config.h"
 
-#include <QtGlobal>
+#ifdef HAVE_DBUS
+#  include <QDBusConnection>
+#  include <QDBusConnectionInterface>
+#  include <QDBusReply>
+#  include "dbusscreensaver.h"
+#endif
 
 #include "screensaver.h"
 
-#ifdef HAVE_DBUS
-  #include "dbusscreensaver.h"
-  #include <QDBusConnection>
-  #include <QDBusConnectionInterface>
-#endif
-
 #ifdef Q_OS_DARWIN
   #include "macscreensaver.h"
 #endif
 
-#include <QtDebug>
-
 const char *Screensaver::kGnomeService   = "org.gnome.ScreenSaver";
 const char *Screensaver::kGnomePath      = "/";
 const char *Screensaver::kGnomeInterface = "org.gnome.ScreenSaver";