diff --git a/boards/wsn430-v1_4/Makefile b/boards/wsn430-v1_4/Makefile
index 7f7fba05e..6d7ece3cb 100644
--- a/boards/wsn430-v1_4/Makefile
+++ b/boards/wsn430-v1_4/Makefile
@@ -1,4 +1,4 @@
-MODULE =$(BOARD)_base
+MODULE = $(BOARD)_base
 
 DIRS = $(RIOTBOARD)/wsn430-common
 
diff --git a/boards/wsn430-v1_4/Makefile.dep b/boards/wsn430-v1_4/Makefile.dep
index 52516208b..4e36d0ff5 100644
--- a/boards/wsn430-v1_4/Makefile.dep
+++ b/boards/wsn430-v1_4/Makefile.dep
@@ -1 +1 @@
-USEMODULE += msp430_common
\ No newline at end of file
+USEMODULE += msp430_common
diff --git a/boards/wsn430-v1_4/Makefile.include b/boards/wsn430-v1_4/Makefile.include
index a5ba9a0c9..88b3700a3 100644
--- a/boards/wsn430-v1_4/Makefile.include
+++ b/boards/wsn430-v1_4/Makefile.include
@@ -1,4 +1,13 @@
-export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include
+export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include
+
+ifeq (,$(findstring cc2420,$(USEMODULE)))
+	USEMODULE += cc2420
+endif
+
+ifneq (,$(findstring cc2420,$(USEMODULE)))
+	INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include \
+				-I$(RIOTBASE)/sys/net/include
+endif
 
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
 include $(RIOTBOARD)/wsn430-common/Makefile.include
diff --git a/examples/default/Makefile b/examples/default/Makefile
index 81c1fa030..f5d01c389 100644
--- a/examples/default/Makefile
+++ b/examples/default/Makefile
@@ -48,10 +48,6 @@ endif
 ifneq (,$(findstring wsn430-v1_3b,$(BOARD)))
 	USEMODULE += cc110x_ng
 endif
-ifneq (,$(findstring wsn430-v1_4,$(BOARD)))
-	USEMODULE += cc2420
-	export INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include
-endif
 ifneq (,$(findstring msb-430h,$(BOARD)))
 	USEMODULE += cc110x_ng
 endif