diff --git a/Makefile.include b/Makefile.include
index dc336ef576e0..6646a29bd150 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -246,6 +246,13 @@ include $(RIOTBOARD)/$(BOARD)/Makefile.include
 INCLUDES += -I$(RIOTCPU)/$(CPU)/include
 include $(RIOTCPU)/$(CPU)/Makefile.include
 
+# Sanity check
+# The check is only done after 'include $(RIOTBOARD)/$(BOARD)/Makefile.include'
+# because we need to have the 'CPU' variable defined
+ifeq (,$(filter $(RIOTCPU)/$(CPU)/Makefile.features,$(MAKEFILE_LIST)))
+  $(error $$(RIOTCPU)/$$(CPU)/Makefile.features must have been included by the board / board common Makefile.features)
+endif
+
 # Assume GCC/GNU as supported toolchain if CPU's Makefile.include doesn't
 # provide this macro
 TOOLCHAINS_SUPPORTED ?= gnu
diff --git a/boards/airfy-beacon/Makefile.features b/boards/airfy-beacon/Makefile.features
index 0a73e550b875..32008a8330aa 100644
--- a/boards/airfy-beacon/Makefile.features
+++ b/boards/airfy-beacon/Makefile.features
@@ -12,4 +12,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
 
--include $(RIOTCPU)/nrf51/Makefile.features
+include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/arduino-duemilanove/Makefile.features b/boards/arduino-duemilanove/Makefile.features
index 8ade47474f65..b3d37cc98b30 100644
--- a/boards/arduino-duemilanove/Makefile.features
+++ b/boards/arduino-duemilanove/Makefile.features
@@ -1,3 +1,3 @@
 include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
 
--include $(RIOTCPU)/atmega328p/Makefile.features
+include $(RIOTCPU)/atmega328p/Makefile.features
diff --git a/boards/arduino-mega2560/Makefile.features b/boards/arduino-mega2560/Makefile.features
index 42491f5a94b6..c4e9afe55bcd 100644
--- a/boards/arduino-mega2560/Makefile.features
+++ b/boards/arduino-mega2560/Makefile.features
@@ -1,3 +1,3 @@
 include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
 
--include $(RIOTCPU)/atmega2560/Makefile.features
+include $(RIOTCPU)/atmega2560/Makefile.features
diff --git a/boards/arduino-mkr1000/Makefile.features b/boards/arduino-mkr1000/Makefile.features
index bc8c9ae857bc..448878b033f0 100644
--- a/boards/arduino-mkr1000/Makefile.features
+++ b/boards/arduino-mkr1000/Makefile.features
@@ -1,3 +1,3 @@
 include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
 
--include $(RIOTCPU)/samd21/Makefile.features
+include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/arduino-mkrfox1200/Makefile.features b/boards/arduino-mkrfox1200/Makefile.features
index bc8c9ae857bc..448878b033f0 100644
--- a/boards/arduino-mkrfox1200/Makefile.features
+++ b/boards/arduino-mkrfox1200/Makefile.features
@@ -1,3 +1,3 @@
 include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
 
--include $(RIOTCPU)/samd21/Makefile.features
+include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/arduino-mkrzero/Makefile.features b/boards/arduino-mkrzero/Makefile.features
index bc8c9ae857bc..448878b033f0 100644
--- a/boards/arduino-mkrzero/Makefile.features
+++ b/boards/arduino-mkrzero/Makefile.features
@@ -1,3 +1,3 @@
 include $(RIOTBOARD)/common/arduino-mkr/Makefile.features
 
--include $(RIOTCPU)/samd21/Makefile.features
+include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/arduino-uno/Makefile.features b/boards/arduino-uno/Makefile.features
index 8ade47474f65..b3d37cc98b30 100644
--- a/boards/arduino-uno/Makefile.features
+++ b/boards/arduino-uno/Makefile.features
@@ -1,3 +1,3 @@
 include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
 
--include $(RIOTCPU)/atmega328p/Makefile.features
+include $(RIOTCPU)/atmega328p/Makefile.features
diff --git a/boards/arduino-zero/Makefile.features b/boards/arduino-zero/Makefile.features
index 935c7763db33..c40fe7224678 100644
--- a/boards/arduino-zero/Makefile.features
+++ b/boards/arduino-zero/Makefile.features
@@ -14,4 +14,4 @@ FEATURES_PROVIDED += arduino
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
 
--include $(RIOTCPU)/samd21/Makefile.features
+include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/avsextrem/Makefile.features b/boards/avsextrem/Makefile.features
index 796f784c659d..64a84205f62d 100644
--- a/boards/avsextrem/Makefile.features
+++ b/boards/avsextrem/Makefile.features
@@ -10,4 +10,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = arm7
 
--include $(RIOTCPU)/lpc2387/Makefile.features
+include $(RIOTCPU)/lpc2387/Makefile.features
diff --git a/boards/b-l072z-lrwan1/Makefile.features b/boards/b-l072z-lrwan1/Makefile.features
index d17c81f04ed6..650cfcbfb7a0 100644
--- a/boards/b-l072z-lrwan1/Makefile.features
+++ b/boards/b-l072z-lrwan1/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/stm32l0/Makefile.features
+include $(RIOTCPU)/stm32l0/Makefile.features
diff --git a/boards/b-l475e-iot01a/Makefile.features b/boards/b-l475e-iot01a/Makefile.features
index 2746637e28f9..a621e68b70cd 100644
--- a/boards/b-l475e-iot01a/Makefile.features
+++ b/boards/b-l475e-iot01a/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/stm32l4/Makefile.features
+include $(RIOTCPU)/stm32l4/Makefile.features
diff --git a/boards/calliope-mini/Makefile.features b/boards/calliope-mini/Makefile.features
index 07616adaa925..937a64258777 100644
--- a/boards/calliope-mini/Makefile.features
+++ b/boards/calliope-mini/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_pwm
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/nrf51/Makefile.features
+include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/cc2538dk/Makefile.features b/boards/cc2538dk/Makefile.features
index b6bc44bc8dfe..d0e0a42842c3 100644
--- a/boards/cc2538dk/Makefile.features
+++ b/boards/cc2538dk/Makefile.features
@@ -12,4 +12,4 @@ FEATURES_PROVIDED += emulator_renode
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
 
