diff --git a/doomsday/build/codeblocks/doomsday.cbp b/doomsday/build/codeblocks/doomsday.cbp
index 479c0055a0..2a48b2b07d 100644
--- a/doomsday/build/codeblocks/doomsday.cbp
+++ b/doomsday/build/codeblocks/doomsday.cbp
@@ -53,6 +53,7 @@
 					<Add library="comctl32" />
 					<Add library="curllib" />
 					<Add library="sdl_net" />
+					<Add library="sdl_mixer" />
 					<Add library="sdl" />
 					<Add library="zlib1" />
 					<Add library="libpng13" />
@@ -117,6 +118,7 @@
 					<Add library="comctl32" />
 					<Add library="curllib" />
 					<Add library="sdl_net" />
+					<Add library="sdl_mixer" />
 					<Add library="sdl" />
 					<Add library="zlib1" />
 					<Add library="libpng13" />
@@ -144,8 +146,9 @@
 		<Unit filename="..\..\engine\api\dd_share.h" />
 		<Unit filename="..\..\engine\api\dd_types.h" />
 		<Unit filename="..\..\engine\api\doomsday.h" />
-		<Unit filename="..\..\engine\api\sys_musd.h" />
-		<Unit filename="..\..\engine\api\sys_sfxd.h" />
+		<Unit filename="..\..\engine\api\sys_audiod.h" />
+		<Unit filename="..\..\engine\api\sys_audiod_mus.h" />
+		<Unit filename="..\..\engine\api\sys_audiod_sfx.h" />
 		<Unit filename="..\..\engine\mac\include\DoomsdayRunner.h">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
@@ -158,6 +161,10 @@
 		<Unit filename="..\..\engine\mac\src\DoomsdayRunner.m">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
+		<Unit filename="..\..\engine\mac\src\qt.c">
+			<Option compilerVar="CC" />
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit
 		<Unit filename="..\..\engine\mac\src\SDLMain.m">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
@@ -250,6 +257,7 @@
 		<Unit filename="..\..\engine\portable\include\m_linkedlist.h" />
 		<Unit filename="..\..\engine\portable\include\m_md5.h" />
 		<Unit filename="..\..\engine\portable\include\m_misc.h" />
+		<Unit filename="..\..\engine\portable\include\m_mus2midi.h" />
 		<Unit filename="..\..\engine\portable\include\m_nodepile.h" />
 		<Unit filename="..\..\engine\portable\include\m_profiler.h" />
 		<Unit filename="..\..\engine\portable\include\m_string.h" />
@@ -334,6 +342,7 @@
 		<Unit filename="..\..\engine\portable\include\sys_network.h" />
 		<Unit filename="..\..\engine\portable\include\sys_sfxd_dummy.h" />
 		<Unit filename="..\..\engine\portable\include\sys_sfxd_loader.h" />
+		<Unit filename="..\..\engine\portable\include\sys_sfxd_sdlmixer.h" />
 		<Unit filename="..\..\engine\portable\include\sys_sock.h" />
 		<Unit filename="..\..\engine\portable\include\sys_system.h" />
 		<Unit filename="..\..\engine\portable\include\sys_timer.h" />
@@ -549,6 +558,9 @@
 		<Unit filename="..\..\engine\portable\src\m_misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\engine\portable\src\m_mus2midi.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\..\engine\portable\src\m_nodepile.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -781,6 +793,9 @@
 		<Unit filename="..\..\engine\portable\src\sys_sfxd_dummy.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\engine\portable\src\sys_sfxd_sdlmixer.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\..\engine\portable\src\sys_sock.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -852,9 +867,6 @@
 		</Unit>
 		<Unit filename="..\..\engine\win32\include\dd_winit.h" />
 		<Unit filename="..\..\engine\win32\include\resource.h" />
-		<Unit filename="..\..\engine\win32\include\sys_cdaudio.h" />
-		<Unit filename="..\..\engine\win32\include\sys_musd_win.h" />
-		<Unit filename="..\..\engine\win32\include\sys_sfxd_ds.h" />
 		<Unit filename="..\..\engine\win32\res\doomsday.ico" />
 		<Unit filename="..\..\engine\win32\res\doomsday.rc">
 			<Option compilerVar="WINDRES" />
@@ -862,9 +874,6 @@
 		<Unit filename="..\..\engine\win32\src\dd_winit.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\engine\win32\src\sys_cdaudio.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="..\..\engine\win32\src\sys_console.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -877,12 +886,6 @@
 		<Unit filename="..\..\engine\win32\src\sys_mixer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\engine\win32\src\sys_musd_win.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\engine\win32\src\sys_sfxd_ds.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="..\..\engine\win32\src\sys_sfxd_loader.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/doomsday/build/codeblocks/doomsday.workspace b/doomsday/build/codeblocks/doomsday.workspace
index f36e6511fb..8c2e454c3a 100644
--- a/doomsday/build/codeblocks/doomsday.workspace
+++ b/doomsday/build/codeblocks/doomsday.workspace
@@ -26,10 +26,10 @@
 		<Project filename="dsdirectsound.cbp">
 			<Depends filename="doomsday.cbp" />
 		</Project>
-		<Project filename="dsopenal.cbp">
+		<Project filename="dswinmm.cbp">
 			<Depends filename="doomsday.cbp" />
 		</Project>
-		<Project filename="dssdlmixer.cbp">
+		<Project filename="dsopenal.cbp">
 			<Depends filename="doomsday.cbp" />
 		</Project>
 	</Workspace>
