diff --git a/VisualC/SDL/SDL.vcxproj b/VisualC/SDL/SDL.vcxproj
index 56274818a..fd9732b7d 100644
--- a/VisualC/SDL/SDL.vcxproj
+++ b/VisualC/SDL/SDL.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -288,10 +288,9 @@
     <ClInclude Include="..\..\include\SDL_video.h" />
     <ClInclude Include="..\..\src\events\blank_cursor.h" />
     <ClInclude Include="..\..\src\events\default_cursor.h" />
-    <ClInclude Include="..\..\src\libm\math.h" />
+    <ClInclude Include="..\..\src\libm\math_libm.h" />
     <ClInclude Include="..\..\src\libm\math_private.h" />
     <ClInclude Include="..\..\src\render\mmx.h" />
-    <ClInclude Include="resource.h" />
     <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
     <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
     <ClInclude Include="..\..\src\render\software\SDL_blendfillrect.h" />
@@ -319,9 +318,8 @@
     <ClInclude Include="..\..\src\SDL_error_c.h" />
     <ClInclude Include="..\..\src\events\SDL_events_c.h" />
     <ClInclude Include="..\..\src\events\SDL_gesture_c.h" />
-    <ClInclude Include="..\..\src\video\SDL_glesfuncs.h" />
-    <ClInclude Include="..\..\src\video\SDL_glfuncs.h" />
-    <ClInclude Include="..\..\src\SDL_hints_c.h" />
+    <ClInclude Include="..\..\src\render\opengles\SDL_glesfuncs.h" />
+    <ClInclude Include="..\..\src\render\opengl\SDL_glfuncs.h" />
     <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
     <ClInclude Include="..\..\src\events\SDL_keyboard_c.h" />
     <ClInclude Include="..\..\src\events\SDL_mouse_c.h" />
@@ -342,7 +340,6 @@
     <ClInclude Include="..\..\src\render\SDL_sysrender.h" />
     <ClInclude Include="..\..\src\thread\SDL_systhread.h" />
     <ClInclude Include="..\..\src\thread\windows\SDL_systhread_c.h" />
-    <ClInclude Include="..\..\src\timer\SDL_systimer.h" />
     <ClInclude Include="..\..\src\video\SDL_sysvideo.h" />
     <ClInclude Include="..\..\src\thread\SDL_thread_c.h" />
     <ClInclude Include="..\..\src\timer\SDL_timer_c.h" />
diff --git a/VisualC/SDL/SDL.vcxproj.filters b/VisualC/SDL/SDL.vcxproj.filters
index 36b6c5077..8ae4b26fd 100644
--- a/VisualC/SDL/SDL.vcxproj.filters
+++ b/VisualC/SDL/SDL.vcxproj.filters
@@ -278,7 +278,6 @@
     <ClInclude Include="..\..\src\render\SDL_sysrender.h" />
     <ClInclude Include="..\..\src\thread\SDL_systhread.h" />
     <ClInclude Include="..\..\src\thread\windows\SDL_systhread_c.h" />
-    <ClInclude Include="..\..\src\timer\SDL_systimer.h" />
     <ClInclude Include="..\..\src\video\SDL_sysvideo.h" />
     <ClInclude Include="..\..\src\thread\SDL_thread_c.h" />
     <ClInclude Include="..\..\src\timer\SDL_timer_c.h" />
diff --git a/VisualC/SDL/SDL_VS2008.vcproj b/VisualC/SDL/SDL_VS2008.vcproj
index 884d7c0c1..2ae464db5 100644
--- a/VisualC/SDL/SDL_VS2008.vcproj
+++ b/VisualC/SDL/SDL_VS2008.vcproj
@@ -690,7 +690,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\libm\math.h"
+			RelativePath="..\..\src\libm\math_libm.h"
 			>
 		</File>
 		<File
@@ -701,10 +701,6 @@
 			RelativePath="..\..\src\render\mmx.h"
 			>
 		</File>
-		<File
-			RelativePath=".\resource.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\src\libm\s_atan.c"
 			>
@@ -1002,11 +998,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\video\SDL_glesfuncs.h"
+			RelativePath="..\..\src\render\opengles\SDL_glesfuncs.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\video\SDL_glfuncs.h"
+			RelativePath="..\..\src\render\opengl\SDL_glfuncs.h"
 			>
 		</File>
 		<File
@@ -1017,10 +1013,6 @@
 			RelativePath="..\..\src\SDL_hints.c"
 			>
 		</File>
-		<File
-			RelativePath="..\..\src\SDL_hints_c.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\src\stdlib\SDL_iconv.c"
 			>
@@ -1265,10 +1257,6 @@
 			RelativePath="..\..\src\timer\windows\SDL_systimer.c"
 			>
 		</File>
-		<File
-			RelativePath="..\..\src\timer\SDL_systimer.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\src\thread\windows\SDL_systls.c"
 			>