diff --git a/cpu/esp32/irq_arch.c b/cpu/esp32/irq_arch.c
index fd52da69d1..cd7b5ac691 100644
--- a/cpu/esp32/irq_arch.c
+++ b/cpu/esp32/irq_arch.c
@@ -18,9 +18,6 @@
  * @}
  */
 
-#define ENABLE_DEBUG    0
-#include "debug.h"
-
 #include "irq_arch.h"
 
 #include "esp_err.h"
@@ -28,6 +25,9 @@
 #include "soc/dport_reg.h"
 #include "xtensa/xtensa_api.h"
 
+#define ENABLE_DEBUG 0
+#include "debug.h"
+
 struct _irq_alloc_table_t {
     int      src;   /* peripheral interrupt source */
     uint32_t intr;  /* interrupt number */
diff --git a/cpu/esp32/startup.c b/cpu/esp32/startup.c
index 2f5bb48fe1..16697b5041 100644
--- a/cpu/esp32/startup.c
+++ b/cpu/esp32/startup.c
@@ -18,8 +18,6 @@
  * @}
  */
 
-#define ENABLE_DEBUG  (0)
-#include "debug.h"
 #include "esp_common.h"
 
 #include <stdlib.h>
@@ -68,6 +66,9 @@
 #include "stdio_uart.h"
 #endif
 
+#define ENABLE_DEBUG 0
+#include "debug.h"
+
 #define MHZ 1000000UL
 #define STRINGIFY(s) STRINGIFY2(s)
 #define STRINGIFY2(s) #s
diff --git a/cpu/esp8266/periph/adc.c b/cpu/esp8266/periph/adc.c
index a5f4b498c4..ff37598aef 100644
--- a/cpu/esp8266/periph/adc.c
+++ b/cpu/esp8266/periph/adc.c
@@ -19,9 +19,6 @@
  * @}
  */
 
-#define ENABLE_DEBUG    0
-#include "debug.h"
-
 #include "cpu.h"
 #include "mutex.h"
 #include "periph/adc.h"
@@ -31,6 +28,9 @@
 #include "esp_common.h"
 #include "sdk/sdk.h"
 
+#define ENABLE_DEBUG 0
+#include "debug.h"
+
 extern uint16_t test_tout(void);
 
 int adc_init(adc_t line)
diff --git a/cpu/esp8266/periph/gpio.c b/cpu/esp8266/periph/gpio.c
index 4a538436ff..60e7604edb 100644
--- a/cpu/esp8266/periph/gpio.c
+++ b/cpu/esp8266/periph/gpio.c
@@ -18,9 +18,6 @@
  * @}
  */
 
-#define ENABLE_DEBUG    (0)
-#include "debug.h"
-
 #include <stdbool.h>
 
 #include "log.h"
@@ -40,6 +37,9 @@
 #include "irq_arch.h"
 #include "syscalls.h"
 
+#define ENABLE_DEBUG 0
+#include "debug.h"
+
 /*
  * IOMUX to GPIO mapping
  * source https://www.espressif.com/sites/default/files/documentation/0d-esp8266_pin_list_release_15-11-2014.xlsx
diff --git a/cpu/esp8266/periph/pwm.c b/cpu/esp8266/periph/pwm.c
index f70bdcef05..4e4495cfdd 100644
--- a/cpu/esp8266/periph/pwm.c
+++ b/cpu/esp8266/periph/pwm.c
@@ -20,9 +20,6 @@
 
 #include <assert.h>
 
-#define ENABLE_DEBUG (0)
-#include "debug.h"
-
 #include "cpu.h"
 #include "log.h"
 #include "irq_arch.h"
@@ -36,6 +33,9 @@
 #include "sdk/sdk.h"
 #include "xtensa/xtensa_api.h"
 
+#define ENABLE_DEBUG 0
+#include "debug.h"
+
 #define TIMER_FRC1_CLKDIV_16    BIT(2)
 #define TIMER_FRC1_CLKDIV_256   BIT(3)
 
diff --git a/cpu/esp8266/startup.c b/cpu/esp8266/startup.c
index fadedd9134..e85a197e09 100644
--- a/cpu/esp8266/startup.c
+++ b/cpu/esp8266/startup.c
@@ -16,8 +16,6 @@
  * @author      Gunar Schorcht <gunar@schorcht.net>
  * @}
  */
-#define ENABLE_DEBUG  0
-#include "debug.h"
 
 #include <stdint.h>
 #include <stdio.h>
@@ -46,6 +44,9 @@
 #include "gdbstub.h"
 #endif
 
+#define ENABLE_DEBUG 0
+#include "debug.h"
+
 /* external esp function declarations */
 extern uint32_t hwrand (void);
 
diff --git a/cpu/esp_common/esp-wifi/esp_wifi_netdev.c b/cpu/esp_common/esp-wifi/esp_wifi_netdev.c
index a6fefa7acb..9e1b10a95c 100644
--- a/cpu/esp_common/esp-wifi/esp_wifi_netdev.c
+++ b/cpu/esp_common/esp-wifi/esp_wifi_netdev.c
@@ -46,9 +46,6 @@
 #include "esp_wifi_params.h"
 #include "esp_wifi_netdev.h"
 
