diff --git a/Makefile.dep b/Makefile.dep
index 82bf855983f9b5240c102200021d1890725c778a..107e3abaa9ae556f6dbcf6b3365d4d20234861e6 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -1,37 +1,21 @@
 ifneq (,$(filter libcoap,$(USEPKG)))
-	ifeq (,$(filter pnet,$(USEMODULE)))
-		USEMODULE += pnet
-	endif
+	USEMODULE += pnet
 endif
 
 ifneq (,$(filter pnet,$(USEMODULE)))
-	ifeq (,$(filter posix,$(USEMODULE)))
-		USEMODULE += posix
-	endif
-	ifeq (,$(filter destiny,$(USEMODULE)))
-		USEMODULE += destiny
-	endif
-	ifeq (,$(filter net_help,$(USEMODULE)))
-		USEMODULE += net_help
-	endif
+	USEMODULE += posix
+	USEMODULE += destiny
+	USEMODULE += net_help
 endif
 
 ifneq (,$(filter destiny,$(USEMODULE)))
-    ifeq (,$(filter sixlowpan,$(USEMODULE)))
-        USEMODULE += sixlowpan
-    endif
-    ifeq (,$(filter net_help,$(USEMODULE)))
-        USEMODULE += net_help
-    endif
-    ifeq (,$(filter vtimer,$(USEMODULE)))
-        USEMODULE += vtimer
-    endif
+    USEMODULE += sixlowpan
+    USEMODULE += net_help
+    USEMODULE += vtimer
 endif
 
 ifneq (,$(filter sixlowborder,$(USEMODULE)))
-    ifeq (,$(filter sixlowpan,$(USEMODULE)))
-        USEMODULE += sixlowpan
-    endif
+    USEMODULE += sixlowpan
 endif
 
 ifneq (,$(filter rpl,$(USEMODULE)))
@@ -43,94 +27,52 @@ ifneq (,$(filter routing,$(USEMODULE)))
 endif
 
 ifneq (,$(filter sixlowpan,$(USEMODULE)))
-    ifeq (,$(filter ieee802154,$(USEMODULE)))
-        USEMODULE += ieee802154
-    endif
-    ifeq (,$(filter net_help,$(USEMODULE)))
-        USEMODULE += net_help
-    endif
-    ifeq (,$(filter net_if,$(USEMODULE)))
-        USEMODULE += net_if
-    endif
-    ifeq (,$(filter posix, $(USEMODULE)))
-        USEMODULE += posix
-    endif
-    ifeq (,$(filter vtimer, $(USEMODULE)))
-        USEMODULE += vtimer
-    endif
+    USEMODULE += ieee802154
+    USEMODULE += net_help
+    USEMODULE += net_if
+    USEMODULE += posix
+    USEMODULE += vtimer
 endif
 
 ifneq (,$(filter posix,$(USEMODULE)))
-	ifeq (,$(filter uart0,$(USEMODULE)))
-		USEMODULE += uart0
-	endif
-	ifeq (,$(filter timex,$(USEMODULE)))
-		USEMODULE += timex
-	endif
-	ifeq (,$(filter vtimer,$(USEMODULE)))
-		USEMODULE += vtimer
-	endif
+	USEMODULE += uart0
+	USEMODULE += timex
+	USEMODULE += vtimer
 endif
 
 ifneq (,$(filter uart0,$(USEMODULE)))
-	ifeq (,$(filter lib,$(USEMODULE)))
-		USEMODULE += lib
-	endif
-	ifeq (,$(filter posix,$(USEMODULE)))
-		USEMODULE += posix
-	endif
+	USEMODULE += lib
+	USEMODULE += posix
 endif
 
 ifneq (,$(filter cc110x%,$(USEMODULE)))
