diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj b/msvc-360/SSNES-360/SSNES-360.vcxproj
index 795ebbf824..1113aa9828 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj
@@ -378,7 +378,7 @@
     <ClInclude Include="..\..\fifo_buffer.h" />
     <ClInclude Include="..\..\file.h" />
     <ClInclude Include="..\..\general.h" />
-    <ClInclude Include="..\..\libsnes.hpp" />
+    <ClInclude Include="..\..\libretro.hpp" />
     <ClInclude Include="..\..\message.h" />
     <ClInclude Include="..\..\netplay.h" />
     <ClInclude Include="..\..\rewind.h" />
@@ -531,20 +531,20 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\360\media\sd\rarch_libsnescore_browser.xui">
+    <CustomBuild Include="..\..\360\media\sd\rarch_libretrocore_browser.xui">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libsnescore_browser.xui" "$(OutDir)media\sd\rarch_libsnescore_browser.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libsnescore_browser.xui" "$(OutDir)media\sd\rarch_libsnescore_browser.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libsnescore_browser.xui" "$(OutDir)media\sd\rarch_libsnescore_browser.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libsnescore_browser.xui" "$(OutDir)media\sd\rarch_libsnescore_browser.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libsnescore_browser.xui" "$(OutDir)media\sd\rarch_libsnescore_browser.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libsnescore_browser.xui" "$(OutDir)media\sd\rarch_libsnescore_browser.xur"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">$(OutDir)media\sd\rarch_libsnescore_browser.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">$(OutDir)media\sd\rarch_libsnescore_browser.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">$(OutDir)media\sd\rarch_libsnescore_browser.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">$(OutDir)media\sd\rarch_libsnescore_browser.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\sd\rarch_libsnescore_browser.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\sd\rarch_libsnescore_browser.xur;</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libretrocore_browser.xui" "$(OutDir)media\sd\rarch_libretrocore_browser.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libretrocore_browser.xui" "$(OutDir)media\sd\rarch_libretrocore_browser.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libretrocore_browser.xui" "$(OutDir)media\sd\rarch_libretrocore_browser.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libretrocore_browser.xui" "$(OutDir)media\sd\rarch_libretrocore_browser.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libretrocore_browser.xui" "$(OutDir)media\sd\rarch_libretrocore_browser.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libretrocore_browser.xui" "$(OutDir)media\sd\rarch_libretrocore_browser.xur"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">$(OutDir)media\sd\rarch_libretrocore_browser.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">$(OutDir)media\sd\rarch_libretrocore_browser.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">$(OutDir)media\sd\rarch_libretrocore_browser.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">$(OutDir)media\sd\rarch_libretrocore_browser.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\sd\rarch_libretrocore_browser.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\sd\rarch_libretrocore_browser.xur;</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
@@ -586,20 +586,20 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\hd\rarch_filebrowser.xur;</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\hd\rarch_filebrowser.xur;</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\360\media\hd\rarch_libsnescore_browser.xui">
+    <CustomBuild Include="..\..\360\media\hd\rarch_libretrocore_browser.xui">
       <FileType>Document</FileType>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">$(OutDir)media\hd\rarch_libsnescore_browser.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">$(OutDir)media\hd\rarch_libsnescore_browser.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">$(OutDir)media\hd\rarch_libsnescore_browser.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">$(OutDir)media\hd\rarch_libsnescore_browser.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\hd\rarch_libsnescore_browser.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\hd\rarch_libsnescore_browser.xur;</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libsnescore_browser.xui" "$(OutDir)media\hd\rarch_libsnescore_browser.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libsnescore_browser.xui" "$(OutDir)media\hd\rarch_libsnescore_browser.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libsnescore_browser.xui" "$(OutDir)media\hd\rarch_libsnescore_browser.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libsnescore_browser.xui" "$(OutDir)media\hd\rarch_libsnescore_browser.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libsnescore_browser.xui" "$(OutDir)media\hd\rarch_libsnescore_browser.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libsnescore_browser.xui" "$(OutDir)media\hd\rarch_libsnescore_browser.xur"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">$(OutDir)media\hd\rarch_libretrocore_browser.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">$(OutDir)media\hd\rarch_libretrocore_browser.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">$(OutDir)media\hd\rarch_libretrocore_browser.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">$(OutDir)media\hd\rarch_libretrocore_browser.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\hd\rarch_libretrocore_browser.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\hd\rarch_libretrocore_browser.xur;</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libretrocore_browser.xui" "$(OutDir)media\hd\rarch_libretrocore_browser.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libretrocore_browser.xui" "$(OutDir)media\hd\rarch_libretrocore_browser.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libretrocore_browser.xui" "$(OutDir)media\hd\rarch_libretrocore_browser.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libretrocore_browser.xui" "$(OutDir)media\hd\rarch_libretrocore_browser.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libretrocore_browser.xui" "$(OutDir)media\hd\rarch_libretrocore_browser.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_libretrocore_browser.xui" "$(OutDir)media\hd\rarch_libretrocore_browser.xur"</Command>
     </CustomBuild>
     <CustomBuild Include="..\..\360\media\hd\rarch_main.xui">
       <FileType>Document</FileType>
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
index 49ae0d75cf..9c434ed26d 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
@@ -88,9 +88,6 @@
     <ClInclude Include="..\..\general.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libsnes.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\message.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -130,20 +127,17 @@
     <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>
