diff --git a/projects/msvc15/VARCem.vcxproj b/projects/msvc15/VARCem.vcxproj
index 1e8b43c..99d3225 100644
--- a/projects/msvc15/VARCem.vcxproj
+++ b/projects/msvc15/VARCem.vcxproj
@@ -22,7 +22,7 @@
     <ClCompile Include="..\..\src\bugger.c" />
     <ClCompile Include="..\..\src\cdrom\cdrom.c" />
     <ClCompile Include="..\..\src\cdrom\cdrom_dosbox.cpp" />
-    <ClCompile Include="..\..\src\cdrom\cdrom_image.cc" />
+    <ClCompile Include="..\..\src\cdrom\cdrom_image.cpp" />
     <ClCompile Include="..\..\src\cdrom\cdrom_null.c" />
     <ClCompile Include="..\..\src\config.c" />
     <ClCompile Include="..\..\src\cpu\386.c" />
@@ -201,29 +201,29 @@
     <ClCompile Include="..\..\src\sound\munt\TVP.cpp" />
     <ClCompile Include="..\..\src\sound\nukedopl.cpp" />
     <ClCompile Include="..\..\src\sound\openal.c" />
-    <ClCompile Include="..\..\src\sound\resid-fp\convolve-sse.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\convolve.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\envelope.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\extfilt.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\filter.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\pot.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\sid.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\voice.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\wave.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\wave6581_PST.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\wave6581_PS_.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\wave6581_P_T.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\wave6581__ST.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\wave8580_PST.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\wave8580_PS_.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\wave8580_P_T.cc" />
-    <ClCompile Include="..\..\src\sound\resid-fp\wave8580__ST.cc" />
+    <ClCompile Include="..\..\src\sound\resid-fp\convolve-sse.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\convolve.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\envelope.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\extfilt.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\filter.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\pot.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\sid.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\voice.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\wave.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\wave6581_PST.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\wave6581_PS_.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\wave6581_P_T.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\wave6581__ST.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\wave8580_PST.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\wave8580_PS_.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\wave8580_P_T.cpp" />
+    <ClCompile Include="..\..\src\sound\resid-fp\wave8580__ST.cpp" />
     <ClCompile Include="..\..\src\sound\snd_ad1848.c" />
     <ClCompile Include="..\..\src\sound\snd_adlib.c" />
     <ClCompile Include="..\..\src\sound\snd_adlibgold.c" />
     <ClCompile Include="..\..\src\sound\snd_audiopci.c" />
     <ClCompile Include="..\..\src\sound\snd_cms.c" />
-    <ClCompile Include="..\..\src\sound\snd_dbopl.cc" />
+    <ClCompile Include="..\..\src\sound\snd_dbopl.cpp" />
     <ClCompile Include="..\..\src\sound\snd_emu8k.c" />
     <ClCompile Include="..\..\src\sound\snd_gus.c" />
     <ClCompile Include="..\..\src\sound\snd_lpt_dac.c" />
@@ -232,7 +232,7 @@
     <ClCompile Include="..\..\src\sound\snd_opl.c" />
     <ClCompile Include="..\..\src\sound\snd_pas16.c" />
     <ClCompile Include="..\..\src\sound\snd_pssj.c" />
-    <ClCompile Include="..\..\src\sound\snd_resid.cc" />
+    <ClCompile Include="..\..\src\sound\snd_resid.cpp" />
     <ClCompile Include="..\..\src\sound\snd_sb.c" />
     <ClCompile Include="..\..\src\sound\snd_sb_dsp.c" />
     <ClCompile Include="..\..\src\sound\snd_sn76489.c" />
@@ -265,7 +265,6 @@
     <ClCompile Include="..\..\src\video\vid_ics2595.c" />
     <ClCompile Include="..\..\src\video\vid_incolor.c" />
     <ClCompile Include="..\..\src\video\vid_mda.c" />
-    <ClCompile Include="..\..\src\video\vid_nv_riva128.c" />
     <ClCompile Include="..\..\src\video\vid_oti067.c" />
     <ClCompile Include="..\..\src\video\vid_paradise.c" />
     <ClCompile Include="..\..\src\video\vid_s3.c" />
