diff --git a/mednafen/include/blip/Blip_Buffer.h b/mednafen/include/blip/Blip_Buffer.h
index a8e90ee0..da1d924c 100644
--- a/mednafen/include/blip/Blip_Buffer.h
+++ b/mednafen/include/blip/Blip_Buffer.h
@@ -8,7 +8,7 @@
 #endif
 
 #include <limits.h>
-#include <inttypes.h>
+#include <stdint.h>
 
 // Blip_Buffer 0.4.1
 #ifndef BLIP_BUFFER_H
diff --git a/mednafen/mednafen-types.h b/mednafen/mednafen-types.h
index dd302065..72626261 100644
--- a/mednafen/mednafen-types.h
+++ b/mednafen/mednafen-types.h
@@ -13,7 +13,7 @@
 #endif
 
 #include <assert.h>
-#include <inttypes.h>
+#include <stdint.h>
 
 typedef int8_t int8;
 typedef int16_t int16;
@@ -46,8 +46,6 @@ typedef uint64_t uint64;
   #define MDFN_WARN_UNUSED_RESULT __attribute__ ((warn_unused_result))
 
 #elif defined(_MSC_VER)
-
-  #warning "Compiling with MSVC, untested"
   #define INLINE inline __forceinline
   #define NO_INLINE __declspec(noinline)
 
diff --git a/mednafen/state.cpp b/mednafen/state.cpp
index 9bbdf9f2..12dd3ac8 100644
--- a/mednafen/state.cpp
+++ b/mednafen/state.cpp
@@ -20,7 +20,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 #include <time.h>
 
 #include <trio/trio.h>
diff --git a/mednafen/video/surface.cpp b/mednafen/video/surface.cpp
index ad3b388d..bffc034b 100644
--- a/mednafen/video/surface.cpp
+++ b/mednafen/video/surface.cpp
@@ -15,7 +15,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <mednafen/mednafen.h>
+#include "../mednafen.h"
 #include "surface.h"
 
 MDFN_PixelFormat::MDFN_PixelFormat()
diff --git a/mednafen/video/video.cpp b/mednafen/video/video.cpp
index 43f78e85..4bcb62f6 100644
--- a/mednafen/video/video.cpp
+++ b/mednafen/video/video.cpp
@@ -18,8 +18,6 @@
 #include "video-common.h"
 
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdarg.h>
 