--include $(RIOTCPU)/cc2538/Makefile.features
+include $(RIOTCPU)/cc2538/Makefile.features
diff --git a/boards/cc2650-launchpad/Makefile.features b/boards/cc2650-launchpad/Makefile.features
index 8da1747fd46e..c1a98fac3e87 100644
--- a/boards/cc2650-launchpad/Makefile.features
+++ b/boards/cc2650-launchpad/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
 
--include $(RIOTCPU)/cc26x0/Makefile.features
+include $(RIOTCPU)/cc26x0/Makefile.features
diff --git a/boards/cc2650stk/Makefile.features b/boards/cc2650stk/Makefile.features
index 8da1747fd46e..c1a98fac3e87 100644
--- a/boards/cc2650stk/Makefile.features
+++ b/boards/cc2650stk/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
 
--include $(RIOTCPU)/cc26x0/Makefile.features
+include $(RIOTCPU)/cc26x0/Makefile.features
diff --git a/boards/chronos/Makefile.features b/boards/chronos/Makefile.features
index 6ce23897f75d..02a808413865 100644
--- a/boards/chronos/Makefile.features
+++ b/boards/chronos/Makefile.features
@@ -7,4 +7,4 @@ FEATURES_PROVIDED += periph_rtc
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
 
--include $(RIOTCPU)/cc430/Makefile.features
+include $(RIOTCPU)/cc430/Makefile.features
diff --git a/boards/common/arduino-due/Makefile.features b/boards/common/arduino-due/Makefile.features
index f524147e52e9..3ae850c4c031 100644
--- a/boards/common/arduino-due/Makefile.features
+++ b/boards/common/arduino-due/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += arduino
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
 
--include $(RIOTCPU)/sam3/Makefile.features
+include $(RIOTCPU)/sam3/Makefile.features
diff --git a/boards/common/msb-430/Makefile.features b/boards/common/msb-430/Makefile.features
index 95bbe7047200..e040106a4734 100644
--- a/boards/common/msb-430/Makefile.features
+++ b/boards/common/msb-430/Makefile.features
@@ -1 +1 @@
--include $(RIOTCPU)/msp430fxyz/Makefile.features
+include $(RIOTCPU)/msp430fxyz/Makefile.features
diff --git a/boards/common/nrf52xxxdk/Makefile.features b/boards/common/nrf52xxxdk/Makefile.features
index 8a346e8eae36..fbac3cffa7bb 100644
--- a/boards/common/nrf52xxxdk/Makefile.features
+++ b/boards/common/nrf52xxxdk/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += radio_nrfble
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/nrf52/Makefile.features
+include $(RIOTCPU)/nrf52/Makefile.features
diff --git a/boards/common/stm32f103c8/Makefile.features b/boards/common/stm32f103c8/Makefile.features
index 08264c53f96c..48981878b9d6 100644
--- a/boards/common/stm32f103c8/Makefile.features
+++ b/boards/common/stm32f103c8/Makefile.features
@@ -10,4 +10,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/stm32f1/Makefile.features
+include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/common/wsn430/Makefile.features b/boards/common/wsn430/Makefile.features
index c13bd0d37a06..f25d1793d057 100644
--- a/boards/common/wsn430/Makefile.features
+++ b/boards/common/wsn430/Makefile.features
@@ -7,4 +7,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
 
--include $(RIOTCPU)/msp430fxyz/Makefile.features
+include $(RIOTCPU)/msp430fxyz/Makefile.features
diff --git a/boards/ek-lm4f120xl/Makefile.features b/boards/ek-lm4f120xl/Makefile.features
index f32cd2a3834e..b82b65480909 100644
--- a/boards/ek-lm4f120xl/Makefile.features
+++ b/boards/ek-lm4f120xl/Makefile.features
@@ -8,4 +8,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_1
 
--include $(RIOTCPU)/lm4f120/Makefile.features
+include $(RIOTCPU)/lm4f120/Makefile.features
diff --git a/boards/f4vi1/Makefile.features b/boards/f4vi1/Makefile.features
index ed6890cde26c..bb0aef5413e4 100644
--- a/boards/f4vi1/Makefile.features
+++ b/boards/f4vi1/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_gpio periph_gpio_irq
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_1
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/feather-m0/Makefile.features b/boards/feather-m0/Makefile.features
index 489e089ba2a5..dd11a33c75da 100644
--- a/boards/feather-m0/Makefile.features
+++ b/boards/feather-m0/Makefile.features
@@ -12,4 +12,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
 
--include $(RIOTCPU)/samd21/Makefile.features
+include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/fox/Makefile.features b/boards/fox/Makefile.features
index 3040df89ed2f..436cef6f18c5 100644
--- a/boards/fox/Makefile.features
+++ b/boards/fox/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
 
--include $(RIOTCPU)/stm32f1/Makefile.features
+include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/ikea-tradfri/Makefile.features b/boards/ikea-tradfri/Makefile.features
index 37725672907a..4bd8d204d080 100644
--- a/boards/ikea-tradfri/Makefile.features
+++ b/boards/ikea-tradfri/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/efm32/Makefile.features
+include $(RIOTCPU)/efm32/Makefile.features
diff --git a/boards/iotlab-a8-m3/Makefile.features b/boards/iotlab-a8-m3/Makefile.features
index ba052b7a220f..e3bcc4007e10 100644
--- a/boards/iotlab-a8-m3/Makefile.features
+++ b/boards/iotlab-a8-m3/Makefile.features
@@ -1,3 +1,3 @@
 include $(RIOTBOARD)/common/iotlab/Makefile.features
 
