diff --git a/xdk/render_chain_xdk.cpp b/gfx/d3d9/render_chain_xdk.h
similarity index 100%
rename from xdk/render_chain_xdk.cpp
rename to gfx/d3d9/render_chain_xdk.h
diff --git a/xdk/xdk_d3d.cpp b/gfx/d3d9/xdk_d3d.cpp
similarity index 99%
rename from xdk/xdk_d3d.cpp
rename to gfx/d3d9/xdk_d3d.cpp
index 84a88594ee..b9c10e8936 100644
--- a/xdk/xdk_d3d.cpp
+++ b/gfx/d3d9/xdk_d3d.cpp
@@ -19,24 +19,20 @@
 #include <xgraphics.h>
 #endif
 
-#include "../driver.h"
+#include "../../driver.h"
 #include "xdk_d3d.h"
 
 #ifdef HAVE_HLSL
-#include "../gfx/shader_hlsl.h"
+#include "../../gfx/shader_hlsl.h"
 #endif
 
-#include "./../gfx/gfx_context.h"
-#include "../general.h"
-#include "../message_queue.h"
+#include "./../../gfx/gfx_context.h"
+#include "../../general.h"
+#include "../../message_queue.h"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "../../xdk/xdk_resources.h"
 
-#include "../xdk/xdk_resources.h"
-
-#include "render_chain_xdk.cpp"
+#include "render_chain_xdk.h"
 
 //OK
 static void d3d_deinit_chain(void *data)
diff --git a/xdk/xdk_d3d.h b/gfx/d3d9/xdk_d3d.h
similarity index 92%
rename from xdk/xdk_d3d.h
rename to gfx/d3d9/xdk_d3d.h
index d6b428c592..ea7e67eac9 100644
--- a/xdk/xdk_d3d.h
+++ b/gfx/d3d9/xdk_d3d.h
@@ -21,13 +21,13 @@
 #ifdef _XBOX1
 #include <xfont.h>
 #endif
-#include "../gfx/shader_common.h"
-#include "../gfx/shader_parse.h"
-#include "../gfx/image/image.h"
-#include "../gfx/fonts/d3d_font.h"
+#include "../../gfx/shader_common.h"
+#include "../../gfx/shader_parse.h"
+#include "../../gfx/image/image.h"
+#include "../../gfx/fonts/d3d_font.h"
 
-#include "../gfx/gfx_context.h"
-#include "../xdk/xdk_defines.h"
+#include "../../gfx/gfx_context.h"
+#include "../../xdk/xdk_defines.h"
 
 #define DFONT_MAX	4096
 #if defined(_XBOX360)
diff --git a/xdk/xdk_defines.h b/gfx/d3d9/xdk_defines.h
similarity index 100%
rename from xdk/xdk_defines.h
rename to gfx/d3d9/xdk_defines.h
diff --git a/griffin/griffin.c b/griffin/griffin.c
index b937adcf39..87d8741441 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -224,7 +224,7 @@ VIDEO DRIVER
 #endif
 
 #ifdef _XBOX
-#include "../xdk/xdk_d3d.cpp"
+#include "../gfx/d3d9/xdk_d3d.cpp"
 #endif
 
 #if defined(GEKKO)