diff --git a/src/libtomahawk/database/databasecommand_deletefiles.cpp b/src/libtomahawk/database/databasecommand_deletefiles.cpp
index 2aad9f883..6c766d57f 100644
--- a/src/libtomahawk/database/databasecommand_deletefiles.cpp
+++ b/src/libtomahawk/database/databasecommand_deletefiles.cpp
@@ -18,14 +18,14 @@
 
 #include "databasecommand_deletefiles.h"
 
-#include <QSqlQuery>
+#include <QtSql/QSqlQuery>
 
 #include "artist.h"
 #include "album.h"
 #include "collection.h"
 #include "source.h"
 #include "database/database.h"
-#include "databaseimpl.h"
+#include "database/databaseimpl.h"
 #include "network/servent.h"
 #include "utils/logger.h"
 #include "utils/tomahawkutils.h"
@@ -60,7 +60,7 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
 {
     Q_ASSERT( !source().isNull() );
 
-    QVariant srcid = source()->isLocal() ? QVariant( QVariant::Int ) : source()->id();
+    int srcid = source()->isLocal() ? 0 : source()->id();
     TomahawkSqlQuery delquery = dbi->newquery();
 
     if ( m_deleteAll )
@@ -68,8 +68,8 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
         TomahawkSqlQuery dirquery = dbi->newquery();
         dirquery.prepare( QString( "SELECT id FROM file WHERE source %1" )
                     .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) ) );
-
         dirquery.exec();
+        
         while ( dirquery.next() )
             m_idList << dirquery.value( 0 ).toUInt();
     }
@@ -115,7 +115,8 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
             delquery.prepare( QString( "SELECT id FROM file WHERE source = %1 AND url IN ( %2 )" )
                         .arg( source()->id() )
                         .arg( idstring ) );
-
+            delquery.exec();
+            
             idstring = QString();
             while ( delquery.next() )
             {
@@ -128,7 +129,6 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
         delquery.prepare( QString( "DELETE FROM file WHERE source %1 AND id IN ( %2 )" )
                              .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) )
                              .arg( idstring ) );
-
         delquery.exec();
     }
 
diff --git a/src/libtomahawk/database/databasecommand_deletefiles.h b/src/libtomahawk/database/databasecommand_deletefiles.h
index f99ecc0b7..f76091ad8 100644
--- a/src/libtomahawk/database/databasecommand_deletefiles.h
+++ b/src/libtomahawk/database/databasecommand_deletefiles.h
@@ -19,9 +19,9 @@
 #ifndef DATABASECOMMAND_DELETEFILES_H
 #define DATABASECOMMAND_DELETEFILES_H
 
-#include <QObject>
-#include <QDir>
-#include <QVariantMap>
+#include <QtCore/QObject>
+#include <QtCore/QDir>
+#include <QtCore/QVariantMap>
 
 #include "database/databasecommandloggable.h"
 #include "typedefs.h"
diff --git a/src/musicscanner.cpp b/src/musicscanner.cpp
index 84c22d3e1..a4782244b 100644
--- a/src/musicscanner.cpp
+++ b/src/musicscanner.cpp
@@ -18,7 +18,7 @@
 
 #include "musicscanner.h"
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 #include "utils/tomahawkutils.h"
 #include "tomahawksettings.h"
diff --git a/src/musicscanner.h b/src/musicscanner.h
index ed59d3cc5..e5ed08369 100644
--- a/src/musicscanner.h
+++ b/src/musicscanner.h
@@ -26,15 +26,15 @@
 #include <taglib/fileref.h>
 #include <taglib/tag.h>
 
-#include <QVariantMap>
-#include <QDir>
-#include <QFileInfo>
-#include <QString>
-#include <QDateTime>
-#include <QTimer>
-#include <QMutex>
-#include <QMutexLocker>
-#include <QWeakPointer>
+#include <QtCore/QVariantMap>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QString>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QMutex>
+#include <QtCore/QMutexLocker>
+#include <QtCore/QWeakPointer>
 #include <database/database.h>
 
 // descend dir tree comparing dir mtimes to last known mtime
diff --git a/src/scanmanager.cpp b/src/scanmanager.cpp
index a9061cb2f..1209f58ce 100644
--- a/src/scanmanager.cpp
+++ b/src/scanmanager.cpp
@@ -18,9 +18,9 @@
 
 #include "scanmanager.h"
 
-#include <QThread>
-#include <QCoreApplication>
-#include <QTimer>
+#include <QtCore/QThread>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
 
 #include "musicscanner.h"
 #include "tomahawksettings.h"
diff --git a/src/scanmanager.h b/src/scanmanager.h
index c08a070d6..77632c2f2 100644
--- a/src/scanmanager.h
+++ b/src/scanmanager.h
@@ -21,12 +21,12 @@
 
 #include "typedefs.h"
 
-#include <QHash>
-#include <QMap>
-#include <QObject>
-#include <QStringList>
-#include <QWeakPointer>
-#include <QSet>
+#include <QtCore/QHash>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+#include <QtCore/QWeakPointer>
+#include <QtCore/QSet>
 
 class MusicScanner;
 class QThread;