--include $(RIOTCPU)/stm32f1/Makefile.features
+include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/iotlab-m3/Makefile.features b/boards/iotlab-m3/Makefile.features
index ba052b7a220f..e3bcc4007e10 100644
--- a/boards/iotlab-m3/Makefile.features
+++ b/boards/iotlab-m3/Makefile.features
@@ -1,3 +1,3 @@
 include $(RIOTBOARD)/common/iotlab/Makefile.features
 
--include $(RIOTCPU)/stm32f1/Makefile.features
+include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/jiminy-mega256rfr2/Makefile.features b/boards/jiminy-mega256rfr2/Makefile.features
index 4e78995dd68b..358ba448f54b 100644
--- a/boards/jiminy-mega256rfr2/Makefile.features
+++ b/boards/jiminy-mega256rfr2/Makefile.features
@@ -7,4 +7,4 @@ include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = avr6
 
--include $(RIOTCPU)/atmega256rfr2/Makefile.features
+include $(RIOTCPU)/atmega256rfr2/Makefile.features
diff --git a/boards/limifrog-v1/Makefile.features b/boards/limifrog-v1/Makefile.features
index 618ba1ecb0e9..ab5097f4e3d4 100644
--- a/boards/limifrog-v1/Makefile.features
+++ b/boards/limifrog-v1/Makefile.features
@@ -8,4 +8,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/stm32l1/Makefile.features
+include $(RIOTCPU)/stm32l1/Makefile.features
diff --git a/boards/lobaro-lorabox/Makefile.features b/boards/lobaro-lorabox/Makefile.features
index 19f672f277ec..0de97a3d8143 100644
--- a/boards/lobaro-lorabox/Makefile.features
+++ b/boards/lobaro-lorabox/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
--include $(RIOTCPU)/stm32l1/Makefile.features
+include $(RIOTCPU)/stm32l1/Makefile.features
diff --git a/boards/maple-mini/Makefile.features b/boards/maple-mini/Makefile.features
index 7b03bc4e010e..5e143535c62e 100644
--- a/boards/maple-mini/Makefile.features
+++ b/boards/maple-mini/Makefile.features
@@ -8,4 +8,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
 
--include $(RIOTCPU)/stm32f1/Makefile.features
+include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/mbed_lpc1768/Makefile.features b/boards/mbed_lpc1768/Makefile.features
index 90283b5a667a..854f6fde60b5 100644
--- a/boards/mbed_lpc1768/Makefile.features
+++ b/boards/mbed_lpc1768/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
 
--include $(RIOTCPU)/lpc1768/Makefile.features
+include $(RIOTCPU)/lpc1768/Makefile.features
diff --git a/boards/mega-xplained/Makefile.features b/boards/mega-xplained/Makefile.features
index af99dda59d92..7a8d6d41bfcc 100644
--- a/boards/mega-xplained/Makefile.features
+++ b/boards/mega-xplained/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = avr8
 
--include $(RIOTCPU)/atmega1284p/Makefile.features
+include $(RIOTCPU)/atmega1284p/Makefile.features
diff --git a/boards/microbit/Makefile.features b/boards/microbit/Makefile.features
index e5117182f532..2c53068f05f3 100644
--- a/boards/microbit/Makefile.features
+++ b/boards/microbit/Makefile.features
@@ -10,4 +10,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/nrf51/Makefile.features
+include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/mips-malta/Makefile.features b/boards/mips-malta/Makefile.features
index 9c005872fdb3..675e1c9b301b 100644
--- a/boards/mips-malta/Makefile.features
+++ b/boards/mips-malta/Makefile.features
@@ -4,4 +4,4 @@ FEATURES_PROVIDED += periph_timer
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = mips32r2
 
--include $(RIOTCPU)/mips32r2_generic/Makefile.features
+include $(RIOTCPU)/mips32r2_generic/Makefile.features
diff --git a/boards/msb-430/Makefile.features b/boards/msb-430/Makefile.features
index 90d2ee7ac923..3e683cbdf72a 100644
--- a/boards/msb-430/Makefile.features
+++ b/boards/msb-430/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
 
--include $(RIOTCPU)/msp430fxyz/Makefile.features
+include $(RIOTCPU)/msp430fxyz/Makefile.features
diff --git a/boards/msb-430h/Makefile.features b/boards/msb-430h/Makefile.features
index 42f5e9972585..b75b46866204 100644
--- a/boards/msb-430h/Makefile.features
+++ b/boards/msb-430h/Makefile.features
@@ -7,4 +7,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
 
--include $(RIOTCPU)/msp430fxyz/Makefile.features
+include $(RIOTCPU)/msp430fxyz/Makefile.features
diff --git a/boards/msba2/Makefile.features b/boards/msba2/Makefile.features
index 2bd10a890cd1..d3f2b4894d88 100644
--- a/boards/msba2/Makefile.features
+++ b/boards/msba2/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = arm7
 
--include $(RIOTCPU)/lpc2387/Makefile.features
+include $(RIOTCPU)/lpc2387/Makefile.features
diff --git a/boards/msbiot/Makefile.features b/boards/msbiot/Makefile.features
index 6706dd5d118d..777ce74bc0bb 100644
--- a/boards/msbiot/Makefile.features
+++ b/boards/msbiot/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_1
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/native/Makefile.features b/boards/native/Makefile.features
index 5082431ba4c5..3f14443cd2b8 100644
--- a/boards/native/Makefile.features
+++ b/boards/native/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += ethernet
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = x86
 
