diff --git a/boards/esp32-mh-et-live-minikit/include/board.h b/boards/esp32-mh-et-live-minikit/include/board.h
index 5efe74313ab1..44541ff67e3d 100644
--- a/boards/esp32-mh-et-live-minikit/include/board.h
+++ b/boards/esp32-mh-et-live-minikit/include/board.h
@@ -33,10 +33,6 @@
 
 #include <stdint.h>
 
-#ifdef __cplusplus
- extern "C" {
-#endif
-
 /**
  * @name    LED (on-board) configuration
  *
@@ -48,16 +44,16 @@
 #define LED_BLUE_PIN    GPIO2
 /** @} */
 
-#ifdef __cplusplus
-} /* end extern "C" */
-#endif
-
 /* include common board definitions as last step */
 #include "board_common.h"
 
 /* include definitions for optional hardware modules */
 #include "board_modules.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Initialize the board specific hardware
  */
@@ -66,5 +62,9 @@ static inline void board_init(void) {
     board_init_common();
 }
 
+#ifdef __cplusplus
+} /* end extern "C" */
+#endif
+
 #endif /* BOARD_H */
 /** @} */
diff --git a/boards/esp32-olimex-evb/include/board.h b/boards/esp32-olimex-evb/include/board.h
index 4233bede7554..d0b325257f37 100644
--- a/boards/esp32-olimex-evb/include/board.h
+++ b/boards/esp32-olimex-evb/include/board.h
@@ -36,10 +36,6 @@
 
 #include <stdint.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * @name    Button pin definitions
  * @{
@@ -98,6 +94,10 @@ extern "C" {
 /* include common board definitions as last step */
 #include "board_common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Initialize the board specific hardware
  */
diff --git a/boards/esp32-ttgo-t-beam/include/board.h b/boards/esp32-ttgo-t-beam/include/board.h
index 80fee9be7e42..82dc892543c5 100644
--- a/boards/esp32-ttgo-t-beam/include/board.h
+++ b/boards/esp32-ttgo-t-beam/include/board.h
@@ -32,10 +32,6 @@
 
 #include <stdint.h>
 
-#ifdef __cplusplus
- extern "C" {
-#endif
-
 /**
  * @name    Button pin definitions
  * @{
@@ -58,10 +54,6 @@
 #endif
 /** @} */
 
-#ifdef __cplusplus
-} /* end extern "C" */
-#endif
-
 /**
  * @name        SX127X
  *
@@ -79,10 +71,18 @@
 /* include common board definitions as last step */
 #include "board_common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Initialize the board specific hardware
  */
 void board_init(void);
 
+#ifdef __cplusplus
+} /* end extern "C" */
+#endif
+
 #endif /* BOARD_H */
 /** @} */
diff --git a/boards/esp32-wemos-lolin-d32-pro/include/board.h b/boards/esp32-wemos-lolin-d32-pro/include/board.h
index 330d2970ed09..6860255e6bfa 100644
--- a/boards/esp32-wemos-lolin-d32-pro/include/board.h
+++ b/boards/esp32-wemos-lolin-d32-pro/include/board.h
@@ -44,10 +44,6 @@
 
 #include <stdint.h>
 
-#ifdef __cplusplus
- extern "C" {
-#endif
-
 /**
  * @name LED (on-board) configuration
  * @{
@@ -73,13 +69,13 @@
 #endif
 /** @} */
 
-#ifdef __cplusplus
-} /* end extern "C" */
-#endif
-
 /* include common board definitions as last step */
 #include "board_common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Initialize the board specific hardware
  */
@@ -88,5 +84,9 @@ static inline void board_init(void) {
     board_init_common();
 }
 
+#ifdef __cplusplus
+} /* end extern "C" */
+#endif
+
 #endif /* BOARD_H */
 /** @} */
diff --git a/boards/esp32-wroom-32/include/board.h b/boards/esp32-wroom-32/include/board.h
index 3ff7e5f03ae1..11a608a8a7a3 100644
--- a/boards/esp32-wroom-32/include/board.h
+++ b/boards/esp32-wroom-32/include/board.h
@@ -33,14 +33,6 @@
 
 #include <stdint.h>
 
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-#ifdef __cplusplus
-} /* end extern "C" */
-#endif
-
 /**
  * @name    Button pin definitions
  * @{
@@ -64,6 +56,10 @@
 /* include common board definitions as last step */
 #include "board_common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Initialize the board specific hardware
  */
@@ -72,5 +68,9 @@ static inline void board_init(void) {
     board_init_common();
 }
 
+#ifdef __cplusplus
+} /* end extern "C" */
+#endif
+
 #endif /* BOARD_H */
 /** @} */
diff --git a/boards/esp32-wrover-kit/include/board.h b/boards/esp32-wrover-kit/include/board.h
index ab559e0be3c3..55ac14810171 100644
--- a/boards/esp32-wrover-kit/include/board.h
+++ b/boards/esp32-wrover-kit/include/board.h
@@ -47,10 +47,6 @@
 
 #include <stdint.h>
 
-#ifdef __cplusplus
- extern "C" {
-#endif
-
 /**
  * @name    LED (on-board) configuration
  * @{
@@ -101,13 +97,13 @@
 #endif
 /** @} */
 
-#ifdef __cplusplus
-} /* end extern "C" */
-#endif
-
 /* include common board definitions as last step */
 #include "board_common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Initialize the board specific hardware
  */
@@ -116,5 +112,9 @@ static inline void board_init(void) {
     board_init_common();
 }
 
+#ifdef __cplusplus
+} /* end extern "C" */
+#endif
+
 #endif /* BOARD_H */
 /** @} */