diff --git a/src/amalgamated.cpp b/src/amalgamated.cpp
index d61f06845..dc6c8f6cd 100644
--- a/src/amalgamated.cpp
+++ b/src/amalgamated.cpp
@@ -9,8 +9,8 @@
 #include "glcontext_ppapi.cpp"
 #include "glcontext_wgl.cpp"
 #include "image.cpp"
-#include "ovr.cpp"
-#include "renderdoc.cpp"
+#include "hmd_ovr.cpp"
+#include "debug_renderdoc.cpp"
 #include "renderer_d3d9.cpp"
 #include "renderer_d3d11.cpp"
 #include "renderer_d3d12.cpp"
diff --git a/src/renderdoc.cpp b/src/debug_renderdoc.cpp
similarity index 100%
rename from src/renderdoc.cpp
rename to src/debug_renderdoc.cpp
diff --git a/src/renderdoc.h b/src/debug_renderdoc.h
similarity index 100%
rename from src/renderdoc.h
rename to src/debug_renderdoc.h
diff --git a/src/ovr.cpp b/src/hmd_ovr.cpp
similarity index 99%
rename from src/ovr.cpp
rename to src/hmd_ovr.cpp
index ca6e25ae2..e8d465e42 100644
--- a/src/ovr.cpp
+++ b/src/hmd_ovr.cpp
@@ -3,7 +3,7 @@
  * License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
  */
 
-#include "ovr.h"
+#include "hmd_ovr.h"
 
 #if BGFX_CONFIG_USE_OVR
 
diff --git a/src/ovr.h b/src/hmd_ovr.h
similarity index 100%
rename from src/ovr.h
rename to src/hmd_ovr.h
diff --git a/src/renderer_d3d11.h b/src/renderer_d3d11.h
index dbe16a984..c1b4917ff 100644
--- a/src/renderer_d3d11.h
+++ b/src/renderer_d3d11.h
@@ -32,8 +32,8 @@ BX_PRAGMA_DIAGNOSTIC_POP()
 #include "renderer.h"
 #include "renderer_d3d.h"
 #include "shader_dxbc.h"
-#include "ovr.h"
-#include "renderdoc.h"
+#include "hmd_ovr.h"
+#include "debug_renderdoc.h"
 
 #ifndef D3DCOLOR_ARGB
 #	define D3DCOLOR_ARGB(_a, _r, _g, _b) ( (DWORD)( ( ( (_a)&0xff)<<24)|( ( (_r)&0xff)<<16)|( ( (_g)&0xff)<<8)|( (_b)&0xff) ) )
diff --git a/src/renderer_gl.h b/src/renderer_gl.h
index 2bc9da441..3bed1f17c 100644
--- a/src/renderer_gl.h
+++ b/src/renderer_gl.h
@@ -107,8 +107,8 @@ typedef uint64_t GLuint64;
 #endif // BGFX_CONFIG_RENDERER_OPENGL
 
 #include "renderer.h"
-#include "ovr.h"
-#include "renderdoc.h"
+#include "hmd_ovr.h"
+#include "debug_renderdoc.h"
 
 #ifndef GL_LUMINANCE
 #	define GL_LUMINANCE 0x1909