diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index e8541312d..febe748ac 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -267,6 +267,9 @@ set( libHeaders
     widgets/infowidgets/sourceinfowidget.h
 )
 
+set( libHeaders_NoMOC 
+		playlist/dynamic/GeneratorInterface.h 
+)
 set( libUI ${libUI}
     widgets/newplaylistwidget.ui
     widgets/welcomewidget.ui
@@ -335,7 +338,7 @@ ENDIF( UNIX AND NOT APPLE )
 qt4_wrap_ui( libUI_H ${libUI} )
 qt4_wrap_cpp( libMoc ${libHeaders} )
 
-SET( libSources ${libSources} ${libUI_H} )
+SET( libSources ${libSources} ${libUI_H} ${libHeaders_NoMOC} )
 
 add_library( tomahawklib SHARED ${libSources} ${libMoc} )
 
diff --git a/src/libtomahawk/artist.cpp b/src/libtomahawk/artist.cpp
index 1e7034b53..596cede96 100644
--- a/src/libtomahawk/artist.cpp
+++ b/src/libtomahawk/artist.cpp
@@ -33,8 +33,8 @@ Artist::Artist( unsigned int id, const QString& name, const Tomahawk::collection
     : PlaylistInterface( this )
     , m_id( id )
     , m_name( name )
-    , m_collection( collection )
     , m_currentTrack( 0 )
+    , m_collection( collection )
 {
 }
 
diff --git a/src/libtomahawk/database/fuzzyindex.cpp b/src/libtomahawk/database/fuzzyindex.cpp
index 97463d45c..8e85a72f2 100644
--- a/src/libtomahawk/database/fuzzyindex.cpp
+++ b/src/libtomahawk/database/fuzzyindex.cpp
@@ -122,7 +122,7 @@ FuzzyIndex::search( const QString& table, const QString& name )
     lucene::search::FuzzyQuery* qry = _CLNEW lucene::search::FuzzyQuery( _CLNEW lucene::index::Term( table.toStdWString().c_str(), name.toStdWString().c_str() ) );
     hits = m_luceneSearcher->search( qry );
 
-    for ( unsigned int i = 0; i < hits->length(); i++ )
+    for ( int i = 0; i < hits->length(); i++ )
     {
         lucene::document::Document* d = &hits->doc( i );
 
diff --git a/src/libtomahawk/network/servent.cpp b/src/libtomahawk/network/servent.cpp
index b1038ef10..df603b58c 100644
--- a/src/libtomahawk/network/servent.cpp
+++ b/src/libtomahawk/network/servent.cpp
@@ -739,4 +739,5 @@ Servent::httpIODeviceFactory( const Tomahawk::result_ptr& result )
     QNetworkRequest req( result->url() );
     QNetworkReply* reply = APP->nam()->get( req );
     return QSharedPointer<QIODevice>( reply );*/
+    return QSharedPointer<QIODevice>();
 }
diff --git a/src/libtomahawk/playlist.cpp b/src/libtomahawk/playlist.cpp
index 6f0d51400..50666134e 100644
--- a/src/libtomahawk/playlist.cpp
+++ b/src/libtomahawk/playlist.cpp
@@ -394,7 +394,6 @@ Playlist::resolve()
 void
 Playlist::onResultsFound( const QList<Tomahawk::result_ptr>& results )
 {
-    Query* query = qobject_cast<Query*>( sender() );
     m_locallyChanged = true;
 }