-	ifeq (,$(filter protocol_multiplex,$(USEMODULE)))
-		USEMODULE += protocol_multiplex
-	endif
-	ifeq (,$(filter vtimer,$(USEMODULE)))
-		USEMODULE += vtimer
-	endif
+	USEMODULE += protocol_multiplex
+	USEMODULE += vtimer
 endif
 
 ifneq (,$(filter cc110x_ng,$(USEMODULE)))
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
+	USEMODULE += transceiver
 endif
 
 ifneq (,$(filter cc2420,$(USEMODULE)))
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
-	ifeq (,$(filter ieee802154,$(USEMODULE)))
-		USEMODULE += ieee802154
-	endif
+	USEMODULE += transceiver
+	USEMODULE += ieee802154
 endif
 
 ifneq (,$(filter at86rf231,$(USEMODULE)))
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
-	ifeq (,$(filter ieee802154,$(USEMODULE)))
-		USEMODULE += ieee802154
-	endif
-	ifeq (,$(filter vtimer,$(USEMODULE)))
-		USEMODULE += vtimer
-	endif
+	USEMODULE += transceiver
+	USEMODULE += ieee802154
+	USEMODULE += vtimer
 endif
 
 ifneq (,$(filter vtimer,$(USEMODULE)))
-	ifeq (,$(filter timex,$(USEMODULE)))
-		USEMODULE += timex
-	endif
+	USEMODULE += timex
 endif
 
 ifneq (,$(filter net_if,$(USEMODULE)))
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
+	USEMODULE += transceiver
 endif
 
 ifneq (,$(filter shell_commands,$(USEMODULE)))
-	ifneq (,$(filter net_if,$(USEMODULE)))
-		USEMODULE += net_help
-	endif
+	USEMODULE += net_help
 endif
diff --git a/Makefile.modules b/Makefile.modules
index 0627b5cccc709d882427c11f9efb10b2f4780b1c..27e1b0a5f27be070c3820c627357bcaa63094549 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -6,9 +6,9 @@ USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
 INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
 ED = $(USEMODULE:%=-DMODULE_%)
 ED += $(USEPKG:%=-DMODULE_%)
-EXTDEFINES = $(shell echo $(ED)|tr 'a-z' 'A-Z')
-REALMODULES = $(filter-out $(PSEUDOMODULES), $(USEMODULE))
-export BASELIBS = $(REALMODULES:%= $(BINDIR)%.a)
+EXTDEFINES = $(shell echo $(sort $(ED))|tr 'a-z' 'A-Z')
+REALMODULES = $(filter-out $(PSEUDOMODULES), $(sort $(USEMODULE)))
+export BASELIBS = $(REALMODULES:%=$(BINDIR)%.a)
 
 CFLAGS += $(EXTDEFINES)
 
diff --git a/boards/avsextrem/Makefile.include b/boards/avsextrem/Makefile.include
index 28df46718fc0a5789cfd2decba17f29e377de965..37535057d5cb0adc9c9903a48a6ce5c2a7d8f1da 100644
--- a/boards/avsextrem/Makefile.include
+++ b/boards/avsextrem/Makefile.include
@@ -1,12 +1,8 @@
 export INCLUDES += -I$(RIOTBOARD)/avsextrem/include
 
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	ifeq (,$(filter cc110x,$(USEMODULE)))
-		USEMODULE += cc110x
-	endif
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
+	USEMODULE += cc110x
+	USEMODULE += transceiver
 endif
 
 ifneq (,$(filter cc110x,$(USEMODULE)))
diff --git a/boards/chronos/Makefile.dep b/boards/chronos/Makefile.dep
index 5fdf00ff8ba64278299c1856fae865cd44970be2..9a17ee7da10b3025166732aba56862940d5dd328 100644
--- a/boards/chronos/Makefile.dep
+++ b/boards/chronos/Makefile.dep
@@ -1,8 +1,4 @@
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	ifeq (,$(filter cc110x_ng,$(USEMODULE)))
-		USEMODULE += cc110x_ng
-	endif
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
+	USEMODULE += cc110x_ng
+	USEMODULE += transceiver
 endif
