diff --git a/src/AudioControls.cpp b/src/AudioControls.cpp
index 9080753f8..6a1e639c3 100644
--- a/src/AudioControls.cpp
+++ b/src/AudioControls.cpp
@@ -28,7 +28,7 @@
 #include "playlist/PlaylistView.h"
 #include "database/Database.h"
 #include "widgets/ImageButton.h"
-#include "utils/TomahawkUtils.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 #include "Album.h"
 #include "DropJob.h"
diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp
index 3a95b1bcb..bb325da05 100644
--- a/src/TomahawkWindow.cpp
+++ b/src/TomahawkWindow.cpp
@@ -35,13 +35,10 @@
 #include <QTimer>
 #include <QToolBar>
 
-#include "Playlist.h"
-#include "Query.h"
-#include "Artist.h"
-#include "ViewManager.h"
 #include "accounts/AccountManager.h"
 #include "sourcetree/SourceTreeView.h"
 #include "network/Servent.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/ProxyStyle.h"
 #include "widgets/AnimatedSplitter.h"
 #include "widgets/NewPlaylistWidget.h"
@@ -52,27 +49,31 @@
 #include "playlist/PlaylistModel.h"
 #include "playlist/PlaylistView.h"
 #include "playlist/QueueView.h"
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/ErrorStatusMessage.h"
+#include "jobview/JobStatusModel.h"
 
+#include "Playlist.h"
+#include "Query.h"
+#include "Artist.h"
+#include "ViewManager.h"
+#include "ActionCollection.h"
 #include "AudioControls.h"
 #include "SettingsDialog.h"
 #include "DiagnosticsDialog.h"
 #include "TomahawkSettings.h"
 #include "SourceList.h"
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-#include "jobview/ErrorStatusMessage.h"
 #include "TomahawkTrayIcon.h"
 #include "ScanManager.h"
 #include "TomahawkApp.h"
+#include "LoadXSPFDialog.h"
 
 #ifdef Q_WS_WIN
 #include <qtsparkle/Updater>
 #endif
 
 #include "utils/Logger.h"
-#include "jobview/JobStatusModel.h"
-#include "LoadXSPFDialog.h"
-#include <ActionCollection.h>
 
 using namespace Tomahawk;
 using namespace Accounts;
diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp
index 07b9ba533..8afa38db3 100644
--- a/src/libtomahawk/ViewManager.cpp
+++ b/src/libtomahawk/ViewManager.cpp
@@ -46,6 +46,7 @@
 #include "RecentlyPlayedModel.h"
 #include "dynamic/widgets/DynamicWidget.h"
 
+#include "widgets/NewReleasesWidget.h"
 #include "widgets/WelcomeWidget.h"
 #include "widgets/WhatsHotWidget.h"
 #include "widgets/infowidgets/SourceInfoWidget.h"
@@ -1025,3 +1026,44 @@ ViewManager::showCurrentTrack()
     }
 }
 