--include $(RIOTCPU)/native/Makefile.features
+include $(RIOTCPU)/native/Makefile.features
diff --git a/boards/nrf51dongle/Makefile.features b/boards/nrf51dongle/Makefile.features
index 1c38b1882998..0b4482057812 100644
--- a/boards/nrf51dongle/Makefile.features
+++ b/boards/nrf51dongle/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/nrf51/Makefile.features
+include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/nrf6310/Makefile.features b/boards/nrf6310/Makefile.features
index be7c033af4a8..6cec355f5fcd 100644
--- a/boards/nrf6310/Makefile.features
+++ b/boards/nrf6310/Makefile.features
@@ -10,4 +10,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
 
--include $(RIOTCPU)/nrf51/Makefile.features
+include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/nucleo-f030r8/Makefile.features b/boards/nucleo-f030r8/Makefile.features
index cb9067c7c047..d89cb1c08e05 100644
--- a/boards/nucleo-f030r8/Makefile.features
+++ b/boards/nucleo-f030r8/Makefile.features
@@ -12,4 +12,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/stm32f0/Makefile.features
+include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/nucleo-f031k6/Makefile.features b/boards/nucleo-f031k6/Makefile.features
index 0c16e432b95d..5f5155134ea6 100644
--- a/boards/nucleo-f031k6/Makefile.features
+++ b/boards/nucleo-f031k6/Makefile.features
@@ -13,4 +13,4 @@ include $(RIOTBOARD)/common/nucleo32/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/stm32f0/Makefile.features
+include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/nucleo-f042k6/Makefile.features b/boards/nucleo-f042k6/Makefile.features
index 0c16e432b95d..5f5155134ea6 100644
--- a/boards/nucleo-f042k6/Makefile.features
+++ b/boards/nucleo-f042k6/Makefile.features
@@ -13,4 +13,4 @@ include $(RIOTBOARD)/common/nucleo32/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/stm32f0/Makefile.features
+include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/nucleo-f070rb/Makefile.features b/boards/nucleo-f070rb/Makefile.features
index f75770478b06..cf8216e993f4 100644
--- a/boards/nucleo-f070rb/Makefile.features
+++ b/boards/nucleo-f070rb/Makefile.features
@@ -13,4 +13,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/stm32f0/Makefile.features
+include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/nucleo-f072rb/Makefile.features b/boards/nucleo-f072rb/Makefile.features
index a4b143aa2f97..b07069454ad2 100644
--- a/boards/nucleo-f072rb/Makefile.features
+++ b/boards/nucleo-f072rb/Makefile.features
@@ -13,4 +13,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/stm32f0/Makefile.features
+include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/nucleo-f091rc/Makefile.features b/boards/nucleo-f091rc/Makefile.features
index 58683adfd9dd..cae52720d68a 100644
--- a/boards/nucleo-f091rc/Makefile.features
+++ b/boards/nucleo-f091rc/Makefile.features
@@ -14,4 +14,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/stm32f0/Makefile.features
+include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/nucleo-f103rb/Makefile.features b/boards/nucleo-f103rb/Makefile.features
index c5285e983920..f18b9a12adc3 100644
--- a/boards/nucleo-f103rb/Makefile.features
+++ b/boards/nucleo-f103rb/Makefile.features
@@ -12,4 +12,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
 