@@ -568,7 +567,6 @@
     <ClInclude Include="..\..\src\video\vid_ics2595.h" />
     <ClInclude Include="..\..\src\video\vid_incolor.h" />
     <ClInclude Include="..\..\src\video\vid_mda.h" />
-    <ClInclude Include="..\..\src\video\vid_nv_riva128.h" />
     <ClInclude Include="..\..\src\video\vid_oti067.h" />
     <ClInclude Include="..\..\src\video\vid_paradise.h" />
     <ClInclude Include="..\..\src\video\vid_s3.h" />
diff --git a/projects/msvc15/VARCem.vcxproj.filters b/projects/msvc15/VARCem.vcxproj.filters
index c07cc56..f72b7c2 100644
--- a/projects/msvc15/VARCem.vcxproj.filters
+++ b/projects/msvc15/VARCem.vcxproj.filters
@@ -66,9 +66,6 @@
     <ClCompile Include="..\..\src\cdrom\cdrom_dosbox.cpp">
       <Filter>cdrom</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cdrom\cdrom_image.cc">
-      <Filter>cdrom</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cdrom\cdrom_null.c">
       <Filter>cdrom</Filter>
     </ClCompile>
@@ -432,9 +429,6 @@
     <ClCompile Include="..\..\src\sound\snd_cms.c">
       <Filter>sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\sound\snd_dbopl.cc">
-      <Filter>sound</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\sound\snd_emu8k.c">
       <Filter>sound</Filter>
     </ClCompile>
@@ -459,9 +453,6 @@
     <ClCompile Include="..\..\src\sound\snd_pssj.c">
       <Filter>sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\sound\snd_resid.cc">
-      <Filter>sound</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\sound\snd_sb.c">
       <Filter>sound</Filter>
     </ClCompile>
@@ -549,57 +540,6 @@
     <ClCompile Include="..\..\src\sound\munt\sha1\sha1.cpp">
       <Filter>sound\munt\sha1</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\convolve.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\convolve-sse.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\envelope.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\extfilt.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\filter.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\pot.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\sid.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\voice.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\wave.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\wave6581__ST.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\wave6581_P_T.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\wave6581_PS_.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\wave6581_PST.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\wave8580__ST.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\wave8580_P_T.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\wave8580_PS_.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sound\resid-fp\wave8580_PST.cc">
-      <Filter>sound\resid-fp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\video\vid_ati_eeprom.c">
       <Filter>video</Filter>
     </ClCompile>
@@ -666,9 +606,6 @@
     <ClCompile Include="..\..\src\video\vid_mda.c">
       <Filter>video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\video\vid_nv_riva128.c">
-      <Filter>video</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\video\vid_oti067.c">
       <Filter>video</Filter>
     </ClCompile>
@@ -842,6 +779,66 @@
     <ClCompile Include="..\..\src\sio_w83877f.c" />
     <ClCompile Include="..\..\src\timer.c" />
     <ClCompile Include="..\..\src\zip.c" />
+    <ClCompile Include="..\..\src\sound\resid-fp\wave8580_PST.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\voice.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\wave.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\wave6581__ST.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\wave6581_P_T.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\wave6581_PS_.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\wave6581_PST.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\wave8580__ST.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\wave8580_P_T.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\wave8580_PS_.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\sid.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\pot.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\filter.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\extfilt.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\envelope.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\convolve-sse.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\resid-fp\convolve.cpp">
+      <Filter>sound\resid-fp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\snd_dbopl.cpp">
+      <Filter>sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sound\snd_resid.cpp">
+      <Filter>sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cdrom\cdrom_image.cpp">
+      <Filter>cdrom</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cdrom\cdrom.h">
@@ -1510,9 +1507,6 @@
     <ClInclude Include="..\..\src\video\vid_mda.h">
       <Filter>video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\video\vid_nv_riva128.h">
-      <Filter>video</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\video\vid_oti067.h">
       <Filter>video</Filter>
     </ClInclude>