diff --git a/Makefile.dep b/Makefile.dep
index 97650d319af42cb486879a0a1300a2a86f2b9db5..83ea7641843582698d291639eca6578d7bdc6f5b 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -10,6 +10,11 @@ ifneq (,$(filter ccn-lite,$(USEPKG)))
     export CFLAGS += -DCCNL_RIOT
 endif
 
+ifneq (,$(filter gnrc_csma_sender,$(USEMODULE)))
+  USEMODULE += random
+  USEMODULE += xtimer
+endif
+
 ifneq (,$(filter nhdp,$(USEMODULE)))
   USEMODULE += conn_udp
   USEMODULE += xtimer
diff --git a/sys/net/gnrc/link_layer/csma_sender/Makefile b/sys/net/gnrc/link_layer/csma_sender/Makefile
index 41589fd0826b3130ad8e9dac87823f2d448b0d35..b2cfa41e9434ecef79808419d25b3cfa925dfd69 100644
--- a/sys/net/gnrc/link_layer/csma_sender/Makefile
+++ b/sys/net/gnrc/link_layer/csma_sender/Makefile
@@ -1,6 +1,3 @@
-MODULE = gnrc_csma_sender
-
-USEMODULE += xtimer
-USEMODULE += random
+MODULE := gnrc_csma_sender
 
 include $(RIOTBASE)/Makefile.base