diff --git a/components/heap/include/esp_heap_caps_init.h b/components/heap/include/esp_heap_caps_init.h
index 5cfb8d82b5..3cf23ff7f3 100644
--- a/components/heap/include/esp_heap_caps_init.h
+++ b/components/heap/include/esp_heap_caps_init.h
@@ -17,6 +17,10 @@
 #include "esp_heap_caps.h"
 #include "soc/soc_memory_layout.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Initialize the capability-aware heap allocator.
  *
@@ -82,5 +86,6 @@ esp_err_t heap_caps_add_region(intptr_t start, intptr_t end);
 esp_err_t heap_caps_add_region_with_caps(const uint32_t caps[], intptr_t start, intptr_t end);
 
 
-
-
+#ifdef __cplusplus
+}
+#endif
diff --git a/components/heap/include/esp_heap_trace.h b/components/heap/include/esp_heap_trace.h
index 24b5c60f55..08b8caa218 100644
--- a/components/heap/include/esp_heap_trace.h
+++ b/components/heap/include/esp_heap_trace.h
@@ -17,6 +17,10 @@
 #include <stdint.h>
 #include <esp_err.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if !defined(CONFIG_HEAP_TRACING) && !defined(HEAP_TRACE_SRCFILE)
 #warning "esp_heap_trace.h is included but heap tracing is disabled in menuconfig, functions are no-ops"
 #endif
@@ -134,3 +138,7 @@ esp_err_t heap_trace_get(size_t index, heap_trace_record_t *record);
  *
  */
 void heap_trace_dump(void);
+
+#ifdef __cplusplus
+}
+#endif