diff --git a/msvc/SSNES/SSNES/SSNES.vcxproj.filters b/msvc/SSNES/SSNES/SSNES.vcxproj.filters
index c7c8f3a0aa..e475517a65 100644
--- a/msvc/SSNES/SSNES/SSNES.vcxproj.filters
+++ b/msvc/SSNES/SSNES/SSNES.vcxproj.filters
@@ -130,139 +130,139 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\autosave.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers\top</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\boolean.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers\top</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\bps.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers\top</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\cheats.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers\top</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\config.def.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers\top</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\config.features.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers\top</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\conf\config_file.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\dynamic.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\record\ffemu.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\fifo_buffer.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\file.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\gfx\fonts.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\general.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\getopt_ssnes.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\gfx\gfx_common.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\gfx\gl_common.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\audio\hermite.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\gfx\image.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\libsnes.hpp">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\input\keysym.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\message.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\movie.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\msvc_compat.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\netplay.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\posix_string.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\gfx\py_state\py_state.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\rewind.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\screenshot.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\gfx\sdlwrap.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\sha256.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\gfx\shader_cg.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\gfx\shader_glsl.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\gfx\snes_state.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\audio\ext\ssnes_audio.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\input\ssnes_dinput.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\audio\ext\ssnes_dsp.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\input\ssnes_sdl_input.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\gfx\ext\ssnes_video.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\strl.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\thread.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\ups.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\audio\utils.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\audio\xaudio-c\xaudio-c.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\audio\xaudio-c\xaudio.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers\top</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\driver.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\dynamic.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\record\ffemu.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\fifo_buffer.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\file.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\general.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\getopt_ssnes.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libsnes.hpp">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\message.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\movie.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\msvc_compat.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\netplay.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\posix_string.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\rewind.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\sha256.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\strl.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\thread.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\ups.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\audio\utils.h">
+      <Filter>Headers\top</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\gfx\fonts.h">
+      <Filter>Headers\gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\gfx\gfx_common.h">
+      <Filter>Headers\gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\gfx\gl_common.h">
+      <Filter>Headers\gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\gfx\py_state\py_state.h">
+      <Filter>Headers\gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\gfx\sdlwrap.h">
+      <Filter>Headers\gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\gfx\shader_cg.h">
+      <Filter>Headers\gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\gfx\shader_glsl.h">
+      <Filter>Headers\gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\gfx\snes_state.h">
+      <Filter>Headers\gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\gfx\ext\ssnes_video.h">
+      <Filter>Headers\gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\input\ssnes_sdl_input.h">
+      <Filter>Headers\input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\input\ssnes_dinput.h">
+      <Filter>Headers\input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\input\keysym.h">
+      <Filter>Headers\input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\gfx\image.h">
+      <Filter>Headers\gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\screenshot.h">
+      <Filter>Headers\gfx</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\audio\hermite.h">
+      <Filter>Headers\audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\audio\xaudio-c\xaudio.h">
+      <Filter>Headers\audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\audio\ext\ssnes_audio.h">
+      <Filter>Headers\audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\audio\ext\ssnes_dsp.h">
+      <Filter>Headers\audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\audio\xaudio-c\xaudio-c.h">
+      <Filter>Headers\audio</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -284,5 +284,17 @@
     <Filter Include="Sources\input">
       <UniqueIdentifier>{f5587648-1c52-408e-80de-effb813294f1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Headers\top">
+      <UniqueIdentifier>{3e498457-23e5-469a-8f36-5bd9430d9e00}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Headers\gfx">
+      <UniqueIdentifier>{efcb213b-6038-4ad9-a2c4-07d8063ca5d8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Headers\input">
+      <UniqueIdentifier>{3542518e-8825-483f-992b-3c680ef3de4c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Headers\audio">
+      <UniqueIdentifier>{8adc8069-5b48-4fca-9fe8-22214a5fcc08}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file