diff --git a/boards/msb-430h/Makefile.dep b/boards/msb-430h/Makefile.dep
index c20de5e788ea1fd5247397f3892b3c0a0fa4494f..67f7a2424fa10c8f4ae91fac576d51223b42a147 100644
--- a/boards/msb-430h/Makefile.dep
+++ b/boards/msb-430h/Makefile.dep
@@ -1,14 +1,8 @@
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	ifeq (,$(filter cc110x_ng,$(USEMODULE)))
-		USEMODULE += cc110x_ng
-	endif
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
+	USEMODULE += cc110x_ng
+	USEMODULE += transceiver
 endif
 
 ifneq (,$(filter cc110x_ng,$(USEMODULE)))
-	ifeq (,$(filter cc110x_spi,$(USEMODULE)))
-		USEMODULE += cc110x_spi
-	endif
+	USEMODULE += cc110x_spi
 endif
diff --git a/boards/msba2-common/Makefile.dep b/boards/msba2-common/Makefile.dep
index 01d2b0809825f9a38e341bda336e6c80aedeba16..6a06e212459afbbb0670eddcb3916007756e995a 100644
--- a/boards/msba2-common/Makefile.dep
+++ b/boards/msba2-common/Makefile.dep
@@ -1,20 +1,12 @@
 ifneq (,$(filter cc110x,$(USEMODULE)))
-	ifeq (,$(filter gpioint,$(USEMODULE)))
-		USEMODULE += gpioint
-	endif
+	USEMODULE += gpioint
 endif
 
 ifneq (,$(filter cc110x_ng,$(USEMODULE)))
-	ifeq (,$(filter cc110x_spi,$(USEMODULE)))
-		USEMODULE += cc110x_spi
-	endif
-	ifeq (,$(filter gpioint,$(USEMODULE)))
-		USEMODULE += gpioint
-	endif
+	USEMODULE += cc110x_spi
+	USEMODULE += gpioint
 endif
 
 ifneq (,$(filter ltc4150,$(USEMODULE)))
-	ifeq (,$(filter gpioint,$(USEMODULE)))
-		USEMODULE += gpioint
-	endif
+	USEMODULE += gpioint
 endif
diff --git a/boards/msba2/Makefile.include b/boards/msba2/Makefile.include
index 750e92254f628a7821125e98c2fc5fdc4999d90a..886bdfd2f81fcfeb6bdbc8ce1dcb9072e11f9df9 100644
--- a/boards/msba2/Makefile.include
+++ b/boards/msba2/Makefile.include
@@ -1,12 +1,8 @@
 export INCLUDES += -I$(RIOTBOARD)/msba2/include
 
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	ifeq (,$(filter cc110x_ng,$(USEMODULE)))
-		USEMODULE += cc110x_ng
-	endif
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
+	USEMODULE += cc110x_ng
+	USEMODULE += transceiver
 endif
 
 include $(RIOTBOARD)/msba2-common/Makefile.include
diff --git a/boards/native/Makefile.dep b/boards/native/Makefile.dep
index 444440b75475ed3208a5cd59db7e68ad4b788e33..c2782aff80269e41802d46ced1282ce1ebce56b1 100644
--- a/boards/native/Makefile.dep
+++ b/boards/native/Makefile.dep
@@ -1,8 +1,4 @@
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	ifeq (,$(filter nativenet,$(USEMODULE)))
-		USEMODULE += nativenet
-	endif
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
+	USEMODULE += nativenet
+	USEMODULE += transceiver
 endif
