diff --git a/audio/drivers/xaudio.c b/audio/drivers/xaudio.cpp
similarity index 100%
rename from audio/drivers/xaudio.c
rename to audio/drivers/xaudio.cpp
diff --git a/gfx/d3d/d3d_wrapper.c b/gfx/d3d/d3d_wrapper.cpp
similarity index 100%
rename from gfx/d3d/d3d_wrapper.c
rename to gfx/d3d/d3d_wrapper.cpp
diff --git a/gfx/drivers_font/d3d_w32_font.c b/gfx/drivers_font/d3d_w32_font.cpp
similarity index 100%
rename from gfx/drivers_font/d3d_w32_font.c
rename to gfx/drivers_font/d3d_w32_font.cpp
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 324834e425..599a5e722c 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -224,7 +224,7 @@ VIDEO DRIVER
 #endif
 
 #if defined(HAVE_D3D)
-#include "../gfx/d3d/d3d_wrapper.c"
+#include "../gfx/d3d/d3d_wrapper.cpp"
 #include "../gfx/d3d/d3d.cpp"
 #ifndef _XBOX
 #include "../gfx/d3d/render_chain.cpp"
@@ -259,7 +259,7 @@ FONTS
 #endif
 
 #if defined(HAVE_D3D9)
-#include "../gfx/drivers_font/d3d_w32_font.c"
+#include "../gfx/drivers_font/d3d_w32_font.cpp"
 #endif
 
 #if defined(HAVE_LIBDBGFONT)
@@ -473,7 +473,7 @@ AUDIO
 #endif
 
 #ifdef HAVE_XAUDIO
-#include "../audio/drivers/xaudio.c"
+#include "../audio/drivers/xaudio.cpp"
 #endif
 
 #ifdef HAVE_DSOUND