diff --git a/boards/airfy-beacon/Makefile.features b/boards/airfy-beacon/Makefile.features
index 0696ba299f..893ee7836f 100644
--- a/boards/airfy-beacon/Makefile.features
+++ b/boards/airfy-beacon/Makefile.features
@@ -16,3 +16,5 @@ FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
+
+-include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/arduino-due/Makefile.features b/boards/arduino-due/Makefile.features
index 336368630c..e961596e19 100644
--- a/boards/arduino-due/Makefile.features
+++ b/boards/arduino-due/Makefile.features
@@ -15,3 +15,5 @@ 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
diff --git a/boards/arduino-duemilanove/Makefile.features b/boards/arduino-duemilanove/Makefile.features
index f76efd160e..dea129ce0f 100644
--- a/boards/arduino-duemilanove/Makefile.features
+++ b/boards/arduino-duemilanove/Makefile.features
@@ -1 +1,3 @@
 include $(RIOTBOARD)/arduino-atmega-common/Makefile.features
+
+-include $(RIOTCPU)/atmega328p/Makefile.features
diff --git a/boards/arduino-mega2560/Makefile.features b/boards/arduino-mega2560/Makefile.features
index f76efd160e..ee597e1995 100644
--- a/boards/arduino-mega2560/Makefile.features
+++ b/boards/arduino-mega2560/Makefile.features
@@ -1 +1,3 @@
 include $(RIOTBOARD)/arduino-atmega-common/Makefile.features
+
+-include $(RIOTCPU)/atmega2560/Makefile.features
diff --git a/boards/arduino-mkr1000/Makefile.features b/boards/arduino-mkr1000/Makefile.features
index 3be56220c5..75f211c04c 100644
--- a/boards/arduino-mkr1000/Makefile.features
+++ b/boards/arduino-mkr1000/Makefile.features
@@ -1 +1,3 @@
 include $(RIOTBOARD)/arduino-mkr-common/Makefile.features
+
+-include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/arduino-mkrzero/Makefile.features b/boards/arduino-mkrzero/Makefile.features
index 3be56220c5..75f211c04c 100644
--- a/boards/arduino-mkrzero/Makefile.features
+++ b/boards/arduino-mkrzero/Makefile.features
@@ -1 +1,3 @@
 include $(RIOTBOARD)/arduino-mkr-common/Makefile.features
+
+-include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/arduino-uno/Makefile.features b/boards/arduino-uno/Makefile.features
index f76efd160e..dea129ce0f 100644
--- a/boards/arduino-uno/Makefile.features
+++ b/boards/arduino-uno/Makefile.features
@@ -1 +1,3 @@
 include $(RIOTBOARD)/arduino-atmega-common/Makefile.features
