diff --git a/VS2008/Supermodel.vcxproj b/VS2008/Supermodel.vcxproj
index 9a76e59..c90a0e5 100644
--- a/VS2008/Supermodel.vcxproj
+++ b/VS2008/Supermodel.vcxproj
@@ -373,12 +373,7 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
       </ExceptionHandling>
     </ClCompile>
     <ClCompile Include="..\Src\ROMSet.cpp" />
-    <ClCompile Include="..\Src\Sound\MPEG\audio.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)amp_%(Filename).obj</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)amp_%(Filename).obj</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)amp_%(Filename).obj</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)amp_%(Filename).obj</ObjectFileName>
-    </ClCompile>
+    <ClCompile Include="..\Src\Sound\MPEG\amp_audio.cpp" />
     <ClCompile Include="..\Src\Sound\MPEG\dump.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)amp_%(Filename).obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)amp_%(Filename).obj</ObjectFileName>
@@ -592,7 +587,7 @@ xcopy /D /Y "$(ProjectDir)\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDi
     <ClInclude Include="..\Src\Pkgs\wglew.h" />
     <ClInclude Include="..\Src\ROMSet.h" />
     <ClInclude Include="..\Src\Sound\MPEG\amp.h" />
-    <ClInclude Include="..\Src\Sound\MPEG\audio.h" />
+    <ClInclude Include="..\Src\Sound\MPEG\amp_audio.h" />
     <ClInclude Include="..\Src\Sound\MPEG\config.h" />
     <ClInclude Include="..\Src\Sound\MPEG\dump.h" />
     <ClInclude Include="..\Src\Sound\MPEG\formats.h" />
diff --git a/VS2008/Supermodel.vcxproj.filters b/VS2008/Supermodel.vcxproj.filters
index e598a84..f64f5de 100644
--- a/VS2008/Supermodel.vcxproj.filters
+++ b/VS2008/Supermodel.vcxproj.filters
@@ -275,9 +275,6 @@
     <ClCompile Include="..\Src\Sound\SCSPLFO.cpp">
       <Filter>Source Files\Sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\Src\Sound\MPEG\audio.cpp">
-      <Filter>Source Files\Sound\MPEG</Filter>
-    </ClCompile>
     <ClCompile Include="..\Src\Sound\MPEG\dump.cpp">
       <Filter>Source Files\Sound\MPEG</Filter>
     </ClCompile>
@@ -446,6 +443,9 @@
     <ClCompile Include="..\Src\Model3\JTAG.cpp">
       <Filter>Source Files\Model3</Filter>
     </ClCompile>
+    <ClCompile Include="..\Src\Sound\MPEG\amp_audio.cpp">
+      <Filter>Source Files\Sound\MPEG</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <MASM Include="..\Src\CPU\68K\Turbo68K\Turbo68K.asm">
@@ -634,9 +634,6 @@
     <ClInclude Include="..\Src\Sound\MPEG\amp.h">
       <Filter>Header Files\Sound\MPEG</Filter>
     </ClInclude>
-    <ClInclude Include="..\Src\Sound\MPEG\audio.h">
-      <Filter>Header Files\Sound\MPEG</Filter>
-    </ClInclude>
     <ClInclude Include="..\Src\Sound\MPEG\config.h">
       <Filter>Header Files\Sound\MPEG</Filter>
     </ClInclude>
@@ -829,6 +826,9 @@
     <ClInclude Include="..\Src\Util\BitRegister.h">
       <Filter>Header Files\Util</Filter>
     </ClInclude>
+    <ClInclude Include="..\Src\Sound\MPEG\amp_audio.h">
+      <Filter>Header Files\Sound\MPEG</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\Src\Debugger\ReadMe.txt">