diff --git a/doomsday/build/codeblocks/dssdlmixer.cbp b/doomsday/build/codeblocks/dswinmm.cbp
similarity index 54%
rename from doomsday/build/codeblocks/dssdlmixer.cbp
rename to doomsday/build/codeblocks/dswinmm.cbp
index e869c911f6..4fe4ae4ab1 100644
--- a/doomsday/build/codeblocks/dssdlmixer.cbp
+++ b/doomsday/build/codeblocks/dswinmm.cbp
@@ -2,14 +2,14 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="dsSDLMixer" />
+		<Option title="dsWinMM" />
 		<Option pch_mode="2" />
 		<Option compiler="msvc8" />
 		<Build>
 			<Target title="Release Win32">
 				<Option platforms="Windows;" />
-				<Option output="bin\Release Win32\dsSDLMixer" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".\Obj\Release Win32\dsSDLMixer" />
+				<Option output="bin\Release Win32\dswinmm" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".\Obj\Release Win32\dswinmm" />
 				<Option type="3" />
 				<Option compiler="msvc8" />
 				<Option createDefFile="1" />
@@ -18,31 +18,28 @@
 					<Add option="/MT" />
 					<Add option="/W3" />
 					<Add option="/Ob1" />
-					<Add option="/DGLBSP_PLUGIN" />
 					<Add option="/DWIN32" />
 					<Add option="/DNDEBUG" />
 					<Add option="/D_WINDOWS" />
 					<Add option="/D_USRDLL" />
-					<Add option="/DDPDEHREAD_EXPORTS" />
 					<Add directory="..\..\engine\api" />
-					<Add directory="..\..\plugins\sdlmixer\portable\include" />
+					<Add directory="..\..\plugins\winmm\include" />
 				</Compiler>
 				<ResourceCompiler>
 					<Add directory="..\..\engine\api" />
-					<Add directory="..\..\plugins\sdlmixer\portable\include" />
+					<Add directory="..\..\plugins\winmm\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add option='/DEF:&quot;..\..\plugins\sdlmixer\api\dssdlmixer.def&quot;' />
+					<Add option='/DEF:&quot;..\..\plugins\winmm\api\dswinmm.def&quot;' />
 					<Add option="/INCREMENTAL:NO" />
 					<Add library="bin\Release Win32\Doomsday.lib" />
-					<Add library="sdl_mixer" />
-					<Add library="sdl" />
+					<Add library="winmm" />
 				</Linker>
 			</Target>
 			<Target title="Debug Win32">
 				<Option platforms="Windows;" />
-				<Option output="bin\Debug Win32\dsSDLMixer" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".\Obj\Debug Win32\dsSDLMixer" />
+				<Option output="bin\Debug Win32\dswinmm" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".\Obj\Debug Win32\dswinmm" />
 				<Option type="3" />
 				<Option compiler="msvc8" />
 				<Option createDefFile="1" />
@@ -53,44 +50,34 @@
 					<Add option="/W3" />
 					<Add option="/ZI" />
 					<Add option="/D_CRT_SECURE_NO_DEPRECATE" />
-					<Add option="/DGLBSP_PLUGIN" />
 					<Add option="/DWIN32" />
 					<Add option="/D_DEBUG" />
 					<Add option="/D_WINDOWS" />
 					<Add option="/D_USRDLL" />
-					<Add option="/DDPDEHREAD_EXPORTS" />
 					<Add directory="..\..\engine\api" />
-					<Add directory="..\..\plugins\sdlmixer\portable\include" />
+					<Add directory="..\..\plugins\winmm\include" />
 				</Compiler>
 				<ResourceCompiler>
 					<Add directory="..\..\engine\api" />
-					<Add directory="..\..\plugins\sdlmixer\portable\include" />
+					<Add directory="..\..\plugins\winmm\include" />
 				</ResourceCompiler>
 				<Linker>
-					<Add option='/DEF:&quot;..\..\plugins\sdlmixer\api\dssdlmixer.def&quot;' />
+					<Add option='/DEF:&quot;..\..\plugins\winmm\api\dswinmm.def&quot;' />
 					<Add option="/opt:noicf" />
 					<Add option="/opt:noref" />
 					<Add library="bin\Debug Win32\Doomsday.lib" />
-					<Add library="sdl_mixer" />
-					<Add library="sdl" />
+					<Add library="winmm" />
 				</Linker>
 			</Target>
 		</Build>
 		<VirtualTargets>
 			<Add alias="All" targets="Release Win32;Debug Win32;" />
 		</VirtualTargets>
-		<Unit filename="..\..\plugins\sdlmixer\api\dssdlmixer.def" />
-		<Unit filename="..\..\plugins\sdlmixer\portable\include\driver.h" />
-		<Unit filename="..\..\plugins\sdlmixer\portable\include\mus2midi.h" />
-		<Unit filename="..\..\plugins\sdlmixer\portable\src\driver_sdlmixer.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\plugins\sdlmixer\portable\src\mus2midi.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\plugins\sdlmixer\portable\src\sdl.c">
-			<Option compilerVar="CC" />
-		</Unit>
+		<Unit filename="..\..\plugins\winmm\api\dswinmm.def" />
+		<Unit filename="..\..\plugins\winmm\include\dswinmm.h" />
+		<Unit filename="..\..\plugins\winmm\src\dswinmm.c" />
+		<Unit filename="..\..\plugins\winmm\src\dswinmm_cdaudio.c" />
+		<Unit filename="..\..\plugins\winmm\src\dswinmm_mus.c" />
 		<Extensions>
 			<code_completion />
 			<debugger />