diff --git a/Makefile.common b/Makefile.common
index 839fd46cc8..6554f7ed58 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1258,7 +1258,7 @@ endif
 ifeq ($(HAVE_D3D9), 1)
 	HAVE_D3D_COMMON = 1
    DEFINES += -DHAVE_D3D9
-   LIBS += -ld3d9 -ld3dx9 -ldxguid
+   LIBS += -ldxguid
    OBJ  += gfx/drivers_font/d3d_w32_font.o
    ifeq ($(HAVE_CG), 1)
       LIBS += -lcgD3D9
diff --git a/gfx/common/d3d_common.c b/gfx/common/d3d_common.c
index 6ac2285698..1d91dd4382 100644
--- a/gfx/common/d3d_common.c
+++ b/gfx/common/d3d_common.c
@@ -30,10 +30,17 @@
 
 void *d3d_create(void)
 {
+   UINT SDKVersion = 0;
 #if defined(HAVE_D3D9)
-   return Direct3DCreate9(D3D_SDK_VERSION);
+#ifndef _XBOX
+   SDKVersion = 31;
+#endif
+   return Direct3DCreate9(SDKVersion);
 #elif defined(HAVE_D3D8)
-   return Direct3DCreate8(D3D_SDK_VERSION);
+#ifndef _XBOX
+   SDKVersion = 220;
+#endif
+   return Direct3DCreate8(SDKVersion);
 #endif
 }