diff --git a/SConstruct b/SConstruct
index 3698a2541d..4aefc6f223 100644
--- a/SConstruct
+++ b/SConstruct
@@ -53,6 +53,7 @@ include_paths = [
     '../../../../Externals/WiiUseSrc/Src',
     '../../../Core/VideoCommon/Src',
     '../../../Core/InputCommon/Src',
+	'../../../Core/AudioCommon/Src',
     ]
 
 dirs = [
@@ -64,6 +65,7 @@ dirs = [
     'Source/Core/DiscIO/Src',
     'Source/Core/VideoCommon/Src',
     'Source/Core/InputCommon/Src',
+	'Source/Core/AudioCommon/Src',
     'Source/Plugins/Plugin_VideoOGL/Src',
     'Source/Plugins/Plugin_DSP_HLE/Src',
     'Source/Plugins/Plugin_DSP_LLE/Src',
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/AOSoundStream.cpp b/Source/Core/AudioCommon/Src/AOSoundStream.cpp
similarity index 100%
rename from Source/Plugins/Plugin_DSP_HLE/Src/PCHW/AOSoundStream.cpp
rename to Source/Core/AudioCommon/Src/AOSoundStream.cpp
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/AOSoundStream.h b/Source/Core/AudioCommon/Src/AOSoundStream.h
similarity index 100%
rename from Source/Plugins/Plugin_DSP_HLE/Src/PCHW/AOSoundStream.h
rename to Source/Core/AudioCommon/Src/AOSoundStream.h
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/DSoundStream.cpp b/Source/Core/AudioCommon/Src/DSoundStream.cpp
similarity index 100%
rename from Source/Plugins/Plugin_DSP_HLE/Src/PCHW/DSoundStream.cpp
rename to Source/Core/AudioCommon/Src/DSoundStream.cpp
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/DSoundStream.h b/Source/Core/AudioCommon/Src/DSoundStream.h
similarity index 100%
rename from Source/Plugins/Plugin_DSP_HLE/Src/PCHW/DSoundStream.h
rename to Source/Core/AudioCommon/Src/DSoundStream.h
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/NullSoundStream.h b/Source/Core/AudioCommon/Src/NullSoundStream.h
similarity index 100%
rename from Source/Plugins/Plugin_DSP_HLE/Src/PCHW/NullSoundStream.h
rename to Source/Core/AudioCommon/Src/NullSoundStream.h
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/SoundStream.h b/Source/Core/AudioCommon/Src/SoundStream.h
similarity index 100%
rename from Source/Plugins/Plugin_DSP_HLE/Src/PCHW/SoundStream.h
rename to Source/Core/AudioCommon/Src/SoundStream.h
diff --git a/Source/Plugins/Plugin_DSP_HLE/Plugin_DSP_HLE.vcproj b/Source/Plugins/Plugin_DSP_HLE/Plugin_DSP_HLE.vcproj
index 6ca23d8cd3..443d0bfc46 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Plugin_DSP_HLE.vcproj
+++ b/Source/Plugins/Plugin_DSP_HLE/Plugin_DSP_HLE.vcproj
@@ -45,7 +45,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../Core/Common/Src;../../../Core/AudioCommon/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;_SECURE_SCL=0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -129,7 +129,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../Core/Common/Src;../../../Core/AudioCommon/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="LOGGING;WIN32;_DEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;_SECURE_SCL=0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -216,7 +216,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../Core/Common/Src;../../../Core/AudioCommon/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -305,7 +305,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../Core/Common/Src;../../../Core/AudioCommon/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -392,7 +392,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../Core/Common/Src;../../../Core/AudioCommon/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="DEBUGFAST;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -481,7 +481,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
+				AdditionalIncludeDirectories="../../Core/Common/Src;../../../Core/AudioCommon/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
 				PreprocessorDefinitions="LOGGING;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSP_HLE_EXPORTS;DEBUGFAST;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
@@ -545,22 +545,6 @@
 		<Filter
 			Name="PCHW"
 			>
-			<File
-				RelativePath=".\Src\PCHW\AOSoundStream.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Src\PCHW\AOSoundStream.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Src\Pchw\DSoundStream.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Src\Pchw\DSoundStream.h"
-				>
-			</File>
 			<File
 				RelativePath=".\Src\Pchw\Mixer.cpp"
 				>
@@ -569,14 +553,6 @@
 				RelativePath=".\Src\Pchw\Mixer.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Src\PCHW\NullSoundStream.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Src\PCHW\SoundStream.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="UCodes"
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
index 1bd0596d56..6cfa257bf4 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
@@ -11,7 +11,7 @@ files = [
 	'main.cpp',
 	'Config.cpp',
 	'Globals.cpp',
-	'PCHW/AOSoundStream.cpp',
+#	'PCHW/AOSoundStream.cpp',
 	'PCHW/Mixer.cpp',
 	'Debugger/File.cpp',
 	'UCodes/UCode_AX.cpp',
@@ -39,7 +39,7 @@ if dspenv['HAVE_WX']:
 
 dspenv.Append(
 	CXXFLAGS = [ '-fPIC' ],
-	LIBS = [ 'common' ],
+	LIBS = [ 'common', 'audiocommon' ],
 	)
 
 dspenv.SharedLibrary(env['plugin_dir']+name, files)
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
index e159276b78..04096280de 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
@@ -34,9 +34,9 @@ CDebugger* m_frame = NULL;
 #include "Setup.h"
 #include "StringUtil.h"
 
-#include "PCHW/AOSoundStream.h"
-#include "PCHW/DSoundStream.h"
-#include "PCHW/NullSoundStream.h"
+#include "AOSoundStream.h"
+#include "DSoundStream.h"
+#include "NullSoundStream.h"
 
 // Declarations and definitions
 PLUGIN_GLOBALS* globals = NULL;
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/main.h b/Source/Plugins/Plugin_DSP_HLE/Src/main.h
index 539338a9b0..03fb624f1c 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/main.h
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/main.h
@@ -18,7 +18,7 @@
 #ifndef __MAIN_H__
 #define __MAIN_H__
 
-#include "PCHW/SoundStream.h"
+#include "SoundStream.h"
 #include "Globals.h" // Local
 
 #if defined(HAVE_WX) && HAVE_WX