diff --git a/Makefile.include b/Makefile.include
index 61b536071d06..bfbdec2f130f 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -363,6 +363,12 @@ include $(RIOTBASE)/Makefile.features
 include $(RIOTMAKE)/pseudomodules.inc.mk
 include $(RIOTMAKE)/defaultmodules.inc.mk
 
+# handle removal of default modules
+USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
+
+# process dependencies
+include $(RIOTMAKE)/dependency_resolution.inc.mk
+
 # Include Board and CPU configuration
 INCLUDES += $(addprefix -I,$(wildcard $(BOARDDIR)/include))
 include $(BOARDDIR)/Makefile.include
@@ -385,12 +391,6 @@ include $(RIOTMAKE)/toolchain/$(TOOLCHAIN).inc.mk
 # For more information, see http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html
 export CCACHE_CPP2=yes
 
-# handle removal of default modules
-USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
-
-# process dependencies
-include $(RIOTMAKE)/dependency_resolution.inc.mk
-
 ifeq ($(strip $(MCU)),)
 	MCU = $(CPU)
 endif
diff --git a/boards/common/nrf52/Makefile.include b/boards/common/nrf52/Makefile.include
index 6897d2664f56..e398c4562750 100644
--- a/boards/common/nrf52/Makefile.include
+++ b/boards/common/nrf52/Makefile.include
@@ -15,14 +15,6 @@ endif
 # setup serial terminal
 include $(RIOTMAKE)/tools/serial.inc.mk
 
-# The following configuration are dependencies specific, specifically they need
-# to know if 'nordic_softdevice_ble' is used. The dependencies are not known
-# because BOARDs Makefile.include are included before Makefile.dep
-# This HACK can be removed either when Makefile.include is included after
-# Makefile.features (see #9913) or if 'nordic_softdevice_ble' is deprecated.
--include $(APPDIR)/Makefile.board.dep
-include $(BOARDDIR)/Makefile.dep
-
 PROGRAMMER ?= jlink
 ifeq (jlink,$(PROGRAMMER))
   # setup JLink for flashing