+
+Tomahawk::ViewPage*
+ViewManager::welcomeWidget() const
+{
+    return m_welcomeWidget;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::whatsHotWidget() const
+{
+    return m_whatsHotWidget;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::newReleasesWidget() const
+{
+    return m_newReleasesWidget;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::topLovedWidget() const
+{
+    return m_topLovedWidget;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::recentPlaysWidget() const
+{
+    return m_recentPlaysWidget;
+}
+
+
+ArtistView*
+ViewManager::superCollectionView() const
+{
+    return m_superCollectionView;
+}
diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h
index 2ac07447f..85702642b 100644
--- a/src/libtomahawk/ViewManager.h
+++ b/src/libtomahawk/ViewManager.h
@@ -29,9 +29,6 @@
 #include "PlaylistInterface.h"
 #include "playlist/QueueView.h"
 #include "ViewPage.h"
-#include "widgets/WelcomeWidget.h"
-#include "widgets/WhatsHotWidget.h"
-#include "widgets/NewReleasesWidget.h"
 
 #include "DllMacro.h"
 
@@ -56,6 +53,7 @@ class SourceInfoWidget;
 class InfoBar;
 class TopBar;
 class TrackInfoWidget;
+class NewReleasesWidget;
 class WelcomeWidget;
 class WhatsHotWidget;
 class QPushButton;
@@ -91,12 +89,12 @@ public:
 
     Tomahawk::ViewPage* show( Tomahawk::ViewPage* page );
 
-    Tomahawk::ViewPage* welcomeWidget() const { return m_welcomeWidget; }
-    Tomahawk::ViewPage* whatsHotWidget() const { return m_whatsHotWidget; }
-    Tomahawk::ViewPage* newReleasesWidget() const { return m_newReleasesWidget; }
-    Tomahawk::ViewPage* topLovedWidget() const { return m_topLovedWidget; }
-    Tomahawk::ViewPage* recentPlaysWidget() const { return m_recentPlaysWidget; }
-    ArtistView* superCollectionView() const { return m_superCollectionView; }
+    Tomahawk::ViewPage* welcomeWidget() const;
+    Tomahawk::ViewPage* whatsHotWidget() const;
+    Tomahawk::ViewPage* newReleasesWidget() const;
+    Tomahawk::ViewPage* topLovedWidget() const;
+    Tomahawk::ViewPage* recentPlaysWidget() const;
+    ArtistView* superCollectionView() const;
 
     /// Get the view page for the given item. Not pretty...
     Tomahawk::ViewPage* pageForPlaylist( const Tomahawk::playlist_ptr& pl ) const;
diff --git a/src/libtomahawk/infobar/InfoBar.cpp b/src/libtomahawk/infobar/InfoBar.cpp
index 0aaca0c59..ae786f64d 100644
--- a/src/libtomahawk/infobar/InfoBar.cpp
+++ b/src/libtomahawk/infobar/InfoBar.cpp
@@ -22,14 +22,14 @@
 
 #include <QLabel>
 #include <QPixmap>
-
-#include "ViewManager.h"
-#include "thirdparty/Qocoa/qsearchfield.h"
-#include "utils/TomahawkUtils.h"
-#include "utils/Logger.h"
 #include <QCheckBox>
 #include <QPaintEvent>
 #include <QPainter>
+
+#include "ViewManager.h"
+#include "thirdparty/Qocoa/qsearchfield.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
 #include <widgets/QueryLabel.h>
 
 #define ANIMATION_TIME 400
diff --git a/src/libtomahawk/playlist/AlbumItemDelegate.cpp b/src/libtomahawk/playlist/AlbumItemDelegate.cpp
index c05ee89a4..0f262f44e 100644
--- a/src/libtomahawk/playlist/AlbumItemDelegate.cpp
+++ b/src/libtomahawk/playlist/AlbumItemDelegate.cpp
@@ -31,7 +31,7 @@
 #include "Source.h"
 #include "audio/AudioEngine.h"
 
-#include "utils/TomahawkUtils.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/PixmapDelegateFader.h"
 #include <utils/Closure.h>
 
diff --git a/src/libtomahawk/playlist/AlbumView.cpp b/src/libtomahawk/playlist/AlbumView.cpp
index 03c5eaa8b..1bcd30565 100644
--- a/src/libtomahawk/playlist/AlbumView.cpp
+++ b/src/libtomahawk/playlist/AlbumView.cpp
@@ -29,6 +29,7 @@
 #include "context/ContextWidget.h"
 #include "TomahawkSettings.h"
 #include "Artist.h"
+#include "Source.h"
 #include "PlayableItem.h"
 #include "AlbumItemDelegate.h"
 #include "AlbumModel.h"
@@ -36,6 +37,7 @@
 #include "ViewManager.h"
 #include "utils/Logger.h"
 #include "utils/AnimatedSpinner.h"
+#include "utils/TomahawkUtilsGui.h"
 
 #define SCROLL_TIMEOUT 280
 
diff --git a/src/libtomahawk/playlist/ArtistView.cpp b/src/libtomahawk/playlist/ArtistView.cpp
index 993a875b6..e080847f0 100644
--- a/src/libtomahawk/playlist/ArtistView.cpp
+++ b/src/libtomahawk/playlist/ArtistView.cpp
@@ -35,7 +35,9 @@
 #include "TreeItemDelegate.h"
 #include "TreeModel.h"
 #include "PlayableItem.h"
+#include "Source.h"
 #include "ViewManager.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 
 #define SCROLL_TIMEOUT 280
diff --git a/src/libtomahawk/playlist/TrackView.cpp b/src/libtomahawk/playlist/TrackView.cpp
index af3cb230e..f1d00f2b5 100644
--- a/src/libtomahawk/playlist/TrackView.cpp
+++ b/src/libtomahawk/playlist/TrackView.cpp
@@ -31,7 +31,7 @@
 #include "audio/AudioEngine.h"
 #include "context/ContextWidget.h"
 #include "widgets/OverlayWidget.h"
-#include "utils/TomahawkUtils.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 #include "utils/Closure.h"
 #include "DropJob.h"
diff --git a/src/libtomahawk/widgets/NewReleasesWidget.cpp b/src/libtomahawk/widgets/NewReleasesWidget.cpp
index e57820603..68636a8f1 100644
--- a/src/libtomahawk/widgets/NewReleasesWidget.cpp
+++ b/src/libtomahawk/widgets/NewReleasesWidget.cpp
@@ -39,7 +39,7 @@
 #include "playlist/TreeProxyModel.h"
 #include "playlist/PlaylistChartItemDelegate.h"
 #include "widgets/OverlayWidget.h"
-#include "utils/TomahawkUtils.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 #include "Pipeline.h"
 
diff --git a/src/libtomahawk/widgets/NewReleasesWidget.h b/src/libtomahawk/widgets/NewReleasesWidget.h
index f61afb398..c26e4eefc 100644
--- a/src/libtomahawk/widgets/NewReleasesWidget.h
+++ b/src/libtomahawk/widgets/NewReleasesWidget.h
@@ -30,8 +30,6 @@
 #include "infosystem/InfoSystem.h"
 #include "ViewPage.h"
 
-#include "utils/TomahawkUtils.h"
-
 #include "DllMacro.h"
 
 class QSortFilterProxyModel;
diff --git a/src/libtomahawk/widgets/SearchWidget.cpp b/src/libtomahawk/widgets/SearchWidget.cpp
index b99d462b5..1ad389472 100644
--- a/src/libtomahawk/widgets/SearchWidget.cpp
+++ b/src/libtomahawk/widgets/SearchWidget.cpp
@@ -30,7 +30,7 @@
 #include "widgets/OverlayWidget.h"
 #include "utils/AnimatedSpinner.h"
 
-#include "utils/TomahawkUtils.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 
 
diff --git a/src/libtomahawk/widgets/WhatsHotWidget.cpp b/src/libtomahawk/widgets/WhatsHotWidget.cpp
index 4cc7b7ca7..5fadd8bc1 100644
--- a/src/libtomahawk/widgets/WhatsHotWidget.cpp
+++ b/src/libtomahawk/widgets/WhatsHotWidget.cpp
@@ -38,7 +38,7 @@
 #include "playlist/TreeProxyModel.h"
 #include "playlist/PlaylistChartItemDelegate.h"
 #include "widgets/OverlayWidget.h"
-#include "utils/TomahawkUtils.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 #include "Pipeline.h"
 
diff --git a/src/libtomahawk/widgets/WhatsHotWidget.h b/src/libtomahawk/widgets/WhatsHotWidget.h
index cb8a8f635..d192fad92 100644
--- a/src/libtomahawk/widgets/WhatsHotWidget.h
+++ b/src/libtomahawk/widgets/WhatsHotWidget.h
@@ -29,8 +29,6 @@
 #include "infosystem/InfoSystem.h"
 #include "ViewPage.h"
 
-#include "utils/TomahawkUtils.h"
-
 #include "DllMacro.h"
 
 class QSortFilterProxyModel;
diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
index 4f84b29f5..4fc2a5d6a 100644
--- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
@@ -30,7 +30,7 @@
 #include "database/DatabaseCommand_AllTracks.h"
 #include "database/DatabaseCommand_AllAlbums.h"
 
-#include "utils/TomahawkUtils.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 
 #include "widgets/OverlayButton.h"
diff --git a/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp
index e6f51088a..ebc46a80a 100644
--- a/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp
@@ -30,7 +30,7 @@
 #include "database/Database.h"
 #include "database/DatabaseCommand_AllAlbums.h"
 
-#include "utils/TomahawkUtils.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 
 #include "widgets/OverlayWidget.h"
diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
index 29e4bc68e..eaedf96fa 100644
--- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
@@ -26,7 +26,7 @@
 #include "playlist/AlbumModel.h"
 #include "audio/AudioEngine.h"
 
-#include "utils/TomahawkUtils.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk;
diff --git a/src/sourcetree/SourceTreeView.cpp b/src/sourcetree/SourceTreeView.cpp
index c47ce9617..c73853c92 100644
--- a/src/sourcetree/SourceTreeView.cpp
+++ b/src/sourcetree/SourceTreeView.cpp
@@ -42,12 +42,13 @@
 #include "TomahawkSettings.h"
 #include "GlobalActionManager.h"
 #include "DropJob.h"
-#include "utils/Logger.h"
 #include "items/GenericPageItems.h"
 #include "items/TemporaryPageItem.h"
 #include "database/DatabaseCommand_SocialAction.h"
 #include "database/Database.h"
 #include "LatchManager.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
 
 using namespace Tomahawk;