diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index f36c4ae54..4c31e08e9 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -216,6 +216,8 @@ list(APPEND libSources
 
     audio/AudioEngine.cpp
     audio/AudioOutput.cpp
+    audio/MediaStream.cpp
+    audio/Qnr_IoDeviceStream.cpp
 
     collection/Collection.cpp
     collection/ArtistsRequest.cpp
@@ -348,14 +350,12 @@ list(APPEND libSources
     utils/Json.cpp
     utils/TomahawkUtils.cpp
     utils/Logger.cpp
-    utils/Qnr_IoDeviceStream.cpp
     utils/XspfLoader.cpp
     utils/TomahawkCache.cpp
     utils/GuiHelpers.cpp
     utils/WeakObjectHash.cpp
     utils/WeakObjectList.cpp
     utils/PluginLoader.cpp
-    utils/MediaStream.cpp
 )
 
 add_subdirectory( accounts/configstorage )
diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp
index 810aa6e49..66f8fd478 100644
--- a/src/libtomahawk/audio/AudioEngine.cpp
+++ b/src/libtomahawk/audio/AudioEngine.cpp
@@ -23,6 +23,7 @@
 
 #include "config.h"
 
+#include "audio/Qnr_IoDeviceStream.h"
 #include "filemetadata/MusicScanner.h"
 #include "jobview/JobStatusView.h"
 #include "jobview/JobStatusModel.h"
@@ -31,7 +32,6 @@
 #include "playlist/SingleTrackPlaylistInterface.h"
 #include "utils/Closure.h"
 #include "utils/Logger.h"
-#include "utils/Qnr_IoDeviceStream.h"
 
 #include "Album.h"
 #include "Artist.h"
diff --git a/src/libtomahawk/audio/AudioOutput.h b/src/libtomahawk/audio/AudioOutput.h
index bf4452f02..de2493fea 100644
--- a/src/libtomahawk/audio/AudioOutput.h
+++ b/src/libtomahawk/audio/AudioOutput.h
@@ -24,7 +24,8 @@
 
 #include "DllMacro.h"
 #include "Typedefs.h"
-#include "utils/MediaStream.h"
+
+#include "audio/MediaStream.h"
 
 #include <functional>
 
diff --git a/src/libtomahawk/utils/MediaStream.cpp b/src/libtomahawk/audio/MediaStream.cpp
similarity index 100%
rename from src/libtomahawk/utils/MediaStream.cpp
rename to src/libtomahawk/audio/MediaStream.cpp
diff --git a/src/libtomahawk/utils/MediaStream.h b/src/libtomahawk/audio/MediaStream.h
similarity index 100%
rename from src/libtomahawk/utils/MediaStream.h
rename to src/libtomahawk/audio/MediaStream.h
diff --git a/src/libtomahawk/utils/Qnr_IoDeviceStream.cpp b/src/libtomahawk/audio/Qnr_IoDeviceStream.cpp
similarity index 100%
rename from src/libtomahawk/utils/Qnr_IoDeviceStream.cpp
rename to src/libtomahawk/audio/Qnr_IoDeviceStream.cpp
diff --git a/src/libtomahawk/utils/Qnr_IoDeviceStream.h b/src/libtomahawk/audio/Qnr_IoDeviceStream.h
similarity index 100%
rename from src/libtomahawk/utils/Qnr_IoDeviceStream.h
rename to src/libtomahawk/audio/Qnr_IoDeviceStream.h