--include $(RIOTCPU)/stm32f1/Makefile.features
+include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/nucleo-f207zg/Makefile.features b/boards/nucleo-f207zg/Makefile.features
index f90aa3b20b58..0eabc60d252d 100644
--- a/boards/nucleo-f207zg/Makefile.features
+++ b/boards/nucleo-f207zg/Makefile.features
@@ -13,4 +13,4 @@ include $(RIOTBOARD)/common/nucleo144/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/stm32f2/Makefile.features
+include $(RIOTCPU)/stm32f2/Makefile.features
diff --git a/boards/nucleo-f302r8/Makefile.features b/boards/nucleo-f302r8/Makefile.features
index cbe74657b00d..187315dcf26d 100644
--- a/boards/nucleo-f302r8/Makefile.features
+++ b/boards/nucleo-f302r8/Makefile.features
@@ -13,4 +13,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/stm32f3/Makefile.features
+include $(RIOTCPU)/stm32f3/Makefile.features
diff --git a/boards/nucleo-f303k8/Makefile.features b/boards/nucleo-f303k8/Makefile.features
index 6e84db790c90..68ba32b51b2f 100644
--- a/boards/nucleo-f303k8/Makefile.features
+++ b/boards/nucleo-f303k8/Makefile.features
@@ -12,4 +12,4 @@ include $(RIOTBOARD)/common/nucleo32/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/stm32f3/Makefile.features
+include $(RIOTCPU)/stm32f3/Makefile.features
diff --git a/boards/nucleo-f303re/Makefile.features b/boards/nucleo-f303re/Makefile.features
index cbe74657b00d..187315dcf26d 100644
--- a/boards/nucleo-f303re/Makefile.features
+++ b/boards/nucleo-f303re/Makefile.features
@@ -13,4 +13,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/stm32f3/Makefile.features
+include $(RIOTCPU)/stm32f3/Makefile.features
diff --git a/boards/nucleo-f303ze/Makefile.features b/boards/nucleo-f303ze/Makefile.features
index aaa7efe24465..aba609b3012b 100644
--- a/boards/nucleo-f303ze/Makefile.features
+++ b/boards/nucleo-f303ze/Makefile.features
@@ -12,4 +12,4 @@ include $(RIOTBOARD)/common/nucleo144/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/stm32f3/Makefile.features
+include $(RIOTCPU)/stm32f3/Makefile.features
diff --git a/boards/nucleo-f334r8/Makefile.features b/boards/nucleo-f334r8/Makefile.features
index 2ccfc67e0f63..cc5a4edef610 100644
--- a/boards/nucleo-f334r8/Makefile.features
+++ b/boards/nucleo-f334r8/Makefile.features
@@ -12,4 +12,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/stm32f3/Makefile.features
+include $(RIOTCPU)/stm32f3/Makefile.features
diff --git a/boards/nucleo-f401re/Makefile.features b/boards/nucleo-f401re/Makefile.features
index 12d2e69d15bb..6ee3b71d340d 100644
--- a/boards/nucleo-f401re/Makefile.features
+++ b/boards/nucleo-f401re/Makefile.features
@@ -15,4 +15,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo-f410rb/Makefile.features b/boards/nucleo-f410rb/Makefile.features
index dc39d2b1b0db..dea27cd04da4 100644
--- a/boards/nucleo-f410rb/Makefile.features
+++ b/boards/nucleo-f410rb/Makefile.features
@@ -10,4 +10,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo-f411re/Makefile.features b/boards/nucleo-f411re/Makefile.features
index 6e16d4fab4d8..44f50b73ea08 100644
--- a/boards/nucleo-f411re/Makefile.features
+++ b/boards/nucleo-f411re/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo-f412zg/Makefile.features b/boards/nucleo-f412zg/Makefile.features
index 59f12a89d16d..56263ee68a26 100644
--- a/boards/nucleo-f412zg/Makefile.features
+++ b/boards/nucleo-f412zg/Makefile.features
@@ -14,4 +14,4 @@ include $(RIOTBOARD)/common/nucleo144/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo-f413zh/Makefile.features b/boards/nucleo-f413zh/Makefile.features
index aa44c10a01c7..9114fc148c66 100644
--- a/boards/nucleo-f413zh/Makefile.features
+++ b/boards/nucleo-f413zh/Makefile.features
@@ -16,4 +16,4 @@ include $(RIOTBOARD)/common/nucleo144/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo-f429zi/Makefile.features b/boards/nucleo-f429zi/Makefile.features
index a7b79824ef11..fe0b424fb3f8 100644
--- a/boards/nucleo-f429zi/Makefile.features
+++ b/boards/nucleo-f429zi/Makefile.features
@@ -14,4 +14,4 @@ include $(RIOTBOARD)/common/nucleo144/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo-f446re/Makefile.features b/boards/nucleo-f446re/Makefile.features
index 12d2e69d15bb..6ee3b71d340d 100644
--- a/boards/nucleo-f446re/Makefile.features
+++ b/boards/nucleo-f446re/Makefile.features
@@ -15,4 +15,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo-f446ze/Makefile.features b/boards/nucleo-f446ze/Makefile.features
index 0861a00011e8..09c0aca52b3d 100644
--- a/boards/nucleo-f446ze/Makefile.features
+++ b/boards/nucleo-f446ze/Makefile.features
@@ -13,4 +13,4 @@ include $(RIOTBOARD)/common/nucleo144/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo-f722ze/Makefile.features b/boards/nucleo-f722ze/Makefile.features
index 0e0df98b3c15..0af7baf7b263 100644
--- a/boards/nucleo-f722ze/Makefile.features
+++ b/boards/nucleo-f722ze/Makefile.features
@@ -11,4 +11,4 @@ include $(RIOTBOARD)/common/nucleo144/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m7
 
--include $(RIOTCPU)/stm32f7/Makefile.features
+include $(RIOTCPU)/stm32f7/Makefile.features
diff --git a/boards/nucleo-f746zg/Makefile.features b/boards/nucleo-f746zg/Makefile.features
index b077b170a4a7..cf72ba6f2d71 100644
--- a/boards/nucleo-f746zg/Makefile.features
+++ b/boards/nucleo-f746zg/Makefile.features
@@ -10,4 +10,4 @@ include $(RIOTBOARD)/common/nucleo144/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m7
 
--include $(RIOTCPU)/stm32f7/Makefile.features
+include $(RIOTCPU)/stm32f7/Makefile.features
diff --git a/boards/nucleo-f767zi/Makefile.features b/boards/nucleo-f767zi/Makefile.features
index b077b170a4a7..cf72ba6f2d71 100644
--- a/boards/nucleo-f767zi/Makefile.features
+++ b/boards/nucleo-f767zi/Makefile.features
@@ -10,4 +10,4 @@ include $(RIOTBOARD)/common/nucleo144/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m7
 
--include $(RIOTCPU)/stm32f7/Makefile.features
+include $(RIOTCPU)/stm32f7/Makefile.features
diff --git a/boards/nucleo-l031k6/Makefile.features b/boards/nucleo-l031k6/Makefile.features
index f76b2326a686..3d52183cfb92 100644
--- a/boards/nucleo-l031k6/Makefile.features
+++ b/boards/nucleo-l031k6/Makefile.features
@@ -13,4 +13,4 @@ include $(RIOTBOARD)/common/nucleo32/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/stm32l0/Makefile.features
+include $(RIOTCPU)/stm32l0/Makefile.features
diff --git a/boards/nucleo-l053r8/Makefile.features b/boards/nucleo-l053r8/Makefile.features
index 151f44822feb..417203f411ac 100644
--- a/boards/nucleo-l053r8/Makefile.features
+++ b/boards/nucleo-l053r8/Makefile.features
@@ -12,4 +12,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/stm32l0/Makefile.features
+include $(RIOTCPU)/stm32l0/Makefile.features
diff --git a/boards/nucleo-l073rz/Makefile.features b/boards/nucleo-l073rz/Makefile.features
index cf0fa6655da7..8b9e19e63466 100644
--- a/boards/nucleo-l073rz/Makefile.features
+++ b/boards/nucleo-l073rz/Makefile.features
@@ -14,4 +14,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/stm32l0/Makefile.features
+include $(RIOTCPU)/stm32l0/Makefile.features
diff --git a/boards/nucleo-l152re/Makefile.features b/boards/nucleo-l152re/Makefile.features
index 82c72e7a2c52..ad81f0d97e98 100644
--- a/boards/nucleo-l152re/Makefile.features
+++ b/boards/nucleo-l152re/Makefile.features
@@ -15,4 +15,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/stm32l1/Makefile.features
+include $(RIOTCPU)/stm32l1/Makefile.features
diff --git a/boards/nucleo-l432kc/Makefile.features b/boards/nucleo-l432kc/Makefile.features
index d6c46358217a..97a60e30909d 100644
--- a/boards/nucleo-l432kc/Makefile.features
+++ b/boards/nucleo-l432kc/Makefile.features
@@ -12,4 +12,4 @@ include $(RIOTBOARD)/common/nucleo32/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_1
 