+
+-include $(RIOTCPU)/atmega328p/Makefile.features
diff --git a/boards/arduino-zero/Makefile.features b/boards/arduino-zero/Makefile.features
index db2b2d4cb5..d1690342f3 100644
--- a/boards/arduino-zero/Makefile.features
+++ b/boards/arduino-zero/Makefile.features
@@ -15,3 +15,5 @@ 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
diff --git a/boards/avsextrem/Makefile.features b/boards/avsextrem/Makefile.features
index c44db8d529..7270b062db 100644
--- a/boards/avsextrem/Makefile.features
+++ b/boards/avsextrem/Makefile.features
@@ -9,3 +9,5 @@ FEATURES_PROVIDED += periph_uart
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = arm7
+
+-include $(RIOTCPU)/lpc2387/Makefile.features
diff --git a/boards/b-l072z-lrwan1/Makefile.features b/boards/b-l072z-lrwan1/Makefile.features
index c93f7a3d2b..f2f9ec055d 100644
--- a/boards/b-l072z-lrwan1/Makefile.features
+++ b/boards/b-l072z-lrwan1/Makefile.features
@@ -11,3 +11,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/stm32l0/Makefile.features
diff --git a/boards/calliope-mini/Makefile.features b/boards/calliope-mini/Makefile.features
index 449a3e9d52..cbc118bd37 100644
--- a/boards/calliope-mini/Makefile.features
+++ b/boards/calliope-mini/Makefile.features
@@ -13,3 +13,5 @@ FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/cc2538dk/Makefile.features b/boards/cc2538dk/Makefile.features
index e742706309..6dde5943a0 100644
--- a/boards/cc2538dk/Makefile.features
+++ b/boards/cc2538dk/Makefile.features
@@ -13,3 +13,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
+
+-include $(RIOTCPU)/cc2538/Makefile.features
diff --git a/boards/cc2650stk/Makefile.features b/boards/cc2650stk/Makefile.features
index 8f81826a8b..c0892ea265 100644
--- a/boards/cc2650stk/Makefile.features
+++ b/boards/cc2650stk/Makefile.features
@@ -9,3 +9,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
+
+-include $(RIOTCPU)/cc26x0/Makefile.features
diff --git a/boards/chronos/Makefile.features b/boards/chronos/Makefile.features
index 2d710ba08b..6ce23897f7 100644
--- a/boards/chronos/Makefile.features
+++ b/boards/chronos/Makefile.features
@@ -6,3 +6,5 @@ FEATURES_PROVIDED += periph_rtc
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
+
+-include $(RIOTCPU)/cc430/Makefile.features
diff --git a/boards/ek-lm4f120xl/Makefile.features b/boards/ek-lm4f120xl/Makefile.features
index e7ffe1be3b..954dd8fbe5 100644
--- a/boards/ek-lm4f120xl/Makefile.features
+++ b/boards/ek-lm4f120xl/Makefile.features
@@ -10,3 +10,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_1
+
+-include $(RIOTCPU)/lm4f120/Makefile.features
diff --git a/boards/f4vi1/Makefile.features b/boards/f4vi1/Makefile.features
index d4b3ddc664..7e38681be0 100644
--- a/boards/f4vi1/Makefile.features
+++ b/boards/f4vi1/Makefile.features
@@ -7,3 +7,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_1
+
+-include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/fox/Makefile.features b/boards/fox/Makefile.features
index 639d2ca2cc..14e2bdfc7b 100644
--- a/boards/fox/Makefile.features
+++ b/boards/fox/Makefile.features
@@ -13,3 +13,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
+
+-include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/frdm-k22f/Makefile.features b/boards/frdm-k22f/Makefile.features
index 5cf7e4f9a1..d11a62a55a 100644
--- a/boards/frdm-k22f/Makefile.features
+++ b/boards/frdm-k22f/Makefile.features
@@ -16,3 +16,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_1
+
+-include $(RIOTCPU)/k22f/Makefile.features
diff --git a/boards/frdm-k64f/Makefile.features b/boards/frdm-k64f/Makefile.features
index 5cf7e4f9a1..3ad3f64283 100644
--- a/boards/frdm-k64f/Makefile.features
+++ b/boards/frdm-k64f/Makefile.features
@@ -16,3 +16,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_1
+
+-include $(RIOTCPU)/k64f/Makefile.features
diff --git a/boards/iotlab-a8-m3/Makefile.features b/boards/iotlab-a8-m3/Makefile.features
index 8ae0feee2c..6a08fbcdd3 100644
--- a/boards/iotlab-a8-m3/Makefile.features
+++ b/boards/iotlab-a8-m3/Makefile.features
@@ -1 +1,3 @@
 include $(RIOTBOARD)/iotlab-common/Makefile.features
+
+-include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/iotlab-m3/Makefile.features b/boards/iotlab-m3/Makefile.features
index 8ae0feee2c..6a08fbcdd3 100644
--- a/boards/iotlab-m3/Makefile.features
+++ b/boards/iotlab-m3/Makefile.features
@@ -1 +1,3 @@
 include $(RIOTBOARD)/iotlab-common/Makefile.features
