diff --git a/src/libtomahawk/playlist/topbar/topbar.cpp b/src/libtomahawk/playlist/topbar/topbar.cpp
index 0d20c3390..b83e52079 100644
--- a/src/libtomahawk/playlist/topbar/topbar.cpp
+++ b/src/libtomahawk/playlist/topbar/topbar.cpp
@@ -106,8 +106,8 @@ TopBar::TopBar( QWidget* parent )
     connect( ViewManager::instance(), SIGNAL( filterAvailable( bool ) ),
                                         SLOT( setFilterVisible( bool ) ) );
 
-    connect( ViewManager::instance(), SIGNAL( modeChanged( PlaylistInterface::ViewMode ) ),
-                                        SLOT( onModeChanged( PlaylistInterface::ViewMode ) ) );
+    connect( ViewManager::instance(), SIGNAL( modeChanged( Tomahawk::PlaylistInterface::ViewMode ) ),
+                                        SLOT( onModeChanged( Tomahawk::PlaylistInterface::ViewMode ) ) );
 }
 
 
@@ -290,20 +290,20 @@ TopBar::setFilter( const QString& filter )
 
 
 void
-TopBar::onModeChanged( PlaylistInterface::ViewMode mode )
+TopBar::onModeChanged( Tomahawk::PlaylistInterface::ViewMode mode )
 {
     qDebug() << Q_FUNC_INFO << mode;
     switch ( mode )
     {
-        case PlaylistInterface::Flat:
+        case Tomahawk::PlaylistInterface::Flat:
             onFlatMode();
             break;
 
-        case PlaylistInterface::Tree:
+        case Tomahawk::PlaylistInterface::Tree:
             onArtistMode();
             break;
 
-        case PlaylistInterface::Album:
+        case Tomahawk::PlaylistInterface::Album:
             onAlbumMode();
             break;
 
diff --git a/src/libtomahawk/viewmanager.cpp b/src/libtomahawk/viewmanager.cpp
index 806895722..fa2ed2318 100644
--- a/src/libtomahawk/viewmanager.cpp
+++ b/src/libtomahawk/viewmanager.cpp
@@ -122,7 +122,7 @@ ViewManager::ViewManager( QObject* parent )
     m_widget->layout()->setMargin( 0 );
     m_widget->layout()->setSpacing( 0 );
 
-    connect( AudioEngine::instance(), SIGNAL( playlistChanged( PlaylistInterface* ) ), this, SLOT( playlistInterfaceChanged( PlaylistInterface* ) ) );
+    connect( AudioEngine::instance(), SIGNAL( playlistChanged( Tomahawk::PlaylistInterface* ) ), this, SLOT( playlistInterfaceChanged( Tomahawk::PlaylistInterface* ) ) );
 
     connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( applyFilter() ) );
 
@@ -425,7 +425,7 @@ ViewManager::showSuperCollection()
 }
 
 void
