diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index ed5fe7925c..317b36b72b 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -54,6 +54,10 @@
 
 #endif
 
+#if !defined(DONT_HAVE_STATE_TRACKER) && !defined(_XBOX)
+#include "../../dynamic.h"
+#endif
+
 /* forward declarations */
 static void d3d_calculate_rect(d3d_video_t *d3d,
       unsigned width, unsigned height,
diff --git a/gfx/d3d/d3d.hpp b/gfx/d3d/d3d.hpp
index 9a42bd2e8a..2f236510d2 100644
--- a/gfx/d3d/d3d.hpp
+++ b/gfx/d3d/d3d.hpp
@@ -17,6 +17,9 @@
 #ifndef D3DVIDEO_HPP__
 #define D3DVIDEO_HPP__
 
+#include <string>
+#include <vector>
+
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
@@ -55,8 +58,7 @@
 #include <Cg/cgD3D9.h>
 #endif
 #include "d3d_wrapper.h"
-#include <string>
-#include <vector>
+
 
 #ifdef HAVE_OVERLAY
 typedef struct