diff --git a/gfx/context/d3d_ctx.cpp b/gfx/context/d3d_ctx.cpp
index e6a81e9081..a80a53e7b5 100644
--- a/gfx/context/d3d_ctx.cpp
+++ b/gfx/context/d3d_ctx.cpp
@@ -15,7 +15,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../d3d/d3d.hpp"
+#include "../d3d/d3d.h"
 #include "win32_common.h"
 
 #include "../gfx_common.h"
diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 8e1621bc6f..a5023a48af 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -20,9 +20,9 @@
 #include <xgraphics.h>
 #endif
 
-#include "d3d.hpp"
+#include "d3d.h"
 #ifndef _XBOX
-#include "render_chain.hpp"
+#include "render_chain.h"
 #endif
 #include "../gfx_common.h"
 
diff --git a/gfx/d3d/d3d.hpp b/gfx/d3d/d3d.h
similarity index 98%
rename from gfx/d3d/d3d.hpp
rename to gfx/d3d/d3d.h
index 33d198e398..9491fa4f3f 100644
--- a/gfx/d3d/d3d.hpp
+++ b/gfx/d3d/d3d.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef D3DVIDEO_HPP__
-#define D3DVIDEO_HPP__
+#ifndef __D3DVIDEO_INTF_H__
+#define __D3DVIDEO_INTF_H__
 
 #include <string>
 #include <vector>
diff --git a/gfx/d3d/d3d_wrapper.cpp b/gfx/d3d/d3d_wrapper.cpp
index 59fef10c5e..0cef07b9ad 100644
--- a/gfx/d3d/d3d_wrapper.cpp
+++ b/gfx/d3d/d3d_wrapper.cpp
@@ -14,10 +14,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "d3d.hpp"
+#include "d3d.h"
 #include "d3d_wrapper.h"
 #ifndef _XBOX
-#include "render_chain.hpp"
+#include "render_chain.h"
 #endif
 
 void d3d_swap(void *data, LPDIRECT3DDEVICE dev)
diff --git a/gfx/d3d/render_chain.cpp b/gfx/d3d/render_chain.cpp
index 527aadf0ed..27798d16d6 100644
--- a/gfx/d3d/render_chain.cpp
+++ b/gfx/d3d/render_chain.cpp
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "render_chain.hpp"
+#include "render_chain.h"
 #include <string.h>
 
 static inline D3DTEXTUREFILTERTYPE translate_filter(unsigned type)
diff --git a/gfx/d3d/render_chain.hpp b/gfx/d3d/render_chain.h
similarity index 98%
rename from gfx/d3d/render_chain.hpp
rename to gfx/d3d/render_chain.h
index 5b63860009..0658c229e9 100644
--- a/gfx/d3d/render_chain.hpp
+++ b/gfx/d3d/render_chain.h
@@ -14,10 +14,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RENDER_CHAIN_HPP__
-#define RENDER_CHAIN_HPP__
+#ifndef __D3D_RENDER_CHAIN_H
+#define __D3D_RENDER_CHAIN_H
 
-#include "d3d.hpp"
+#include "d3d.h"
 #include "../state_tracker.h"
 #include "../shader/shader_parse.h"
 
diff --git a/gfx/fonts/d3d_w32_font.cpp b/gfx/fonts/d3d_w32_font.cpp
index aaaf590f17..80bf83d663 100644
--- a/gfx/fonts/d3d_w32_font.cpp
+++ b/gfx/fonts/d3d_w32_font.cpp
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../d3d/d3d.hpp"
+#include "../d3d/d3d.h"
 #include "d3d_font.h"
 #include "../gfx_common.h"
 #include "../../general.h"
diff --git a/gfx/fonts/xdk360_fonts.cpp b/gfx/fonts/xdk360_fonts.cpp
index 261df1fa52..89efdf8e69 100644
--- a/gfx/fonts/xdk360_fonts.cpp
+++ b/gfx/fonts/xdk360_fonts.cpp
@@ -16,7 +16,7 @@
 
 #include <xtl.h>
 #include "d3d_font.h"
-#include "../d3d/d3d.hpp"
+#include "../d3d/d3d.h"
 #include "../gfx_common.h"
 #include "../../general.h"
 #include "../../xdk/xdk_resources.h"
diff --git a/gfx/shader/shader_hlsl.c b/gfx/shader/shader_hlsl.c
index f5d0ec7a99..2591b29e3c 100644
--- a/gfx/shader/shader_hlsl.c
+++ b/gfx/shader/shader_hlsl.c
@@ -16,7 +16,7 @@
 
 #include "shader_hlsl.h"
 #include "shader_parse.h"
-#include "../d3d/d3d.hpp"
+#include "../d3d/d3d.h"
 
 static const char *stock_hlsl_program =
       "void main_vertex\n"
diff --git a/menu/disp/rmenu_xui.cpp b/menu/disp/rmenu_xui.cpp
index 77cffdce97..3daa71271e 100644
--- a/menu/disp/rmenu_xui.cpp
+++ b/menu/disp/rmenu_xui.cpp
@@ -31,7 +31,7 @@
 #include "../../message_queue.h"
 #include "../../general.h"
 
-#include "../../gfx/d3d/d3d.hpp"
+#include "../../gfx/d3d/d3d.h"
 
 #include "shared.h"