diff --git a/Makefile.common b/Makefile.common
index dcc115e924..ea835367b6 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -746,6 +746,10 @@ ifeq ($(HAVE_D3D9), 1)
    DEFINES += -DHAVE_D3D -DHAVE_D3D9
    LIBS += -ld3d9 -ld3dx9 -ldxguid
 
+   #ifeq ($(HAVE_MENU_COMMON), 1)
+		#OBJ += menu/drivers_display/menu_display_d3d.o
+	#endif
+
    ifeq ($(HAVE_CG), 1)
       LIBS += -lcgD3D9
       OBJ  += gfx/d3d/render_chain_cg.o
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 0c8a4ffa6b..3a9c3aad5d 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -139,9 +139,6 @@ VIDEO CONTEXT
 #include "../gfx/drivers_context/vc_egl_ctx.c"
 #endif
 
-#ifdef HAVE_MENU
-#include "../menu/drivers_display/menu_display_gl.c"
-#endif
 
 #if defined(_WIN32) && !defined(_XBOX)
 #include "../gfx/drivers_context/wgl_ctx.c"
@@ -817,9 +814,21 @@ MENU
 #include "../menu/intl/menu_hash_pt.c"
 #include "../menu/intl/menu_hash_us.c"
 
-#include "../menu/drivers_display/menu_display_null.c"
 #include "../menu/drivers/null.c"
 #include "../menu/drivers/menu_generic.c"
+
+#include "../menu/drivers_display/menu_display_null.c"
+
+#ifdef HAVE_OPENGL
+#include "../menu/drivers_display/menu_display_gl.c"
+#endif
+
+#if 0
+#if defined(HAVE_D3D)
+#include "../menu/drivers_display/menu_display_d3d.c"
+#endif
+#endif
+
 #endif