diff --git a/cpu/Makefile.include.cortexm_common b/cpu/Makefile.include.cortexm_common
index c19cf959d2c417cf55276005ebb55c797defed2a..f7d20a35cd8bcb77be7570a400de3f5bd36968b3 100644
--- a/cpu/Makefile.include.cortexm_common
+++ b/cpu/Makefile.include.cortexm_common
@@ -118,7 +118,7 @@ endif
 include $(RIOTCPU)/cortexm_common/Makefile.include
 
 # Import all toolchain settings
-include $(RIOTBOARD)/Makefile.include.$(TOOLCHAIN)
+include $(RIOTCPU)/Makefile.include.$(TOOLCHAIN)
 
 # use the nano-specs of Newlib when available
 ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
diff --git a/boards/Makefile.include.gnu b/cpu/Makefile.include.gnu
similarity index 100%
rename from boards/Makefile.include.gnu
rename to cpu/Makefile.include.gnu
diff --git a/boards/Makefile.include.llvm b/cpu/Makefile.include.llvm
similarity index 100%
rename from boards/Makefile.include.llvm
rename to cpu/Makefile.include.llvm
diff --git a/cpu/Makefile.include.msp430_common b/cpu/Makefile.include.msp430_common
index 5b9014b8e00b506dc524392d255166f757c3e884..e0cbe468d705b8cc6bbb194f7d1fcca86bb942ee 100644
--- a/cpu/Makefile.include.msp430_common
+++ b/cpu/Makefile.include.msp430_common
@@ -15,4 +15,4 @@ export ASFLAGS += $(CFLAGS_CPU) --defsym $(CPU_MODEL)=1 $(CFLAGS_DEBUG)
 export LINKFLAGS += $(CFLAGS_CPU) -lgcc
 
 # Import all toolchain settings
-include $(RIOTBOARD)/Makefile.include.gnu
+include $(RIOTCPU)/Makefile.include.gnu