-#define ENABLE_DEBUG_HEXDUMP    (0)
-#define ENABLE_DEBUG            (0)
-#include "debug.h"
 #include "log.h"
 
 #define ESP_WIFI_DEBUG(f, ...) \
@@ -93,6 +90,10 @@
 
 #endif /* MCU_ESP8266 */
 
+#define ENABLE_DEBUG_HEXDUMP    0
+#define ENABLE_DEBUG            0
+#include "debug.h"
+
 /**
  * There is only one ESP WiFi device. We define it as static device variable
  * to have access to the device inside ESP WiFi interrupt routines which do
diff --git a/cpu/esp_common/irq_arch.c b/cpu/esp_common/irq_arch.c
index 62d264f3ec..d6292baf8c 100644
--- a/cpu/esp_common/irq_arch.c
+++ b/cpu/esp_common/irq_arch.c
@@ -18,9 +18,6 @@
  * @}
  */
 
-#define ENABLE_DEBUG    (0)
-#include "debug.h"
-
 #include <stdint.h>
 #include <stdio.h>
 
@@ -32,6 +29,9 @@
 #include "esp/xtensa_ops.h"
 #include "xtensa/xtensa_context.h"
 
+#define ENABLE_DEBUG 0
+#include "debug.h"
+
 /**
  * @brief Set on entry into and reset on exit from an ISR
  */
diff --git a/cpu/esp_common/periph/spi.c b/cpu/esp_common/periph/spi.c
index 8c8fbafafa..f43106be7b 100644
--- a/cpu/esp_common/periph/spi.c
+++ b/cpu/esp_common/periph/spi.c
@@ -22,8 +22,6 @@
 #include <assert.h>
 #include <string.h>
 
-#define ENABLE_DEBUG (0)
-#include "debug.h"
 #include "esp_common.h"
 #include "log.h"
 
@@ -34,6 +32,9 @@
 #include "esp_attr.h"
 #include "gpio_arch.h"
 
+#define ENABLE_DEBUG 0
+#include "debug.h"
+
 #ifdef MCU_ESP32
 
 #include "driver/periph_ctrl.h"
diff --git a/cpu/esp_common/periph/uart.c b/cpu/esp_common/periph/uart.c
index 059b5cdd5a..9e7316215b 100644
--- a/cpu/esp_common/periph/uart.c
+++ b/cpu/esp_common/periph/uart.c
@@ -21,9 +21,6 @@
 
 #include <assert.h>
 
-#define ENABLE_DEBUG (0)
-#include "debug.h"
-
 #include "esp_common.h"
 #include "cpu.h"
 #include "irq_arch.h"
@@ -40,6 +37,9 @@
 #include "rom/ets_sys.h"
 #include "xtensa/xtensa_api.h"
 
+#define ENABLE_DEBUG 0
+#include "debug.h"
+
 #ifdef MCU_ESP32
 
 #include "gpio_arch.h"
diff --git a/cpu/esp_common/thread_arch.c b/cpu/esp_common/thread_arch.c
index cf304d2582..0f1b47c6cb 100644
--- a/cpu/esp_common/thread_arch.c
+++ b/cpu/esp_common/thread_arch.c
@@ -45,9 +45,6 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#define ENABLE_DEBUG    (0)
-#include "debug.h"
-
 #include <stdio.h>
 #include <string.h>
 
@@ -75,6 +72,9 @@
 #include "sdk/sdk.h"
 #endif /* MCU_ESP32 */
 
+#define ENABLE_DEBUG 0
+#include "debug.h"
+
 /* User exception dispatcher when exiting */
 extern void _xt_user_exit(void);
 
diff --git a/cpu/kinetis/periph/flashpage.c b/cpu/kinetis/periph/flashpage.c
index 827f43ec64..193b963299 100644
--- a/cpu/kinetis/periph/flashpage.c
+++ b/cpu/kinetis/periph/flashpage.c
@@ -21,11 +21,11 @@
 #include "cpu.h"
 #include "assert.h"
 
-#define ENABLE_DEBUG        (0)
-#include "debug.h"
-
 #include "periph/flashpage.h"
 
+#define ENABLE_DEBUG                0
+#include "debug.h"
+
 /**
  * @brief   Flash controller commands
  */
diff --git a/cpu/stm32/periph/flashpage.c b/cpu/stm32/periph/flashpage.c
index 3228d186d9..85d4da1ed4 100644
--- a/cpu/stm32/periph/flashpage.c
+++ b/cpu/stm32/periph/flashpage.c
@@ -26,11 +26,11 @@
 #include "stmclk.h"
 #include "assert.h"
 
-#define ENABLE_DEBUG        (0)
-#include "debug.h"
-
 #include "periph/flashpage.h"
 
+#define ENABLE_DEBUG           0
+#include "debug.h"
+
 #if defined(CPU_FAM_STM32L0) || defined(CPU_FAM_STM32L1)
 /* Program memory unlock keys */
 #define FLASH_PRGKEY1          ((uint32_t)0x8C9DAEBF)