diff --git a/components/drivers/include/ipc/completion.h b/components/drivers/include/ipc/completion.h
index bc075c410c..25581f66f0 100644
--- a/components/drivers/include/ipc/completion.h
+++ b/components/drivers/include/ipc/completion.h
@@ -6,6 +6,7 @@
  * Change Logs:
  * Date           Author       Notes
  * 2024-04-28     Shell        Add new wait_flags() & wakeup_by_errno() API
+ * 2024-10-24     yekai        Add C++ support
  */
 #ifndef COMPLETION_H_
 #define COMPLETION_H_
@@ -30,6 +31,10 @@ struct rt_completion
 
 #define RT_COMPLETION_INIT(comp) {0}
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void rt_completion_init(struct rt_completion *completion);
 rt_err_t rt_completion_wait(struct rt_completion *completion,
                             rt_int32_t            timeout);
@@ -42,4 +47,9 @@ rt_err_t rt_completion_wait_flags_noisr(struct rt_completion *completion,
 void rt_completion_done(struct rt_completion *completion);
 rt_err_t rt_completion_wakeup(struct rt_completion *completion);
 rt_err_t rt_completion_wakeup_by_errno(struct rt_completion *completion, rt_err_t error);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/components/drivers/spi/dev_spi_flash_sfud.h b/components/drivers/spi/dev_spi_flash_sfud.h
index 7769ddc808..5c3236fcce 100644
--- a/components/drivers/spi/dev_spi_flash_sfud.h
+++ b/components/drivers/spi/dev_spi_flash_sfud.h
@@ -6,6 +6,7 @@
  * Change Logs:
  * Date           Author       Notes
  * 2016-09-28     armink       first version.
+ * 2024-10-24     yekai        Add C++ support
  */
 
 #ifndef __DEV_SPI_FLASH_SFUD_H__
@@ -16,6 +17,10 @@
 #include "./sfud/inc/sfud.h"
 #include "dev_spi_flash.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Probe SPI flash by SFUD(Serial Flash Universal Driver) driver library and though SPI device.
  *
@@ -66,4 +71,8 @@ sfud_flash_t rt_sfud_flash_find(const char *spi_dev_name);
  */
 sfud_flash_t rt_sfud_flash_find_by_dev_name(const char *flash_dev_name);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __DEV_SPI_FLASH_SFUD_H__ */