diff --git a/src/libtomahawk/Result.cpp b/src/libtomahawk/Result.cpp
index b3d959059..32691a3aa 100644
--- a/src/libtomahawk/Result.cpp
+++ b/src/libtomahawk/Result.cpp
@@ -85,12 +85,12 @@ Result::isCached( const QString& url )
 Result::Result( const QString& url )
     : QObject()
     , m_url( url )
+    , m_checked( false )
     , m_bitrate( 0 )
     , m_size( 0 )
     , m_modtime( 0 )
     , m_score( 0 )
     , m_fileId( 0 )
-    , m_checked( false )
 {
     connect( Pipeline::instance(), SIGNAL( resolverRemoved( Tomahawk::Resolver* ) ), SLOT( onResolverRemoved( Tomahawk::Resolver* ) ), Qt::QueuedConnection );
 }
diff --git a/src/libtomahawk/playlist/GridView.cpp b/src/libtomahawk/playlist/GridView.cpp
index b122c2143..7e0fda64b 100644
--- a/src/libtomahawk/playlist/GridView.cpp
+++ b/src/libtomahawk/playlist/GridView.cpp
@@ -419,6 +419,3 @@ GridView::setPlaylistInterface( const Tomahawk::playlistinterface_ptr& playlistI
 {
     proxyModel()->setPlaylistInterface( playlistInterface );
 }
-
-
-#include "GridView.moc"
diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp
index e4d3ddebc..f4d1e0857 100644
--- a/src/libtomahawk/utils/TomahawkUtils.cpp
+++ b/src/libtomahawk/utils/TomahawkUtils.cpp
@@ -1120,5 +1120,3 @@ urlSetQuery( QUrl& url, const QString& query )
 
 
 } // ns
-
-#include "TomahawkUtils.moc"
diff --git a/src/libtomahawk/widgets/WelcomeWidget.cpp b/src/libtomahawk/widgets/WelcomeWidget.cpp
index 9f937f19d..708d4ccdc 100644
--- a/src/libtomahawk/widgets/WelcomeWidget.cpp
+++ b/src/libtomahawk/widgets/WelcomeWidget.cpp
@@ -356,5 +356,3 @@ PlaylistWidget::setModel( QAbstractItemModel* model )
     QListView::setModel( model );
     emit modelChanged();
 }
-
-#include "WelcomeWidget.moc"
diff --git a/src/tomahawk/AclRegistryImpl.h b/src/tomahawk/AclRegistryImpl.h
index 96b808202..d0a9037bc 100644
--- a/src/tomahawk/AclRegistryImpl.h
+++ b/src/tomahawk/AclRegistryImpl.h
@@ -44,9 +44,6 @@ public:
     ACLRegistryImpl( QObject *parent = 0 );
     virtual ~ACLRegistryImpl();
 
-signals:
-    void aclResult( QString nodeid, QString username, ACLRegistry::ACL peerStatus );
-
 public slots:
     /**
      * @brief Checks if peer is authorized; optionally, can authorize peer with given type if not found