diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj
index 8912df0e..57bda23d 100644
--- a/src/libvgmstream.vcxproj
+++ b/src/libvgmstream.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -85,7 +85,6 @@
     <ClInclude Include="api_helpers.h" />
     <ClInclude Include="api_streamfile.h" />
     <ClInclude Include="api_tags.h" />
-    <ClInclude Include="coding\libs\ongakukan_adp_lib.h" />
     <ClInclude Include="streamfile.h" />
     <ClInclude Include="streamtypes.h" />
     <ClInclude Include="util.h" />
@@ -116,6 +115,7 @@
     <ClInclude Include="coding\libs\icelib.h" />
     <ClInclude Include="coding\libs\libacm.h" />
     <ClInclude Include="coding\libs\nwa_lib.h" />
+    <ClInclude Include="coding\libs\ongakukan_adp_lib.h" />
     <ClInclude Include="coding\libs\relic_lib.h" />
     <ClInclude Include="coding\libs\tac_data.h" />
     <ClInclude Include="coding\libs\tac_lib.h" />
@@ -207,10 +207,7 @@
     <ClInclude Include="util\zlib_vgmstream.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="coding\libs\ongakukan_adp_lib.c" />
-    <ClCompile Include="coding\ongakukan_adp_decoder.c" />
     <ClCompile Include="formats.c" />
-    <ClCompile Include="meta\adp_ongakukan.c" />
     <ClCompile Include="streamfile.c" />
     <ClCompile Include="util.c" />
     <ClCompile Include="vgmstream.c" />
@@ -283,6 +280,7 @@
     <ClCompile Include="coding\nwa_decoder.c" />
     <ClCompile Include="coding\ogg_vorbis_decoder.c" />
     <ClCompile Include="coding\oki_decoder.c" />
+    <ClCompile Include="coding\ongakukan_adp_decoder.c" />
     <ClCompile Include="coding\pcm_decoder.c" />
     <ClCompile Include="coding\psv_decoder.c" />
     <ClCompile Include="coding\psx_decoder.c" />
@@ -318,6 +316,7 @@
     <ClCompile Include="coding\libs\libacm_decode.c" />
     <ClCompile Include="coding\libs\libacm_util.c" />
     <ClCompile Include="coding\libs\nwa_lib.c" />
+    <ClCompile Include="coding\libs\ongakukan_adp_lib.c" />
     <ClCompile Include="coding\libs\relic_lib.c" />
     <ClCompile Include="coding\libs\relic_mixfft.c" />
     <ClCompile Include="coding\libs\tac_lib.c" />
@@ -379,6 +378,7 @@
     <ClCompile Include="meta\adm.c" />
     <ClCompile Include="meta\adpcm_capcom.c" />
     <ClCompile Include="meta\adp_konami.c" />
+    <ClCompile Include="meta\adp_ongakukan.c" />
     <ClCompile Include="meta\adp_qd.c" />
     <ClCompile Include="meta\adp_wildfire.c" />
     <ClCompile Include="meta\ads.c" />
@@ -507,6 +507,7 @@
     <ClCompile Include="meta\idsp_ie.c" />
     <ClCompile Include="meta\idtech.c" />
     <ClCompile Include="meta\ifs.c" />
+    <ClCompile Include="meta\iivb.c" />
     <ClCompile Include="meta\ikm.c" />
     <ClCompile Include="meta\ild.c" />
     <ClCompile Include="meta\ima.c" />
@@ -515,7 +516,6 @@
     <ClCompile Include="meta\isb.c" />
     <ClCompile Include="meta\ish_isd.c" />
     <ClCompile Include="meta\ivag.c" />
-    <ClCompile Include="meta\ivb.c" />
     <ClCompile Include="meta\jstm.c" />
     <ClCompile Include="meta\kat.c" />
     <ClCompile Include="meta\kma9.c" />
diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters
index 58efecb3..b181840a 100644
--- a/src/libvgmstream.vcxproj.filters
+++ b/src/libvgmstream.vcxproj.filters
@@ -179,6 +179,9 @@
     <ClInclude Include="coding\libs\nwa_lib.h">
       <Filter>coding\libs\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="coding\libs\ongakukan_adp_lib.h">
+      <Filter>coding\libs\Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="coding\libs\relic_lib.h">
       <Filter>coding\libs\Header Files</Filter>
     </ClInclude>
@@ -446,57 +449,6 @@
     <ClInclude Include="util\zlib_vgmstream.h">
       <Filter>util\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="coding\libs\circus_vq_data.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\circus_vq_lib.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\circus_vq_lzxpcm.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\clhca.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\compresswave_lib.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\g7221_aes.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\g7221_data.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\g7221_lib.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\icelib.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\libacm.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\nwa_lib.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\ongakukan_adp_lib.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\relic_lib.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\tac_data.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\tac_lib.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\tac_ops.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="coding\libs\utkdec.h">
-      <Filter>coding\libs\Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="formats.c">
@@ -718,6 +670,9 @@
     <ClCompile Include="coding\oki_decoder.c">
       <Filter>coding\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="coding\ongakukan_adp_decoder.c">
+      <Filter>coding\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="coding\pcm_decoder.c">
       <Filter>coding\Source Files</Filter>
     </ClCompile>
@@ -823,6 +778,9 @@
     <ClCompile Include="coding\libs\nwa_lib.c">
       <Filter>coding\libs\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="coding\libs\ongakukan_adp_lib.c">
+      <Filter>coding\libs\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="coding\libs\relic_lib.c">
       <Filter>coding\libs\Source Files</Filter>
     </ClCompile>
@@ -1006,6 +964,9 @@
     <ClCompile Include="meta\adp_konami.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\adp_ongakukan.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="meta\adp_qd.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
@@ -1390,6 +1351,9 @@
     <ClCompile Include="meta\ifs.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\iivb.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="meta\ikm.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
@@ -1414,9 +1378,6 @@
     <ClCompile Include="meta\ivag.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\ivb.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\jstm.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
@@ -2290,53 +2251,5 @@
     <ClCompile Include="util\text_reader.c">
       <Filter>util\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\adp_ongakukan.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\ongakukan_adp_decoder.c">
-      <Filter>coding\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\circus_vq_lib.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\clhca.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\compresswave_lib.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\g7221_aes.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\g7221_lib.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\icelib.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\libacm_decode.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\libacm_util.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\nwa_lib.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\ongakukan_adp_lib.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\relic_lib.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\relic_mixfft.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\tac_lib.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="coding\libs\utkdec.c">
-      <Filter>coding\libs\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/meta/ivb.c b/src/meta/iivb.c
similarity index 100%
rename from src/meta/ivb.c
rename to src/meta/iivb.c
diff --git a/vspf.py b/vspf.py
index 407d24b0..0e078cff 100644
--- a/vspf.py
+++ b/vspf.py
@@ -150,7 +150,13 @@ class ProjectFixer:
 def main():
     types = [
         './src/*.vcxproj',
-        './src/*.vcxproj.filters'
+        './src/*.vcxproj.filters',
+        #'./cli/*.vcxproj',
+        #'./cli/*.vcxproj.filters',
+        './winamp/*.vcxproj',
+        './winamp/*.vcxproj.filters',
+        './xmplay/*.vcxproj',
+        './xmplay/*.vcxproj.filters',
     ]
 
     for type in types: