diff --git a/Makefile.include b/Makefile.include
index f9c83051455e872100e4cf2ef72e4b610a47a590..5b08f846328460bf5293bbc3769fc2c74553cfb2 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -97,6 +97,8 @@ include $(RIOTBOARD)/$(BOARD)/Makefile.include
 include $(RIOTCPU)/$(CPU)/Makefile.include
 include $(RIOTBASE)/Makefile.dep
 
+USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
+
 ifeq ($(strip $(MCU)),)
 	MCU = $(CPU)
 endif
diff --git a/Makefile.modules b/Makefile.modules
index 6e75fb9a810f94f40397b264d41d619526ca3ce8..5f21180645126adf0e55d28ec8c114054fcf62b5 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -1,7 +1,6 @@
 include $(RIOTBASE)/Makefile.pseudomodules
 include $(RIOTBASE)/Makefile.defaultmodules
 
-USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
 USEMODULE := $(filter-out $(filter-out $(FEATURES_PROVIDED), $(FEATURES_OPTIONAL)), $(sort $(USEMODULE)))
 
 INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include