+
+-include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/limifrog-v1/Makefile.features b/boards/limifrog-v1/Makefile.features
index 6f9d385cad..3767f36095 100644
--- a/boards/limifrog-v1/Makefile.features
+++ b/boards/limifrog-v1/Makefile.features
@@ -11,3 +11,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
+
+-include $(RIOTCPU)/stm32l1/Makefile.features
diff --git a/boards/maple-mini/Makefile.features b/boards/maple-mini/Makefile.features
index 792dc9fcb2..19fe833788 100644
--- a/boards/maple-mini/Makefile.features
+++ b/boards/maple-mini/Makefile.features
@@ -11,3 +11,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
+
+-include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/mbed_lpc1768/Makefile.features b/boards/mbed_lpc1768/Makefile.features
index 4edefbfd95..d0b9b55903 100644
--- a/boards/mbed_lpc1768/Makefile.features
+++ b/boards/mbed_lpc1768/Makefile.features
@@ -8,3 +8,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
+
+-include $(RIOTCPU)/lpc1768/Makefile.features
diff --git a/boards/microbit/Makefile.features b/boards/microbit/Makefile.features
index d677586fb5..4f87793d78 100644
--- a/boards/microbit/Makefile.features
+++ b/boards/microbit/Makefile.features
@@ -14,3 +14,5 @@ FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/mips-malta/Makefile.features b/boards/mips-malta/Makefile.features
index bf4ba1fe26..49cd47b422 100644
--- a/boards/mips-malta/Makefile.features
+++ b/boards/mips-malta/Makefile.features
@@ -7,3 +7,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = mips32r2
+
+-include $(RIOTCPU)/mips32r2_common/Makefile.features
diff --git a/boards/msb-430/Makefile.features b/boards/msb-430/Makefile.features
index 26fb1ac1bf..8fdc24d179 100644
--- a/boards/msb-430/Makefile.features
+++ b/boards/msb-430/Makefile.features
@@ -9,3 +9,5 @@ FEATURES_PROVIDED += periph_uart
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
+
+-include $(RIOTCPU)/msp430fxyz/Makefile.features
diff --git a/boards/msb-430h/Makefile.features b/boards/msb-430h/Makefile.features
index a39b503f31..93f404c051 100644
--- a/boards/msb-430h/Makefile.features
+++ b/boards/msb-430h/Makefile.features
@@ -10,3 +10,5 @@ FEATURES_PROVIDED += config
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
+
+-include $(RIOTCPU)/msp430fxyz/Makefile.features
diff --git a/boards/msba2/Makefile.features b/boards/msba2/Makefile.features
index 0c2546373c..6fb31bce00 100644
--- a/boards/msba2/Makefile.features
+++ b/boards/msba2/Makefile.features
@@ -12,3 +12,5 @@ FEATURES_PROVIDED += config
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = arm7
+
+-include $(RIOTCPU)/lpc2387/Makefile.features
diff --git a/boards/msbiot/Makefile.features b/boards/msbiot/Makefile.features
index b94933ef52..cc73c616f4 100644
--- a/boards/msbiot/Makefile.features
+++ b/boards/msbiot/Makefile.features
@@ -14,3 +14,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_1
+
+-include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/mulle/Makefile.features b/boards/mulle/Makefile.features
index 9b5794461b..0f26602fd5 100644
--- a/boards/mulle/Makefile.features
+++ b/boards/mulle/Makefile.features
@@ -17,3 +17,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
+
+-include $(RIOTCPU)/k60/Makefile.features
diff --git a/boards/native/Makefile.features b/boards/native/Makefile.features
index db176c5d76..52d9d04828 100644
--- a/boards/native/Makefile.features
+++ b/boards/native/Makefile.features
@@ -13,3 +13,5 @@ FEATURES_PROVIDED += ethernet
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = x86
+
+-include $(RIOTCPU)/native/Makefile.features
diff --git a/boards/nrf51dongle/Makefile.features b/boards/nrf51dongle/Makefile.features
index 0eb488a51b..89bbd99fad 100644
--- a/boards/nrf51dongle/Makefile.features
+++ b/boards/nrf51dongle/Makefile.features
@@ -13,3 +13,5 @@ FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/nrf52840dk/Makefile.features b/boards/nrf52840dk/Makefile.features
index 748d31f896..eb0fac6f18 100644
--- a/boards/nrf52840dk/Makefile.features
+++ b/boards/nrf52840dk/Makefile.features
@@ -14,3 +14,5 @@ FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/nrf52/Makefile.features
diff --git a/boards/nrf52dk/Makefile.features b/boards/nrf52dk/Makefile.features
index 748d31f896..eb0fac6f18 100644
--- a/boards/nrf52dk/Makefile.features
+++ b/boards/nrf52dk/Makefile.features
@@ -14,3 +14,5 @@ FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/nrf52/Makefile.features
diff --git a/boards/nrf6310/Makefile.features b/boards/nrf6310/Makefile.features
index a99f850276..c25ca12242 100644
--- a/boards/nrf6310/Makefile.features
+++ b/boards/nrf6310/Makefile.features
@@ -14,3 +14,5 @@ FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
+
+-include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/nucleo-f030/Makefile.features b/boards/nucleo-f030/Makefile.features
index e7147b0ecb..d40dcc43f0 100644
--- a/boards/nucleo-f030/Makefile.features
+++ b/boards/nucleo-f030/Makefile.features
@@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/nucleo-f070/Makefile.features b/boards/nucleo-f070/Makefile.features
index e7147b0ecb..d40dcc43f0 100644
--- a/boards/nucleo-f070/Makefile.features
+++ b/boards/nucleo-f070/Makefile.features
@@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/nucleo-f072/Makefile.features b/boards/nucleo-f072/Makefile.features
index 5017d4f193..0a5688bf67 100644
--- a/boards/nucleo-f072/Makefile.features
+++ b/boards/nucleo-f072/Makefile.features
@@ -14,3 +14,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/nucleo-f091/Makefile.features b/boards/nucleo-f091/Makefile.features
index 5017d4f193..0a5688bf67 100644
--- a/boards/nucleo-f091/Makefile.features
+++ b/boards/nucleo-f091/Makefile.features
@@ -14,3 +14,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/nucleo-f103/Makefile.features b/boards/nucleo-f103/Makefile.features
index d1facda292..87bf682b58 100755
--- a/boards/nucleo-f103/Makefile.features
+++ b/boards/nucleo-f103/Makefile.features
@@ -12,3 +12,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
+
+-include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/nucleo-f302/Makefile.features b/boards/nucleo-f302/Makefile.features
index 76904ec22c..38003ab436 100755
--- a/boards/nucleo-f302/Makefile.features
+++ b/boards/nucleo-f302/Makefile.features
@@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
+
+-include $(RIOTCPU)/stm32f3/Makefile.features
diff --git a/boards/nucleo-f303/Makefile.features b/boards/nucleo-f303/Makefile.features
index 76904ec22c..38003ab436 100755
--- a/boards/nucleo-f303/Makefile.features
+++ b/boards/nucleo-f303/Makefile.features
@@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
+
+-include $(RIOTCPU)/stm32f3/Makefile.features
diff --git a/boards/nucleo-f334/Makefile.features b/boards/nucleo-f334/Makefile.features
index f013259130..11fdfe25a3 100644
--- a/boards/nucleo-f334/Makefile.features
+++ b/boards/nucleo-f334/Makefile.features
@@ -12,3 +12,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
+
+-include $(RIOTCPU)/stm32f3/Makefile.features
diff --git a/boards/nucleo-f401/Makefile.features b/boards/nucleo-f401/Makefile.features
index 28e38f9c12..e9b8eeafc4 100644
--- a/boards/nucleo-f401/Makefile.features
+++ b/boards/nucleo-f401/Makefile.features
@@ -14,3 +14,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo-f410/Makefile.features b/boards/nucleo-f410/Makefile.features
index aa6afd8b47..84870a09f8 100644
--- a/boards/nucleo-f410/Makefile.features
+++ b/boards/nucleo-f410/Makefile.features
@@ -14,3 +14,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo-f411/Makefile.features b/boards/nucleo-f411/Makefile.features
index 573a2f2ce2..d0c668935a 100644
--- a/boards/nucleo-f411/Makefile.features
+++ b/boards/nucleo-f411/Makefile.features
@@ -14,3 +14,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo-f446/Makefile.features b/boards/nucleo-f446/Makefile.features
index 28e38f9c12..e9b8eeafc4 100644
--- a/boards/nucleo-f446/Makefile.features
+++ b/boards/nucleo-f446/Makefile.features
@@ -14,3 +14,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo-l053/Makefile.features b/boards/nucleo-l053/Makefile.features
index 58200e3051..7dc79f6efb 100644
--- a/boards/nucleo-l053/Makefile.features
+++ b/boards/nucleo-l053/Makefile.features
@@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/stm32l0/Makefile.features
diff --git a/boards/nucleo-l073/Makefile.features b/boards/nucleo-l073/Makefile.features
index bba9f6e210..83e1163d81 100644
--- a/boards/nucleo-l073/Makefile.features
+++ b/boards/nucleo-l073/Makefile.features
@@ -14,3 +14,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/stm32l0/Makefile.features
diff --git a/boards/nucleo-l152/Makefile.features b/boards/nucleo-l152/Makefile.features
index 322a9f2b42..3e6125be58 100644
--- a/boards/nucleo-l152/Makefile.features
+++ b/boards/nucleo-l152/Makefile.features
@@ -15,3 +15,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
+
+-include $(RIOTCPU)/stm32l1/Makefile.features
diff --git a/boards/nucleo-l476/Makefile.features b/boards/nucleo-l476/Makefile.features
index be20012b0c..586023eb4c 100644
--- a/boards/nucleo-l476/Makefile.features
+++ b/boards/nucleo-l476/Makefile.features
@@ -14,3 +14,5 @@ include $(RIOTBOARD)/nucleo-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
+
+-include $(RIOTCPU)/stm32l4/Makefile.features
diff --git a/boards/nucleo144-f207/Makefile.features b/boards/nucleo144-f207/Makefile.features
index 3504158d02..f3b5d3568d 100644
--- a/boards/nucleo144-f207/Makefile.features
+++ b/boards/nucleo144-f207/Makefile.features
@@ -14,3 +14,5 @@ include $(RIOTBOARD)/nucleo144-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
+
+-include $(RIOTCPU)/stm32f2/Makefile.features
diff --git a/boards/nucleo144-f303/Makefile.features b/boards/nucleo144-f303/Makefile.features
index b6af1ce809..4c74c70edf 100644
--- a/boards/nucleo144-f303/Makefile.features
+++ b/boards/nucleo144-f303/Makefile.features
@@ -12,3 +12,5 @@ include $(RIOTBOARD)/nucleo144-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/stm32f3/Makefile.features
diff --git a/boards/nucleo144-f412/Makefile.features b/boards/nucleo144-f412/Makefile.features
index b780768dbe..8e0c963fa6 100644
--- a/boards/nucleo144-f412/Makefile.features
+++ b/boards/nucleo144-f412/Makefile.features
@@ -14,3 +14,5 @@ include $(RIOTBOARD)/nucleo144-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo144-f413/Makefile.features b/boards/nucleo144-f413/Makefile.features
index e824d2b8c9..fbe7bfcda8 100644
--- a/boards/nucleo144-f413/Makefile.features
+++ b/boards/nucleo144-f413/Makefile.features
@@ -15,3 +15,5 @@ include $(RIOTBOARD)/nucleo144-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo144-f429/Makefile.features b/boards/nucleo144-f429/Makefile.features
index e824d2b8c9..fbe7bfcda8 100644
--- a/boards/nucleo144-f429/Makefile.features
+++ b/boards/nucleo144-f429/Makefile.features
@@ -15,3 +15,5 @@ include $(RIOTBOARD)/nucleo144-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo144-f446/Makefile.features b/boards/nucleo144-f446/Makefile.features
index 2e1586f78c..b4a18e6cf9 100644
--- a/boards/nucleo144-f446/Makefile.features
+++ b/boards/nucleo144-f446/Makefile.features
@@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo144-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/stm32f4/Makefile.features
diff --git a/boards/nucleo144-f722/Makefile.features b/boards/nucleo144-f722/Makefile.features
index ad40e5bab8..608d21bf22 100644
--- a/boards/nucleo144-f722/Makefile.features
+++ b/boards/nucleo144-f722/Makefile.features
@@ -11,3 +11,5 @@ include $(RIOTBOARD)/nucleo144-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m7
+
+-include $(RIOTCPU)/stm32f7/Makefile.features
diff --git a/boards/nucleo144-f746/Makefile.features b/boards/nucleo144-f746/Makefile.features
index e04022bd7c..4d30ca3652 100644
--- a/boards/nucleo144-f746/Makefile.features
+++ b/boards/nucleo144-f746/Makefile.features
@@ -11,3 +11,5 @@ include $(RIOTBOARD)/nucleo144-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m7
+
+-include $(RIOTCPU)/stm32f7/Makefile.features
diff --git a/boards/nucleo144-f767/Makefile.features b/boards/nucleo144-f767/Makefile.features
index e04022bd7c..4d30ca3652 100644
--- a/boards/nucleo144-f767/Makefile.features
+++ b/boards/nucleo144-f767/Makefile.features
@@ -11,3 +11,5 @@ include $(RIOTBOARD)/nucleo144-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m7
+
+-include $(RIOTCPU)/stm32f7/Makefile.features
diff --git a/boards/nucleo32-f031/Makefile.features b/boards/nucleo32-f031/Makefile.features
index 2d7d93ce27..9971f9113e 100644
--- a/boards/nucleo32-f031/Makefile.features
+++ b/boards/nucleo32-f031/Makefile.features
@@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo32-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/nucleo32-f042/Makefile.features b/boards/nucleo32-f042/Makefile.features
index 2d7d93ce27..9971f9113e 100644
--- a/boards/nucleo32-f042/Makefile.features
+++ b/boards/nucleo32-f042/Makefile.features
@@ -13,3 +13,5 @@ include $(RIOTBOARD)/nucleo32-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/nucleo32-f303/Makefile.features b/boards/nucleo32-f303/Makefile.features
index fdc1d9d34a..2d357bc7e0 100644
--- a/boards/nucleo32-f303/Makefile.features
+++ b/boards/nucleo32-f303/Makefile.features
@@ -12,3 +12,5 @@ include $(RIOTBOARD)/nucleo32-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_2
+
+-include $(RIOTCPU)/stm32f3/Makefile.features
diff --git a/boards/nucleo32-l031/Makefile.features b/boards/nucleo32-l031/Makefile.features
index f2ce7419b6..cd58857f2e 100644
--- a/boards/nucleo32-l031/Makefile.features
+++ b/boards/nucleo32-l031/Makefile.features
@@ -12,3 +12,5 @@ include $(RIOTBOARD)/nucleo32-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/stm32l0/Makefile.features
diff --git a/boards/nucleo32-l432/Makefile.features b/boards/nucleo32-l432/Makefile.features
index 754a66d5d8..254f4bc5d9 100644
--- a/boards/nucleo32-l432/Makefile.features
+++ b/boards/nucleo32-l432/Makefile.features
@@ -12,3 +12,5 @@ include $(RIOTBOARD)/nucleo32-common/Makefile.features
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_1
+
+-include $(RIOTCPU)/stm32l4/Makefile.features
diff --git a/boards/nz32-sc151/Makefile.features b/boards/nz32-sc151/Makefile.features
index 36b05e20b5..e10f7ded73 100644
--- a/boards/nz32-sc151/Makefile.features
+++ b/boards/nz32-sc151/Makefile.features
@@ -15,3 +15,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
+
+-include $(RIOTCPU)/stm32l1/Makefile.features
diff --git a/boards/opencm904/Makefile.features b/boards/opencm904/Makefile.features
index 9c388d7b4b..07bb83eba6 100755
--- a/boards/opencm904/Makefile.features
+++ b/boards/opencm904/Makefile.features
@@ -9,3 +9,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
+
+-include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/openmote-cc2538/Makefile.features b/boards/openmote-cc2538/Makefile.features
index 923b5130eb..04a4dc4405 100644
--- a/boards/openmote-cc2538/Makefile.features
+++ b/boards/openmote-cc2538/Makefile.features
@@ -13,3 +13,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
+
+-include $(RIOTCPU)/cc2538/Makefile.features
diff --git a/boards/pba-d-01-kw2x/Makefile.features b/boards/pba-d-01-kw2x/Makefile.features
index e1cea528d2..211d52b23a 100644
--- a/boards/pba-d-01-kw2x/Makefile.features
+++ b/boards/pba-d-01-kw2x/Makefile.features
@@ -16,3 +16,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/kw2xd/Makefile.features
diff --git a/boards/pca10000/Makefile.features b/boards/pca10000/Makefile.features
index 3141fd04d5..fda4bd670b 100644
--- a/boards/pca10000/Makefile.features
+++ b/boards/pca10000/Makefile.features
@@ -13,3 +13,5 @@ FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
+
+-include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/pca10005/Makefile.features b/boards/pca10005/Makefile.features
index 720cb00dc6..35960b40bd 100644
--- a/boards/pca10005/Makefile.features
+++ b/boards/pca10005/Makefile.features
@@ -15,3 +15,5 @@ FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/pic32-clicker/Makefile.features b/boards/pic32-clicker/Makefile.features
index 195a6f4b43..e36345eafc 100644
--- a/boards/pic32-clicker/Makefile.features
+++ b/boards/pic32-clicker/Makefile.features
@@ -9,3 +9,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = mips32r2
+
+-include $(RIOTCPU)/mips_pic32mx/Makefile.features
diff --git a/boards/pic32-wifire/Makefile.features b/boards/pic32-wifire/Makefile.features
index 0fe3095fb6..09ee1723c6 100644
--- a/boards/pic32-wifire/Makefile.features
+++ b/boards/pic32-wifire/Makefile.features
@@ -10,3 +10,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = mips32r2
+
+-include $(RIOTCPU)/mips_pic32mz/Makefile.features
diff --git a/boards/qemu-i386/Makefile.features b/boards/qemu-i386/Makefile.features
index 84ed33d618..a5dbbfeef7 100644
--- a/boards/qemu-i386/Makefile.features
+++ b/boards/qemu-i386/Makefile.features
@@ -4,3 +4,5 @@
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = x86
+
+-include $(RIOTCPU)/x86/Makefile.features
diff --git a/boards/remote-pa/Makefile.features b/boards/remote-pa/Makefile.features
index 923b5130eb..04a4dc4405 100644
--- a/boards/remote-pa/Makefile.features
+++ b/boards/remote-pa/Makefile.features
@@ -13,3 +13,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
+
+-include $(RIOTCPU)/cc2538/Makefile.features
diff --git a/boards/remote-reva/Makefile.features b/boards/remote-reva/Makefile.features
index 923b5130eb..04a4dc4405 100644
--- a/boards/remote-reva/Makefile.features
+++ b/boards/remote-reva/Makefile.features
@@ -13,3 +13,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
+
+-include $(RIOTCPU)/cc2538/Makefile.features
diff --git a/boards/remote-revb/Makefile.features b/boards/remote-revb/Makefile.features
index 923b5130eb..04a4dc4405 100644
--- a/boards/remote-revb/Makefile.features
+++ b/boards/remote-revb/Makefile.features
@@ -13,3 +13,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
+
+-include $(RIOTCPU)/cc2538/Makefile.features
diff --git a/boards/samd21-xpro/Makefile.features b/boards/samd21-xpro/Makefile.features
index b037e1c017..8caa68ecfb 100644
--- a/boards/samd21-xpro/Makefile.features
+++ b/boards/samd21-xpro/Makefile.features
@@ -16,3 +16,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
+
+-include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/saml21-xpro/Makefile.features b/boards/saml21-xpro/Makefile.features
index 8f680caccf..cab389b2e7 100644
--- a/boards/saml21-xpro/Makefile.features
+++ b/boards/saml21-xpro/Makefile.features
@@ -15,3 +15,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
+
+-include $(RIOTCPU)/saml21/Makefile.features
diff --git a/boards/samr21-xpro/Makefile.features b/boards/samr21-xpro/Makefile.features
index b037e1c017..8caa68ecfb 100644
--- a/boards/samr21-xpro/Makefile.features
+++ b/boards/samr21-xpro/Makefile.features
@@ -16,3 +16,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
+
+-include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/seeeduino_arch-pro/Makefile.features b/boards/seeeduino_arch-pro/Makefile.features
index 4edefbfd95..d0b9b55903 100644
--- a/boards/seeeduino_arch-pro/Makefile.features
+++ b/boards/seeeduino_arch-pro/Makefile.features
@@ -8,3 +8,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_1
+
+-include $(RIOTCPU)/lpc1768/Makefile.features
diff --git a/boards/slwstk6220a/Makefile.features b/boards/slwstk6220a/Makefile.features
index 63583eed95..5f02cea6dd 100644
--- a/boards/slwstk6220a/Makefile.features
+++ b/boards/slwstk6220a/Makefile.features
@@ -6,3 +6,5 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
 FEATURES_MCU_GROUP = cortex_m4_1
