diff --git a/src/accounts/zeroconf/Zeroconf.cpp b/src/accounts/zeroconf/Zeroconf.cpp
index b1924f8bc..442e403c8 100644
--- a/src/accounts/zeroconf/Zeroconf.cpp
+++ b/src/accounts/zeroconf/Zeroconf.cpp
@@ -32,6 +32,7 @@
 using namespace Tomahawk;
 using namespace Accounts;
 
+#define MYNAME "zeroconf"
 
 ZeroconfPlugin::ZeroconfPlugin ( ZeroconfAccount* parent )
     : SipPlugin( parent )
diff --git a/src/accounts/zeroconf/Zeroconf.h b/src/accounts/zeroconf/Zeroconf.h
index 2de0e9b44..54b44702f 100644
--- a/src/accounts/zeroconf/Zeroconf.h
+++ b/src/accounts/zeroconf/Zeroconf.h
@@ -28,8 +28,6 @@
 
 #include <QtCore/QTimer>
 
-#define MYNAME "zeroconf"
-
 namespace Tomahawk
 {
 namespace Accounts
@@ -65,9 +63,9 @@ public slots:
 
     void advertise();
 
-    virtual void sendSipInfos( const Tomahawk::peerinfo_ptr& receiver, const QList<SipInfo>& info ) {}
-    void broadcastMsg( const QString & ) {}
-    void addContact( const QString &, const QString&  ) {}
+    virtual void sendSipInfos( const Tomahawk::peerinfo_ptr& /* receiver */, const QList<SipInfo>& /* info */ ) {}
+    void broadcastMsg( const QString& ) {}
+    void addContact( const QString&, const QString& ) {}
 
 private slots:
     void lanHostFound( const QString& host, int port, const QString& name, const QString& nodeid );
diff --git a/src/libtomahawk/jobview/InboxJobItem.cpp b/src/libtomahawk/jobview/InboxJobItem.cpp
index ddd0c5480..e3b042141 100644
--- a/src/libtomahawk/jobview/InboxJobItem.cpp
+++ b/src/libtomahawk/jobview/InboxJobItem.cpp
@@ -31,7 +31,7 @@
 InboxJobItem::InboxJobItem( Side side,
                             const QString& prettyName,
                             const Tomahawk::trackdata_ptr& track,
-                            QObject* parent )
+                            QObject* /* parent */ )
     : JobStatusItem()
     , m_track( track )
     , m_prettyName( prettyName )
diff --git a/src/libtomahawk/network/ControlConnection.cpp b/src/libtomahawk/network/ControlConnection.cpp
index 311051780..120c4b715 100644
--- a/src/libtomahawk/network/ControlConnection.cpp
+++ b/src/libtomahawk/network/ControlConnection.cpp
@@ -38,8 +38,8 @@ ControlConnection::ControlConnection( Servent* parent )
     : Connection( parent )
     , m_dbsyncconn( 0 )
     , m_registered( false )
-    , m_pingtimer( 0 )
     , m_shutdownOnEmptyPeerInfos( true )
+    , m_pingtimer( 0 )
 {
     qDebug() << "CTOR controlconnection";
     setId("ControlConnection()");