diff --git a/griffin/griffin.c b/griffin/griffin.c
index e7e970eded..48a6c912dd 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -732,7 +732,6 @@ 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_msg_window.c"
 #include "../ui/drivers/win32/ui_win32_application.c"
 #endif
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 54e88b1233..f1d4a01743 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -120,6 +120,14 @@ VIDEO CONTEXT
 #include "../gfx/drivers_context/d3d_ctx.cpp"
 #endif
 
+/*============================================================
+UI
+============================================================ */
+
+#if defined(_WIN32) && !defined(_XBOX)
+#include "../ui/drivers/win32/ui_win32_window.cpp"
+#endif
+
 /*============================================================
 VIDEO DRIVER
 ============================================================ */
diff --git a/ui/drivers/win32/ui_win32_msg_window.c b/ui/drivers/win32/ui_win32_msg_window.c
index cb26058a81..24ce672389 100644
--- a/ui/drivers/win32/ui_win32_msg_window.c
+++ b/ui/drivers/win32/ui_win32_msg_window.c
@@ -23,6 +23,23 @@
 
 #include "../../ui_companion_driver.h"
 
+static enum ui_msg_window_response ui_msg_window_win32_response(ui_msg_window_state *state, UINT response)
+{
+	switch (response)
+	{
+	   case IDOK:
+		return UI_MSG_RESPONSE_OK;
+	   case IDCANCEL:
+		return UI_MSG_RESPONSE_CANCEL;
+	   case IDYES:
+	    return UI_MSG_RESPONSE_YES;
+	   case IDNO:
+        return UI_MSG_RESPONSE_NO;
+	}
+
+	return UI_MSG_RESPONSE_NA;
+}
+
 static enum ui_msg_window_response ui_msg_window_win32_error(ui_msg_window_state *state)
 {
    return UI_MSG_RESPONSE_CANCEL;
diff --git a/ui/drivers/win32/ui_win32_window.c b/ui/drivers/win32/ui_win32_window.cpp
similarity index 96%
rename from ui/drivers/win32/ui_win32_window.c
rename to ui/drivers/win32/ui_win32_window.cpp
index 987e751f49..9df67c27e7 100644
--- a/ui/drivers/win32/ui_win32_window.c
+++ b/ui/drivers/win32/ui_win32_window.cpp
@@ -77,6 +77,7 @@ static void ui_window_win32_set_title(void *data, char *buf)
 
 static void ui_window_win32_set_droppable(void *data, bool droppable)
 {
+   /* Minimum supported client: Windows XP, minimum supported server: Windows 2000 Server */
    ui_window_win32_t *window = (ui_window_win32_t*)data;
    DragAcceptFiles(window->hwnd, droppable);
 }