+    <ClInclude Include="..\..\compat\getopt_rarch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libretro.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\360\media\ssnes.ttf">
-      <Filter>Source Files\media</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\360\media\ssnes_scene_skin.xui">
-      <Filter>Source Files\media</Filter>
-    </CustomBuild>
     <CustomBuild Include="..\..\360\media\a.png">
       <Filter>Source Files\media</Filter>
     </CustomBuild>
@@ -156,35 +150,37 @@
     <CustomBuild Include="..\..\360\media\shaders\stock.cg">
       <Filter>Source Files\media\shader</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\360\media\sd\ssnes_filebrowser.xui">
+    <CustomBuild Include="..\..\360\media\rarch.ttf" />
+    <CustomBuild Include="..\..\360\media\rarch_scene_skin.xui" />
+    <CustomBuild Include="..\..\360\media\sd\rarch_filebrowser.xui">
       <Filter>Source Files\media\sd</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\360\media\sd\ssnes_libsnescore_browser.xui">
+    <CustomBuild Include="..\..\360\media\hd\rarch_filebrowser.xui">
+      <Filter>Source Files\media\hd</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\360\media\sd\rarch_libretrocore_browser.xui">
       <Filter>Source Files\media\sd</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\360\media\sd\ssnes_main.xui">
+    <CustomBuild Include="..\..\360\media\hd\rarch_libretrocore_browser.xui">
+      <Filter>Source Files\media\hd</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\360\media\sd\rarch_main.xui">
       <Filter>Source Files\media\sd</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\360\media\sd\ssnes_quickmenu.xui">
+    <CustomBuild Include="..\..\360\media\hd\rarch_main.xui">
+      <Filter>Source Files\media\hd</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\360\media\hd\rarch_quickmenu.xui">
+      <Filter>Source Files\media\hd</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\360\media\sd\rarch_quickmenu.xui">
       <Filter>Source Files\media\sd</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\360\media\sd\ssnes_settings.xui">
+    <CustomBuild Include="..\..\360\media\hd\rarch_settings.xui">
+      <Filter>Source Files\media\hd</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\360\media\sd\rarch_settings.xui">
       <Filter>Source Files\media\sd</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\360\media\hd\ssnes_filebrowser.xui">
-      <Filter>Source Files\media\hd</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\360\media\hd\ssnes_libsnescore_browser.xui">
-      <Filter>Source Files\media\hd</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\360\media\hd\ssnes_main.xui">
-      <Filter>Source Files\media\hd</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\360\media\hd\ssnes_quickmenu.xui">
-      <Filter>Source Files\media\hd</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\360\media\hd\ssnes_settings.xui">
-      <Filter>Source Files\media\hd</Filter>
-    </CustomBuild>
   </ItemGroup>
 </Project>
\ No newline at end of file