diff --git a/common/arch/ogl/ogl_extensions.cpp b/common/arch/ogl/ogl_extensions.cpp
index 6c0e075b3..f05f13148 100644
--- a/common/arch/ogl/ogl_extensions.cpp
+++ b/common/arch/ogl/ogl_extensions.cpp
@@ -19,6 +19,8 @@
 #include "dxxsconf.h"
 #include "compiler-array.h"
 
+inline namespace dcx {
+
 /* GL_ARB_sync */
 bool ogl_have_ARB_sync = false;
 PFNGLFENCESYNCPROC glFenceSyncFunc = NULL;
@@ -93,3 +95,5 @@ void ogl_extensions_init()
 		con_printf(CON_VERBOSE, "GL_ARB_sync not available");
 	}
 }
+
+}
diff --git a/common/arch/ogl/ogl_sync.cpp b/common/arch/ogl/ogl_sync.cpp
index 639cefcf8..06b40a8c2 100644
--- a/common/arch/ogl/ogl_sync.cpp
+++ b/common/arch/ogl/ogl_sync.cpp
@@ -20,6 +20,8 @@
 #include "ogl_sync.h"
 #include "timer.h"
 
+inline namespace dcx {
+
 ogl_sync::ogl_sync()
 {
 	method=SYNC_GL_NONE;
@@ -119,3 +121,5 @@ void ogl_sync::deinit()
 {
 	fence.reset();
 }
+
+}
diff --git a/common/include/ogl_extensions.h b/common/include/ogl_extensions.h
index ee0772820..145d1d726 100644
--- a/common/include/ogl_extensions.h
+++ b/common/include/ogl_extensions.h
@@ -47,6 +47,8 @@ typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuin
 #define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
 #define GL_TIMEOUT_EXPIRED                0x911B
 
+inline namespace dcx {
+
 extern bool ogl_have_ARB_sync;
 extern PFNGLFENCESYNCPROC glFenceSyncFunc;
 extern PFNGLDELETESYNCPROC glDeleteSyncFunc;
@@ -57,3 +59,4 @@ extern PFNGLCLIENTWAITSYNCPROC glClientWaitSyncFunc;
  */
 void ogl_extensions_init();
 
+}
diff --git a/common/include/ogl_sync.h b/common/include/ogl_sync.h
index 5583eaea5..5432a319f 100644
--- a/common/include/ogl_sync.h
+++ b/common/include/ogl_sync.h
@@ -17,6 +17,8 @@
 #include "args.h"
 #include "ogl_extensions.h"
 
+inline namespace dcx {
+
 class ogl_sync {
 	class sync_deleter
 	{
@@ -37,3 +39,5 @@ class ogl_sync {
 		void init(SyncGLMethod sync_method, int wait);
 		void deinit();
 };
+
+}