+
+-include $(RIOTCPU)/ezr32wg/Makefile.features
diff --git a/boards/sodaq-autonomo/Makefile.features b/boards/sodaq-autonomo/Makefile.features
index 3b09ac148d..c6527e4317 100644
--- a/boards/sodaq-autonomo/Makefile.features
+++ b/boards/sodaq-autonomo/Makefile.features
@@ -14,3 +14,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
+
+-include $(RIOTCPU)/samd21/Makefile.features
diff --git a/boards/spark-core/Makefile.features b/boards/spark-core/Makefile.features
index 3de96ca4b3..e5b8ec57c0 100644
--- a/boards/spark-core/Makefile.features
+++ b/boards/spark-core/Makefile.features
@@ -9,3 +9,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
+
+-include $(RIOTCPU)/stm32f1/Makefile.features
diff --git a/boards/stm32f0discovery/Makefile.features b/boards/stm32f0discovery/Makefile.features
index 9427aad2be..f80546644c 100644
--- a/boards/stm32f0discovery/Makefile.features
+++ b/boards/stm32f0discovery/Makefile.features
@@ -13,3 +13,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_1
+
+-include $(RIOTCPU)/stm32f0/Makefile.features
diff --git a/boards/stm32f3discovery/Makefile.features b/boards/stm32f3discovery/Makefile.features
index a7008e3bb4..51189a3fbe 100644
--- a/boards/stm32f3discovery/Makefile.features
+++ b/boards/stm32f3discovery/Makefile.features
@@ -14,3 +14,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m4_3
+
+-include $(RIOTCPU)/stm32f3/Makefile.features
diff --git a/boards/stm32f4discovery/Makefile.features b/boards/stm32f4discovery/Makefile.features
index d3faa3eaa7..18c9c9e5da 100644
--- a/boards/stm32f4discovery/Makefile.features
+++ b/boards/stm32f4discovery/Makefile.features
@@ -21,3 +21,5 @@ FEATURES_MCU_GROUP = cortex_m4_2
 # TODO: re-think concept for conflicts based on actual used peripherals...
 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