--include $(RIOTCPU)/stm32l4/Makefile.features
+include $(RIOTCPU)/stm32l4/Makefile.features
diff --git a/boards/nucleo-l433rc/Makefile.features b/boards/nucleo-l433rc/Makefile.features
index 3c544af51586..1c3821ce3dbe 100644
--- a/boards/nucleo-l433rc/Makefile.features
+++ b/boards/nucleo-l433rc/Makefile.features
@@ -13,4 +13,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/stm32l4/Makefile.features
+include $(RIOTCPU)/stm32l4/Makefile.features
diff --git a/boards/nucleo-l452re/Makefile.features b/boards/nucleo-l452re/Makefile.features
index 3c544af51586..1c3821ce3dbe 100644
--- a/boards/nucleo-l452re/Makefile.features
+++ b/boards/nucleo-l452re/Makefile.features
@@ -13,4 +13,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/stm32l4/Makefile.features
+include $(RIOTCPU)/stm32l4/Makefile.features
diff --git a/boards/nucleo-l476rg/Makefile.features b/boards/nucleo-l476rg/Makefile.features
index f58f80b5704c..1576991fbac0 100644
--- a/boards/nucleo-l476rg/Makefile.features
+++ b/boards/nucleo-l476rg/Makefile.features
@@ -14,4 +14,4 @@ include $(RIOTBOARD)/common/nucleo64/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/stm32l4/Makefile.features
+include $(RIOTCPU)/stm32l4/Makefile.features
diff --git a/boards/nucleo-l496zg/Makefile.features b/boards/nucleo-l496zg/Makefile.features
index 170abf266dd4..64084068c591 100644
--- a/boards/nucleo-l496zg/Makefile.features
+++ b/boards/nucleo-l496zg/Makefile.features
@@ -13,4 +13,4 @@ include $(RIOTBOARD)/common/nucleo144/Makefile.features
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/stm32l4/Makefile.features
+include $(RIOTCPU)/stm32l4/Makefile.features
diff --git a/boards/nz32-sc151/Makefile.features b/boards/nz32-sc151/Makefile.features
index c6ff493bd909..d055dfbe31e7 100644
--- a/boards/nz32-sc151/Makefile.features
+++ b/boards/nz32-sc151/Makefile.features
@@ -12,4 +12,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/stm32l1/Makefile.features
+include $(RIOTCPU)/stm32l1/Makefile.features
diff --git a/boards/opencm904/Makefile.features b/boards/opencm904/Makefile.features
index f4f8bb56562b..1e709599991e 100644
--- a/boards/opencm904/Makefile.features
+++ b/boards/opencm904/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
 
--include $(RIOTCPU)/stm32f1/Makefile.features
+include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/openmote-b/Makefile.features b/boards/openmote-b/Makefile.features
index 5452d8bd15b3..d5fede5eb9d1 100644
--- a/boards/openmote-b/Makefile.features
+++ b/boards/openmote-b/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/cc2538/Makefile.features
+include $(RIOTCPU)/cc2538/Makefile.features
diff --git a/boards/openmote-cc2538/Makefile.features b/boards/openmote-cc2538/Makefile.features
index f96279badc53..d770cd86a716 100644
--- a/boards/openmote-cc2538/Makefile.features
+++ b/boards/openmote-cc2538/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_adc
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/cc2538/Makefile.features
+include $(RIOTCPU)/cc2538/Makefile.features
diff --git a/boards/pic32-clicker/Makefile.features b/boards/pic32-clicker/Makefile.features
index 6df4270b8821..03248ec211b3 100644
--- a/boards/pic32-clicker/Makefile.features
+++ b/boards/pic32-clicker/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = mips32r2
 
--include $(RIOTCPU)/mips_pic32mx/Makefile.features
+include $(RIOTCPU)/mips_pic32mx/Makefile.features
diff --git a/boards/pic32-wifire/Makefile.features b/boards/pic32-wifire/Makefile.features
index 5e6f5d12271a..c45cc17a18ac 100644
--- a/boards/pic32-wifire/Makefile.features
+++ b/boards/pic32-wifire/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = mips32r2
 
