diff --git a/griffin/griffin.c b/griffin/griffin.c
index 784c5b8155..2c9a616299 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -826,10 +826,6 @@ MENU
 #include "../menu/drivers_display/menu_display_gl.c"
 #endif
 
-#if defined(HAVE_D3D)
-#include "../menu/drivers_display/menu_display_d3d.c"
-#endif
-
 #endif
 
 
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 199c3a6024..27648fb5ea 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -39,6 +39,10 @@ MENU
 #include "../menu/drivers/rmenu_xui.cpp"
 #endif
 
+#if defined(HAVE_D3D)
+#include "../menu/drivers_display/menu_display_d3d.cpp"
+#endif
+
 /*============================================================
 VIDEO CONTEXT
 ============================================================ */
diff --git a/menu/drivers_display/menu_display_d3d.c b/menu/drivers_display/menu_display_d3d.cpp
similarity index 100%
rename from menu/drivers_display/menu_display_d3d.c
rename to menu/drivers_display/menu_display_d3d.cpp