diff --git a/defines/d3d_defines.h b/defines/d3d_defines.h
index 5743a642db..96b9d365e0 100644
--- a/defines/d3d_defines.h
+++ b/defines/d3d_defines.h
@@ -20,7 +20,6 @@
 #if defined(HAVE_D3D9)
 /* Direct3D 9 */
 #include <d3d9.h>
-#include "../gfx/include/d3d9/d3dx9core.h"
 
 #define LPDIRECT3D                     LPDIRECT3D9
 #define LPDIRECT3DDEVICE               LPDIRECT3DDEVICE9
diff --git a/gfx/common/d3d_common.cpp b/gfx/common/d3d_common.cpp
index 6449dc2aaf..290c7016fa 100644
--- a/gfx/common/d3d_common.cpp
+++ b/gfx/common/d3d_common.cpp
@@ -18,6 +18,8 @@
 
 #include "d3d_common.h"
 
+#include "../include/d3d9/d3dx9core.h"
+
 bool d3d_swap(void *data, LPDIRECT3DDEVICE dev)
 {
 #if defined(_XBOX1)
@@ -55,11 +57,12 @@ LPDIRECT3DTEXTURE d3d_texture_new(LPDIRECT3DDEVICE dev,
       const char *path, unsigned width, unsigned height,
       unsigned miplevels, unsigned usage, D3DFORMAT format,
       D3DPOOL pool, unsigned filter, unsigned mipfilter,
-      D3DCOLOR color_key, D3DXIMAGE_INFO *src_info, 
+      D3DCOLOR color_key, D3DXIMAGE_INFO *src_info_data, 
       PALETTEENTRY *palette)
 {
    HRESULT hr;
    LPDIRECT3DTEXTURE buf;
+   D3DXIMAGE_INFO *src_info = (D3DXIMAGE_INFO*)src_info_data;
 
    if (path)
       hr = D3DXCreateTextureFromFileExA(dev,
diff --git a/gfx/common/d3d_common.h b/gfx/common/d3d_common.h
index 966e31f5e8..6da1fb0e67 100644
--- a/gfx/common/d3d_common.h
+++ b/gfx/common/d3d_common.h
@@ -40,7 +40,7 @@ LPDIRECT3DTEXTURE d3d_texture_new(LPDIRECT3DDEVICE dev,
       const char *path, unsigned width, unsigned height,
       unsigned miplevels, unsigned usage, D3DFORMAT format,
       D3DPOOL pool, unsigned filter, unsigned mipfilter,
-      D3DCOLOR color_key, D3DXIMAGE_INFO *src_info, 
+      D3DCOLOR color_key, void *src_info, 
       PALETTEENTRY *palette);
 
 void d3d_set_stream_source(LPDIRECT3DDEVICE dev, unsigned stream_no,
diff --git a/gfx/drivers_font/d3d_w32_font.cpp b/gfx/drivers_font/d3d_w32_font.cpp
index 55043290e3..d1f2511808 100644
--- a/gfx/drivers_font/d3d_w32_font.cpp
+++ b/gfx/drivers_font/d3d_w32_font.cpp
@@ -18,6 +18,8 @@
 #include "../font_driver.h"
 #include "../../general.h"
 
+#include "../include/d3d9/d3dx9core.h"
+
 typedef struct
 {
    d3d_video_t *d3d;
diff --git a/menu/drivers_display/menu_display_d3d.cpp b/menu/drivers_display/menu_display_d3d.cpp
index 769bd0c321..0d6bd0313a 100644
--- a/menu/drivers_display/menu_display_d3d.cpp
+++ b/menu/drivers_display/menu_display_d3d.cpp
@@ -26,6 +26,8 @@
 
 #include "../menu_display.h"
 
+#include "../../gfx/include/d3d9/d3dx9math.h"
+
 #define BYTE_CLAMP(i) (int) ((((i) > 255) ? 255 : (((i) < 0) ? 0 : (i))))
 
 static const float d3d_vertexes[] = {