diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_adc.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_adc.h
index 8be4496674d..a19a78380eb 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_adc.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_adc.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_ADC_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_ADC_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_ADC_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_ADC_H
 
 /****************************************************************************
  * Included Files
@@ -73,4 +73,4 @@ int board_adc_init(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_ADC_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_ADC_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_apds9960.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_apds9960.h
index 1d59592f77c..c4824afe09a 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_apds9960.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_apds9960.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_APDS9960_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_APDS9960_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_APDS9960_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_APDS9960_H
 
 /****************************************************************************
  * Included Files
@@ -73,4 +73,4 @@ int board_apds9960_initialize(int devno, int busno);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_APDS9960_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_APDS9960_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_bmp180.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_bmp180.h
index c798e73a85a..85304e57826 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_bmp180.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_bmp180.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_BMP180_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_BMP180_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_BMP180_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_BMP180_H
 
 /****************************************************************************
  * Included Files
@@ -73,4 +73,4 @@ int board_bmp180_initialize(int devno, int busno);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_BMP180_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_BMP180_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_i2c.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_i2c.h
index 516c7d8c80f..195f6c7e0b4 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_i2c.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_i2c.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_I2C_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_I2C_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_I2C_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_I2C_H
 
 /****************************************************************************
  * Included Files
@@ -73,4 +73,4 @@ int board_i2c_init(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_I2C_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_I2C_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_ice40.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_ice40.h
index c0a6bf33dd5..c953634987c 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_ice40.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_ice40.h
@@ -69,4 +69,4 @@ int esp32c3_ice40_setup(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_BMP180_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_ICE40_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_ledc.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_ledc.h
index 7f9d6486a1c..4bd42816efd 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_ledc.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_ledc.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_LEDC_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_LEDC_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_LEDC_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_LEDC_H
 
 /****************************************************************************
  * Included Files
@@ -73,4 +73,4 @@ int board_ledc_setup(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_LEDC_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_LEDC_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_mpu60x0_i2c.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_mpu60x0_i2c.h
index 6dec1e24fbc..d8d2be10e82 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_mpu60x0_i2c.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_mpu60x0_i2c.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_MPU60X0_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_MPU60X0_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_MPU60X0_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_MPU60X0_H
 
 /****************************************************************************
  * Included Files
@@ -73,4 +73,4 @@ int board_mpu60x0_initialize(int devno, int busno);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_MPU60X0_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_MPU60X0_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_oneshot.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_oneshot.h
index a08d04aa7d1..cffc5f2f495 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_oneshot.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_oneshot.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_ONESHOT_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_ONESHOT_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_ONESHOT_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_ONESHOT_H
 
 /****************************************************************************
  * Included Files
@@ -74,4 +74,4 @@ int board_oneshot_init(int timer, uint16_t resolution);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_ONESHOT_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_ONESHOT_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spidev.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spidev.h
index 640f073a9ac..f0f331f8581 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spidev.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spidev.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_SPIDEV_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_SPIDEV_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_SPIDEV_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_SPIDEV_H
 
 /****************************************************************************
  * Included Files
@@ -73,4 +73,4 @@ int board_spidev_initialize(int bus);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_SPIDEV_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_SPIDEV_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spiflash.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spiflash.h
index a1a4ad119c0..2abfab6f111 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spiflash.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spiflash.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_SPIFLASH_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_SPIFLASH_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_SPIFLASH_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_SPIFLASH_H
 
 /****************************************************************************
  * Included Files
@@ -73,4 +73,4 @@ int board_spiflash_init(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_SPIFLASH_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_SPIFLASH_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spislavedev.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spislavedev.h
index cebe84214ff..276ec064a14 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spislavedev.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_spislavedev.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_SPISLAVEDEV_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_SPISLAVEDEV_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_SPISLAVEDEV_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_SPISLAVEDEV_H
 
 /****************************************************************************
  * Included Files
@@ -73,4 +73,4 @@ int board_spislavedev_initialize(int bus);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_SPISLAVEDEV_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_SPISLAVEDEV_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_twai.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_twai.h
index 33b8f874eee..e500ce3e084 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_twai.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_twai.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_TWAI_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_TWAI_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_TWAI_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_TWAI_H
 
 /****************************************************************************
  * Included Files
@@ -73,4 +73,4 @@ int board_twai_setup(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_TWAI_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_TWAI_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wdt.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wdt.h
index dc228027f9f..216ab0bdece 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wdt.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wdt.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_WDT_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_WDT_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_WDT_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_WDT_H
 
 /****************************************************************************
  * Included Files
@@ -73,4 +73,4 @@ int board_wdt_init(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_WDT_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_WDT_H */
diff --git a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wlan.h b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wlan.h
index d38bc1eefe6..892398ca21f 100644
--- a/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wlan.h
+++ b/boards/risc-v/esp32c3-legacy/common/include/esp32c3_board_wlan.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_WLAN_H
-#define __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_WLAN_H
+#ifndef __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_WLAN_H
+#define __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_WLAN_H
 
 /****************************************************************************
  * Included Files
@@ -73,4 +73,4 @@ int board_wlan_init(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_COMMON_INCLUDE_ESP32C3_BOARD_WLAN_H */
+#endif /* __BOARDS_RISCV_ESP32C3_LEGACY_COMMON_INCLUDE_ESP32C3_BOARD_WLAN_H */
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/include/board.h b/boards/risc-v/esp32c3/esp32c3-devkit/include/board.h
index 604c3d05575..c8391ecd962 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/include/board.h
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/include/board.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_INCLUDE_BOARD_H
-#define __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_INCLUDE_BOARD_H
+#ifndef __BOARDS_RISCV_ESP32C3_ESP32C3_DEVKIT_INCLUDE_BOARD_H
+#define __BOARDS_RISCV_ESP32C3_ESP32C3_DEVKIT_INCLUDE_BOARD_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -38,4 +38,4 @@
 
 #define BUTTON_BOOT  9
 
-#endif /* __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_INCLUDE_BOARD_H */
+#endif /* __BOARDS_RISCV_ESP32C3_ESP32C3_DEVKIT_INCLUDE_BOARD_H */
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3-devkit.h b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3-devkit.h
index 502661eeae7..5f2bac614d3 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3-devkit.h
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3-devkit.h
@@ -20,8 +20,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H
-#define __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H
+#ifndef __BOARDS_RISCV_ESP32C3_ESP32C3_DEVKIT_SRC_ESP32C3_DEVKIT_H
+#define __BOARDS_RISCV_ESP32C3_ESP32C3_DEVKIT_SRC_ESP32C3_DEVKIT_H
 
 /****************************************************************************
  * Included Files
@@ -118,4 +118,4 @@ int esp_gpio_init(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_RISCV_ESP32C3_ESP32C3_GENERIC_SRC_ESP32C3_GENERIC_H */
+#endif /* __BOARDS_RISCV_ESP32C3_ESP32C3_DEVKIT_SRC_ESP32C3_DEVKIT_H */