diff --git a/src/accounts/xmpp/sip/XmppSip.h b/src/accounts/xmpp/sip/XmppSip.h
index 0a70b734f..24ff380da 100644
--- a/src/accounts/xmpp/sip/XmppSip.h
+++ b/src/accounts/xmpp/sip/XmppSip.h
@@ -32,6 +32,7 @@
 #endif
 
 #include "accounts/AccountDllMacro.h"
+#include "accounts/Account.h"
 
 #include "../XmppInfoPlugin.h"
 
diff --git a/src/accounts/zeroconf/Zeroconf.cpp b/src/accounts/zeroconf/Zeroconf.cpp
index 442e403c8..579b7528f 100644
--- a/src/accounts/zeroconf/Zeroconf.cpp
+++ b/src/accounts/zeroconf/Zeroconf.cpp
@@ -24,6 +24,7 @@
 #include "ZeroconfAccount.h"
 #include "Source.h"
 #include "sip/PeerInfo.h"
+#include "sip/SipInfo.h"
 #include "network/ControlConnection.h"
 
 #include <QtPlugin>
diff --git a/src/libtomahawk/accounts/AccountManager.cpp b/src/libtomahawk/accounts/AccountManager.cpp
index fcd0ad6ca..8bd948eb9 100644
--- a/src/libtomahawk/accounts/AccountManager.cpp
+++ b/src/libtomahawk/accounts/AccountManager.cpp
@@ -20,16 +20,18 @@
 
 #include "AccountManager.h"
 
-#include "CredentialsManager.h"
-#include "config.h"
-#include "SourceList.h"
-#include "TomahawkSettings.h"
-#include "ResolverAccount.h"
-#include "utils/Logger.h"
+#include "sip/SipPlugin.h"
 #include "sip/SipStatusMessage.h"
 #include "jobview/JobStatusView.h"
 #include "jobview/JobStatusModel.h"
 #include "utils/Closure.h"
+#include "utils/Logger.h"
+
+#include "CredentialsManager.h"
+#include "config.h"
+#include "ResolverAccount.h"
+#include "SourceList.h"
+#include "TomahawkSettings.h"
 
 #include <QtCore/QLibrary>
 #include <QtCore/QDir>
diff --git a/src/libtomahawk/accounts/AccountManager.h b/src/libtomahawk/accounts/AccountManager.h
index 420b73859..3e74802cc 100644
--- a/src/libtomahawk/accounts/AccountManager.h
+++ b/src/libtomahawk/accounts/AccountManager.h
@@ -27,7 +27,6 @@
 #include "Typedefs.h"
 #include "DllMacro.h"
 #include "infosystem/InfoSystem.h"
-#include "sip/SipPlugin.h"
 #include "Account.h"
 
 namespace Tomahawk
diff --git a/src/libtomahawk/network/ConnectionManager.cpp b/src/libtomahawk/network/ConnectionManager.cpp
index 26a9a4156..790d8f5d6 100644
--- a/src/libtomahawk/network/ConnectionManager.cpp
+++ b/src/libtomahawk/network/ConnectionManager.cpp
@@ -24,6 +24,7 @@
 
 #include "database/Database.h"
 #include "database/DatabaseImpl.h"
+#include "sip/SipInfo.h"
 #include "sip/SipPlugin.h"
 #include "utils/Logger.h"
 
diff --git a/src/libtomahawk/sip/PeerInfo.cpp b/src/libtomahawk/sip/PeerInfo.cpp
index 385524202..1e7c3a524 100644
--- a/src/libtomahawk/sip/PeerInfo.cpp
+++ b/src/libtomahawk/sip/PeerInfo.cpp
@@ -19,13 +19,16 @@
 
 #include "PeerInfo_p.h"
 
-#include "SipPlugin.h"
-#include "WeakPeerHash.h"
-#include "utils/TomahawkCache.h"
-#include "utils/TomahawkUtilsGui.h"
+#include "accounts/Account.h"
 #include "network/ControlConnection.h"
 #include "network/Servent.h"
 #include "utils/Logger.h"
+#include "utils/TomahawkCache.h"
+#include "utils/TomahawkUtilsGui.h"
+
+#include "SipInfo.h"
+#include "SipPlugin.h"
+#include "WeakPeerHash.h"
 
 #include <QCryptographicHash>
 #include <QBuffer>
diff --git a/src/libtomahawk/sip/SipPlugin.h b/src/libtomahawk/sip/SipPlugin.h
index caa23877e..a11d4046d 100644
--- a/src/libtomahawk/sip/SipPlugin.h
+++ b/src/libtomahawk/sip/SipPlugin.h
@@ -4,6 +4,7 @@
  *             2011, Dominik Schmidt <dev@dominik-schmidt.de>
  *             2010-2011, Leo Franchi <lfranchi@kde.org>
  *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2013, Uwe L. Korn <uwelk@xhochy.com>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,20 +23,26 @@
 #ifndef SIPPLUGIN_H
 #define SIPPLUGIN_H
 
-#include "SipInfo.h"
+#include "Typedefs.h"
 
 #include <QObject>
 #include <QString>
-#include <QNetworkProxy>
 
-#include "accounts/Account.h"
 #ifndef ENABLE_HEADLESS
     #include <QMenu>
 #endif
 
 #include "DllMacro.h"
 
-class SipPlugin;
+class SipInfo;
+namespace Tomahawk
+{
+    namespace Accounts
+    {
+        class Account;
+    }
+    class PeerInfo;
+}
 
 class DLLEXPORT SipPlugin : public QObject
 {
diff --git a/src/tomahawk/DiagnosticsDialog.cpp b/src/tomahawk/DiagnosticsDialog.cpp
index 2332422f0..5e26db6a8 100644
--- a/src/tomahawk/DiagnosticsDialog.cpp
+++ b/src/tomahawk/DiagnosticsDialog.cpp
@@ -27,14 +27,16 @@
 #include "SourceList.h"
 
 #include "accounts/AccountManager.h"
-#include "network/Servent.h"
-#include "sip/PeerInfo.h"
-#include "utils/TomahawkUtilsGui.h"
-#include "utils/Logger.h"
-#include "infosystem/InfoSystem.h"
-#include "infosystem/InfoSystemWorker.h"
 #include "database/Database.h"
 #include "database/DatabaseImpl.h"
+#include "infosystem/InfoSystem.h"
+#include "infosystem/InfoSystemWorker.h"
+#include "network/Servent.h"
+#include "sip/PeerInfo.h"
+#include "sip/SipInfo.h"
+#include "sip/SipPlugin.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
 
 #include <QLabel>
 #include <QTextEdit>