3 files changed, 25 insertions, 0 deletions
diff --git a/src/intel/common/gen_decoder.h b/src/intel/common/gen_decoder.h
index 5d5ce7825f4..f2291f43e92 100644
--- a/src/intel/common/gen_decoder.h
+++ b/src/intel/common/gen_decoder.h
@@ -30,6 +30,10 @@
 #include "common/gen_device_info.h"
 #include "util/hash_table.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct gen_spec;
 struct gen_group;
 struct gen_field;
@@ -164,4 +168,9 @@ void gen_print_group(FILE *out,
                      uint64_t offset, const uint32_t *p,
                      bool color);
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* GEN_DECODER_H */
diff --git a/src/intel/common/gen_device_info.h b/src/intel/common/gen_device_info.h
index 59b345e949c..30ddd905be1 100644
--- a/src/intel/common/gen_device_info.h
+++ b/src/intel/common/gen_device_info.h
@@ -28,6 +28,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Intel hardware information and quirks
  */
@@ -198,4 +202,8 @@ struct gen_device_info
 bool gen_get_device_info(int devid, struct gen_device_info *devinfo);
 const char *gen_get_device_name(int devid);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GEN_DEVICE_INFO_H */
diff --git a/src/intel/tools/gen_disasm.h b/src/intel/tools/gen_disasm.h
index 24b56c9a8e1..d2764bb90b7 100644
--- a/src/intel/tools/gen_disasm.h
+++ b/src/intel/tools/gen_disasm.h
@@ -24,6 +24,10 @@
 #ifndef GEN_DISASM_H
 #define GEN_DISASM_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct gen_disasm;
 
 struct gen_disasm *gen_disasm_create(int pciid);
@@ -32,4 +36,8 @@ void gen_disasm_disassemble(struct gen_disasm *disasm,
 
 void gen_disasm_destroy(struct gen_disasm *disasm);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GEN_DISASM_H */