diff --git a/desmume/src/windows/DeSmuME.vcxproj b/desmume/src/windows/DeSmuME.vcxproj
index 7a2150cf8..2c6a78146 100644
--- a/desmume/src/windows/DeSmuME.vcxproj
+++ b/desmume/src/windows/DeSmuME.vcxproj
@@ -107,26 +107,23 @@
     <ClCompile Include="..\libretro-common\compat\compat_snprintf.c" />
     <ClCompile Include="..\libretro-common\compat\compat_strcasestr.c" />
     <ClCompile Include="..\libretro-common\compat\compat_strl.c" />
-    <ClCompile Include="..\libretro-common\file\dir_list.c" />
-    <ClCompile Include="..\libretro-common\file\file_archive.c" />
-    <ClCompile Include="..\libretro-common\file\file_archive_zlib.c" />
-    <ClCompile Include="..\libretro-common\file\file_list.c">
-      <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PreprocessToFile>
-    </ClCompile>
+    <ClCompile Include="..\libretro-common\file\archive_file.c" />
+    <ClCompile Include="..\libretro-common\file\archive_file_zlib.c" />
     <ClCompile Include="..\libretro-common\file\file_path.c" />
-    <ClCompile Include="..\libretro-common\file\memory_stream.c" />
     <ClCompile Include="..\libretro-common\file\nbio\nbio_stdio.c" />
     <ClCompile Include="..\libretro-common\file\retro_dirent.c" />
-    <ClCompile Include="..\libretro-common\file\retro_file.c" />
     <ClCompile Include="..\libretro-common\file\retro_stat.c" />
     <ClCompile Include="..\libretro-common\formats\bmp\rbmp_encode.c" />
     <ClCompile Include="..\libretro-common\formats\png\rpng.c" />
     <ClCompile Include="..\libretro-common\formats\png\rpng_encode.c" />
     <ClCompile Include="..\libretro-common\hash\rhash.c" />
+    <ClCompile Include="..\libretro-common\lists\dir_list.c" />
+    <ClCompile Include="..\libretro-common\lists\file_list.c" />
+    <ClCompile Include="..\libretro-common\lists\string_list.c" />
     <ClCompile Include="..\libretro-common\rthreads\rsemaphore.c" />
     <ClCompile Include="..\libretro-common\rthreads\rthreads.c" />
-    <ClCompile Include="..\libretro-common\string\string_list.c" />
+    <ClCompile Include="..\libretro-common\streams\file_stream.c" />
+    <ClCompile Include="..\libretro-common\streams\memory_stream.c" />
     <ClCompile Include="..\lua-engine.cpp" />
     <ClCompile Include="..\matrix.cpp" />
     <ClCompile Include="..\mc.cpp" />
diff --git a/desmume/src/windows/DeSmuME.vcxproj.filters b/desmume/src/windows/DeSmuME.vcxproj.filters
index 0add110a2..816a50e32 100644
--- a/desmume/src/windows/DeSmuME.vcxproj.filters
+++ b/desmume/src/windows/DeSmuME.vcxproj.filters
@@ -118,6 +118,12 @@
     <Filter Include="Core\libretro-common\include\compat">
       <UniqueIdentifier>{0e38e634-1de6-4c6e-b1d4-8b3f9e77840a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Core\libretro-common\include\streams">
+      <UniqueIdentifier>{2eba95b4-6c79-43a6-bc38-ae9ce1df54dd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Core\libretro-common\lists">
+      <UniqueIdentifier>{18cba3ce-aaa6-441d-8111-408d0fcef7d2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\aggdraw.cpp">
@@ -912,9 +918,6 @@
     <ClCompile Include="..\libretro-common\file\nbio\nbio_stdio.c">
       <Filter>Core\libretro-common\file\nbio</Filter>
     </ClCompile>
-    <ClCompile Include="..\libretro-common\string\string_list.c">
-      <Filter>Core\libretro-common\string</Filter>
-    </ClCompile>
     <ClCompile Include="..\libretro-common\compat\compat_posix_string.c">
       <Filter>Core\libretro-common\compat</Filter>
     </ClCompile>
@@ -930,30 +933,12 @@
     <ClCompile Include="..\libretro-common\compat\compat_fnmatch.c">
       <Filter>Core\libretro-common\compat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libretro-common\file\retro_file.c">
-      <Filter>Core\libretro-common\file</Filter>
-    </ClCompile>
     <ClCompile Include="..\libretro-common\file\retro_stat.c">
       <Filter>Core\libretro-common\file</Filter>
     </ClCompile>
-    <ClCompile Include="..\libretro-common\file\dir_list.c">
-      <Filter>Core\libretro-common\file</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libretro-common\file\file_archive.c">
-      <Filter>Core\libretro-common\file</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libretro-common\file\file_archive_zlib.c">
-      <Filter>Core\libretro-common\file</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libretro-common\file\file_list.c">
-      <Filter>Core\libretro-common\file</Filter>
-    </ClCompile>
     <ClCompile Include="..\libretro-common\file\file_path.c">
       <Filter>Core\libretro-common\file</Filter>
     </ClCompile>
-    <ClCompile Include="..\libretro-common\file\memory_stream.c">
-      <Filter>Core\libretro-common\file</Filter>
-    </ClCompile>
     <ClCompile Include="..\libretro-common\file\retro_dirent.c">
       <Filter>Core\libretro-common\file</Filter>
     </ClCompile>
@@ -966,6 +951,27 @@
     <ClCompile Include="..\libretro-common\compat\compat_snprintf.c">
       <Filter>Core\libretro-common\compat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libretro-common\streams\memory_stream.c">
+      <Filter>Core\libretro-common\include\streams</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libretro-common\streams\file_stream.c">
+      <Filter>Core\libretro-common\include\streams</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libretro-common\file\archive_file.c">
+      <Filter>Core\libretro-common\file</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libretro-common\lists\file_list.c">
+      <Filter>Core\libretro-common\lists</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libretro-common\lists\string_list.c">
+      <Filter>Core\libretro-common\lists</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libretro-common\lists\dir_list.c">
+      <Filter>Core\libretro-common\lists</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libretro-common\file\archive_file_zlib.c">
+      <Filter>Core\libretro-common\file</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\armcpu.h">