diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 39434954c..fe218bc8d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -104,6 +104,7 @@ SET( tomahawkUI ${tomahawkUI}
 INCLUDE_DIRECTORIES(
     .
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk
 
     sourcetree
     libtomahawk
@@ -146,10 +147,12 @@ IF(QCA2_FOUND)
 ENDIF(QCA2_FOUND)
 
 INCLUDE(GNUInstallDirs)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in
-               ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TomahawkVersion.h.in
-               ${CMAKE_CURRENT_BINARY_DIR}/TomahawkVersion.h)
+
+# currently only in libtomahawk, we might want to properly split what's in which config file
+# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in
+#                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TomahawkVersion.h.in
+#                ${CMAKE_CURRENT_BINARY_DIR}/TomahawkVersion.h)
 
 # translations
 include( ${CMAKE_SOURCE_DIR}/lang/translations.cmake )
diff --git a/src/libtomahawk/AclRegistry.h b/src/libtomahawk/AclRegistry.h
index dfaa1491f..7fd9cb588 100644
--- a/src/libtomahawk/AclRegistry.h
+++ b/src/libtomahawk/AclRegistry.h
@@ -20,6 +20,8 @@
 #ifndef TOMAHAWK_ACLREGISTRY_H
 #define TOMAHAWK_ACLREGISTRY_H
 
+#include "DllMacro.h"
+
 #include <QObject>
 #include <QString>
 #include <QHash>
@@ -30,9 +32,6 @@
 #include <QStringList>
 #include <QUuid>
 
-#include "HeadlessCheck.h"
-#include "DllMacro.h"
-
 #define ACLUSERVERSION 1
 
 class DLLEXPORT ACLRegistry : public QObject
diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp
index 8115a8146..6b0afe143 100644
--- a/src/libtomahawk/ActionCollection.cpp
+++ b/src/libtomahawk/ActionCollection.cpp
@@ -26,6 +26,8 @@
 #include "utils/Logger.h"
 #include "Source.h"
 
+#include <QCoreApplication>
+
 ActionCollection* ActionCollection::s_instance = 0;
 ActionCollection* ActionCollection::instance()
 {
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index a71dab7f3..abba94f30 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -17,6 +17,11 @@ add_definitions( -DQT_SHARED )
 add_definitions( -DDLLEXPORT_PRO )
 add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../Config.h.in
+               ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../TomahawkVersion.h.in
+               ${CMAKE_CURRENT_BINARY_DIR}/TomahawkVersion.h)
+
 set( libGuiSources
     ActionCollection.cpp
 
@@ -335,18 +340,17 @@ set( libUI ${libUI}
     accounts/lastfm/LastFmConfig.ui
 )
 
-include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ..
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
+
     ${QT_INCLUDE_DIR}
     ${QJSON_INCLUDE_DIR}
     ${ECHONEST_INCLUDE_DIR}
     ${LIBLASTFM_INCLUDE_DIRS}
-    ${LIBLASTFM_INCLUDE_DIRS}/..
     ${CLUCENE_INCLUDE_DIRS}
     ${PHONON_INCLUDES}
 
-    playlist
-
     ${LIBPORTFWD_INCLUDE_DIR}
     ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/qxtweb
     ${QuaZip_INCLUDE_DIR}
diff --git a/src/libtomahawk/Collection.cpp b/src/libtomahawk/Collection.cpp
index ea83985ac..b10d0b63a 100644
--- a/src/libtomahawk/Collection.cpp
+++ b/src/libtomahawk/Collection.cpp
@@ -19,13 +19,13 @@
 
 #include "Collection.h"
 
-#include <QMetaObject>
-#include <QGenericArgument>
-
 #include "Source.h"
 
 #include "utils/Logger.h"
-#include <PlaylistUpdaterInterface.h>
+#include "playlist/PlaylistUpdaterInterface.h"
+
+#include <QMetaObject>
+#include <QGenericArgument>
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/ContextMenu.cpp b/src/libtomahawk/ContextMenu.cpp
index b4573d804..628d238a3 100644
--- a/src/libtomahawk/ContextMenu.cpp
+++ b/src/libtomahawk/ContextMenu.cpp
@@ -20,7 +20,7 @@
 #include "ContextMenu.h"
 
 #include "GlobalActionManager.h"
-#include "PlaylistView.h"
+#include "playlist/PlaylistView.h"
 #include "ViewManager.h"
 #include "Query.h"
 #include "Result.h"
diff --git a/src/libtomahawk/Playlist.cpp b/src/libtomahawk/Playlist.cpp
index 9550d20ea..64a519e55 100644
--- a/src/libtomahawk/Playlist.cpp
+++ b/src/libtomahawk/Playlist.cpp
@@ -20,9 +20,6 @@
 
 #include "Playlist.h"
 
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
-
 #include "database/Database.h"
 #include "database/DatabaseCommand_LoadPlaylistEntries.h"
 #include "database/DatabaseCommand_SetPlaylistRevision.h"
@@ -38,9 +35,12 @@
 
 #include "utils/Logger.h"
 #include "utils/Closure.h"
-#include "PlaylistUpdaterInterface.h"
+#include "playlist/PlaylistUpdaterInterface.h"
 #include "widgets/SourceTreePopupDialog.h"
 
+#include <QtXml/QDomDocument>
+#include <QtXml/QDomElement>
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp
index e5bf88b84..e073b2490 100644
--- a/src/libtomahawk/TomahawkSettings.cpp
+++ b/src/libtomahawk/TomahawkSettings.cpp
@@ -31,7 +31,7 @@
 
 #include "database/DatabaseCommand_UpdateSearchIndex.h"
 #include "database/Database.h"
-#include "PlaylistUpdaterInterface.h"
+#include "playlist/PlaylistUpdaterInterface.h"
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/TomahawkSettingsGui.cpp b/src/libtomahawk/TomahawkSettingsGui.cpp
index 2e6932fda..7bf2d6504 100644
--- a/src/libtomahawk/TomahawkSettingsGui.cpp
+++ b/src/libtomahawk/TomahawkSettingsGui.cpp
@@ -19,7 +19,6 @@
 #include "TomahawkSettingsGui.h"
 
 #include <QDesktopServices>
-#include "SettingsDialog.h"
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp
index d50e07111..0dd15b156 100644
--- a/src/libtomahawk/ViewManager.cpp
+++ b/src/libtomahawk/ViewManager.cpp
@@ -20,28 +20,25 @@
 
 #include "ViewManager.h"
 
-#include <QVBoxLayout>
-#include <QMetaMethod>
-
 #include "audio/AudioEngine.h"
 #include "context/ContextWidget.h"
 #include "infobar/InfoBar.h"
 
-#include "FlexibleView.h"
-#include "TreeModel.h"
-#include "PlaylistModel.h"
-#include "PlaylistView.h"
-#include "PlayableProxyModel.h"
-#include "PlayableModel.h"
-#include "TreeView.h"
-#include "GridView.h"
-#include "AlbumModel.h"
+#include "playlist/FlexibleView.h"
+#include "playlist/TreeModel.h"
+#include "playlist/PlaylistModel.h"
+#include "playlist/PlaylistView.h"
+#include "playlist/PlayableProxyModel.h"
+#include "playlist/PlayableModel.h"
+#include "playlist/TreeView.h"
+#include "playlist/GridView.h"
+#include "playlist/AlbumModel.h"
 #include "SourceList.h"
 #include "TomahawkSettings.h"
 
-#include "PlaylistLargeItemDelegate.h"
-#include "RecentlyPlayedModel.h"
-#include "dynamic/widgets/DynamicWidget.h"
+#include "playlist/PlaylistLargeItemDelegate.h"
+#include "playlist/RecentlyPlayedModel.h"
+#include "playlist/dynamic/widgets/DynamicWidget.h"
 
 #include "widgets/NewReleasesWidget.h"
 #include "widgets/WelcomeWidget.h"
@@ -55,6 +52,10 @@
 
 #include "utils/Logger.h"
 
+#include <QVBoxLayout>
+#include <QMetaMethod>
+
+
 #define FILTER_TIMEOUT 280
 
 using namespace Tomahawk;
diff --git a/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp b/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp
index 164883d64..b39395691 100644
--- a/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp
+++ b/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp
@@ -22,7 +22,9 @@
 #include "accounts/AccountManager.h"
 #include "SpotifyAccount.h"
 #include "utils/TomahawkUtils.h"
+
 #include <QMessageBox>
+#include <QApplication>
 
 using namespace Tomahawk;
 using namespace Accounts;
diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp
index 0a51299a3..e6df45925 100644
--- a/src/libtomahawk/audio/AudioEngine.cpp
+++ b/src/libtomahawk/audio/AudioEngine.cpp
@@ -21,10 +21,6 @@
 
 #include "config.h"
 
-#include <QtCore/QUrl>
-#include <QtNetwork/QNetworkReply>
-#include <QTemporaryFile>
-
 #include "PlaylistInterface.h"
 #include "SourcePlaylistInterface.h"
 #include "TomahawkSettings.h"
@@ -33,7 +29,6 @@
 #include "network/Servent.h"
 #include "utils/Qnr_IoDeviceStream.h"
 #include "utils/Closure.h"
-#include "HeadlessCheck.h"
 #include "infosystem/InfoSystem.h"
 #include "Album.h"
 #include "Pipeline.h"
@@ -42,7 +37,11 @@
 #include "jobview/ErrorStatusMessage.h"
 
 #include "utils/Logger.h"
-#include "SingleTrackPlaylistInterface.h"
+#include "playlist/SingleTrackPlaylistInterface.h"
+
+#include <QtCore/QUrl>
+#include <QtNetwork/QNetworkReply>
+#include <QTemporaryFile>
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/audio/AudioEngine.h b/src/libtomahawk/audio/AudioEngine.h
index df5d5f5f8..cf21b9f7f 100644
--- a/src/libtomahawk/audio/AudioEngine.h
+++ b/src/libtomahawk/audio/AudioEngine.h
@@ -20,22 +20,22 @@
 #ifndef AUDIOENGINE_H
 #define AUDIOENGINE_H
 
-#include <QtCore/QObject>
-#include <QtCore/QTimer>
-#include <QtCore/QQueue>
-
-#include <phonon/MediaObject>
-#include <phonon/AudioOutput>
-#include <phonon/BackendCapabilities>
-
-#include "libtomahawk/infosystem/InfoSystem.h"
-
+#include "infosystem/InfoSystem.h"
 #include "Typedefs.h"
 #include "Result.h"
 #include "PlaylistInterface.h"
 
 #include "DllMacro.h"
 
+#include <phonon/MediaObject>
+#include <phonon/AudioOutput>
+#include <phonon/BackendCapabilities>
+
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QQueue>
+
+
 class DLLEXPORT AudioEngine : public QObject
 {
 Q_OBJECT
diff --git a/src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.cpp b/src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.cpp
index d9b2f2a36..ad8d8e374 100644
--- a/src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.cpp
@@ -18,14 +18,11 @@
 
 #include "DatabaseCommand_CreateDynamicPlaylist.h"
 
-#include <QSqlQuery>
-#include <QSqlDriver>
-
 #include "DatabaseImpl.h"
 #include "TomahawkSqlQuery.h"
-#include "dynamic/DynamicPlaylist.h"
-#include "dynamic/DynamicControl.h"
-#include "dynamic/GeneratorInterface.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
+#include "playlist/dynamic/DynamicControl.h"
+#include "playlist/dynamic/GeneratorInterface.h"
 
 #include "Source.h"
 #include "network/Servent.h"
@@ -35,6 +32,9 @@
     #include "ViewManager.h"
 #endif
 
+#include <QSqlQuery>
+#include <QSqlDriver>
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.cpp b/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.cpp
index 1772589bf..b2db60005 100644
--- a/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.cpp
@@ -18,12 +18,12 @@
 
 #include "DatabaseCommand_DeleteDynamicPlaylist.h"
 
-#include <QSqlQuery>
-
-#include "dynamic/DynamicPlaylist.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
 #include "network/Servent.h"
 #include "utils/Logger.h"
 
+#include <QSqlQuery>
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.cpp b/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.cpp
index 467c71543..cf037a8d9 100644
--- a/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.cpp
@@ -18,13 +18,15 @@
 
 #include "DatabaseCommand_LoadAllAutoPlaylists.h"
 
-#include <QSqlQuery>
-
 #include "DatabaseImpl.h"
 #include "Source.h"
-#include "dynamic/DynamicPlaylist.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
 #include "utils/Logger.h"
 
+
+#include <QSqlQuery>
+
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.cpp b/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.cpp
index 95bd87136..1468e9e85 100644
--- a/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.cpp
@@ -20,7 +20,7 @@
 #include "DatabaseImpl.h"
 
 #include "Playlist.h"
-#include <libtomahawk/SourceList.h>
+#include "SourceList.h"
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/database/DatabaseCommand_LoadAllStations.cpp b/src/libtomahawk/database/DatabaseCommand_LoadAllStations.cpp
index 36cee7e0c..e56e40a23 100644
--- a/src/libtomahawk/database/DatabaseCommand_LoadAllStations.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_LoadAllStations.cpp
@@ -18,13 +18,14 @@
 
 #include "DatabaseCommand_LoadAllStations.h"
 
-#include <QSqlQuery>
 
 #include "DatabaseImpl.h"
 #include "Source.h"
-#include "dynamic/DynamicPlaylist.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
 #include "utils/Logger.h"
 
+#include <QSqlQuery>
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.cpp b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.cpp
index 70df163aa..5e333a42b 100644
--- a/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.cpp
@@ -18,14 +18,15 @@
 
 #include "DatabaseCommand_LoadDynamicPlaylist.h"
 
-#include <QSqlQuery>
-
 #include "DatabaseImpl.h"
 #include "Source.h"
-#include "dynamic/DynamicPlaylist.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
 #include "utils/Logger.h"
 #include "Source.h"
 
+#include <QSqlQuery>
+
+
 using namespace Tomahawk;
 
 Tomahawk::DatabaseCommand_LoadDynamicPlaylist::DatabaseCommand_LoadDynamicPlaylist( const source_ptr& s, const QString& guid, QObject* parent )
diff --git a/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp
index 985b22c67..c429f4846 100644
--- a/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp
@@ -18,18 +18,18 @@
 
 #include "DatabaseCommand_LoadDynamicPlaylistEntries.h"
 
-#include <QSqlQuery>
-#include <QString>
-
 #include "DatabaseImpl.h"
 #include "TomahawkSqlQuery.h"
-#include "dynamic/DynamicControl.h"
-#include "dynamic/GeneratorInterface.h"
-#include "dynamic/GeneratorFactory.h"
+#include "playlist/dynamic/DynamicControl.h"
+#include "playlist/dynamic/GeneratorInterface.h"
+#include "playlist/dynamic/GeneratorFactory.h"
 #include "qjson/parser.h"
 #include "utils/Logger.h"
 #include "Source.h"
 
+#include <QSqlQuery>
+#include <QString>
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.cpp b/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.cpp
index 031e434f5..3d37da562 100644
--- a/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.cpp
@@ -18,16 +18,15 @@
 
 #include "DatabaseCommand_SetDynamicPlaylistRevision.h"
 
-#include <QSqlQuery>
-
 #include "Source.h"
 #include "DatabaseImpl.h"
 #include "TomahawkSqlQuery.h"
-#include "dynamic/DynamicPlaylist.h"
-#include "dynamic/DynamicControl.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
+#include "playlist/dynamic/DynamicControl.h"
 #include "network/Servent.h"
 #include "utils/Logger.h"
 
+#include <QSqlQuery>
 
 DatabaseCommand_SetDynamicPlaylistRevision::DatabaseCommand_SetDynamicPlaylistRevision( const Tomahawk::source_ptr& s,
                                                                                 const QString& playlistguid,
diff --git a/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.h b/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.h
index 4f863e871..a23f39ddd 100644
--- a/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.h
+++ b/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.h
@@ -20,7 +20,7 @@
 #define DATABASECOMMAND_SETDYNAMICPLAYLISTREVISION_H
 
 #include "DatabaseCommand_SetPlaylistRevision.h"
-#include "dynamic/GeneratorInterface.h"
+#include "playlist/dynamic/GeneratorInterface.h"
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/filemetadata/ScanManager.cpp b/src/libtomahawk/filemetadata/ScanManager.cpp
index 08c223400..c3a26d608 100644
--- a/src/libtomahawk/filemetadata/ScanManager.cpp
+++ b/src/libtomahawk/filemetadata/ScanManager.cpp
@@ -19,15 +19,10 @@
 
 #include "ScanManager.h"
 
-#include <QtCore/QThread>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
-#include <QtCore/QSet>
-
 #include "MusicScanner.h"
 #include "TomahawkSettings.h"
 #include "utils/TomahawkUtils.h"
-#include "libtomahawk/SourceList.h"
+#include "SourceList.h"
 
 #include "database/Database.h"
 #include "database/DatabaseCommand_FileMTimes.h"
@@ -35,6 +30,11 @@
 
 #include "utils/Logger.h"
 
+#include <QThread>
+#include <QCoreApplication>
+#include <QTimer>
+#include <QSet>
+
 ScanManager* ScanManager::s_instance = 0;
 
 
diff --git a/src/libtomahawk/infosystem/InfoSystemWorker.cpp b/src/libtomahawk/infosystem/InfoSystemWorker.cpp
index f52ba8729..86b3f1af0 100644
--- a/src/libtomahawk/infosystem/InfoSystemWorker.cpp
+++ b/src/libtomahawk/infosystem/InfoSystemWorker.cpp
@@ -21,7 +21,6 @@
 #include "InfoSystemWorker.h"
 
 #include "config.h"
-#include "HeadlessCheck.h"
 #include "InfoSystemCache.h"
 #include "GlobalActionManager.h"
 #include "utils/TomahawkUtils.h"
diff --git a/src/libtomahawk/jobview/AclJobItem.cpp b/src/libtomahawk/jobview/AclJobItem.cpp
index 335eda707..e7ff72a60 100644
--- a/src/libtomahawk/jobview/AclJobItem.cpp
+++ b/src/libtomahawk/jobview/AclJobItem.cpp
@@ -22,7 +22,7 @@
 #include "JobStatusModel.h"
 #include "utils/TomahawkUtils.h"
 #include "utils/TomahawkUtilsGui.h"
-#include "libtomahawk/infosystem/InfoSystem.h"
+#include "infosystem/InfoSystem.h"
 #include "utils/Logger.h"
 
 #include <QPixmap>
diff --git a/src/libtomahawk/jobview/PipelineStatusItem.cpp b/src/libtomahawk/jobview/PipelineStatusItem.cpp
index ab7c9d05e..18f8a7f16 100644
--- a/src/libtomahawk/jobview/PipelineStatusItem.cpp
+++ b/src/libtomahawk/jobview/PipelineStatusItem.cpp
@@ -22,7 +22,6 @@
 
 #include "utils/TomahawkUtils.h"
 #include "Pipeline.h"
-#include "TomahawkApp.h"
 #include "JobStatusModel.h"
 #include "JobStatusView.h"
 #include "Source.h"
diff --git a/src/libtomahawk/network/Connection.h b/src/libtomahawk/network/Connection.h
index 6bc1122bd..ba8d92e28 100644
--- a/src/libtomahawk/network/Connection.h
+++ b/src/libtomahawk/network/Connection.h
@@ -20,27 +20,28 @@
 #ifndef CONNECTION_H
 #define CONNECTION_H
 
-#include <QtCore/QSharedPointer>
-#include <QtNetwork/QTcpSocket>
-#include <QtNetwork/QHostAddress>
-#include <QtCore/QVariant>
-#include <QtCore/QVariantMap>
-#include <QtCore/QString>
-#include <QtCore/QDataStream>
-#include <QtCore/QtEndian>
-#include <QtCore/QTimer>
-#include <QtCore/QTime>
-#include <QtCore/QPointer>
+#include "Msg.h"
+#include "MsgProcessor.h"
+#include "AclRegistry.h"
+
+#include "DllMacro.h"
 
 #include <qjson/parser.h>
 #include <qjson/serializer.h>
 #include <qjson/qobjecthelper.h>
 
-#include "Msg.h"
-#include "MsgProcessor.h"
-#include "libtomahawk/AclRegistry.h"
+#include <QSharedPointer>
+#include <QTcpSocket>
+#include <QHostAddress>
+#include <QVariant>
+#include <QVariantMap>
+#include <QString>
+#include <QDataStream>
+#include <QtEndian>
+#include <QTimer>
+#include <QTime>
+#include <QPointer>
 
-#include "DllMacro.h"
 
 class Servent;
 
diff --git a/src/libtomahawk/network/DbSyncConnection.h b/src/libtomahawk/network/DbSyncConnection.h
index 64ef84df8..427a2c4ce 100644
--- a/src/libtomahawk/network/DbSyncConnection.h
+++ b/src/libtomahawk/network/DbSyncConnection.h
@@ -19,14 +19,16 @@
 #ifndef DBSYNCCONNECTION_H
 #define DBSYNCCONNECTION_H
 
+#include "network/Connection.h"
+#include "database/Op.h"
+#include "Typedefs.h"
+
 #include <QObject>
 #include <QTimer>
 #include <QSharedPointer>
 #include <QIODevice>
 
-#include "network/Connection.h"
-#include "database/Op.h"
-#include "Typedefs.h"
+
 
 class DatabaseCommand;
 
diff --git a/src/libtomahawk/network/PortFwdThread.cpp b/src/libtomahawk/network/PortFwdThread.cpp
index b6b4d84a6..c42cf0ad5 100644
--- a/src/libtomahawk/network/PortFwdThread.cpp
+++ b/src/libtomahawk/network/PortFwdThread.cpp
@@ -18,11 +18,11 @@
 
 #include "PortFwdThread.h"
 
-#include "HeadlessCheck.h"
 #include "portfwd/portfwd.h"
 #include "utils/Logger.h"
 #include "Source.h"
 
+#include <QCoreApplication>
 #include <QNetworkInterface>
 #include <QStringList>
 #include <QTime>
diff --git a/src/libtomahawk/playlist/TreeProxyModel.h b/src/libtomahawk/playlist/TreeProxyModel.h
index c8bcb43ab..0578d6ac5 100644
--- a/src/libtomahawk/playlist/TreeProxyModel.h
+++ b/src/libtomahawk/playlist/TreeProxyModel.h
@@ -56,7 +56,7 @@ protected:
 
     bool lessThan( const QModelIndex& left, const QModelIndex& right ) const;
     // workaround overloaded-virtual warning: using this would lead to serious weirdness in release mode, sometimes an assert is simply not enough
-    bool lessThan(int, const Tomahawk::query_ptr&, const Tomahawk::query_ptr&) const {  Q_ASSERT(false); TomahawkUtils::crash(); return false; }
+    bool lessThan( int, const Tomahawk::query_ptr&, const Tomahawk::query_ptr& ) const {  Q_ASSERT( false ); TomahawkUtils::crash(); return false; }
 
 private slots:
     void onRowsInserted( const QModelIndex& parent, int start, int end );
diff --git a/src/libtomahawk/playlist/dynamic/DynamicModel.h b/src/libtomahawk/playlist/dynamic/DynamicModel.h
index 683f4c2d4..58db92a84 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicModel.h
+++ b/src/libtomahawk/playlist/dynamic/DynamicModel.h
@@ -20,7 +20,7 @@
 #ifndef DYNAMIC_MODEL_H
 #define DYNAMIC_MODEL_H
 
-#include "PlaylistModel.h"
+#include "playlist/PlaylistModel.h"
 #include "Query.h"
 
 namespace Tomahawk
diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylistRevision.cpp b/src/libtomahawk/playlist/dynamic/DynamicPlaylistRevision.cpp
index bbc85b57a..d14737b07 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicPlaylistRevision.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylistRevision.cpp
@@ -18,7 +18,7 @@
 
 #include "DynamicPlaylistRevision.h"
 
-#include "dynamic/DynamicControl.h"
+#include "playlist/dynamic/DynamicControl.h"
 #include "Source.h"
 
 using namespace Tomahawk;
diff --git a/src/libtomahawk/playlist/dynamic/DynamicView.cpp b/src/libtomahawk/playlist/dynamic/DynamicView.cpp
index acd6aec43..beaf51804 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicView.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicView.cpp
@@ -19,18 +19,19 @@
 
 #include "DynamicView.h"
 
+#include "../PlaylistModel.h"
+#include "../PlayableProxyModel.h"
+#include "DynamicModel.h"
+#include "widgets/OverlayWidget.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
 #include <QApplication>
 #include <QPainter>
 #include <QPaintEvent>
 #include <QPaintEngine>
 #include <QScrollBar>
 
-#include "PlaylistModel.h"
-#include "PlayableProxyModel.h"
-#include "DynamicModel.h"
-#include "widgets/OverlayWidget.h"
-#include "utils/Logger.h"
-#include "Source.h"
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/playlist/dynamic/GeneratorFactory.cpp b/src/libtomahawk/playlist/dynamic/GeneratorFactory.cpp
index c534c6066..75838998e 100644
--- a/src/libtomahawk/playlist/dynamic/GeneratorFactory.cpp
+++ b/src/libtomahawk/playlist/dynamic/GeneratorFactory.cpp
@@ -16,8 +16,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dynamic/GeneratorFactory.h"
-#include "dynamic/GeneratorInterface.h"
+#include "playlist/dynamic/GeneratorFactory.h"
+#include "playlist/dynamic/GeneratorInterface.h"
 
 #include "utils/Logger.h"
 #include "Source.h"
diff --git a/src/libtomahawk/playlist/dynamic/GeneratorInterface.cpp b/src/libtomahawk/playlist/dynamic/GeneratorInterface.cpp
index 4b6bd1aca..9cfb12c76 100644
--- a/src/libtomahawk/playlist/dynamic/GeneratorInterface.cpp
+++ b/src/libtomahawk/playlist/dynamic/GeneratorInterface.cpp
@@ -17,7 +17,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dynamic/GeneratorInterface.h"
+#include "playlist/dynamic/GeneratorInterface.h"
 
 #include "utils/Logger.h"
 #include "Source.h"
diff --git a/src/libtomahawk/playlist/dynamic/database/DatabaseControl.h b/src/libtomahawk/playlist/dynamic/database/DatabaseControl.h
index bf2a39d7e..257b50c14 100644
--- a/src/libtomahawk/playlist/dynamic/database/DatabaseControl.h
+++ b/src/libtomahawk/playlist/dynamic/database/DatabaseControl.h
@@ -19,7 +19,7 @@
 #ifndef DATABASE_CONTROL_H
 #define DATABASE_CONTROL_H
 
-#include "dynamic/DynamicControl.h"
+#include "playlist/dynamic/DynamicControl.h"
 
 #include <QTimer>
 
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
index 5f37bd92d..d9983b846 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
@@ -16,7 +16,16 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dynamic/echonest/EchonestControl.h"
+#include "playlist/dynamic/echonest/EchonestControl.h"
+
+#include "playlist/dynamic/widgets/MiscControlWidgets.h"
+
+#include "EchonestGenerator.h"
+
+#include "utils/Logger.h"
+#include "SourceList.h"
+
+#include <echonest/Playlist.h>
 
 #include <QComboBox>
 #include <QLineEdit>
@@ -24,13 +33,6 @@
 #include <QCompleter>
 #include <QStringListModel>
 
-#include "dynamic/widgets/MiscControlWidgets.h"
-#include <echonest/Playlist.h>
-#include "EchonestGenerator.h"
-
-#include "utils/Logger.h"
-#include <SourceList.h>
-
 
 QHash< QString, QStringList > Tomahawk::EchonestControl::s_suggestCache = QHash< QString, QStringList >();
 bool Tomahawk::EchonestControl::s_fetchingMoodsAndStyles = false;
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
index f4df5eb61..b4839834f 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
@@ -19,9 +19,9 @@
 #ifndef ECHONEST_CONTROL_H
 #define ECHONEST_CONTROL_H
 
-#include <echonest/Playlist.h>
+#include "playlist/dynamic/DynamicControl.h"
 
-#include "dynamic/DynamicControl.h"
+#include <echonest/Playlist.h>
 
 #include <QTimer>
 
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
index a0ea2f3a2..e581d7aff 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
@@ -16,9 +16,9 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dynamic/echonest/EchonestGenerator.h"
-#include "dynamic/echonest/EchonestControl.h"
-#include "dynamic/echonest/EchonestSteerer.h"
+#include "playlist/dynamic/echonest/EchonestGenerator.h"
+#include "playlist/dynamic/echonest/EchonestControl.h"
+#include "playlist/dynamic/echonest/EchonestSteerer.h"
 #include "Query.h"
 #include "utils/TomahawkUtils.h"
 #include "TomahawkSettings.h"
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
index 82a44d3c0..179cf6b73 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
@@ -16,7 +16,14 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dynamic/echonest/EchonestSteerer.h"
+#include "playlist/dynamic/echonest/EchonestSteerer.h"
+
+#include "Source.h"
+#include "playlist/dynamic/widgets/DynamicWidget.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+#include <echonest/Playlist.h>
 
 #include <QPaintEvent>
 #include <QHBoxLayout>
@@ -27,13 +34,6 @@
 #include <QToolButton>
 #include <QPropertyAnimation>
 
-#include "echonest/Playlist.h"
-#include "Source.h"
-#include "dynamic/widgets/DynamicWidget.h"
-
-#include "utils/TomahawkUtils.h"
-#include "utils/Logger.h"
-
 using namespace Tomahawk;
 
 #define ANIM_DURATION 300
diff --git a/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp b/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp
index 728638e56..e87cb525b 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp
@@ -21,19 +21,19 @@
 
 #include "DynamicControlList.h"
 #include "DynamicControlWrapper.h"
-#include "dynamic/GeneratorInterface.h"
-#include "dynamic/DynamicControl.h"
+#include "playlist/dynamic/GeneratorInterface.h"
+#include "playlist/dynamic/DynamicControl.h"
 #include "utils/TomahawkUtils.h"
 #include "widgets/ElidedLabel.h"
 #include "Source.h"
 
-#include <QtGui/QLabel>
-#include <QtGui/QStackedLayout>
-#include <QtGui/QToolButton>
-#include <QtCore/QEasingCurve>
-#include <QtCore/QTimeLine>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPainter>
+#include <QLabel>
+#include <QStackedLayout>
+#include <QToolButton>
+#include <QEasingCurve>
+#include <QTimeLine>
+#include <QPaintEvent>
+#include <QPainter>
 
 #include "utils/Logger.h"
 
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp
index 9ea763c28..fbb7f6b50 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp
@@ -18,6 +18,12 @@
 
 #include "DynamicControlList.h"
 
+#include "DynamicControlWrapper.h"
+#include "playlist/dynamic/GeneratorInterface.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
 #include <QLayout>
 #include <QLabel>
 #include <QPaintEvent>
@@ -27,11 +33,6 @@
 #include <QGridLayout>
 #include <QHBoxLayout>
 
-#include "DynamicControlWrapper.h"
-#include "dynamic/GeneratorInterface.h"
-#include "utils/TomahawkUtils.h"
-#include "utils/Logger.h"
-#include "Source.h"
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.h b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.h
index 65f6c1ed4..bc70e09dc 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.h
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.h
@@ -20,7 +20,7 @@
 #define DYNAMIC_CONTROL_LIST_H
 
 #include "Typedefs.h"
-#include "dynamic/DynamicPlaylist.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
 
 #include <QStackedWidget>
 
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp
index d948c437b..25a677520 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp
@@ -18,6 +18,10 @@
 
 #include "DynamicControlWrapper.h"
 
+#include "playlist/dynamic/DynamicControl.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
 #include <QHBoxLayout>
 #include <QComboBox>
 #include <QLayout>
@@ -26,10 +30,6 @@
 #include <QPainter>
 #include <QStackedLayout>
 
-#include "dynamic/DynamicControl.h"
-#include "utils/TomahawkUtils.h"
-#include "utils/Logger.h"
-
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
index 8cebb8fea..93c7b97a3 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
@@ -19,20 +19,12 @@
 
 #include "DynamicWidget.h"
 
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QComboBox>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QEvent>
-#include <QPainter>
-
 #include "DynamicControlList.h"
-#include "dynamic/DynamicModel.h"
-#include "PlayableProxyModel.h"
-#include "PlayableItem.h"
-#include "dynamic/GeneratorInterface.h"
-#include "dynamic/GeneratorFactory.h"
+#include "playlist/dynamic/DynamicModel.h"
+#include "playlist/PlayableProxyModel.h"
+#include "playlist/PlayableItem.h"
+#include "playlist/dynamic/GeneratorInterface.h"
+#include "playlist/dynamic/GeneratorFactory.h"
 #include "Pipeline.h"
 #include "Source.h"
 #include "audio/AudioEngine.h"
@@ -40,11 +32,19 @@
 #include "CollapsibleControls.h"
 #include "DynamicControlWrapper.h"
 #include "ViewManager.h"
-#include "dynamic/DynamicView.h"
+#include "playlist/dynamic/DynamicView.h"
 #include "DynamicSetupWidget.h"
 #include "utils/AnimatedSpinner.h"
 #include "utils/Logger.h"
 
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QComboBox>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QEvent>
+#include <QPainter>
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp
index 4c720b2ce..77a0ccb82 100644
--- a/src/libtomahawk/utils/TomahawkUtils.cpp
+++ b/src/libtomahawk/utils/TomahawkUtils.cpp
@@ -20,7 +20,6 @@
 
 #include "TomahawkVersion.h"
 #include "config.h"
-#include "HeadlessCheck.h"
 #include "TomahawkSettings.h"
 
 #include "utils/TomahawkUtils.h"
@@ -33,6 +32,10 @@
     #include <lastfm/ws.h>
 #endif
 
+#include <quazip.h>
+#include <quazipfile.h>
+
+
 #include <QNetworkConfiguration>
 #include <QNetworkAccessManager>
 #include <QNetworkProxy>
@@ -44,9 +47,6 @@
 #include <QCryptographicHash>
 #include <QProcess>
 
-#include <quazip.h>
-#include <quazipfile.h>
-
 #ifdef Q_OS_WIN
     #include <windows.h>
     #include <shlobj.h>
@@ -527,9 +527,9 @@ proxyFactory( bool makeClone, bool noMutexLocker )
 
     // create a new proxy factory for this thread
     TomahawkUtils::NetworkProxyFactory *newProxyFactory = new TomahawkUtils::NetworkProxyFactory();
-    if ( s_threadProxyFactoryHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) )
+    if ( s_threadProxyFactoryHash.contains( QCoreApplication::instance()->thread() ) )
     {
-        TomahawkUtils::NetworkProxyFactory *mainProxyFactory = s_threadProxyFactoryHash[ TOMAHAWK_APPLICATION::instance()->thread() ];
+        TomahawkUtils::NetworkProxyFactory *mainProxyFactory = s_threadProxyFactoryHash[ QCoreApplication::instance()->thread() ];
         *newProxyFactory = *mainProxyFactory;
     }
 
@@ -549,10 +549,10 @@ setProxyFactory( NetworkProxyFactory* factory, bool noMutexLocker )
     QMutex otherMutex;
     QMutexLocker locker( noMutexLocker ? &otherMutex : &s_namAccessMutex );
 
-    if ( !s_threadProxyFactoryHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) )
+    if ( !s_threadProxyFactoryHash.contains( QCoreApplication::instance()->thread() ) )
         return;
 
-    if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
+    if ( QThread::currentThread() == QCoreApplication::instance()->thread() )
     {
         foreach ( QThread* thread, s_threadProxyFactoryHash.keys() )
         {
@@ -579,9 +579,9 @@ nam()
         return s_threadNamHash[ QThread::currentThread() ];
     }
 
-    if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) )
+    if ( !s_threadNamHash.contains( QCoreApplication::instance()->thread() ) )
     {
-        if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
+        if ( QThread::currentThread() == QCoreApplication::instance()->thread() )
         {
             setNam( new QNetworkAccessManager(), true );
             return s_threadNamHash[ QThread::currentThread() ];
@@ -592,7 +592,7 @@ nam()
     tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Found gui thread in nam hash";
 
     // Create a nam for this thread based on the main thread's settings but with its own proxyfactory
-    QNetworkAccessManager *mainNam = s_threadNamHash[ TOMAHAWK_APPLICATION::instance()->thread() ];
+    QNetworkAccessManager *mainNam = s_threadNamHash[ QCoreApplication::instance()->thread() ];
     QNetworkAccessManager* newNam = new QNetworkAccessManager();
 
     newNam->setConfiguration( QNetworkConfiguration( mainNam->configuration() ) );
@@ -616,10 +616,10 @@ setNam( QNetworkAccessManager* nam, bool noMutexLocker )
     // Don't lock if being called from nam()()
     QMutex otherMutex;
     QMutexLocker locker( noMutexLocker ? &otherMutex : &s_namAccessMutex );
-    if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) &&
-            QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
+    if ( !s_threadNamHash.contains( QCoreApplication::instance()->thread() ) &&
+            QThread::currentThread() == QCoreApplication::instance()->thread() )
     {
-        tDebug( LOGVERBOSE ) << "creating initial gui thread (" << TOMAHAWK_APPLICATION::instance()->thread() << ") nam";
+        tDebug( LOGVERBOSE ) << "creating initial gui thread (" << QCoreApplication::instance()->thread() << ") nam";
         // Should only get here on first initialization of the nam
         TomahawkSettings *s = TomahawkSettings::instance();
         TomahawkUtils::NetworkProxyFactory* proxyFactory = new TomahawkUtils::NetworkProxyFactory();
@@ -649,7 +649,7 @@ setNam( QNetworkAccessManager* nam, bool noMutexLocker )
 
     s_threadNamHash[ QThread::currentThread() ] = nam;
 
-    if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
+    if ( QThread::currentThread() == QCoreApplication::instance()->thread() )
         setProxyFactory( dynamic_cast< TomahawkUtils::NetworkProxyFactory* >( nam->proxyFactory() ), true );
 }
 
diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
index ed6f145c1..5e4823582 100644
--- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp
+++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
@@ -23,16 +23,16 @@
 #include "Query.h"
 #include "Result.h"
 #include "Logger.h"
-#include "PlayableItem.h"
+#include "playlist/PlayableItem.h"
 #include "Source.h"
 
-#include <QtGui/QLayout>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtGui/QPalette>
-#include <QtGui/QApplication>
-#include <QtGui/QScrollBar>
-#include <QtGui/QWidget>
+#include <QLayout>
+#include <QPainter>
+#include <QPixmap>
+#include <QPalette>
+#include <QApplication>
+#include <QScrollBar>
+#include <QWidget>
 #include <QStyleOption>
 #include <QDesktopServices>
 
diff --git a/src/libtomahawk/utils/XspfLoader.cpp b/src/libtomahawk/utils/XspfLoader.cpp
index 51fd7068f..e7d27c8b9 100644
--- a/src/libtomahawk/utils/XspfLoader.cpp
+++ b/src/libtomahawk/utils/XspfLoader.cpp
@@ -20,10 +20,6 @@
 
 #include "XspfLoader.h"
 
-#include "HeadlessCheck.h"
-
-#include <QDomDocument>
-
 #ifndef ENABLE_HEADLESS
 #include "jobview/JobStatusView.h"
 #include "jobview/JobStatusModel.h"
@@ -32,13 +28,15 @@
 
 #include "SourceList.h"
 #include "Playlist.h"
-#include <XspfUpdater.h>
-#include <Pipeline.h>
+#include "playlist/XspfUpdater.h"
+#include "Pipeline.h"
 
 #include "utils/NetworkReply.h"
 #include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
+#include <QDomDocument>
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/widgets/NewReleasesWidget.cpp b/src/libtomahawk/widgets/NewReleasesWidget.cpp
index 4e3d99b67..6d2e78fdc 100644
--- a/src/libtomahawk/widgets/NewReleasesWidget.cpp
+++ b/src/libtomahawk/widgets/NewReleasesWidget.cpp
@@ -23,10 +23,6 @@
 #include "WhatsHotWidget_p.h"
 #include "ui_NewReleasesWidget.h"
 
-#include <QPainter>
-#include <QStandardItemModel>
-#include <QStandardItem>
-
 #include "ViewManager.h"
 #include "SourceList.h"
 #include "TomahawkSettings.h"
@@ -34,7 +30,7 @@
 #include "ChartDataLoader.h"
 
 #include "audio/AudioEngine.h"
-#include "dynamic/GeneratorInterface.h"
+#include "playlist/dynamic/GeneratorInterface.h"
 #include "playlist/PlaylistModel.h"
 #include "playlist/TreeProxyModel.h"
 #include "playlist/PlaylistChartItemDelegate.h"
@@ -42,6 +38,11 @@
 #include "utils/Logger.h"
 #include "Pipeline.h"
 
+#include <QPainter>
+#include <QStandardItemModel>
+#include <QStandardItem>
+
+
 #define HISTORY_TRACK_ITEMS 25
 #define HISTORY_PLAYLIST_ITEMS 10
 #define HISTORY_RESOLVING_TIMEOUT 2500
diff --git a/src/libtomahawk/widgets/OverlayWidget.cpp b/src/libtomahawk/widgets/OverlayWidget.cpp
index 6395fa7da..ba9040fa9 100644
--- a/src/libtomahawk/widgets/OverlayWidget.cpp
+++ b/src/libtomahawk/widgets/OverlayWidget.cpp
@@ -19,12 +19,13 @@
 
 #include "OverlayWidget.h"
 
+#include "playlist/PlayableProxyModel.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+
 #include <QPainter>
 #include <QPropertyAnimation>
 
-#include "PlayableProxyModel.h"
-#include "utils/TomahawkUtilsGui.h"
-#include "utils/Logger.h"
 
 #define CORNER_ROUNDNESS 8.0
 #define FADING_DURATION 500
diff --git a/src/libtomahawk/widgets/RecentPlaylistsModel.cpp b/src/libtomahawk/widgets/RecentPlaylistsModel.cpp
index ba0eca7bd..348add60f 100644
--- a/src/libtomahawk/widgets/RecentPlaylistsModel.cpp
+++ b/src/libtomahawk/widgets/RecentPlaylistsModel.cpp
@@ -23,11 +23,11 @@
 #include "audio/AudioEngine.h"
 #include "SourceList.h"
 #include "utils/Logger.h"
-#include "dynamic/DynamicPlaylist.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
 #include "database/Database.h"
 #include "database/DatabaseCommand_LoadAllSortedPlaylists.h"
 #include "RecentlyPlayedPlaylistsModel.h"
-#include <network/Servent.h>
+#include "network/Servent.h"
 
 #define REFRESH_TIMEOUT 1000
 
diff --git a/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp b/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp
index f1dbf14dc..0610490d9 100644
--- a/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp
+++ b/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp
@@ -24,7 +24,7 @@
 #include "audio/AudioEngine.h"
 #include "SourceList.h"
 #include "utils/Logger.h"
-#include "dynamic/DynamicPlaylist.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
 #include "Playlist.h"
 
 using namespace Tomahawk;
diff --git a/src/libtomahawk/widgets/SocialPlaylistWidget.cpp b/src/libtomahawk/widgets/SocialPlaylistWidget.cpp
index 99c5c4d8d..3f4370b4f 100644
--- a/src/libtomahawk/widgets/SocialPlaylistWidget.cpp
+++ b/src/libtomahawk/widgets/SocialPlaylistWidget.cpp
@@ -23,9 +23,9 @@
 #include "database/DatabaseCommand_LoadDynamicPlaylist.h"
 #include "database/Database.h"
 #include "SourceList.h"
-#include "PlayableModel.h"
-#include "dynamic/GeneratorInterface.h"
-#include "dynamic/database/DatabaseGenerator.h"
+#include "playlist/PlayableModel.h"
+#include "playlist/dynamic/GeneratorInterface.h"
+#include "playlist/dynamic/database/DatabaseGenerator.h"
 #include "utils/Logger.h"
 #include "database/DatabaseCommand_GenericSelect.h"
 #include "widgets/OverlayWidget.h"
diff --git a/src/libtomahawk/widgets/WelcomeWidget.cpp b/src/libtomahawk/widgets/WelcomeWidget.cpp
index 4de82bd64..ad3d5559a 100644
--- a/src/libtomahawk/widgets/WelcomeWidget.cpp
+++ b/src/libtomahawk/widgets/WelcomeWidget.cpp
@@ -21,8 +21,6 @@
 #include "WelcomeWidget.h"
 #include "ui_WelcomeWidget.h"
 
-#include <QtGui/QPainter>
-
 #include "ViewManager.h"
 #include "SourceList.h"
 #include "TomahawkSettings.h"
@@ -35,9 +33,12 @@
 #include "utils/AnimatedSpinner.h"
 #include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
-#include "dynamic/GeneratorInterface.h"
+#include "playlist/dynamic/GeneratorInterface.h"
 #include "RecentlyPlayedPlaylistsModel.h"
 
+#include <QPainter>
+
+
 #define HISTORY_PLAYLIST_ITEMS 10
 
 using namespace Tomahawk;
diff --git a/src/libtomahawk/widgets/WhatsHotWidget.cpp b/src/libtomahawk/widgets/WhatsHotWidget.cpp
index da9b0417c..8100f5969 100644
--- a/src/libtomahawk/widgets/WhatsHotWidget.cpp
+++ b/src/libtomahawk/widgets/WhatsHotWidget.cpp
@@ -23,9 +23,6 @@
 #include "WhatsHotWidget_p.h"
 #include "ui_WhatsHotWidget.h"
 
-#include <QPainter>
-#include <QStandardItemModel>
-#include <QStandardItem>
 
 #include "ViewManager.h"
 #include "SourceList.h"
@@ -34,7 +31,7 @@
 #include "ChartDataLoader.h"
 
 #include "audio/AudioEngine.h"
-#include "dynamic/GeneratorInterface.h"
+#include "playlist/dynamic/GeneratorInterface.h"
 #include "playlist/PlayableModel.h"
 #include "playlist/PlaylistModel.h"
 #include "playlist/TreeProxyModel.h"
@@ -44,6 +41,11 @@
 #include "Pipeline.h"
 #include "utils/AnimatedSpinner.h"
 
+#include <QPainter>
+#include <QStandardItemModel>
+#include <QStandardItem>
+
+
 #define HISTORY_TRACK_ITEMS 25
 #define HISTORY_PLAYLIST_ITEMS 10
 #define HISTORY_RESOLVING_TIMEOUT 2500
diff --git a/src/libtomahawk/widgets/WhatsHotWidget.ui b/src/libtomahawk/widgets/WhatsHotWidget.ui
index 88eb41339..dba284e79 100644
--- a/src/libtomahawk/widgets/WhatsHotWidget.ui
+++ b/src/libtomahawk/widgets/WhatsHotWidget.ui
@@ -71,7 +71,7 @@
   <customwidget>
    <class>TreeView</class>
    <extends>QTreeView</extends>
-   <header>TreeView.h</header>
+   <header>playlist/TreeView.h</header>
   </customwidget>
   <customwidget>
    <class>PlaylistView</class>
diff --git a/src/libtomahawk/widgets/WhatsHotWidget_p.h b/src/libtomahawk/widgets/WhatsHotWidget_p.h
index 8be446db3..45d836841 100644
--- a/src/libtomahawk/widgets/WhatsHotWidget_p.h
+++ b/src/libtomahawk/widgets/WhatsHotWidget_p.h
@@ -23,8 +23,8 @@
 #include "WhatsHotWidget.h"
 #include "PlaylistInterface.h"
 #include "ui_WhatsHotWidget.h"
-#include "TreeProxyModel.h"
-#include "PlaylistView.h"
+#include "playlist/TreeProxyModel.h"
+#include "playlist/PlaylistView.h"
 #include "Result.h"
 
 #include <QObject>
diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
index 6518b8587..58d51c8cf 100644
--- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
@@ -22,9 +22,6 @@
 #include "ui_AlbumInfoWidget.h"
 #include "AlbumInfoWidget_p.h"
 
-#include <QScrollArea>
-#include <QScrollBar>
-
 #include "audio/AudioEngine.h"
 #include "ViewManager.h"
 #include "database/Database.h"
@@ -39,6 +36,9 @@
 #include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 
+#include <QScrollArea>
+#include <QScrollBar>
+
 using namespace Tomahawk;
 
 
diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui
index 7f66f9714..a5826e50d 100644
--- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui
+++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui
@@ -331,7 +331,7 @@
   <customwidget>
    <class>GridView</class>
    <extends>QListView</extends>
-   <header location="global">GridView.h</header>
+   <header location="global">playlist/GridView.h</header>
   </customwidget>
   <customwidget>
    <class>TreeView</class>
diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget_p.h b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget_p.h
index f8bac3ea5..d87a36908 100644
--- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget_p.h
+++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget_p.h
@@ -22,7 +22,7 @@
 #include "AlbumInfoWidget.h"
 #include "ui_AlbumInfoWidget.h"
 #include "PlaylistInterface.h"
-#include "TreeProxyModel.h"
+#include "playlist/TreeProxyModel.h"
 #include "Result.h"
 #include "Typedefs.h"
 
diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui
index fac7b5507..939afee3e 100644
--- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui
+++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui
@@ -368,7 +368,7 @@
   <customwidget>
    <class>GridView</class>
    <extends>QListView</extends>
-   <header location="global">GridView.h</header>
+   <header location="global">playlist/GridView.h</header>
   </customwidget>
   <customwidget>
    <class>PlaylistView</class>
diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h
index f923a5374..51b4b519f 100644
--- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h
+++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h
@@ -23,7 +23,7 @@
 #include "ArtistInfoWidget.h"
 #include "ui_ArtistInfoWidget.h"
 #include "PlaylistInterface.h"
-#include "TreeProxyModel.h"
+#include "playlist/TreeProxyModel.h"
 #include "Result.h"
 #include "Typedefs.h"
 
diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.h b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.h
index 1e26ebfae..dfc8b26a1 100644
--- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.h
+++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.h
@@ -30,8 +30,6 @@
 #ifndef TRACKINFOWIDGET_H
 #define TRACKINFOWIDGET_H
 
-#include <QtGui/QWidget>
-
 #include "PlaylistInterface.h"
 #include "ViewPage.h"
 #include "infosystem/InfoSystem.h"
@@ -39,6 +37,8 @@
 #include "DllMacro.h"
 #include "Typedefs.h"
 
+#include <QWidget>
+
 class PlayableModel;
 class QScrollArea;
 
diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui
index 7096059b8..82629aaa8 100644
--- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui
+++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui
@@ -318,7 +318,7 @@
   <customwidget>
    <class>GridView</class>
    <extends>QListView</extends>
-   <header location="global">GridView.h</header>
+   <header location="global">playlist/GridView.h</header>
   </customwidget>
   <customwidget>
    <class>QueryLabel</class>
diff --git a/thirdparty/libportfwd/third-party/miniupnpc-1.6/CMakeLists.txt b/thirdparty/libportfwd/third-party/miniupnpc-1.6/CMakeLists.txt
index 082b653a9..d0a6326d4 100644
--- a/thirdparty/libportfwd/third-party/miniupnpc-1.6/CMakeLists.txt
+++ b/thirdparty/libportfwd/third-party/miniupnpc-1.6/CMakeLists.txt
@@ -61,8 +61,8 @@ if (CMAKE_COMPILER_IS_GNUC)
   endif (NOT CONFIGURED)
 endif ()
 
-configure_file (${CMAKE_SOURCE_DIR}/miniupnpcstrings.h.cmake ${CMAKE_BINARY_DIR}/miniupnpcstrings.h)
-include_directories (${CMAKE_BINARY_DIR})
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/miniupnpcstrings.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/miniupnpcstrings.h)
+include_directories (${CMAKE_CURRENT_BINARY_DIR})
 
 set (MINIUPNPC_SOURCES
   igd_desc_parse.c