diff --git a/src/osd/modules/opengl/osd_opengl.h b/src/osd/modules/opengl/osd_opengl.h
index 94eab4e145b..3e9adbb010c 100644
--- a/src/osd/modules/opengl/osd_opengl.h
+++ b/src/osd/modules/opengl/osd_opengl.h
@@ -89,16 +89,25 @@
 	#define OSD_GL(ret,func,params) ret (APIENTRY *func) params;
 	#define OSD_GL_UNUSED(ret,func,params)
 
-	struct osd_gl_dispatch
+#ifdef _MSC_VER
+	extern "C" {
+#else
 	{
-		#define GET_GLFUNC 1
-		#include "osd_opengl.h"
-		#undef GET_GLFUNC
-	};
+#endif
+		struct osd_gl_dispatch
+		{
+			#define GET_GLFUNC 1
+			#include "osd_opengl.h"
+			#undef GET_GLFUNC
+		};
+	}
 
 	#undef OSD_GL
 	#undef OSD_GL_UNUSED
 
+#ifdef _MSC_VER
+	extern "C" osd_gl_dispatch *gl_dispatch;
+#endif
 	extern osd_gl_dispatch *gl_dispatch;
 
 	/*