--include $(RIOTCPU)/mips_pic32mz/Makefile.features
+include $(RIOTCPU)/mips_pic32mz/Makefile.features
diff --git a/boards/remote-pa/Makefile.features b/boards/remote-pa/Makefile.features
index f96279badc53..d770cd86a716 100644
--- a/boards/remote-pa/Makefile.features
+++ b/boards/remote-pa/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_adc
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/cc2538/Makefile.features
+include $(RIOTCPU)/cc2538/Makefile.features
diff --git a/boards/remote-reva/Makefile.features b/boards/remote-reva/Makefile.features
index f96279badc53..d770cd86a716 100644
--- a/boards/remote-reva/Makefile.features
+++ b/boards/remote-reva/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_adc
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/cc2538/Makefile.features
+include $(RIOTCPU)/cc2538/Makefile.features
diff --git a/boards/remote-revb/Makefile.features b/boards/remote-revb/Makefile.features
index f96279badc53..d770cd86a716 100644
--- a/boards/remote-revb/Makefile.features
+++ b/boards/remote-revb/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_adc
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/cc2538/Makefile.features
+include $(RIOTCPU)/cc2538/Makefile.features
diff --git a/boards/ruuvitag/Makefile.features b/boards/ruuvitag/Makefile.features
index 8d41ae6b04e9..dbd8a3514bf5 100644
--- a/boards/ruuvitag/Makefile.features
+++ b/boards/ruuvitag/Makefile.features
@@ -10,4 +10,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/nrf52/Makefile.features
+include $(RIOTCPU)/nrf52/Makefile.features
diff --git a/boards/samd21-xpro/Makefile.features b/boards/samd21-xpro/Makefile.features
index 489e089ba2a5..dd11a33c75da 100644
--- a/boards/samd21-xpro/Makefile.features
+++ b/boards/samd21-xpro/Makefile.features
@@ -12,4 +12,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
 
--include $(RIOTCPU)/samd21/Makefile.features
+include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/saml21-xpro/Makefile.features b/boards/saml21-xpro/Makefile.features
index c06d9c2a0a91..3a03338264e0 100644
--- a/boards/saml21-xpro/Makefile.features
+++ b/boards/saml21-xpro/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
 
--include $(RIOTCPU)/saml21/Makefile.features
+include $(RIOTCPU)/saml21/Makefile.features
diff --git a/boards/samr21-xpro/Makefile.features b/boards/samr21-xpro/Makefile.features
index 489e089ba2a5..dd11a33c75da 100644
--- a/boards/samr21-xpro/Makefile.features
+++ b/boards/samr21-xpro/Makefile.features
@@ -12,4 +12,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
 
--include $(RIOTCPU)/samd21/Makefile.features
+include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/samr30-xpro/Makefile.features b/boards/samr30-xpro/Makefile.features
index 738e3a8c3675..d7bfc182747e 100644
--- a/boards/samr30-xpro/Makefile.features
+++ b/boards/samr30-xpro/Makefile.features
@@ -12,4 +12,4 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_MCU_GROUP = cortex_m0_2
 
 # samr30 is a specific flavor of saml21
--include $(RIOTCPU)/saml21/Makefile.features
+include $(RIOTCPU)/saml21/Makefile.features
diff --git a/boards/seeeduino_arch-pro/Makefile.features b/boards/seeeduino_arch-pro/Makefile.features
index 90283b5a667a..854f6fde60b5 100644
--- a/boards/seeeduino_arch-pro/Makefile.features
+++ b/boards/seeeduino_arch-pro/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
 
--include $(RIOTCPU)/lpc1768/Makefile.features
+include $(RIOTCPU)/lpc1768/Makefile.features
diff --git a/boards/sensebox_samd21/Makefile.features b/boards/sensebox_samd21/Makefile.features
index 48701b5bc39b..9cbc4e2dc811 100644
--- a/boards/sensebox_samd21/Makefile.features
+++ b/boards/sensebox_samd21/Makefile.features
@@ -10,4 +10,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
 
--include $(RIOTCPU)/samd21/Makefile.features
+include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/slstk3401a/Makefile.features b/boards/slstk3401a/Makefile.features
index 8268377bb881..88da743dc3ef 100644
--- a/boards/slstk3401a/Makefile.features
+++ b/boards/slstk3401a/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/efm32/Makefile.features
+include $(RIOTCPU)/efm32/Makefile.features
diff --git a/boards/slstk3402a/Makefile.features b/boards/slstk3402a/Makefile.features
index 8268377bb881..88da743dc3ef 100644
--- a/boards/slstk3402a/Makefile.features
+++ b/boards/slstk3402a/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/efm32/Makefile.features
+include $(RIOTCPU)/efm32/Makefile.features
diff --git a/boards/sltb001a/Makefile.features b/boards/sltb001a/Makefile.features
index 8268377bb881..88da743dc3ef 100644
--- a/boards/sltb001a/Makefile.features
+++ b/boards/sltb001a/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/efm32/Makefile.features
+include $(RIOTCPU)/efm32/Makefile.features
diff --git a/boards/slwstk6000b/Makefile.features b/boards/slwstk6000b/Makefile.features
index 8268377bb881..88da743dc3ef 100644
--- a/boards/slwstk6000b/Makefile.features
+++ b/boards/slwstk6000b/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/efm32/Makefile.features
+include $(RIOTCPU)/efm32/Makefile.features
diff --git a/boards/slwstk6220a/Makefile.features b/boards/slwstk6220a/Makefile.features
index dfdf8fbb403c..15061604d546 100644
--- a/boards/slwstk6220a/Makefile.features
+++ b/boards/slwstk6220a/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MCU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_1
 
--include $(RIOTCPU)/ezr32wg/Makefile.features
+include $(RIOTCPU)/ezr32wg/Makefile.features
diff --git a/boards/sodaq-autonomo/Makefile.features b/boards/sodaq-autonomo/Makefile.features
index fd418472173c..59b9a673e43f 100644
--- a/boards/sodaq-autonomo/Makefile.features
+++ b/boards/sodaq-autonomo/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
 
--include $(RIOTCPU)/samd21/Makefile.features
+include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/sodaq-explorer/Makefile.features b/boards/sodaq-explorer/Makefile.features
index ac19af155492..f22487913bba 100644
--- a/boards/sodaq-explorer/Makefile.features
+++ b/boards/sodaq-explorer/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
 
--include $(RIOTCPU)/samd21/Makefile.features
+include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/sodaq-one/Makefile.features b/boards/sodaq-one/Makefile.features
index ac19af155492..f22487913bba 100644
--- a/boards/sodaq-one/Makefile.features
+++ b/boards/sodaq-one/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
 
