diff --git a/gfx/common/d3d8_common.c b/gfx/common/d3d8_common.c
index d2c8507ffb..5bbec85867 100644
--- a/gfx/common/d3d8_common.c
+++ b/gfx/common/d3d8_common.c
@@ -29,8 +29,6 @@
 #include "../../configuration.h"
 #include "../../verbosity.h"
 
-#include <d3d8.h>
-
 #ifdef HAVE_D3DX
 #ifdef _XBOX
 #include <d3dx8core.h>
diff --git a/gfx/common/d3d8_common.h b/gfx/common/d3d8_common.h
index 41260b7340..890ba485f8 100644
--- a/gfx/common/d3d8_common.h
+++ b/gfx/common/d3d8_common.h
@@ -19,6 +19,8 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 
+#include <d3d8.h>
+
 #include "../video_driver.h"
 
 RETRO_BEGIN_DECLS
diff --git a/menu/drivers_display/menu_display_d3d8.c b/menu/drivers_display/menu_display_d3d8.c
index 3fc9ce0704..c71270d004 100644
--- a/menu/drivers_display/menu_display_d3d8.c
+++ b/menu/drivers_display/menu_display_d3d8.c
@@ -172,7 +172,7 @@ static void menu_display_d3d8_draw(void *data, video_frame_info_t *video_info)
 #if 1
 	  if ((void*)draw->texture)
       {
-         D3D8SURFACE_DESC desc;
+         D3DSURFACE_DESC desc;
          if (d3d8_texture_get_level_desc((void*)draw->texture, 0, &desc))
          {
             pv[i].u *= desc.Width;