diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0359f30e3..d104d3fca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,7 +56,6 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
      topbar/lineedit.cpp
      topbar/searchbutton.cpp
 
-     xspfloader.cpp
      transferview.cpp
      tomahawktrayicon.cpp
      audiocontrols.cpp
@@ -94,7 +93,6 @@ SET( tomahawkHeadersGui ${tomahawkHeadersGui}
      topbar/lineedit_p.h
      topbar/searchbutton.h
 
-     xspfloader.h
      transferview.h
      tomahawktrayicon.h
      audiocontrols.h
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index acc786929..1b07d0461 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -100,6 +100,7 @@ set( libSources
     utils/proxystyle.cpp
     utils/widgetdragfilter.cpp
     utils/animatedsplitter.cpp
+    utils/xspfloader.cpp
 
     widgets/newplaylistwidget.cpp
     widgets/welcomewidget.cpp
@@ -198,6 +199,7 @@ set( libHeaders
     utils/progresstreeview.h
     utils/widgetdragfilter.h
     utils/animatedsplitter.h
+    utils/xspfloader.h
 
     widgets/newplaylistwidget.h
     widgets/welcomewidget.h
@@ -241,6 +243,9 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
 ENDIF( WIN32 )
 
 IF( APPLE )
+SET( libSources ${libSources} audio/rtaudiooutput.cpp )
+SET( libHeaders ${libHeaders} audio/rtaudiooutput.h )
+
 SET( OS_SPECIFIC_LINK_LIBRARIES
     ${OS_SPECIFIC_LINK_LIBRARIES}
     ${COREAUDIO_LIBRARY}
diff --git a/src/xspfloader.cpp b/src/libtomahawk/utils/xspfloader.cpp
similarity index 100%
rename from src/xspfloader.cpp
rename to src/libtomahawk/utils/xspfloader.cpp
diff --git a/src/xspfloader.h b/src/libtomahawk/utils/xspfloader.h
similarity index 100%
rename from src/xspfloader.h
rename to src/libtomahawk/utils/xspfloader.h
diff --git a/src/libtomahawk/widgets/newplaylistwidget.cpp b/src/libtomahawk/widgets/newplaylistwidget.cpp
index 1d867b84a..e01c35e38 100644
--- a/src/libtomahawk/widgets/newplaylistwidget.cpp
+++ b/src/libtomahawk/widgets/newplaylistwidget.cpp
@@ -10,7 +10,7 @@
 #include "playlist/playlistmodel.h"
 
 #include "pipeline.h"
-#include "xspfloader.h"
+#include "utils/xspfloader.h"
 
 #include "sourcelist.h"
 
diff --git a/src/libtomahawk/widgets/newplaylistwidget.h b/src/libtomahawk/widgets/newplaylistwidget.h
index 36a6c9e67..0fbaa4107 100644
--- a/src/libtomahawk/widgets/newplaylistwidget.h
+++ b/src/libtomahawk/widgets/newplaylistwidget.h
@@ -6,7 +6,7 @@
 
 #include "album.h"
 #include "result.h"
-#include "playlistinterface.h"
+#include "playlist/playlistinterface.h"
 
 #include "dllmacro.h"