diff --git a/griffin/griffin.c b/griffin/griffin.c
index 49aa0648ff..751de38eb1 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -851,6 +851,7 @@ UI
 
 #if defined(_WIN32) && !defined(_XBOX)
 #include "../ui/drivers/ui_win32.c"
+#include "../ui/drivers/win32/ui_win32_window.c"
 #include "../ui/drivers/win32/ui_win32_browser_window.c"
 #include "../ui/drivers/win32/ui_win32_msg_window.c"
 #include "../ui/drivers/win32/ui_win32_application.c"
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index c08dd12e48..f815548479 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -116,11 +116,6 @@ VIDEO CONTEXT
 /*============================================================
 UI
 ============================================================ */
-
-#if defined(_WIN32) && !defined(_XBOX)
-#include "../ui/drivers/win32/ui_win32_window.cpp"
-#endif
-
 #if defined(HAVE_QT)
 #include "../ui/drivers/ui_qt.cpp"
 
diff --git a/ui/drivers/win32/ui_win32_window.cpp b/ui/drivers/win32/ui_win32_window.c
similarity index 99%
rename from ui/drivers/win32/ui_win32_window.cpp
rename to ui/drivers/win32/ui_win32_window.c
index 8a2c4243f5..120b736d5e 100644
--- a/ui/drivers/win32/ui_win32_window.cpp
+++ b/ui/drivers/win32/ui_win32_window.c
@@ -75,10 +75,10 @@ static void ui_window_win32_set_title(void *data, char *buf)
    SetWindowText(window->hwnd, buf);
 }
 
+#ifdef __cplusplus
 extern "C"
-{
+#endif
    VOID (WINAPI *DragAcceptFiles_func)(HWND, BOOL);
-}
 
 void ui_window_win32_set_droppable(void *data, bool droppable)
 {