diff --git a/console/console_ext.c b/console/console_ext.c
index 2bceb58568..a58d387b0c 100644
--- a/console/console_ext.c
+++ b/console/console_ext.c
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef _WIN32
-#include "../posix_string.h"
+#include "../compat/posix_string.h"
 #endif
 
 static char g_rom_ext[1024];
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj b/msvc-360/SSNES-360/SSNES-360.vcxproj
index e6ba545aac..e92aab51cd 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj
@@ -360,12 +360,14 @@
     <ClCompile Include="..\..\autosave.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\bps.c" />
     <ClCompile Include="..\..\cheats.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\compat\getopt.c" />
+    <ClCompile Include="..\..\compat\posix_string.c" />
+    <ClCompile Include="..\..\compat\strl.c" />
     <ClCompile Include="..\..\conf\config_file.c" />
     <ClCompile Include="..\..\console\main_wrap.c" />
     <ClCompile Include="..\..\console\console_ext.c" />
@@ -381,7 +383,6 @@
     <ClCompile Include="..\..\dynamic.c" />
     <ClCompile Include="..\..\fifo_buffer.c" />
     <ClCompile Include="..\..\file.c" />
-    <ClCompile Include="..\..\getopt.c" />
     <ClCompile Include="..\..\input\input_luts.c" />
     <ClCompile Include="..\..\message.c" />
     <ClCompile Include="..\..\movie.c" />
@@ -389,15 +390,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\netplay_compat.c" />
-    <ClCompile Include="..\..\posix_string.c" />
+    <ClCompile Include="..\..\patch.c" />
     <ClCompile Include="..\..\rewind.c" />
     <ClCompile Include="..\..\screenshot.c" />
     <ClCompile Include="..\..\settings.c" />
     <ClCompile Include="..\..\sha256.c" />
     <ClCompile Include="..\..\ssnes.c" />
-    <ClCompile Include="..\..\strl.c" />
     <ClCompile Include="..\..\thread.c" />
-    <ClCompile Include="..\..\ups.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\360\menu.h" />
@@ -409,6 +408,9 @@
     <ClInclude Include="..\..\boolean.h" />
     <ClInclude Include="..\..\bps.h" />
     <ClInclude Include="..\..\cheats.h" />
+    <ClInclude Include="..\..\compat\getopt_ssnes.h" />
+    <ClInclude Include="..\..\compat\posix_string.h" />
+    <ClInclude Include="..\..\compat\strl.h" />
     <ClInclude Include="..\..\config.def.h" />
     <ClInclude Include="..\..\config.features.h" />
     <ClInclude Include="..\..\conf\config_file.h" />
@@ -417,16 +419,13 @@
     <ClInclude Include="..\..\fifo_buffer.h" />
     <ClInclude Include="..\..\file.h" />
     <ClInclude Include="..\..\general.h" />
-    <ClInclude Include="..\..\getopt_ssnes.h" />
     <ClInclude Include="..\..\libsnes.hpp" />
     <ClInclude Include="..\..\message.h" />
     <ClInclude Include="..\..\movie.h" />
     <ClInclude Include="..\..\netplay.h" />
-    <ClInclude Include="..\..\posix_string.h" />
     <ClInclude Include="..\..\rewind.h" />
     <ClInclude Include="..\..\screenshot.h" />
     <ClInclude Include="..\..\sha256.h" />
-    <ClInclude Include="..\..\strl.h" />
     <ClInclude Include="..\..\thread.h" />
     <ClInclude Include="..\..\ups.h" />
   </ItemGroup>
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
index 0997ebc135..390f689f49 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
@@ -42,20 +42,20 @@
     <Filter Include="Source Files\media\shader">
       <UniqueIdentifier>{3a05047b-b9ec-4821-bb28-d1b0e9e3e8bb}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\compat">
+      <UniqueIdentifier>{34c33a54-e69d-4fb2-ba70-ae9c34654825}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\compat">
+      <UniqueIdentifier>{cf25b88e-c7b2-4823-876a-ed0dd8020821}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\360\xdk360_video.cpp">
       <Filter>Source Files\360</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ups.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\autosave.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\bps.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\cheats.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -71,9 +71,6 @@
     <ClCompile Include="..\..\file.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\getopt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\message.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -83,9 +80,6 @@
     <ClCompile Include="..\..\netplay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\posix_string.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\rewind.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -101,9 +95,6 @@
     <ClCompile Include="..\..\ssnes.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\strl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\thread.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -152,6 +143,18 @@
     <ClCompile Include="..\..\360\xdk360_input.c">
       <Filter>Source Files\360</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\patch.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\compat\strl.c">
+      <Filter>Source Files\compat</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\compat\getopt.c">
+      <Filter>Source Files\compat</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\compat\posix_string.c">
+      <Filter>Source Files\compat</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\ups.h">
@@ -190,9 +193,6 @@
     <ClInclude Include="..\..\general.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\getopt_ssnes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\libsnes.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -205,9 +205,6 @@
     <ClInclude Include="..\..\netplay.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\posix_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\rewind.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -217,9 +214,6 @@
     <ClInclude Include="..\..\sha256.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\strl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\thread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -241,6 +235,15 @@
     <ClInclude Include="..\..\360\menu.h">
       <Filter>Header Files\360</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\compat\strl.h">
+      <Filter>Header Files\compat</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\compat\getopt_ssnes.h">
+      <Filter>Header Files\compat</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\compat\posix_string.h">
+      <Filter>Header Files\compat</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\360\media\ssnes.ttf">