diff --git a/gfx/drivers_context/gdi_ctx.cpp b/gfx/drivers_context/gdi_ctx.c
similarity index 98%
rename from gfx/drivers_context/gdi_ctx.cpp
rename to gfx/drivers_context/gdi_ctx.c
index f4f1a9c265..3773a6d1c8 100644
--- a/gfx/drivers_context/gdi_ctx.cpp
+++ b/gfx/drivers_context/gdi_ctx.c
@@ -126,7 +126,8 @@ static void gfx_ctx_gdi_get_video_size(void *data,
    }
 }
 
-static void *gfx_ctx_gdi_init(video_frame_info_t *video_info, void *video_driver)
+static void *gfx_ctx_gdi_init(
+      video_frame_info_t *video_info, void *video_driver)
 {
    WNDCLASSEX wndclass = {0};
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 5f84ebff04..df49afc43a 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -166,9 +166,21 @@ VIDEO CONTEXT
 #include "../gfx/drivers_context/gfx_null_ctx.c"
 
 #if defined(_WIN32) && !defined(_XBOX)
+
 #if defined(HAVE_OPENGL) || defined(HAVE_VULKAN)
 #include "../gfx/drivers_context/wgl_ctx.c"
 #endif
+
+#if defined(_WIN32) && !defined(_XBOX)
+#include "../gfx/drivers_context/gdi_ctx.c"
+#endif
+
+#if defined(HAVE_FFMPEG)
+#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES3)
+#include "../cores/libretro-ffmpeg/ffmpeg_fft.c"
+#endif
+#endif
+
 #endif
 
 #if defined(__CELLOS_LV2__)
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index bfef83a896..53a538109e 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -97,24 +97,6 @@ AUDIO
 #include "../audio/drivers/xaudio.cpp"
 #endif
 
-/*============================================================
-UI COMMON CONTEXT
-============================================================ */
-#if defined(_WIN32) && !defined(_XBOX)
-
-#if defined(_WIN32) && !defined(_XBOX)
-#include "../gfx/drivers_context/gdi_ctx.cpp"
-#endif
-
-#if defined(HAVE_FFMPEG)
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES3)
-#include "../cores/libretro-ffmpeg/fft/fft.cpp"
-#endif
-#endif
-
-#endif
-
-
 /*============================================================
 MENU
 ============================================================ */