3 files changed, 24 insertions, 0 deletions
diff --git a/test/core/end2end/cq_verifier.h b/test/core/end2end/cq_verifier.h
index cc80b58c90..d8a5d491d8 100644
--- a/test/core/end2end/cq_verifier.h
+++ b/test/core/end2end/cq_verifier.h
@@ -24,6 +24,10 @@
 #include <grpc/grpc.h>
 #include "test/core/util/test_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* A cq_verifier can verify that expected events arrive in a timely fashion
    on a single completion queue */
 
@@ -59,4 +63,8 @@ int contains_metadata(grpc_metadata_array *array, const char *key,
 int contains_metadata_slices(grpc_metadata_array *array, grpc_slice key,
                              grpc_slice value);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GRPC_TEST_CORE_END2END_CQ_VERIFIER_H */
diff --git a/test/core/util/port.h b/test/core/util/port.h
index 3a4cf4467a..602099dea6 100644
--- a/test/core/util/port.h
+++ b/test/core/util/port.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_TEST_CORE_UTIL_PORT_H
 #define GRPC_TEST_CORE_UTIL_PORT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct grpc_pick_port_functions {
   int (*pick_unused_port_fn)(void);
   int (*pick_unused_port_or_die_fn)(void);
@@ -41,4 +45,8 @@ void grpc_recycle_unused_port(int port);
 /** Request the family of pick_port functions in \a functions be used. */
 void grpc_set_pick_port_functions(grpc_pick_port_functions functions);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GRPC_TEST_CORE_UTIL_PORT_H */
diff --git a/test/core/util/test_config.h b/test/core/util/test_config.h
index 619359bfab..9761f464f5 100644
--- a/test/core/util/test_config.h
+++ b/test/core/util/test_config.h
@@ -21,6 +21,10 @@
 
 #include <grpc/support/time.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int64_t g_fixture_slowdown_factor;
 extern int64_t g_poller_slowdown_factor;
 
@@ -39,4 +43,8 @@ gpr_timespec grpc_timeout_milliseconds_to_deadline(int64_t time_ms);
 
 void grpc_test_init(int argc, char **argv);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GRPC_TEST_CORE_UTIL_TEST_CONFIG_H */