diff --git a/boards/pttu/Makefile.include b/boards/pttu/Makefile.include
index 289e0e92a1a14dcc2fe920ae09f8cd0789963faf..e73b05efba834c48b1c9e899984f90ddd44a69aa 100644
--- a/boards/pttu/Makefile.include
+++ b/boards/pttu/Makefile.include
@@ -2,12 +2,8 @@ export INCLUDES += -I$(RIOTBOARD)/pttu/include
 
 # Enable this after fixing https://github.com/RIOT-OS/RIOT/issues/659
 #ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-#	ifeq (,$(filter cc110x,$(USEMODULE)))
-#		USEMODULE += cc110x
-#	endif
-#	ifeq (,$(filter transceiver,$(USEMODULE)))
-#		USEMODULE += transceiver
-#	endif
+#	USEMODULE += cc110x
+#	USEMODULE += transceiver
 #endif
 
 include $(RIOTBOARD)/msba2-common/Makefile.include
diff --git a/boards/redbee-econotag/Makefile.include b/boards/redbee-econotag/Makefile.include
index 290044032714dceabe0888d57e4c8353b2d43636..80ade37401e8c86e1df39ddecbfce17279bb3eec 100644
--- a/boards/redbee-econotag/Makefile.include
+++ b/boards/redbee-econotag/Makefile.include
@@ -33,12 +33,8 @@ export INCLUDES += -I$(RIOTCPU)/$(CPU)/maca/include
 export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
 
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	ifeq (,$(filter mc1322x,$(USEMODULE)))
-		USEMODULE += mc1322x
-	endif
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
+	USEMODULE += mc1322x
+	USEMODULE += transceiver
 endif
 
 export UNDEF += $(BINDIR)cpu/startup.o
diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include
index 60cc849660e6057be55afc97fd052d37ff4f1555..8bf7773c6559f43876f3e18fc276b94a7d6a2a42 100644
--- a/boards/telosb/Makefile.include
+++ b/boards/telosb/Makefile.include
@@ -26,12 +26,8 @@ export INCLUDES += -I$(RIOTCPU)/msp430-common/include -I$(RIOTBOARD)/$(BOARD)/in
 export OFLAGS = -O ihex
 
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	ifeq (,$(filter cc2240,$(USEMODULE)))
-		USEMODULE += cc2420
-	endif
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
+	USEMODULE += cc2420
+	USEMODULE += transceiver
 endif
 
 export UNDEF += $(BINDIR)msp430_common/startup.o
diff --git a/boards/wsn430-v1_3b/Makefile.dep b/boards/wsn430-v1_3b/Makefile.dep
index ec40a19435cd24265c3ba0f11c226bf352b08ba3..8fabf8a48472a9b04be9ab9d399b25f92cb1a2f4 100644
--- a/boards/wsn430-v1_3b/Makefile.dep
+++ b/boards/wsn430-v1_3b/Makefile.dep
@@ -1,16 +1,10 @@
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	ifeq (,$(filter cc110x_ng,$(USEMODULE)))
-       USEMODULE += cc110x_ng
-   endif
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-       USEMODULE += transceiver
-   endif
+    USEMODULE += cc110x_ng
+    USEMODULE += transceiver
 endif
 
 ifneq (,$(filter cc110x_ng,$(USEMODULE)))
-    ifeq (,$(filter cc110x_spi,$(USEMODULE)))
-        USEMODULE += cc110x_spi
-    endif
+    USEMODULE += cc110x_spi
 endif
 
 USEMODULE += msp430_common
diff --git a/boards/wsn430-v1_4/Makefile.dep b/boards/wsn430-v1_4/Makefile.dep
index b2a12a0e671b10da62b87071b3cd288acc7dd169..e9314092db391003f754d02ae22854a0f94ed07c 100644
--- a/boards/wsn430-v1_4/Makefile.dep
+++ b/boards/wsn430-v1_4/Makefile.dep
@@ -1,10 +1,6 @@
 USEMODULE += msp430_common
 
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	ifeq (,$(filter cc2420,$(USEMODULE)))
-		USEMODULE += cc2420
-	endif
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
+	USEMODULE += cc2420
+	USEMODULE += transceiver
 endif