diff --git a/msvc/msvc-2010/msvc-2010.vcxproj b/msvc/msvc-2010/msvc-2010.vcxproj
index ea3cc01b..5e2ea24f 100644
--- a/msvc/msvc-2010/msvc-2010.vcxproj
+++ b/msvc/msvc-2010/msvc-2010.vcxproj
@@ -14,6 +14,7 @@
     <ProjectGuid>{8631E5F4-307D-47E4-81F7-6C83F1A82BD1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>mednafenpsxlibretro</RootNamespace>
+    <ProjectName>msvc-2010-psx</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -77,24 +78,11 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libretro.cpp" />
-    <ClCompile Include="..\..\mednafen-libretro\cdplay.cpp" />
-    <ClCompile Include="..\..\mednafen-libretro\mednafen-libretro.cpp" />
-    <ClCompile Include="..\..\mednafen-libretro\psx\spu.cpp" />
-    <ClCompile Include="..\..\mednafen-libretro\state.cpp" />
-    <ClCompile Include="..\..\mednafen\cdplay.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\cdrom\audioreader.cpp" />
     <ClCompile Include="..\..\mednafen\cdrom\CDAccess.cpp" />
     <ClCompile Include="..\..\mednafen\cdrom\CDAccess_Image.cpp" />
-    <ClCompile Include="..\..\mednafen\cdrom\CDAccess_Physical.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\cdrom\cdromif.cpp" />
     <ClCompile Include="..\..\mednafen\cdrom\CDUtility.cpp" />
-    <ClCompile Include="..\..\mednafen\cdrom\crc32.cpp" />
     <ClCompile Include="..\..\mednafen\cdrom\galois.cpp" />
     <ClCompile Include="..\..\mednafen\cdrom\l-ec.cpp" />
     <ClCompile Include="..\..\mednafen\cdrom\lec.cpp" />
@@ -113,20 +101,61 @@
     <ClCompile Include="..\..\mednafen\math_ops.cpp" />
     <ClCompile Include="..\..\mednafen\md5.cpp" />
     <ClCompile Include="..\..\mednafen\mednafen.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\mednafen\memory.cpp" />
     <ClCompile Include="..\..\mednafen\mempatcher.cpp" />
-    <ClCompile Include="..\..\mednafen\movie.cpp" />
-    <ClCompile Include="..\..\mednafen\netplay.cpp" />
+    <ClCompile Include="..\..\mednafen\mpcdec\fastmath.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\huffman-bcl.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\huffman.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\mpc_bits_reader.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\mpc_crc32.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\mpc_decoder.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\mpc_demux.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\mpc_reader.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\requant.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\streaminfo.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\synth_filter.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\tags.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
     <ClCompile Include="..\..\mednafen\okiadpcm.cpp" />
-    <ClCompile Include="..\..\mednafen\player.cpp" />
-    <ClCompile Include="..\..\mednafen\PSFLoader.cpp" />
     <ClCompile Include="..\..\mednafen\psx\cdc.cpp" />
     <ClCompile Include="..\..\mednafen\psx\cpu.cpp" />
-    <ClCompile Include="..\..\mednafen\psx\debug.cpp" />
-    <ClCompile Include="..\..\mednafen\psx\dis.cpp" />
     <ClCompile Include="..\..\mednafen\psx\dma.cpp" />
     <ClCompile Include="..\..\mednafen\psx\frontio.cpp" />
     <ClCompile Include="..\..\mednafen\psx\gpu.cpp" />
@@ -141,33 +170,80 @@
     <ClCompile Include="..\..\mednafen\psx\psx.cpp" />
     <ClCompile Include="..\..\mednafen\psx\sio.cpp" />
     <ClCompile Include="..\..\mednafen\psx\spu.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\mednafen\psx\timer.cpp" />
-    <ClCompile Include="..\..\mednafen\qtrecord.cpp" />
     <ClCompile Include="..\..\mednafen\settings.cpp" />
     <ClCompile Include="..\..\mednafen\sound\Blip_Buffer.cpp" />
-    <ClCompile Include="..\..\mednafen\sound\Fir_Resampler.cpp" />
-    <ClCompile Include="..\..\mednafen\sound\sound.cpp" />
     <ClCompile Include="..\..\mednafen\sound\Stereo_Buffer.cpp" />
-    <ClCompile Include="..\..\mednafen\sound\WAVRecord.cpp" />
     <ClCompile Include="..\..\mednafen\state.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\string\ConvertUTF.cpp" />
-    <ClCompile Include="..\..\mednafen\string\escape.cpp" />
-    <ClCompile Include="..\..\mednafen\tests.cpp" />
+    <ClCompile Include="..\..\mednafen\tremor\bitwise.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\block.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\codebook.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\floor0.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\floor1.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\framing.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\info.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\mapping0.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\mdct.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\registry.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\res012.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\sharedbook.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\synthesis.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\vorbisfile.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\window.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
     <ClCompile Include="..\..\mednafen\video\Deinterlacer.cpp" />
-    <ClCompile Include="..\..\mednafen\video\font-data.cpp" />
-    <ClCompile Include="..\..\mednafen\video\png.cpp" />
-    <ClCompile Include="..\..\mednafen\video\resize.cpp" />
     <ClCompile Include="..\..\mednafen\video\surface.cpp" />
-    <ClCompile Include="..\..\mednafen\video\tblur.cpp" />
-    <ClCompile Include="..\..\mednafen\video\text.cpp" />
     <ClCompile Include="..\..\mednafen\video\video.cpp" />
     <ClCompile Include="..\..\stubs.cpp" />
+    <ClCompile Include="..\..\stubs_thread.cpp" />
     <ClCompile Include="..\..\thread.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/msvc/msvc-2010/msvc-2010.vcxproj.filters b/msvc/msvc-2010/msvc-2010.vcxproj.filters
index 36dcc3df..03a50e42 100644
--- a/msvc/msvc-2010/msvc-2010.vcxproj.filters
+++ b/msvc/msvc-2010/msvc-2010.vcxproj.filters
@@ -13,9 +13,6 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Source Files\mednafen-libretro">
-      <UniqueIdentifier>{b68ac4b4-7b1b-4552-934b-591f115f179c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\mednafen">
       <UniqueIdentifier>{6e1feaad-8f37-43dc-a5a4-e7a7b3f5afb4}</UniqueIdentifier>
     </Filter>
@@ -31,14 +28,14 @@
     <Filter Include="Source Files\mednafen\sound">
       <UniqueIdentifier>{17bf18c6-2a07-456d-b3c9-c1e58e556733}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\mednafen\string">
-      <UniqueIdentifier>{7eaf3432-ca88-4867-9d71-32f75d8334d5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\mednafen\video">
       <UniqueIdentifier>{6ebe59df-57e5-44cb-9a5d-cc954268c480}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\mednafen-libretro\psx">
-      <UniqueIdentifier>{a2821c60-f219-4622-ad44-c64bcd811066}</UniqueIdentifier>
+    <Filter Include="Source Files\mednafen\mpcdec">
+      <UniqueIdentifier>{b69c19a1-9cd3-4b28-9663-de79e5423d10}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\mednafen\tremor">
+      <UniqueIdentifier>{f1639efc-7e36-4c58-ab3c-d662ee41d062}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -51,9 +48,6 @@
     <ClCompile Include="..\..\thread.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\cdplay.cpp">
-      <Filter>Source Files\mednafen</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\endian.cpp">
       <Filter>Source Files\mednafen</Filter>
     </ClCompile>
@@ -84,45 +78,21 @@
     <ClCompile Include="..\..\mednafen\mempatcher.cpp">
       <Filter>Source Files\mednafen</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\movie.cpp">
-      <Filter>Source Files\mednafen</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mednafen\netplay.cpp">
-      <Filter>Source Files\mednafen</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\okiadpcm.cpp">
       <Filter>Source Files\mednafen</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\player.cpp">
-      <Filter>Source Files\mednafen</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mednafen\PSFLoader.cpp">
-      <Filter>Source Files\mednafen</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mednafen\qtrecord.cpp">
-      <Filter>Source Files\mednafen</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\settings.cpp">
       <Filter>Source Files\mednafen</Filter>
     </ClCompile>
     <ClCompile Include="..\..\mednafen\state.cpp">
       <Filter>Source Files\mednafen</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\tests.cpp">
-      <Filter>Source Files\mednafen</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\psx\cdc.cpp">
       <Filter>Source Files\mednafen\psx</Filter>
     </ClCompile>
     <ClCompile Include="..\..\mednafen\psx\cpu.cpp">
       <Filter>Source Files\mednafen\psx</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\psx\debug.cpp">
-      <Filter>Source Files\mednafen\psx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mednafen\psx\dis.cpp">
-      <Filter>Source Files\mednafen\psx</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\psx\dma.cpp">
       <Filter>Source Files\mednafen\psx</Filter>
     </ClCompile>
@@ -177,18 +147,12 @@
     <ClCompile Include="..\..\mednafen\cdrom\CDAccess_Image.cpp">
       <Filter>Source Files\mednafen\cdrom</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\cdrom\CDAccess_Physical.cpp">
-      <Filter>Source Files\mednafen\cdrom</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\cdrom\cdromif.cpp">
       <Filter>Source Files\mednafen\cdrom</Filter>
     </ClCompile>
     <ClCompile Include="..\..\mednafen\cdrom\CDUtility.cpp">
       <Filter>Source Files\mednafen\cdrom</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\cdrom\crc32.cpp">
-      <Filter>Source Files\mednafen\cdrom</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\cdrom\galois.cpp">
       <Filter>Source Files\mednafen\cdrom</Filter>
     </ClCompile>
@@ -213,59 +177,101 @@
     <ClCompile Include="..\..\mednafen\sound\Blip_Buffer.cpp">
       <Filter>Source Files\mednafen\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\sound\Fir_Resampler.cpp">
-      <Filter>Source Files\mednafen\sound</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mednafen\sound\sound.cpp">
-      <Filter>Source Files\mednafen\sound</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\sound\Stereo_Buffer.cpp">
       <Filter>Source Files\mednafen\sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\sound\WAVRecord.cpp">
-      <Filter>Source Files\mednafen\sound</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mednafen\string\ConvertUTF.cpp">
-      <Filter>Source Files\mednafen\string</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mednafen\string\escape.cpp">
-      <Filter>Source Files\mednafen\string</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\video\Deinterlacer.cpp">
       <Filter>Source Files\mednafen\video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\video\png.cpp">
-      <Filter>Source Files\mednafen\video</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mednafen\video\resize.cpp">
-      <Filter>Source Files\mednafen\video</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\video\surface.cpp">
       <Filter>Source Files\mednafen\video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\video\tblur.cpp">
-      <Filter>Source Files\mednafen\video</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mednafen\video\text.cpp">
-      <Filter>Source Files\mednafen\video</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\mednafen\video\video.cpp">
       <Filter>Source Files\mednafen\video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen\video\font-data.cpp">
-      <Filter>Source Files\mednafen\video</Filter>
+    <ClCompile Include="..\..\stubs_thread.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen-libretro\psx\spu.cpp">
-      <Filter>Source Files\mednafen-libretro\psx</Filter>
+    <ClCompile Include="..\..\mednafen\mpcdec\tags.c">
+      <Filter>Source Files\mednafen\mpcdec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen-libretro\cdplay.cpp">
-      <Filter>Source Files\mednafen-libretro</Filter>
+    <ClCompile Include="..\..\mednafen\mpcdec\fastmath.c">
+      <Filter>Source Files\mednafen\mpcdec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen-libretro\mednafen-libretro.cpp">
-      <Filter>Source Files\mednafen-libretro</Filter>
+    <ClCompile Include="..\..\mednafen\mpcdec\huffman.c">
+      <Filter>Source Files\mednafen\mpcdec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\mednafen-libretro\state.cpp">
-      <Filter>Source Files\mednafen-libretro</Filter>
+    <ClCompile Include="..\..\mednafen\mpcdec\huffman-bcl.c">
+      <Filter>Source Files\mednafen\mpcdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\mpc_bits_reader.c">
+      <Filter>Source Files\mednafen\mpcdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\mpc_crc32.c">
+      <Filter>Source Files\mednafen\mpcdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\mpc_decoder.c">
+      <Filter>Source Files\mednafen\mpcdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\mpc_demux.c">
+      <Filter>Source Files\mednafen\mpcdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\mpc_reader.c">
+      <Filter>Source Files\mednafen\mpcdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\requant.c">
+      <Filter>Source Files\mednafen\mpcdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\streaminfo.c">
+      <Filter>Source Files\mednafen\mpcdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\mpcdec\synth_filter.c">
+      <Filter>Source Files\mednafen\mpcdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\window.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\bitwise.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\block.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\codebook.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\floor0.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\floor1.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\framing.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\info.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\mapping0.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\mdct.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\registry.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\res012.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\sharedbook.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\synthesis.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mednafen\tremor\vorbisfile.c">
+      <Filter>Source Files\mednafen\tremor</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/stubs.cpp b/stubs.cpp
index 10e33623..4b327db4 100644
--- a/stubs.cpp
+++ b/stubs.cpp
@@ -5,7 +5,9 @@
 #include "mednafen/general.h"
 #include "mednafen/mednafen-driver.h"
 
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 
 #include <iostream>