diff --git a/examples/ccn-lite-client/Makefile b/examples/ccn-lite-client/Makefile
index b7b843db8430873750b2ebb0ccb5ff1352b56fc9..d850dbd18b03e48af721fe62d5ffa1f8109aa50a 100644
--- a/examples/ccn-lite-client/Makefile
+++ b/examples/ccn-lite-client/Makefile
@@ -53,6 +53,6 @@ USEMODULE += crypto_sha256
 USEMODULE += ccn_lite
 USEMODULE += ccn_lite_client
 
-export INCLUDES =  -I$(RIOTBASE)/drivers/cc110x_ng/include/ -I$(RIOTBASE)/sys/net/include
+export INCLUDES = -I$(RIOTBASE)/sys/net/include
 
 include $(RIOTBASE)/Makefile.include
diff --git a/examples/ccn-lite-relay/Makefile b/examples/ccn-lite-relay/Makefile
index 6bff29cfa9b59c986e973a8505c542533c4eafd5..230e536d0b699b3df07f6d55dbb1ade6db33d2c6 100644
--- a/examples/ccn-lite-relay/Makefile
+++ b/examples/ccn-lite-relay/Makefile
@@ -51,6 +51,6 @@ USEMODULE += rtc
 USEMODULE += crypto_sha256
 USEMODULE += ccn_lite
 
-export INCLUDES = -I$(RIOTBASE)/drivers/cc110x_ng/include/ -I$(RIOTBASE)/sys/net/include/
+export INCLUDES = -I$(RIOTBASE)/sys/net/include/
 
 include $(RIOTBASE)/Makefile.include
diff --git a/examples/default/Makefile b/examples/default/Makefile
index 336ad79fe1f0322377f7f12727378fb47a5761f8..81c1fa030e4d48977c551612efadd9effb1d786c 100644
--- a/examples/default/Makefile
+++ b/examples/default/Makefile
@@ -44,11 +44,9 @@ ifneq (,$(findstring msb-430,$(BOARD)))
 endif
 ifneq (,$(findstring chronos,$(BOARD)))
 	USEMODULE += cc110x_ng
-	export INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
 endif
 ifneq (,$(findstring wsn430-v1_3b,$(BOARD)))
 	USEMODULE += cc110x_ng
-	export INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
 endif
 ifneq (,$(findstring wsn430-v1_4,$(BOARD)))
 	USEMODULE += cc2420
@@ -56,7 +54,6 @@ ifneq (,$(findstring wsn430-v1_4,$(BOARD)))
 endif
 ifneq (,$(findstring msb-430h,$(BOARD)))
 	USEMODULE += cc110x_ng
-	export INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
 endif
 ifneq (,$(findstring msba2,$(BOARD)))
 	USEMODULE += sht11
@@ -66,7 +63,6 @@ ifneq (,$(findstring msba2,$(BOARD)))
 	USEMODULE += cc110x_ng
 	USEMODULE += config
 	USEMODULE += random
-	export INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
 endif
 ifneq (,$(findstring native,$(BOARD)))
 	USEMODULE += ltc4150
diff --git a/tests/test_pnet/Makefile b/tests/test_pnet/Makefile
index 01f53df6f9838b71f91793f586f69798941ce311..628e1f5f23eec860b0528352a3bcbbb68b8ab733 100644
--- a/tests/test_pnet/Makefile
+++ b/tests/test_pnet/Makefile
@@ -44,9 +44,4 @@ else
 					   -I$(RIOTBASE)/sys/posix/include
 endif
 
-ifeq ($(BOARD),msba2)
-	export INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include \
-					   -I$(RIOTBASE)/boards/msba2-common/include
-endif
-
 include $(RIOTBASE)/Makefile.include