diff --git a/include/sys/boardctl.h b/include/sys/boardctl.h
index 5177dd8074f..b1ebe45e8fa 100644
--- a/include/sys/boardctl.h
+++ b/include/sys/boardctl.h
@@ -265,6 +265,19 @@ struct boardioc_usbdev_ctrl_s
 };
 #endif /* CONFIG_BOARDCTL_USBDEVCTRL */
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
@@ -299,5 +312,10 @@ struct boardioc_usbdev_ctrl_s
 
 int boardctl(unsigned int cmd, uintptr_t arg);
 
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* CONFIG_LIB_BOARDCTL */
 #endif /* __INCLUDE_SYS_BOARDCTL_H */