4 files changed, 15 insertions, 4 deletions
diff --git a/src/mesa/main/api_exec.h b/src/mesa/main/api_exec.h
index ff35b78bb9f..1e4a9d61a46 100644
--- a/src/mesa/main/api_exec.h
+++ b/src/mesa/main/api_exec.h
@@ -26,6 +26,9 @@
 #ifndef API_EXEC_H
 #define API_EXEC_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 struct _glapi_table;
 struct gl_context;
@@ -39,4 +42,8 @@ _mesa_initialize_exec_table(struct gl_context *ctx);
 extern void
 _mesa_initialize_dispatch_tables(struct gl_context *ctx);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index c14ad32eb3e..d25143faa17 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -41,7 +41,6 @@
 
 #include <gtest/gtest.h>
 
-extern "C" {
 #include "GL/gl.h"
 #include "GL/glext.h"
 #include "main/compiler.h"
@@ -62,7 +61,6 @@ extern "C" {
 #endif
 
 #include "main/dispatch.h"
-}
 
 struct function {
    const char *name;
diff --git a/src/mesa/main/tests/program_state_string.cpp b/src/mesa/main/tests/program_state_string.cpp
index 418c39c8ea9..ddfdb49ee2c 100644
--- a/src/mesa/main/tests/program_state_string.cpp
+++ b/src/mesa/main/tests/program_state_string.cpp
@@ -23,11 +23,9 @@
 
 #include <gtest/gtest.h>
 
-extern "C" {
 #include "GL/gl.h"
 #include "GL/glext.h"
 #include "main/compiler.h"
-}
 
 #include "program/prog_statevars.h"
 
diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h
index efccd901aa6..4f8bc9cdf06 100644
--- a/src/mesa/main/vtxfmt.h
+++ b/src/mesa/main/vtxfmt.h
@@ -35,8 +35,16 @@
 
 #include "mtypes.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern void _mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt );
 extern void _mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt );
 extern void _mesa_initialize_vbo_vtxfmt(struct gl_context *ctx);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* _VTXFMT_H_ */