diff --git a/Makefile.common b/Makefile.common
index c5b0985843..73ee61918e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -738,7 +738,7 @@ ifeq ($(HAVE_D3D9), 1)
    OBJ += gfx/d3d/d3d.o \
           gfx/d3d/render_chain_null.o \
           gfx/d3d/render_chain_driver.o \
-          gfx/d3d/d3d_wrapper.o \
+          gfx/common/d3d_common.o \
           gfx/drivers_font/d3d_w32_font.o \
           gfx/drivers_context/d3d_ctx.o
    DEFINES += -DHAVE_D3D -DHAVE_D3D9
diff --git a/gfx/d3d/d3d_wrapper.cpp b/gfx/common/d3d_common.cpp
similarity index 99%
rename from gfx/d3d/d3d_wrapper.cpp
rename to gfx/common/d3d_common.cpp
index 9088cff6dc..a3ddfb5892 100644
--- a/gfx/d3d/d3d_wrapper.cpp
+++ b/gfx/common/d3d_common.cpp
@@ -1,5 +1,4 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -16,7 +15,7 @@
 
 #include <retro_log.h>
 
-#include "d3d_wrapper.h"
+#include "d3d_common.h"
 
 static LPDIRECT3DDEVICE d3d_wrapper_dev;
 
diff --git a/gfx/d3d/d3d_wrapper.h b/gfx/common/d3d_common.h
similarity index 96%
rename from gfx/d3d/d3d_wrapper.h
rename to gfx/common/d3d_common.h
index f0e3188ef8..82c63a451f 100644
--- a/gfx/d3d/d3d_wrapper.h
+++ b/gfx/common/d3d_common.h
@@ -1,5 +1,4 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
  *  Copyright (C) 2011-2015 - Daniel De Matteis
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -14,12 +13,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _D3D_WRAPPER_H
-#define _D3D_WRAPPER_H
+#ifndef _D3D_COMMON_H
+#define _D3D_COMMON_H
 
 #include <boolean.h>
 
-#include "../common/win32_common.h"
+#include "win32_common.h"
 #include "../../defines/d3d_defines.h"
 
 #ifdef __cplusplus
diff --git a/gfx/d3d/d3d.h b/gfx/d3d/d3d.h
index 8736015c61..c9cf102388 100644
--- a/gfx/d3d/d3d.h
+++ b/gfx/d3d/d3d.h
@@ -55,7 +55,7 @@
 #include "../font_renderer_driver.h"
 #include "../video_context_driver.h"
 #include "../video_viewport.h"
-#include "d3d_wrapper.h"
+#include "../common/d3d_common.h"
 #include "render_chain_driver.h"
 #ifdef _XBOX
 #include "../../defines/xdk_defines.h"
diff --git a/gfx/image/image.c b/gfx/image/image.c
index 66d7c31667..6fc9d6aebd 100644
--- a/gfx/image/image.c
+++ b/gfx/image/image.c
@@ -24,7 +24,7 @@
 #endif
 #include <formats/tga.h>
 #ifdef _XBOX1
-#include "../d3d/d3d_wrapper.h"
+#include "../common/d3d_common.h"
 #endif
 #include "../../file_ops.h"
 
diff --git a/gfx/video_texture_c.c b/gfx/video_texture_c.c
index 7362eaa838..0b1d9ed6d2 100644
--- a/gfx/video_texture_c.c
+++ b/gfx/video_texture_c.c
@@ -110,7 +110,7 @@ void video_texture_png_load_gl(struct texture_image *ti,
 #endif
 
 #ifdef HAVE_D3D
-#include "d3d/d3d_wrapper.h"
+#include "common/d3d_common.h"
 
 static void video_texture_png_load_d3d(struct texture_image *ti,
       enum texture_filter_type filter_type,
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 5870a9ee20..342aa86f60 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -82,7 +82,7 @@ VIDEO DRIVER
 #endif
 
 #if defined(HAVE_D3D)
-#include "../gfx/d3d/d3d_wrapper.cpp"
+#include "../gfx/common/d3d_common.cpp"
 #include "../gfx/d3d/d3d.cpp"
 #ifdef _XBOX
 #include "../gfx/d3d/render_chain_xdk.cpp"
diff --git a/menu/drivers_display/menu_display_d3d.cpp b/menu/drivers_display/menu_display_d3d.cpp
index 8430a98d15..682d1425db 100644
--- a/menu/drivers_display/menu_display_d3d.cpp
+++ b/menu/drivers_display/menu_display_d3d.cpp
@@ -23,7 +23,7 @@
 #include "../../gfx/video_thread_wrapper.h"
 #include "../../gfx/video_texture.h"
 #include "../../gfx/d3d/d3d.h"
-#include "../../gfx/d3d/d3d_wrapper.h"
+#include "../../gfx/common/d3d_common.h"
 
 #include "../menu_display.h"