diff --git a/boards/stm32f7discovery/Makefile.features b/boards/stm32f7discovery/Makefile.features
index d99383943d..cf270f0dec 100644
--- a/boards/stm32f7discovery/Makefile.features
+++ b/boards/stm32f7discovery/Makefile.features
@@ -12,3 +12,5 @@ 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
diff --git a/boards/telosb/Makefile.features b/boards/telosb/Makefile.features
index 26fb1ac1bf..8fdc24d179 100644
--- a/boards/telosb/Makefile.features
+++ b/boards/telosb/Makefile.features
@@ -9,3 +9,5 @@ FEATURES_PROVIDED += periph_uart
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
+
+-include $(RIOTCPU)/msp430fxyz/Makefile.features
diff --git a/boards/udoo/Makefile.features b/boards/udoo/Makefile.features
index 57cf0b41a8..73d88a4f48 100644
--- a/boards/udoo/Makefile.features
+++ b/boards/udoo/Makefile.features
@@ -11,3 +11,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m3_2
+
+-include $(RIOTCPU)/sam3/Makefile.features
diff --git a/boards/waspmote-pro/Makefile.features b/boards/waspmote-pro/Makefile.features
index 5756565617..4e3851d2b6 100644
--- a/boards/waspmote-pro/Makefile.features
+++ b/boards/waspmote-pro/Makefile.features
@@ -9,3 +9,5 @@ FEATURES_PROVIDED += periph_uart
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = avr8
+
+-include $(RIOTCPU)/atmega1281/Makefile.features
diff --git a/boards/wsn430-v1_3b/Makefile.features b/boards/wsn430-v1_3b/Makefile.features
index d9b7460ec5..ded1c05385 100644
--- a/boards/wsn430-v1_3b/Makefile.features
+++ b/boards/wsn430-v1_3b/Makefile.features
@@ -10,3 +10,5 @@ FEATURES_PROVIDED += config
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
+
+-include $(RIOTCPU)/msp430fxyz/Makefile.features
diff --git a/boards/wsn430-v1_4/Makefile.features b/boards/wsn430-v1_4/Makefile.features
index d9b7460ec5..ded1c05385 100644
--- a/boards/wsn430-v1_4/Makefile.features
+++ b/boards/wsn430-v1_4/Makefile.features
@@ -10,3 +10,5 @@ FEATURES_PROVIDED += config
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
+
+-include $(RIOTCPU)/msp430fxyz/Makefile.features
diff --git a/boards/yunjia-nrf51822/Makefile.features b/boards/yunjia-nrf51822/Makefile.features
index 06ecd02a59..e5022629e7 100644
--- a/boards/yunjia-nrf51822/Makefile.features
+++ b/boards/yunjia-nrf51822/Makefile.features
@@ -16,3 +16,5 @@ FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = cortex_m0_2
+
+-include $(RIOTCPU)/nrf51/Makefile.features
diff --git a/boards/z1/Makefile.features b/boards/z1/Makefile.features
index 26fb1ac1bf..8fdc24d179 100644
--- a/boards/z1/Makefile.features
+++ b/boards/z1/Makefile.features
@@ -9,3 +9,5 @@ FEATURES_PROVIDED += periph_uart
 
 # The board MPU family (used for grouping by the CI system)
 FEATURES_MCU_GROUP = msp430
+
+-include $(RIOTCPU)/msp430fxyz/Makefile.features
diff --git a/makefiles/features.inc.mk b/makefiles/features.inc.mk
index adb95de06e..e74cc78662 100644
--- a/makefiles/features.inc.mk
+++ b/makefiles/features.inc.mk
@@ -1,6 +1,5 @@
 # import list of provided features
--include $(RIOTBOARD)/$(BOARD)/Makefile.features
--include $(RIOTCPU)/$(CPU)/Makefile.features
+include $(RIOTBOARD)/$(BOARD)/Makefile.features
 
 DEFAULT_FEATURES += periph_pm