diff --git a/src/libtomahawk/database/TomahawkSqlQuery.cpp b/src/libtomahawk/database/TomahawkSqlQuery.cpp
index f014cd0c4..5a5ea628a 100644
--- a/src/libtomahawk/database/TomahawkSqlQuery.cpp
+++ b/src/libtomahawk/database/TomahawkSqlQuery.cpp
@@ -22,9 +22,9 @@
 
 #include <QSqlError>
 #include <QTime>
+#include <QVariant>
 
 #define QUERY_THRESHOLD 60
-#define QUERY_ANALYZE 1
 
 
 TomahawkSqlQuery::TomahawkSqlQuery()
@@ -59,7 +59,7 @@ TomahawkSqlQuery::exec()
 
     int e = t.elapsed();
     bool log = ( e >= QUERY_THRESHOLD );
-#ifdef QUERY_ANALYZE
+#ifdef TOMAHAWK_QUERY_ANALYZE
     log = true;
 #endif
     
@@ -76,7 +76,7 @@ TomahawkSqlQuery::showError()
     tLog() << "\n" << "*** DATABASE ERROR ***" << "\n"
            << this->lastQuery() << "\n"
            << "boundValues:" << this->boundValues() << "\n"
-           << this->lastError().text() << "\n"
-                ;
+           << this->lastError().text() << "\n";
+
     Q_ASSERT( false );
 }
diff --git a/src/libtomahawk/database/TomahawkSqlQuery.h b/src/libtomahawk/database/TomahawkSqlQuery.h
index ef078f612..8bf1a1495 100644
--- a/src/libtomahawk/database/TomahawkSqlQuery.h
+++ b/src/libtomahawk/database/TomahawkSqlQuery.h
@@ -23,6 +23,8 @@
 
 #include <QSqlQuery>
 
+#define TOMAHAWK_QUERY_ANALYZE 1
+
 class TomahawkSqlQuery : public QSqlQuery
 {