-ViewManager::playlistInterfaceChanged( PlaylistInterface* interface )
+ViewManager::playlistInterfaceChanged( Tomahawk::PlaylistInterface* interface )
 {
     playlist_ptr pl = playlistForInterface( interface );
     if ( !pl.isNull() )
@@ -649,8 +649,8 @@ ViewManager::unlinkPlaylist()
         disconnect( currentPlaylistInterface()->object(), SIGNAL( trackCountChanged( unsigned int ) ),
                     this,                                 SIGNAL( numShownChanged( unsigned int ) ) );
 
-        disconnect( currentPlaylistInterface()->object(), SIGNAL( repeatModeChanged( PlaylistInterface::RepeatMode ) ),
-                    this,                                 SIGNAL( repeatModeChanged( PlaylistInterface::RepeatMode ) ) );
+        disconnect( currentPlaylistInterface()->object(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
+                    this,                                 SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
 
         disconnect( currentPlaylistInterface()->object(), SIGNAL( shuffleModeChanged( bool ) ),
                     this,                                 SIGNAL( shuffleModeChanged( bool ) ) );
@@ -687,8 +687,8 @@ ViewManager::updateView()
         connect( currentPlaylistInterface()->object(), SIGNAL( trackCountChanged( unsigned int ) ),
                                                        SIGNAL( numShownChanged( unsigned int ) ) );
 
-        connect( currentPlaylistInterface()->object(), SIGNAL( repeatModeChanged( PlaylistInterface::RepeatMode ) ),
-                                                       SIGNAL( repeatModeChanged( PlaylistInterface::RepeatMode ) ) );
+        connect( currentPlaylistInterface()->object(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
+                                                       SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
 
         connect( currentPlaylistInterface()->object(), SIGNAL( shuffleModeChanged( bool ) ),
                                                        SIGNAL( shuffleModeChanged( bool ) ) );
@@ -788,7 +788,7 @@ ViewManager::onWidgetDestroyed( QWidget* widget )
 
 
 void
-ViewManager::setRepeatMode( PlaylistInterface::RepeatMode mode )
+ViewManager::setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode mode )
 {
     if ( currentPlaylistInterface() )
         currentPlaylistInterface()->setRepeatMode( mode );
@@ -842,7 +842,7 @@ ViewManager::pageForPlaylist(const playlist_ptr& pl) const
 
 
 ViewPage*
-ViewManager::pageForInterface( PlaylistInterface* interface ) const
+ViewManager::pageForInterface( Tomahawk::PlaylistInterface* interface ) const
 {
     for ( int i = 0; i < m_pageHistory.count(); i++ )
     {
@@ -899,7 +899,7 @@ ViewManager::setHistoryPosition( int position )
 
 
 Tomahawk::playlist_ptr
-ViewManager::playlistForInterface( PlaylistInterface* interface ) const
+ViewManager::playlistForInterface( Tomahawk::PlaylistInterface* interface ) const
 {
     foreach ( PlaylistView* view, m_playlistViews.values() )
     {
@@ -914,7 +914,7 @@ ViewManager::playlistForInterface( PlaylistInterface* interface ) const
 
 
 Tomahawk::dynplaylist_ptr
-ViewManager::dynamicPlaylistForInterface( PlaylistInterface* interface ) const
+ViewManager::dynamicPlaylistForInterface( Tomahawk::PlaylistInterface* interface ) const
 {
     foreach ( DynamicWidget* view, m_dynamicWidgets.values() )
     {
@@ -929,7 +929,7 @@ ViewManager::dynamicPlaylistForInterface( PlaylistInterface* interface ) const
 
 
 Tomahawk::collection_ptr
-ViewManager::collectionForInterface( PlaylistInterface* interface ) const
+ViewManager::collectionForInterface( Tomahawk::PlaylistInterface* interface ) const
 {
     foreach ( CollectionView* view, m_collectionViews.values() )
     {
diff --git a/src/libtomahawk/widgets/welcomeplaylistmodel.cpp b/src/libtomahawk/widgets/welcomeplaylistmodel.cpp
index 85983408e..2345278fe 100644
--- a/src/libtomahawk/widgets/welcomeplaylistmodel.cpp
+++ b/src/libtomahawk/widgets/welcomeplaylistmodel.cpp
@@ -27,14 +27,14 @@ using namespace Tomahawk;
 
 WelcomePlaylistModel::WelcomePlaylistModel( QObject* parent )
     : QAbstractListModel( parent )
-    , m_waitingForSome( true )
     , m_maxPlaylists( 0 )
+    , m_waitingForSome( true )
 {
     loadFromSettings();
 
     connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), this, SLOT( onSourceAdded( Tomahawk::source_ptr ) ), Qt::QueuedConnection );
     connect( TomahawkSettings::instance(), SIGNAL( recentlyPlayedPlaylistAdded( Tomahawk::playlist_ptr ) ), this, SLOT( plAdded( Tomahawk::playlist_ptr ) ) );
-    connect( AudioEngine::instance(),SIGNAL( playlistChanged( PlaylistInterface* ) ), this, SLOT( playlistChanged( PlaylistInterface* ) ), Qt::QueuedConnection );
+    connect( AudioEngine::instance(),SIGNAL( playlistChanged( Tomahawk::PlaylistInterface* ) ), this, SLOT( playlistChanged( Tomahawk::PlaylistInterface* ) ), Qt::QueuedConnection );
 
     emit emptinessChanged( m_recplaylists.isEmpty() );
 }
@@ -157,7 +157,7 @@ WelcomePlaylistModel::plAdded( const playlist_ptr& pl )
 }
 
 void
-WelcomePlaylistModel::playlistChanged( PlaylistInterface* pli )
+WelcomePlaylistModel::playlistChanged( Tomahawk::PlaylistInterface* pli )
 {
     // ARG
     if( Playlist* pl = dynamic_cast< Playlist* >( pli ) ) {
diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp
index 5ba725e8f..e1751b989 100644
--- a/src/libtomahawk/widgets/welcomewidget.cpp
+++ b/src/libtomahawk/widgets/welcomewidget.cpp
@@ -64,7 +64,7 @@ WelcomeWidget::WelcomeWidget( QWidget* parent )
     connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) );
 
     connect( ui->playlistWidget, SIGNAL( activated( QModelIndex ) ), SLOT( onPlaylistActivated( QModelIndex ) ) );
-    connect( AudioEngine::instance() ,SIGNAL( playlistChanged( PlaylistInterface* ) ), this, SLOT( updatePlaylists() ), Qt::QueuedConnection );
+    connect( AudioEngine::instance() ,SIGNAL( playlistChanged( Tomahawk::PlaylistInterface* ) ), this, SLOT( updatePlaylists() ), Qt::QueuedConnection );
 }
 
 
diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp
index cc8d758a5..12727f107 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/tomahawkwindow.cpp
@@ -277,8 +277,8 @@ void
 TomahawkWindow::setupSignals()
 {
     // <From PlaylistManager>
-    connect( ViewManager::instance(), SIGNAL( repeatModeChanged( PlaylistInterface::RepeatMode ) ),
-             m_audioControls,     SLOT( onRepeatModeChanged( PlaylistInterface::RepeatMode ) ) );
+    connect( ViewManager::instance(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
+             m_audioControls,     SLOT( onRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
 
     connect( ViewManager::instance(), SIGNAL( shuffleModeChanged( bool ) ),
              m_audioControls,     SLOT( onShuffleModeChanged( bool ) ) );