diff --git a/input/dinput.c b/input/dinput.c
index 9e82938a5a..b93e47b580 100644
--- a/input/dinput.c
+++ b/input/dinput.c
@@ -178,7 +178,7 @@ static bool dinput_keyboard_pressed(struct dinput_input *di, unsigned key)
    if (key >= RETROK_LAST)
       return false;
 
-   unsigned sym = input_translate_rk_to_keysym(key);
+   unsigned sym = input_translate_rk_to_keysym((retro_key)key);
    return di->state[sym] & 0x80;
 }
 
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index a380947026..8f3aa24d2f 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -167,14 +167,13 @@
     </ClCompile>
     <ClCompile Include="..\..\audio\ext_audio.c">
     </ClCompile>
-    <ClCompile Include="..\..\audio\hermite.c">
-    </ClCompile>
     <ClCompile Include="..\..\audio\null.c">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\nullaudio.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\nullaudio.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\nullaudio.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\nullaudio.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\audio\sinc.c" />
     <ClCompile Include="..\..\audio\utils.c">
     </ClCompile>
     <ClCompile Include="..\..\audio\xaudio-c\xaudio-c.c">
@@ -185,8 +184,10 @@
     </ClCompile>
     <ClCompile Include="..\..\gfx\d3d9\d3d9.cpp" />
     <ClCompile Include="..\..\gfx\d3d9\render_chain.cpp" />
-    <ClCompile Include="..\..\gfx\fonts\freetype.c">
-    </ClCompile>
+    <ClCompile Include="..\..\gfx\fonts\bitmapfont.c" />
+    <ClCompile Include="..\..\gfx\fonts\fonts.c" />
+    <ClCompile Include="..\..\gfx\fonts\gl_font.c" />
+    <ClCompile Include="..\..\gfx\fonts\gl_raster_font.c" />
     <ClCompile Include="..\..\gfx\shader_cg.c" />
     <ClCompile Include="..\..\performance.c">
     </ClCompile>
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
index 91e69dfd4f..a0ba3f1026 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
@@ -105,9 +105,6 @@
     <ClCompile Include="..\..\audio\ext_audio.c">
       <Filter>Source Files\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\audio\hermite.c">
-      <Filter>Source Files\audio</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\audio\null.c">
       <Filter>Source Files\audio</Filter>
     </ClCompile>
@@ -177,9 +174,6 @@
     <ClCompile Include="..\..\audio\xaudio-c\xaudio-c.c">
       <Filter>Source Files\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gfx\fonts\freetype.c">
-      <Filter>Source Files\gfx\fonts</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gfx\d3d9\d3d9.cpp">
       <Filter>Source Files\gfx\d3d9</Filter>
     </ClCompile>
@@ -189,6 +183,21 @@
     <ClCompile Include="..\..\gfx\shader_cg.c">
       <Filter>Source Files\gfx</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\gfx\fonts\gl_font.c">
+      <Filter>Source Files\gfx\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\audio\sinc.c">
+      <Filter>Source Files\audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\fonts\gl_raster_font.c">
+      <Filter>Source Files\gfx\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\fonts\bitmapfont.c">
+      <Filter>Source Files\gfx\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\fonts\fonts.c">
+      <Filter>Source Files\gfx\fonts</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">