diff --git a/components/app_trace/include/esp_app_trace.h b/components/app_trace/include/esp_app_trace.h
index 822b698ee9..b8374ae0e9 100644
--- a/components/app_trace/include/esp_app_trace.h
+++ b/components/app_trace/include/esp_app_trace.h
@@ -18,6 +18,10 @@
 #include "esp_err.h"
 #include "esp_app_trace_util.h" // ESP_APPTRACE_TMO_INFINITE
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Application trace data destinations bits.
  */
@@ -262,4 +266,8 @@ int esp_apptrace_fstop(esp_apptrace_dest_t dest);
  */
 void esp_gcov_dump(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/app_trace/include/esp_app_trace_util.h b/components/app_trace/include/esp_app_trace_util.h
index 6376008c2f..cda26c7a79 100644
--- a/components/app_trace/include/esp_app_trace_util.h
+++ b/components/app_trace/include/esp_app_trace_util.h
@@ -14,6 +14,10 @@
 #ifndef ESP_APP_TRACE_UTIL_H_
 #define ESP_APP_TRACE_UTIL_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "freertos/FreeRTOS.h"
 #include "esp_err.h"
 
@@ -164,4 +168,8 @@ uint32_t esp_apptrace_rb_read_size_get(esp_apptrace_rb_t *rb);
  */
 uint32_t esp_apptrace_rb_write_size_get(esp_apptrace_rb_t *rb);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //ESP_APP_TRACE_UTIL_H_
diff --git a/components/app_trace/include/esp_sysview_trace.h b/components/app_trace/include/esp_sysview_trace.h
index 3cf04f1d25..7a1bd5fd22 100644
--- a/components/app_trace/include/esp_sysview_trace.h
+++ b/components/app_trace/include/esp_sysview_trace.h
@@ -14,6 +14,10 @@
 #ifndef ESP_SYSVIEW_TRACE_H_
 #define ESP_SYSVIEW_TRACE_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdarg.h>
 #include "esp_err.h"
 #include "SEGGER_RTT.h" // SEGGER_RTT_ESP32_Flush
@@ -77,4 +81,8 @@ void esp_sysview_heap_trace_alloc(void *addr, uint32_t size, const void *callers
  */
 void esp_sysview_heap_trace_free(void *addr, const void *callers);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //ESP_SYSVIEW_TRACE_H_