diff --git a/gfx/d3d9/d3d_defines.h b/gfx/d3d9/d3d_defines.h
index f68a0db45a..964f8777e9 100644
--- a/gfx/d3d9/d3d_defines.h
+++ b/gfx/d3d9/d3d_defines.h
@@ -26,28 +26,45 @@
 #define LPDIRECT3D                     LPDIRECT3D9
 #define LPDIRECT3DDEVICE               LPDIRECT3DDEVICE9
 #define LPDIRECT3DTEXTURE              LPDIRECT3DTEXTURE9
+#define LPDIRECT3DCUBETEXTURE          LPDIRECT3DCUBETEXTURE9
 #define LPDIRECT3DVERTEXBUFFER         LPDIRECT3DVERTEXBUFFER9
 #define LPDIRECT3DVERTEXSHADER         LPDIRECT3DVERTEXSHADER9
 #define LPDIRECT3DPIXELSHADER          LPDIRECT3DPIXELSHADER9
 #define LPDIRECT3DSURFACE              LPDIRECT3DSURFACE9
 #define LPDIRECT3DVERTEXDECLARATION    LPDIRECT3DVERTEXDECLARATION9
+#define LPDIRECT3DVOLUMETEXTURE        LPDIRECT3DVOLUMETEXTURE9
+#define LPDIRECT3DRESOURCE             LPDIRECT3DRESOURCE9
 #define D3DVERTEXELEMENT               D3DVERTEXELEMENT9
 #define D3DVIEWPORT                    D3DVIEWPORT9
 
 #define D3DCREATE_CTX                  Direct3DCreate9
+
+#ifndef D3DCREATE_SOFTWARE_VERTEXPROCESSING
+#define D3DCREATE_SOFTWARE_VERTEXPROCESSING 0
+#endif
+
 #elif defined(_XBOX1)
 //Direct3D 8
 #define LPDIRECT3D                     LPDIRECT3D8
 #define LPDIRECT3DDEVICE               LPDIRECT3DDEVICE8
 #define LPDIRECT3DTEXTURE              LPDIRECT3DTEXTURE8
+#define LPDIRECT3DCUBETEXTURE          LPDIRECT3DCUBETEXTURE8
+#define LPDIRECT3DVOLUMETEXTURE        LPDIRECT3DVOLUMETEXTURE8
 #define LPDIRECT3DVERTEXBUFFER         LPDIRECT3DVERTEXBUFFER8
 #define LPDIRECT3DVERTEXSHADER         LPDIRECT3DVERTEXSHADER8
 #define LPDIRECT3DPIXELSHADER          LPDIRECT3DPIXELSHADER8
 #define LPDIRECT3DSURFACE              LPDIRECT3DSURFACE8
+#define LPDIRECT3DRESOURCE             LPDIRECT3DRESOURCE8
 #define D3DVERTEXELEMENT               D3DVERTEXELEMENT8
 #define D3DVIEWPORT                    D3DVIEWPORT8
 
 #define D3DCREATE_CTX                  Direct3DCreate8