--include $(RIOTCPU)/samd21/Makefile.features
+include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/spark-core/Makefile.features b/boards/spark-core/Makefile.features
index c9f7dde1bd24..780803fb54ae 100644
--- a/boards/spark-core/Makefile.features
+++ b/boards/spark-core/Makefile.features
@@ -7,4 +7,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/stm32f1/Makefile.features
+include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/stk3600/Makefile.features b/boards/stk3600/Makefile.features
index 793223669c44..1d4efab3e96f 100644
--- a/boards/stk3600/Makefile.features
+++ b/boards/stk3600/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/efm32/Makefile.features
+include $(RIOTCPU)/efm32/Makefile.features
diff --git a/boards/stk3700/Makefile.features b/boards/stk3700/Makefile.features
index 793223669c44..1d4efab3e96f 100644
--- a/boards/stk3700/Makefile.features
+++ b/boards/stk3700/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
 
--include $(RIOTCPU)/efm32/Makefile.features
+include $(RIOTCPU)/efm32/Makefile.features
diff --git a/boards/stm32f0discovery/Makefile.features b/boards/stm32f0discovery/Makefile.features
index 91b62e728402..90a424746c62 100644
--- a/boards/stm32f0discovery/Makefile.features
+++ b/boards/stm32f0discovery/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
 
--include $(RIOTCPU)/stm32f0/Makefile.features
+include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/stm32f3discovery/Makefile.features b/boards/stm32f3discovery/Makefile.features
index 5803f8ab0ecc..bcf8bebc79ad 100644
--- a/boards/stm32f3discovery/Makefile.features
+++ b/boards/stm32f3discovery/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/stm32f3/Makefile.features
+include $(RIOTCPU)/stm32f3/Makefile.features
diff --git a/boards/stm32f429i-disc1/Makefile.features b/boards/stm32f429i-disc1/Makefile.features
index 96a9e75f17b1..b4237735eb74 100644
--- a/boards/stm32f429i-disc1/Makefile.features
+++ b/boards/stm32f429i-disc1/Makefile.features
@@ -7,4 +7,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/stm32f4discovery/Makefile.features b/boards/stm32f4discovery/Makefile.features
index 90926217cf96..4ea4eda46d05 100644
--- a/boards/stm32f4discovery/Makefile.features
+++ b/boards/stm32f4discovery/Makefile.features
@@ -19,4 +19,4 @@ FEATURES_MCU_GROUP = cortex_m4_2
 FEATURES_CONFLICT += periph_spi:periph_dac
 FEATURES_CONFLICT_MSG += "On stm32f4discovery boards there are the same pins for the DAC and/or SPI_0."
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/stm32f769i-disco/Makefile.features b/boards/stm32f769i-disco/Makefile.features
index 3eb7c8002ae1..452d42537520 100644
--- a/boards/stm32f769i-disco/Makefile.features
+++ b/boards/stm32f769i-disco/Makefile.features
@@ -7,4 +7,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m7
 
--include $(RIOTCPU)/stm32f7/Makefile.features
+include $(RIOTCPU)/stm32f7/Makefile.features
diff --git a/boards/stm32l476g-disco/Makefile.features b/boards/stm32l476g-disco/Makefile.features
index b2d1b37ee92e..5fb664c45f53 100644
--- a/boards/stm32l476g-disco/Makefile.features
+++ b/boards/stm32l476g-disco/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
 
--include $(RIOTCPU)/stm32l4/Makefile.features
+include $(RIOTCPU)/stm32l4/Makefile.features
diff --git a/boards/telosb/Makefile.features b/boards/telosb/Makefile.features
index 90d2ee7ac923..3e683cbdf72a 100644
--- a/boards/telosb/Makefile.features
+++ b/boards/telosb/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
 
--include $(RIOTCPU)/msp430fxyz/Makefile.features
+include $(RIOTCPU)/msp430fxyz/Makefile.features
diff --git a/boards/thingy52/Makefile.features b/boards/thingy52/Makefile.features
index 689e988e5d39..f4802828de94 100644
--- a/boards/thingy52/Makefile.features
+++ b/boards/thingy52/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/nrf52/Makefile.features
+include $(RIOTCPU)/nrf52/Makefile.features
diff --git a/boards/ublox-c030-u201/Makefile.features b/boards/ublox-c030-u201/Makefile.features
index f886564c54b7..355e4723d1ec 100644
--- a/boards/ublox-c030-u201/Makefile.features
+++ b/boards/ublox-c030-u201/Makefile.features
@@ -10,4 +10,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
 
--include $(RIOTCPU)/stm32f4/Makefile.features
+include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/waspmote-pro/Makefile.features b/boards/waspmote-pro/Makefile.features
index a218794bebf8..c4cd23b26486 100644
--- a/boards/waspmote-pro/Makefile.features
+++ b/boards/waspmote-pro/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = avr8
 
--include $(RIOTCPU)/atmega1281/Makefile.features
+include $(RIOTCPU)/atmega1281/Makefile.features
diff --git a/boards/yunjia-nrf51822/Makefile.features b/boards/yunjia-nrf51822/Makefile.features
index 0a73e550b875..32008a8330aa 100644
--- a/boards/yunjia-nrf51822/Makefile.features
+++ b/boards/yunjia-nrf51822/Makefile.features
@@ -12,4 +12,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
 
--include $(RIOTCPU)/nrf51/Makefile.features
+include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/z1/Makefile.features b/boards/z1/Makefile.features
index 90d2ee7ac923..3e683cbdf72a 100644
--- a/boards/z1/Makefile.features
+++ b/boards/z1/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
 
--include $(RIOTCPU)/msp430fxyz/Makefile.features
+include $(RIOTCPU)/msp430fxyz/Makefile.features