diff --git a/Makefile.include b/Makefile.include
index dc336ef576e090d722492d0b344a82342e816755..6646a29bd1500001ce886586700047b8ba2ff5b7 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 0a73e550b8752a81ee70688c93f448dc789a7da6..32008a8330aacd939dd6ef4156a0b7955c9bdc78 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 8ade47474f65bc909aaa48e71175a1ff66b2772c..b3d37cc98b30c7490acd8940021fea0f4cffb695 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 42491f5a94b6f7f9295179f39acb8b9d60e567cb..c4e9afe55bcd038784a7c3627ffb01704c62c312 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 bc8c9ae857bcd05ca625e58ce8ae770abf0940ba..448878b033f06c060b35b7d4f4d121c5a4bf64bc 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 bc8c9ae857bcd05ca625e58ce8ae770abf0940ba..448878b033f06c060b35b7d4f4d121c5a4bf64bc 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 bc8c9ae857bcd05ca625e58ce8ae770abf0940ba..448878b033f06c060b35b7d4f4d121c5a4bf64bc 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 8ade47474f65bc909aaa48e71175a1ff66b2772c..b3d37cc98b30c7490acd8940021fea0f4cffb695 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 935c7763db336681c1368e078a34312c351e8908..c40fe72246782506305cce422ffd176529424cd4 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 796f784c659d02d18e28cb0f2cedf7d5db22df0c..64a84205f62dc08886cd81dbac4801166d79de28 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 d17c81f04ed652978479986ed7ec0b418b8fa67f..650cfcbfb7a098c4d47bfba364ced537fae3ce12 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 2746637e28f903a8f0ce0a6386b84a93d7b0497a..a621e68b70cd943a675685c67170c67a5c8ccd2c 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 07616adaa92563c3a0e8c68644b791b1baf96558..937a64258777c6cfa5edeefa7e02ba750f17b7c5 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 b6bc44bc8dfe2b597e0a73eaf50eca58433a0dd1..d0e0a42842c37ba988899a96f6cba87da3847bad 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 8da1747fd46ede2b54dd7b0b193f5058e7ae0264..c1a98fac3e87ade3294d8b2c9f683378f0498819 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 8da1747fd46ede2b54dd7b0b193f5058e7ae0264..c1a98fac3e87ade3294d8b2c9f683378f0498819 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 6ce23897f75dcd7fd1c1aea59be7c66e2c95ae77..02a80841386570c327fb3c5e39677da62834334c 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 f524147e52e95d65b68b6c248c12f123fb7d8a5f..3ae850c4c0312ca73e50bfb110a690c4a7e3beca 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 95bbe7047200f6dd091f6bc572f3cb5b22ea6ce7..e040106a4734b7d030f646e7c4667e7af53b89f4 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 8a346e8eae365bce30db4e209d22b4bc013ae37c..fbac3cffa7bb897735aa2da00cc855873e453da0 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 08264c53f96c4e686e6ac5640fc601ee781b8f0f..48981878b9d63c6b2f5f8492271ffef53b9f5374 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 c13bd0d37a0667ce537de5075cc8df6f93771808..f25d1793d057727e8aeed62870a901b6d5200d79 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 f32cd2a3834e60e7e5cd704e2ac7f60d168ac881..b82b654809093644d442b2dc7a8d1dfad03672b2 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 ed6890cde26ca5103bca3151a08f90b0445553e6..bb0aef5413e4c1497dd091e8ec739c74541a5234 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 489e089ba2a55074fdfe4ec5fb4fb59d29f7bf85..dd11a33c75da21f0e7040e0946315651755de092 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 3040df89ed2ff5900e55a3147d17a5e7fc573659..436cef6f18c5925c25bcb282086337dd9c24e572 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 37725672907a9d8e358398c1702addf6dc1b8b0a..4bd8d204d08032e032fdac1b854a553363bbf649 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 ba052b7a220f564ad66cb411530c80c19238a9ee..e3bcc4007e10dde18cad3c06cce4642e911ae2b8 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 ba052b7a220f564ad66cb411530c80c19238a9ee..e3bcc4007e10dde18cad3c06cce4642e911ae2b8 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 4e78995dd68b44215673ae4caae499c4e1925b31..358ba448f54b1f7dbfb3746fbd8437144bf132e9 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 618ba1ecb0e98fae726f97eeef8c999f39906b8f..ab5097f4e3d4e9009d0c7ebea77e785b252d6061 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 19f672f277ec4a7b0e43d7ebbb8ddd97aba03ed4..0de97a3d8143863e567aa71d39f8a92277bc6471 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 7b03bc4e010ef0e9af319f7c9dc2e4106ae32e74..5e143535c62e6b1de8aad13ff9026588c025f787 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 90283b5a667a516a918b00e60b313e272af26075..854f6fde60b5342ad8f9802980c5de0057108768 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 af99dda59d92b73f518c165c6e6a3a1627d1660d..7a8d6d41bfcc2eae061e0f7ac08cafa99343ab2e 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 e5117182f532f0bf1ea87b10354a3733f87cf94f..2c53068f05f3486548ea4baeb17da24d425173e4 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 9c005872fdb34ba21671b72aa8791d21a933aca1..675e1c9b301b7d28893178a6f56c99f2221a7429 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 90d2ee7ac9233add3215c947edf6f0206b1cc312..3e683cbdf72afbfa5cb575a11e59277416fec56e 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 42f5e99725852c32ea3807ef900a35fb8d47af1a..b75b46866204b163802562aa0ebc23418b956ff7 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 2bd10a890cd1998390244365f27bc3827dbcebda..d3f2b4894d880b14fc4c7d989d1627583c688628 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 6706dd5d118d7c8bb37df357e364db41733b019a..777ce74bc0bb4b0466c7cb1ee8a24a68e3f59883 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 5082431ba4c56499a7a381604f3543757d661b8b..3f14443cd2b8c8cd151ab130ca10fe56f195d725 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 1c38b1882998c141ed6c5b44530a438bd656afaa..0b44820578129e5ce353c4842ea76ad44ea4631b 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 be7c033af4a8585391bd9f881bc768538cf023a1..6cec355f5fcd3a7ef2d92ba8c460b48e1047f4af 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 cb9067c7c047e5a572ca5629fcb5ae771b7633e0..d89cb1c08e057fd5c7bb96a1b61517822980ef35 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 0c16e432b95d5a9a52a8ed1f1b1be42c7facad1a..5f5155134ea6c3ca4bef4276da21b9398f0ad27e 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 0c16e432b95d5a9a52a8ed1f1b1be42c7facad1a..5f5155134ea6c3ca4bef4276da21b9398f0ad27e 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 f75770478b06d3c1e66b67adfbf5a08ca6417030..cf8216e993f41d98f61abbe475d9783b2eb5d197 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 a4b143aa2f977b1e3e5b18b2c2eb5df253240bca..b07069454ad2fe8dc4c4dbb20ca9962f4d9e32cd 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 58683adfd9dd353ce604df6f811b2bf3202f6b24..cae52720d68ab28baad8eea27b8a6a33150d244b 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 c5285e983920d51852e4fc7f8bf41d53f8bb0beb..f18b9a12adc3b297940d462082e97af110e81f2e 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 f90aa3b20b58cb8540ff3a9d48fd3e428504273a..0eabc60d252d365ee76624bb772a1c59c018a001 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 cbe74657b00dd034c10b7184597bd74cc8b2379f..187315dcf26de77983fe5ada72749a3eb4669fa4 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 6e84db790c9070ad5a110d65e93a6be1211b084b..68ba32b51b2f86a9197bd4dca484b2fb21d1935f 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 cbe74657b00dd034c10b7184597bd74cc8b2379f..187315dcf26de77983fe5ada72749a3eb4669fa4 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 aaa7efe244657e385aa2c0b3b9baf623efedafc9..aba609b3012b684a37834d4c1d639b42954f584b 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 2ccfc67e0f63cf281ff0df38b08286f7603d300a..cc5a4edef6103b0aa5e058c39e059bd98af8c784 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 12d2e69d15bb719429672d078a4b98e0cacd01a6..6ee3b71d340da1e01a74728dee45a1a27c6a481a 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 dc39d2b1b0db1ecebb1c968299af31db9067a3cb..dea27cd04da426ee9613e10b30d9dff2d1e6a9ac 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 6e16d4fab4d8e9188e2c43a26a14bcd830daec82..44f50b73ea08280e0d7b9ea6e3fbcc51a763ea4e 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 59f12a89d16d9ef5de9ba9a26044daf0ccddb2a0..56263ee68a26661de687609b4ade0da64f660406 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 aa44c10a01c79fded513532e0c1d714fe32f45be..9114fc148c665b86b83bae636220b3fb1a79f1bc 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 a7b79824ef119836cbb70541725dcdb796229237..fe0b424fb3f8b48d024e582b43e6f2a906df89a5 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 12d2e69d15bb719429672d078a4b98e0cacd01a6..6ee3b71d340da1e01a74728dee45a1a27c6a481a 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 0861a00011e821f114343fccc43c64a70453b987..09c0aca52b3d1188da8840db31348201e6a28614 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 0e0df98b3c15d0df67dd359be3a23d24314899d2..0af7baf7b263f9e889666cca9e0587385889b96a 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 b077b170a4a7fbda7eb328cb0875e9e548acb8e6..cf72ba6f2d71c8655889d7cda066387c0af19978 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 b077b170a4a7fbda7eb328cb0875e9e548acb8e6..cf72ba6f2d71c8655889d7cda066387c0af19978 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 f76b2326a686fea7e3c105352b6ce0bdf138a12a..3d52183cfb92aa7d8b213c8b9cb26a94d46427e1 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 151f44822febe004e0b8f9e2a0ab5f074def1304..417203f411acc9a2da1a56b1734450043b6f1c1e 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 cf0fa6655da7a4b0e07eaf58f6bbc7684658b011..8b9e19e63466d5578b0c1447a1f7948473d3ffdb 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 82c72e7a2c52124554ca20121fec3d64edca535c..ad81f0d97e9836a2c33651808a5720d32c40fdce 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 d6c46358217a4cc0ec5e6dd8921a39903033f1aa..97a60e30909d249b3c3c84d4c4869932baae2310 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 3c544af5158636e04d19c3489c9319f08a34eae9..1c3821ce3dbe8e77b25f54d8bfc0e34a4eba263e 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 3c544af5158636e04d19c3489c9319f08a34eae9..1c3821ce3dbe8e77b25f54d8bfc0e34a4eba263e 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 f58f80b5704cf8e4ccdbec93cfbd4763c36614b8..1576991fbac0362958d1841c3ccd2b9cdd44bdad 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 170abf266dd422d47096ce65484592930fd6013a..64084068c591229045706e367b054501e0ddf8fe 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 c6ff493bd9090baa3f8e7a57ab824ea22fb5241d..d055dfbe31e7561efedec0bc2a39fcef628866e0 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 f4f8bb56562b85892375a9bf16434fe793e2a1b9..1e709599991e9e38599b956641f6b54314a56530 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 5452d8bd15b397ac957b467f4a8582cc1bfec289..d5fede5eb9d1820873aa7e259a86746ec5a88413 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 f96279badc53db2842e2507330832c21dfd56e08..d770cd86a716e6b8c1853a19165dc5d50bbd9d53 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 6df4270b8821fedd876bc9d64afb1d8e6a6b471b..03248ec211b31663371979eb133555aebfab5946 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 5e6f5d12271aa9b39df85ac9a73bbf72aac13a32..c45cc17a18ac999d7360a75b50f3a5d30535050a 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 f96279badc53db2842e2507330832c21dfd56e08..d770cd86a716e6b8c1853a19165dc5d50bbd9d53 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 f96279badc53db2842e2507330832c21dfd56e08..d770cd86a716e6b8c1853a19165dc5d50bbd9d53 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 f96279badc53db2842e2507330832c21dfd56e08..d770cd86a716e6b8c1853a19165dc5d50bbd9d53 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 8d41ae6b04e9599c255cf7d7e9de2accc1a47f37..dbd8a3514bf501584af9e6aa15123754e87ba489 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 489e089ba2a55074fdfe4ec5fb4fb59d29f7bf85..dd11a33c75da21f0e7040e0946315651755de092 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 c06d9c2a0a918f217f64be7a41bf107225a9999a..3a03338264e0480ce96ae7a2ef5972f1960dce46 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 489e089ba2a55074fdfe4ec5fb4fb59d29f7bf85..dd11a33c75da21f0e7040e0946315651755de092 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 738e3a8c367564d0f5747a7fc9aee986e95bd4e2..d7bfc182747e1d4267c7e5269511b32b9ce295e5 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 90283b5a667a516a918b00e60b313e272af26075..854f6fde60b5342ad8f9802980c5de0057108768 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 48701b5bc39b98c43c9c74e07b4dd060e28ab37d..9cbc4e2dc8111adc96c9c37e4de46e7e2d386875 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 8268377bb88186c8960fef74599334231db26096..88da743dc3ef41d9c3558eb9d17090af97f7a1d7 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 8268377bb88186c8960fef74599334231db26096..88da743dc3ef41d9c3558eb9d17090af97f7a1d7 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 8268377bb88186c8960fef74599334231db26096..88da743dc3ef41d9c3558eb9d17090af97f7a1d7 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 8268377bb88186c8960fef74599334231db26096..88da743dc3ef41d9c3558eb9d17090af97f7a1d7 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 dfdf8fbb403caf3de7895731706034c40277bd29..15061604d546faa8d3865d0c47b5e35d4fd27480 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 fd418472173c8142a93a3986dbb3260cb730fa57..59b9a673e43f32d2dbac1c4a52f6f25d8e60ac37 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 ac19af1554925a48980aa072bbce08010eac16a5..f22487913bba7252a06e426bb4dd9ad73853e3b7 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 ac19af1554925a48980aa072bbce08010eac16a5..f22487913bba7252a06e426bb4dd9ad73853e3b7 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 c9f7dde1bd24acbf5138a263485f031726f9064c..780803fb54aee5bc4c17ac95e63b329aa95606f9 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 793223669c44d89245c18f9cc3fa7e017d03f162..1d4efab3e96fa8c85d37b5387ea7bcaaaf325cf0 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 793223669c44d89245c18f9cc3fa7e017d03f162..1d4efab3e96fa8c85d37b5387ea7bcaaaf325cf0 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 91b62e7284028c178a78b3c438b2114906cfc32e..90a424746c623217211fe1fc34219d672492e83c 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 5803f8ab0ecc6cf063275eab14e395a254c09c2f..bcf8bebc79add2cd9dfec47098b91b5b4a7ed5c4 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 96a9e75f17b15404e3c2d14644007818eb5f76dd..b4237735eb7417cc1674004ac8e0745eb2434976 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 90926217cf9623f89d6a9688fb534b2f79b40316..4ea4eda46d05362f04de540f9d76933af2ad6fa4 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 3eb7c8002ae1ee81cbee0ada20c7741ef048db0d..452d425375202606bb5b3789bb438a8873221f14 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 b2d1b37ee92e7f018fb408af07e02a3d06cb90e7..5fb664c45f53a0c806f365bf85de379568965950 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 90d2ee7ac9233add3215c947edf6f0206b1cc312..3e683cbdf72afbfa5cb575a11e59277416fec56e 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 689e988e5d391175c2a504972be2229386b612ab..f4802828de94a6cce8acc44775a9cfab3e02247d 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 f886564c54b701ab67270f950238f7e2c5f03508..355e4723d1ec253f21b686bba3e5cd7ceaa51a31 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 a218794bebf81ab67c935ad610b8f83c4de3ebc9..c4cd23b26486b19105ef4998fbda5e50f5ccd47b 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 0a73e550b8752a81ee70688c93f448dc789a7da6..32008a8330aacd939dd6ef4156a0b7955c9bdc78 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 90d2ee7ac9233add3215c947edf6f0206b1cc312..3e683cbdf72afbfa5cb575a11e59277416fec56e 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