diff --git a/Makefile.win b/Makefile.win
index edcc5f3d2e..6b6cd318a4 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -150,7 +150,7 @@ else
 endif
 
 ifeq ($(HAVE_D3D9), 1)
-   OBJ += gfx/d3d9/d3d.o gfx/d3d9/d3d9_pc.o gfx/d3d9/render_chain.o gfx/fonts/d3d_font.o gfx/fonts/d3d_w32_font.o
+   OBJ += gfx/d3d9/d3d.o gfx/d3d9/render_chain.o gfx/fonts/d3d_font.o gfx/fonts/d3d_w32_font.o gfx/context/d3d_ctx.o
    DEFINES += -DHAVE_WIN32_D3D9
    LIBS += -ld3d9 -lcg -lcgD3D9 -ld3dx9 -ldxguid
 endif
diff --git a/gfx/context/d3d_ctx.c b/gfx/context/d3d_ctx.cpp
similarity index 100%
rename from gfx/context/d3d_ctx.c
rename to gfx/context/d3d_ctx.cpp
diff --git a/gfx/d3d9/d3d.cpp b/gfx/d3d9/d3d.cpp
index e808ead106..39be77a12d 100644
--- a/gfx/d3d9/d3d.cpp
+++ b/gfx/d3d9/d3d.cpp
@@ -136,7 +136,7 @@ void d3d_recompute_pass_sizes(void *data)
 }
 
 #ifndef DONT_HAVE_STATE_TRACKER
-static bool d3d_init_imports(void *data)
+bool d3d_init_imports(void *data)
 {
    d3d_video_t *d3d = (d3d_video_t*)data;
    if (!d3d->shader.variables)
@@ -236,7 +236,7 @@ bool d3d_init_chain(void *data, const video_info_t *video_info)
 }
 
 #ifdef HAVE_FBO
-static bool d3d_init_multipass(void *data)
+bool d3d_init_multipass(void *data)
 {
    d3d_video_t *d3d = (d3d_video_t*)data;
    config_file_t *conf = config_file_new(d3d->cg_shader.c_str());
@@ -318,7 +318,7 @@ void d3d_set_font_rect(void *data, font_params_t *params)
 #endif
 }
 
-static bool d3d_init_singlepass(void *data)
+bool d3d_init_singlepass(void *data)
 {
    d3d_video_t *d3d = (d3d_video_t*)data;
    memset(&d3d->shader, 0, sizeof(d3d->shader));
diff --git a/griffin/griffin.c b/griffin/griffin.c
index bcc37fb681..fecb6cb4ca 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -100,7 +100,7 @@ VIDEO CONTEXT
 #if defined(__CELLOS_LV2__)
 #include "../gfx/context/ps3_ctx.c"
 #elif defined(_XBOX)
-#include "../gfx/context/d3d_ctx.c"
+#include "../gfx/context/d3d_ctx.cpp"
 #elif defined(ANDROID)
 #include "../gfx/context/androidegl_ctx.c"
 #elif defined(__BLACKBERRY_QNX__)
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 2eb2ea684a..cf3475095c 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -225,7 +225,7 @@
     <ClCompile Include="..\..\frontend\menu\menu_context.c" />
     <ClCompile Include="..\..\frontend\info\core_info.c" />
     <ClCompile Include="..\..\gfx\d3d9\d3d.cpp" />
-    <ClCompile Include="..\..\gfx\context\d3d_ctx.c" />
+    <ClCompile Include="..\..\gfx\context\d3d_ctx.cpp" />
     <ClCompile Include="..\..\gfx\d3d9\render_chain.cpp" />
     <ClCompile Include="..\..\gfx\fonts\bitmapfont.c" />
     <ClCompile Include="..\..\gfx\fonts\d3d_font.c" />
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
index 86e9bf083e..2f0fee94d8 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
@@ -228,7 +228,7 @@
     <ClCompile Include="..\..\frontend\info\core_info.c">
       <Filter>frontend\menu\info</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gfx\context\d3d_ctx.c">
+    <ClCompile Include="..\..\gfx\context\d3d_ctx.cpp">
       <Filter>gfx\context</Filter>
     </ClCompile>
   </ItemGroup>
@@ -297,4 +297,4 @@
       <UniqueIdentifier>{bc290b55-620e-4351-b3b8-4d7a0a3b8792}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>