diff --git a/src/drivers/boards/common/board_common.h b/src/drivers/boards/common/board_common.h
index 50df5ba826..39c8a85056 100644
--- a/src/drivers/boards/common/board_common.h
+++ b/src/drivers/boards/common/board_common.h
@@ -388,6 +388,7 @@ typedef uint8_t px4_guid_t[PX4_GUID_BYTE_LENGTH];
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
+__BEGIN_DECLS
 
 /* Provide an interface for determining if a board supports single wire */
 
@@ -822,7 +823,7 @@ __EXPORT int board_get_uuid32_formated(char *format_buffer, int size,
  *
  * Description:
  *   All boards either provide a way to retrieve a manufactures Unique ID or
- *   define BOARD_OVERRIDE_MFGUID.
+ *   define BOARD_OVERRIDE_UUID.
  *    The MFGUID is returned as an array of bytes in
  *    MSD @ index 0 - LSD @ index PX4_CPU_MFGUID_BYTE_LENGTH-1
  *
@@ -863,7 +864,7 @@ int board_get_mfguid_formated(char *format_buffer, int size); // DEPRICATED use
  *
  * Description:
  *   All boards either provide a way to retrieve a PX4 Globally unique ID or
- *   define BOARD_OVERRIDE_PX4_GUID.
+ *   define BOARD_OVERRIDE_UUID.
  *
  *   The form of the GUID is as follows:
  *  offset:0         1         2         -           17