diff --git a/src/libtomahawk/collection.cpp b/src/libtomahawk/collection.cpp
index fc86de857..795e74cd3 100644
--- a/src/libtomahawk/collection.cpp
+++ b/src/libtomahawk/collection.cpp
@@ -149,24 +149,24 @@ Collection::deleteStation( const dynplaylist_ptr& s )
 }
 
 
-playlist_ptr
+Tomahawk::playlist_ptr
 Collection::playlist( const QString& guid )
 {
-    return m_playlists.value( guid, playlist_ptr() );
+    return m_playlists.value( guid, Tomahawk::playlist_ptr() );
 }
 
 
-dynplaylist_ptr
+Tomahawk::dynplaylist_ptr
 Collection::autoPlaylist( const QString& guid )
 {
-    return m_autoplaylists.value( guid, dynplaylist_ptr() );
+    return m_autoplaylists.value( guid, Tomahawk::dynplaylist_ptr() );
 }
 
 
-dynplaylist_ptr
+Tomahawk::dynplaylist_ptr
 Collection::station( const QString& guid )
 {
-    return m_stations.value( guid, dynplaylist_ptr() );
+    return m_stations.value( guid, Tomahawk::dynplaylist_ptr() );
 }
 
 
diff --git a/src/libtomahawk/globalactionmanager.cpp b/src/libtomahawk/globalactionmanager.cpp
index 767b41157..6d5fcbbaa 100644
--- a/src/libtomahawk/globalactionmanager.cpp
+++ b/src/libtomahawk/globalactionmanager.cpp
@@ -596,19 +596,19 @@ GlobalActionManager::handleAutoPlaylistCommand( const QUrl& url )
 }
 
 
-dynplaylist_ptr
+Tomahawk::dynplaylist_ptr
 GlobalActionManager::loadDynamicPlaylist( const QUrl& url, bool station )
 {
     QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
     if( parts.isEmpty() ) {
         tLog() << "No specific station command:" << url.toString();
-        return dynplaylist_ptr();
+        return Tomahawk::dynplaylist_ptr();
     }
 
     if( parts[ 0 ] == "create" ) {
         if( !url.hasQueryItem( "title" ) || !url.hasQueryItem( "type" ) ) {
             tLog() << "Station create command needs title and type..." << url.toString();
-            return dynplaylist_ptr();
+            return Tomahawk::dynplaylist_ptr();
         }
         QString title = url.queryItemValue( "title" );
         QString type = url.queryItemValue( "type" );
@@ -737,7 +737,7 @@ GlobalActionManager::loadDynamicPlaylist( const QUrl& url, bool station )
         return pl;
     }
 
-    return dynplaylist_ptr();
+    return Tomahawk::dynplaylist_ptr();
 }
 
 
diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
index 728503979..02c70eccf 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
@@ -152,7 +152,7 @@ DynamicPlaylist::create( const Tomahawk::source_ptr& author,
                          bool autoLoad
                        )
 {
-    dynplaylist_ptr dynplaylist = dynplaylist_ptr( new DynamicPlaylist( author, guid, title, info, creator, type, mode, shared, autoLoad ) );
+    dynplaylist_ptr dynplaylist = Tomahawk::dynplaylist_ptr( new DynamicPlaylist( author, guid, title, info, creator, type, mode, shared, autoLoad ) );
 
     DatabaseCommand_CreateDynamicPlaylist* cmd = new DatabaseCommand_CreateDynamicPlaylist( author, dynplaylist, autoLoad );
     connect( cmd, SIGNAL(finished()), dynplaylist.data(), SIGNAL(created()) );
diff --git a/src/libtomahawk/viewmanager.cpp b/src/libtomahawk/viewmanager.cpp
index 40f48c229..069391424 100644
--- a/src/libtomahawk/viewmanager.cpp
+++ b/src/libtomahawk/viewmanager.cpp
@@ -865,7 +865,7 @@ ViewManager::playlistForInterface( Tomahawk::playlistinterface_ptr interface ) c
         }
     }
 
-    return playlist_ptr();
+    return Tomahawk::playlist_ptr();
 }
 
 
@@ -880,7 +880,7 @@ ViewManager::dynamicPlaylistForInterface( Tomahawk::playlistinterface_ptr interf
         }
     }
 
-    return dynplaylist_ptr();
+    return Tomahawk::dynplaylist_ptr();
 }
 
 
diff --git a/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp b/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp
index 6ea2adbea..0dbbf5be5 100644
--- a/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp
+++ b/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp
@@ -60,7 +60,7 @@ RecentlyPlayedPlaylistsModel::loadFromSettings()
     {
 //        qDebug() << "loading playlist" << playlist_guids[i];
 
-        playlist_ptr pl = m_cached.value( playlist_guids[i], playlist_ptr() );
+        playlist_ptr pl = m_cached.value( playlist_guids[i], Tomahawk::playlist_ptr() );
         if( pl.isNull() )
             pl = Tomahawk::Playlist::load( playlist_guids[i] );
         if( pl.isNull() )