diff --git a/boards/avsextrem/Makefile.features b/boards/avsextrem/Makefile.features
index 1798b8f9bf81..9ab9387fa733 100644
--- a/boards/avsextrem/Makefile.features
+++ b/boards/avsextrem/Makefile.features
@@ -7,4 +7,4 @@ FEATURES_PROVIDED += periph_uart
 
 # Various other features (if any)
 
-include $(RIOTCPU)/lpc2387/Makefile.features
+include $(RIOTBOARD)/common/msba2/Makefile.features
diff --git a/boards/blackpill/Makefile.features b/boards/blackpill/Makefile.features
index ef95df38ad2f..b8adee88b3f2 100644
--- a/boards/blackpill/Makefile.features
+++ b/boards/blackpill/Makefile.features
@@ -1 +1 @@
--include $(RIOTBOARD)/common/stm32f103c8/Makefile.features
+include $(RIOTBOARD)/common/stm32f103c8/Makefile.features
diff --git a/boards/bluepill/Makefile.features b/boards/bluepill/Makefile.features
index ef95df38ad2f..b8adee88b3f2 100644
--- a/boards/bluepill/Makefile.features
+++ b/boards/bluepill/Makefile.features
@@ -1 +1 @@
--include $(RIOTBOARD)/common/stm32f103c8/Makefile.features
+include $(RIOTBOARD)/common/stm32f103c8/Makefile.features
diff --git a/boards/common/msba2/Makefile.features b/boards/common/msba2/Makefile.features
new file mode 100644
index 000000000000..c391af5a8234
--- /dev/null
+++ b/boards/common/msba2/Makefile.features
@@ -0,0 +1 @@
+include $(RIOTCPU)/lpc2387/Makefile.features
diff --git a/boards/common/remote/Makefile.features b/boards/common/remote/Makefile.features
new file mode 100644
index 000000000000..59a813e43bad
--- /dev/null
+++ b/boards/common/remote/Makefile.features
@@ -0,0 +1 @@
+include $(RIOTCPU)/cc2538/Makefile.features
diff --git a/boards/firefly/Makefile.features b/boards/firefly/Makefile.features
index 438b044dc5f1..63e966cd82c9 100644
--- a/boards/firefly/Makefile.features
+++ b/boards/firefly/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
--include $(RIOTCPU)/cc2538/Makefile.features
+include $(RIOTBOARD)/common/remote/Makefile.features
diff --git a/boards/msb-430/Makefile.features b/boards/msb-430/Makefile.features
index 98d6e62aa163..94c96d14ef03 100644
--- a/boards/msb-430/Makefile.features
+++ b/boards/msb-430/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
 
 # Various other features (if any)
 
-include $(RIOTCPU)/msp430fxyz/Makefile.features
+include $(RIOTBOARD)/common/msb-430/Makefile.features
diff --git a/boards/msb-430h/Makefile.features b/boards/msb-430h/Makefile.features
index c9c4f0b84aec..18d247410ce6 100644
--- a/boards/msb-430h/Makefile.features
+++ b/boards/msb-430h/Makefile.features
@@ -4,4 +4,4 @@ FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
-include $(RIOTCPU)/msp430fxyz/Makefile.features
+include $(RIOTBOARD)/common/msb-430/Makefile.features
diff --git a/boards/msba2/Makefile.features b/boards/msba2/Makefile.features
index 12ebfb47f01a..9e71ba6f194f 100644
--- a/boards/msba2/Makefile.features
+++ b/boards/msba2/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 
-include $(RIOTCPU)/lpc2387/Makefile.features
+include $(RIOTBOARD)/common/msba2/Makefile.features
diff --git a/boards/remote-pa/Makefile.features b/boards/remote-pa/Makefile.features
index 07fde60b0419..82d591d7c7a7 100644
--- a/boards/remote-pa/Makefile.features
+++ b/boards/remote-pa/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += periph_adc
 
-include $(RIOTCPU)/cc2538/Makefile.features
+include $(RIOTBOARD)/common/remote/Makefile.features
diff --git a/boards/remote-reva/Makefile.features b/boards/remote-reva/Makefile.features
index 07fde60b0419..82d591d7c7a7 100644
--- a/boards/remote-reva/Makefile.features
+++ b/boards/remote-reva/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += periph_adc
 
-include $(RIOTCPU)/cc2538/Makefile.features
+include $(RIOTBOARD)/common/remote/Makefile.features
diff --git a/boards/remote-revb/Makefile.features b/boards/remote-revb/Makefile.features
index 07fde60b0419..82d591d7c7a7 100644
--- a/boards/remote-revb/Makefile.features
+++ b/boards/remote-revb/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += periph_adc
 
-include $(RIOTCPU)/cc2538/Makefile.features
+include $(RIOTBOARD)/common/remote/Makefile.features