diff --git a/src/gallium/auxiliary/util/u_index_modify.h b/src/gallium/auxiliary/util/u_index_modify.h
index ba96725bedd..7540dbaae63 100644
--- a/src/gallium/auxiliary/util/u_index_modify.h
+++ b/src/gallium/auxiliary/util/u_index_modify.h
@@ -23,6 +23,10 @@
 #ifndef UTIL_INDEX_MODIFY_H
 #define UTIL_INDEX_MODIFY_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct pipe_context;
 struct pipe_resource;
 
@@ -48,4 +52,8 @@ void util_rebuild_uint_elts_to_userptr(struct pipe_context *context,
 				       unsigned start, unsigned count,
 				       void *out);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/gallium/auxiliary/util/u_log.h b/src/gallium/auxiliary/util/u_log.h
index 90f5d0f4de1..e16af5c1820 100644
--- a/src/gallium/auxiliary/util/u_log.h
+++ b/src/gallium/auxiliary/util/u_log.h
@@ -49,6 +49,10 @@
 
 #include "util/u_debug.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct u_log_page;
 struct u_log_auto_logger;
 
@@ -97,4 +101,8 @@ u_log_page_destroy(struct u_log_page *page);
 void
 u_log_page_print(struct u_log_page *page, FILE *stream);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* U_LOG_H */