+
+#define D3DLOCK_NOSYSLOCK (0)
+#define D3DSAMP_ADDRESSU D3DTSS_ADDRESSU
+#define D3DSAMP_ADDRESSV D3DTSS_ADDRESSV
+#define D3DSAMP_MAGFILTER D3DTSS_MAGFILTER
+#define D3DSAMP_MINFILTER D3DTSS_MINFILTER
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/gfx/d3d9/d3d_shared.h b/gfx/d3d9/d3d_shared.h
index 68d785434c..b87de79d2e 100644
--- a/gfx/d3d9/d3d_shared.h
+++ b/gfx/d3d9/d3d_shared.h
@@ -1,3 +1,5 @@
+#include "d3d_defines.h"
+
 /* forward declarations */
 static void d3d_calculate_rect(d3d_video_t *d3d,
       unsigned width, unsigned height,
diff --git a/gfx/d3d9/xdk_defines.h b/gfx/d3d9/xdk_defines.h
index 3fccd378ee..dca1dc14a7 100644
--- a/gfx/d3d9/xdk_defines.h
+++ b/gfx/d3d9/xdk_defines.h
@@ -20,20 +20,6 @@
 
 #if defined(_XBOX1)
 /* XBox 1*/
-#define LPDIRECT3DRESOURCE LPDIRECT3DRESOURCE8
-#define LPDIRECT3DTEXTURE LPDIRECT3DTEXTURE8
-#define LPDIRECT3DCUBETEXTURE LPDIRECT3DCUBETEXTURE8
-#define LPDIRECT3DVOLUMETEXTURE LPDIRECT3DVOLUMETEXTURE8
-#define LPDIRECT3DVERTEXBUFFER LPDIRECT3DVERTEXBUFFER8
-#define LPDIRECT3DRESOURCE LPDIRECT3DRESOURCE8
-#define LPDIRECT3D LPDIRECT3D8
-#define LPDIRECT3DDEVICE LPDIRECT3DDEVICE8
-#define LPDIRECT3DSURFACE LPDIRECT3DSURFACE8
-
-#define D3DVIEWPORT D3DVIEWPORT8
-#define D3DVERTEXELEMENT D3DVERTEXELEMENT8
-
-#define direct3d_create_ctx Direct3DCreate8
 
 #define SetSamplerState_function(device, sampler, type, value) \
  D3D__DirtyFlags |= (D3DDIRTYFLAG_TEXTURE_STATE_0 << sampler); \
@@ -56,32 +42,8 @@
 #define D3DDevice_CreateVertexBuffers(device, Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer, pUnusedSharedHandle) IDirect3DDevice8_CreateVertexBuffer(device, Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer)
 #define D3DDevice_SetStreamSources(device, streamNumber, pStreamData, OffsetInBytes, Stride)      IDirect3DDevice8_SetStreamSource(device, streamNumber, pStreamData, Stride);
 
-
-#define D3DLOCK_NOSYSLOCK (0)
-
-#define D3DSAMP_ADDRESSU D3DTSS_ADDRESSU
-#define D3DSAMP_ADDRESSV D3DTSS_ADDRESSV
-#define D3DSAMP_MAGFILTER D3DTSS_MAGFILTER
-#define D3DSAMP_MINFILTER D3DTSS_MINFILTER
-
 #elif defined(_XBOX360)
 /* XBox 360*/
-#define LPDIRECT3D LPDIRECT3D9
-#define LPDIRECT3DDEVICE LPDIRECT3DDEVICE9
-#define LPDIRECT3DTEXTURE LPDIRECT3DTEXTURE9
-#define LPDIRECT3DCUBETEXTURE LPDIRECT3DCUBETEXTURE9
-#define LPDIRECT3DSURFACE LPDIRECT3DSURFACE9
-#define LPDIRECT3DVOLUMETEXTURE LPDIRECT3DVOLUMETEXTURE9
-#define LPDIRECT3DVERTEXBUFFER LPDIRECT3DVERTEXBUFFER9
-#define LPDIRECT3DRESOURCE LPDIRECT3DRESOURCE9
-#define LPDIRECT3DVERTEXDECLARATION LPDIRECT3DVERTEXDECLARATION9
-#define LPDIRECT3DVERTEXSHADER LPDIRECT3DVERTEXSHADER9
-#define LPDIRECT3DPIXELSHADER LPDIRECT3DPIXELSHADER9
-
-#define D3DVIEWPORT D3DVIEWPORT9
-#define D3DVERTEXELEMENT D3DVERTEXELEMENT9
-
-#define direct3d_create_ctx Direct3DCreate9
 
 #define RD3DVertexBuffer_Lock(device, OffsetToLock, SizeToLock, ppbData, Flags) *ppbData = D3DVertexBuffer_Lock(device, OffsetToLock, SizeToLock, Flags)
 #define RD3DVertexBuffer_Unlock(device) D3DVertexBuffer_Unlock(device)
@@ -109,8 +71,4 @@
 
 #define D3DDevice_DrawPrimitive(dev, type, start, count) dev->DrawPrimitive(type, start, count)
 
-#ifndef D3DCREATE_SOFTWARE_VERTEXPROCESSING
-#define D3DCREATE_SOFTWARE_VERTEXPROCESSING 0
-#endif
-
 #endif