diff --git a/gfx/image_context.c b/gfx/image_context.c
index 8afc85e34a..06a4d17836 100644
--- a/gfx/image_context.c
+++ b/gfx/image_context.c
@@ -18,6 +18,7 @@
 #include "gfx_context.h"
 #include "../general.h"
 #include <string.h>
+#include "image_context.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/gfx/image_context.h b/gfx/image_context.h
index fb6f0d0d8d..ad6079ac15 100644
--- a/gfx/image_context.h
+++ b/gfx/image_context.h
@@ -54,6 +54,7 @@ extern const image_ctx_driver_t image_ctx_rpng;
 const void *image_ctx_find_driver(const char *ident);
 void find_prev_image_driver(void);
 void find_next_image_driver(void);
+void find_image_driver(void);
 const void *image_ctx_init_first(void);
 
 #endif
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index f4c3be7d92..75d7225f35 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -240,6 +240,8 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
     </ClCompile>
+    <ClCompile Include="..\..\gfx\image\image_rpng.c" />
+    <ClCompile Include="..\..\gfx\image_context.c" />
     <ClCompile Include="..\..\gfx\rpng\rpng.c" />
     <ClCompile Include="..\..\gfx\shader_cg.c" />
     <ClCompile Include="..\..\gfx\shader_glsl.c" />
@@ -277,8 +279,6 @@
     </ClCompile>
     <ClCompile Include="..\..\gfx\gl.c">
     </ClCompile>
-    <ClCompile Include="..\..\gfx\image\image.c">
-    </ClCompile>
     <ClCompile Include="..\..\gfx\math\matrix.c">
     </ClCompile>
     <ClCompile Include="..\..\gfx\math\matrix_3x3.c">
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
index a9a2e70e3a..cf3363360a 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
@@ -212,7 +212,6 @@
     <ClCompile Include="..\..\input\overlay.c">
       <Filter>input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gfx\image\image.c" />
     <ClCompile Include="..\..\frontend\menu\menu_input_line_cb.c">
       <Filter>frontend\menu</Filter>
     </ClCompile>
@@ -241,6 +240,12 @@
     <ClCompile Include="..\..\frontend\platform\platform_null.c">
       <Filter>frontend\platform</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\gfx\image_context.c">
+      <Filter>gfx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfx\image\image_rpng.c">
+      <Filter>gfx\image</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h" />
@@ -312,5 +317,8 @@
     <Filter Include="frontend\platform">
       <UniqueIdentifier>{09d78055-1c93-4f12-ae3e-97aaa90cf78f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="gfx\image">
+      <UniqueIdentifier>{4a5338d9-92ad-4d07-bb1a-97bd6eb475e4}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file