diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.cpp
similarity index 100%
rename from gfx/common/win32_common.c
rename to gfx/common/win32_common.cpp
diff --git a/gfx/common/win32_common.h b/gfx/common/win32_common.h
index 5dd0b239df..76ff1cd5fa 100644
--- a/gfx/common/win32_common.h
+++ b/gfx/common/win32_common.h
@@ -28,10 +28,6 @@
 #include "../../driver.h"
 #include "../video_context_driver.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef _XBOX
 #include "../drivers_wm/win32_resource.h"
 
@@ -71,8 +67,4 @@ void win32_show_cursor(bool state);
 void win32_check_window(bool *quit,
       bool *resize, unsigned *width, unsigned *height);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.cpp
similarity index 100%
rename from gfx/drivers_context/wgl_ctx.c
rename to gfx/drivers_context/wgl_ctx.cpp
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 2c9a616299..7845d1e35a 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -103,13 +103,6 @@ CHEATS
 #include "../cheats.c"
 #include "../libretro-common/hash/rhash.c"
 
-/*============================================================
-UI COMMON CONTEXT
-============================================================ */
-#if defined(_WIN32)
-#include "../gfx/common/win32_common.c"
-#endif
-
 /*============================================================
 VIDEO CONTEXT
 ============================================================ */
@@ -139,9 +132,7 @@ VIDEO CONTEXT
 #include "../gfx/drivers_context/vc_egl_ctx.c"
 #endif
 
-
 #if defined(_WIN32) && !defined(_XBOX)
-#include "../gfx/drivers_context/wgl_ctx.c"
 #include "../gfx/drivers_wm/win32_shader_dlg.c"
 #endif
 
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 27648fb5ea..d81d425e2d 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -32,6 +32,18 @@ AUDIO
 #include "../audio/drivers/xaudio.cpp"
 #endif
 
+/*============================================================
+UI COMMON CONTEXT
+============================================================ */
+#if defined(_WIN32) && !defined(_XBOX)
+#include "../gfx/common/win32_common.cpp"
+
+#ifdef HAVE_OPENGL
+#include "../gfx/drivers_context/wgl_ctx.cpp"
+#endif
+#endif
+
+
 /*============================================================
 MENU
 ============================================================ */