diff --git a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h
index c23e6189bd5..b75f37fed2e 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h
@@ -32,6 +32,11 @@
 
 #include "compiler/shader_enums.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 void
 tgsi_get_gl_varying_semantic(gl_varying_slot attr,
                              bool needs_texcoord_semantic,
@@ -84,4 +89,8 @@ tgsi_processor_to_shader_stage(unsigned processor)
    }
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* TGSI_FROM_MESA_H */