diff --git a/include/bake-bulk-client.h b/include/bake-bulk-client.h
index 7edc548a43843611ded8f46a7199e657d72adc37..a0cb92fa7e6a1089ee1a68937c6cba4762c6d063 100644
--- a/include/bake-bulk-client.h
+++ b/include/bake-bulk-client.h
@@ -11,6 +11,10 @@
 #include "margo.h"
 #include "bake-bulk.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Obtain identifying information for a bake target through the provided
  * remote mercury address.
@@ -150,4 +154,8 @@ int bake_shutdown_service(bake_target_id_t bti);
 int bake_bulk_noop(
     bake_target_id_t bti);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BAKE_BULK__CLIENT_H */
diff --git a/include/bake-bulk-server.h b/include/bake-bulk-server.h
index f8c29c8e8885f63c6f9b5e01f63a676aa765a374..41c7b7f4411da7d207632d457543a0253f82b5ee 100644
--- a/include/bake-bulk-server.h
+++ b/include/bake-bulk-server.h
@@ -11,6 +11,10 @@
 #include <libpmemobj.h>
 #include "bake-bulk.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct bake_bulk_root
 {
     bake_target_id_t target_id;
@@ -43,4 +47,8 @@ void bake_server_register(
  */
 struct bake_pool_info *bake_server_makepool(
 	const char *poolname);
+
+#ifdef __cplusplus
+}
+#endif
 #endif /* __BAKE_BULK_SERVER_H */
diff --git a/include/bake-bulk.h b/include/bake-bulk.h
index 834743ec309ea29ff4f54caae09e5faf32ef34d6..03fc6bd5a5da1bcdfebe69b96c3eb74ea9ab62a2 100644
--- a/include/bake-bulk.h
+++ b/include/bake-bulk.h
@@ -9,7 +9,11 @@
 
 #include <uuid/uuid.h>
 #include <stdint.h>
- 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Persistent, universal, opaque identifier for a BAKE target.
  * Remains constant if instance is opened, closed, or migrated.
@@ -233,6 +237,11 @@ bake_return_t bake_bulk_region_deprecate(
 bake_return_t bake_bulk_gc(
         bake_instance_t *target,
         bake_request_t *req);
+
+#endif
+
+#ifdef __cplusplus
+}
 #endif
 
 #endif /* __BAKE_BULK_H */