diff --git a/Makefile.modules b/Makefile.modules
index 2cc5ff9f8858fbdd462365108a68dc67c82d631d..a0a173467d153206ff16380ca4f8400c9deb611e 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -15,4 +15,3 @@ include $(RIOTBASE)/Makefile.dep
 
 export USEMODULE
 
-export INCLUDES += -I$(RIOTBASE)/core/include
diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include
index d21fc1215df92e519691f0e5d0161e59b57d8774..3fc5dc1c4e60aea6e0afeb858b44a99518c78b9b 100644
--- a/boards/msb-430-common/Makefile.include
+++ b/boards/msb-430-common/Makefile.include
@@ -12,7 +12,7 @@ export AS = $(PREFIX)as
 export LINK = $(PREFIX)gcc
 export SIZE = $(PREFIX)size
 export OBJCOPY = $(PREFIX)objcopy
-export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)/startup.o
+export LINKFLAGS = -mmcu=$(MCU) -lgcc
 TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
 export HEXFILE = bin/$(PROJECT).hex
 
@@ -36,5 +36,5 @@ endif
 export FFLAGS += "prog $(HEXFILE)"
 
 export USEMODULE += msp430_common 
-export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I$(RIOTBOARD)/msb-430-common/include
+export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I$(RIOTBOARD)/msb-430-common/include -I$(RIOTBOARD)/msb-430-common/drivers/include
 export OFLAGS = -O ihex
diff --git a/core/Makefile b/core/Makefile
index 6a5709576b9dacc98ad40c16b214c47ec9bf846c..57938d4829d786547db169aefb062e3bfc1f9ccc 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1,5 +1,5 @@
 MODULE =core
 
-INCLUDES += -Iinclude/ -I../sys/include -I../sys/lib -I$(RIOTBASE)/drivers/include -I$(RIOTCPU)/$(CPU)/include
+INCLUDES = -Iinclude -I$(RIOTBASE)/sys/include -I$(RIOTCPU)/$(CPU)/include
 
 include $(RIOTBASE)/Makefile.base
diff --git a/drivers/Makefile b/drivers/Makefile
index d2f4914a21d0a84f3aca6d2e16d8931b8a99eed5..709eb35d7aeac0ca118f3b566ecb219bc43fbcbb 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,4 +1,5 @@
 MODULE = drivers
+INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(CURDIR)/include -Iinclude -I$(RIOTBASE)/sys/net/include
 
 DIRS=
 ifneq (,$(findstring powermon,$(USEMODULE)))
@@ -45,6 +46,3 @@ include $(RIOTBASE)/Makefile.base
 clean::
 	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
-
-
-
diff --git a/drivers/at86rf231/Makefile b/drivers/at86rf231/Makefile
index 24a3dea93aa53dbdfdc6e58d6f3c2096b56f2b1a..c3b9d941754d7a507f540083fe62ffb9cdc10adf 100644
--- a/drivers/at86rf231/Makefile
+++ b/drivers/at86rf231/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -Iinclude/ -I$(RIOTBASE)/sys/net/include
 MODULE =at86rf231
 
 DIRS =
diff --git a/drivers/cc110x/Makefile b/drivers/cc110x/Makefile
index 4589024645712a40baadf5b17f3c14b5ee71f0a6..46b179742b6a3e0ea5d8958176a1fa0e27edb137 100644
--- a/drivers/cc110x/Makefile
+++ b/drivers/cc110x/Makefile
@@ -1,7 +1,4 @@
 MODULE =cc110x
 
-INCLUDES += -I$(RIOTBASE)/sys/net/include
-
 include $(MAKEBASE)/Makefile.base
 
-
diff --git a/drivers/cc110x_ng/Makefile b/drivers/cc110x_ng/Makefile
index 997aea9aeacc930a9d762d54223e8a8a4fe5ada2..f812c2980120b196ade264e7b63d18c887c4815b 100644
--- a/drivers/cc110x_ng/Makefile
+++ b/drivers/cc110x_ng/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I$(RIOTBASE)/core/include -I../../ -Iinclude/
 MODULE =cc110x_ng
 
 DIRS =
diff --git a/drivers/cc2420/Makefile b/drivers/cc2420/Makefile
index 9c1a751946f9459f6171962ae268b24fc8a4d518..786dea6b2d579d5e57b5760828b0c73fe0c63199 100644
--- a/drivers/cc2420/Makefile
+++ b/drivers/cc2420/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/sys/include  -I$(RIOTBASE)/core/include -Iinclude/ -I$(RIOTBASE)/sys/net/include
 MODULE =cc2420
 
 DIRS =
diff --git a/drivers/lm75a/Makefile b/drivers/lm75a/Makefile
index 6c0a13b1b2b1173228af030c7be4e430bd3bd544..b9c7862ef585013c57b237f04f6463df360e0019 100644
--- a/drivers/lm75a/Makefile
+++ b/drivers/lm75a/Makefile
@@ -1,5 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include -I$(RIOTBOARD)/$(BOARD)/include
 MODULE =lm75a
 include $(MAKEBASE)/Makefile.base
 
-
diff --git a/drivers/ltc4150/Makefile b/drivers/ltc4150/Makefile
index 1365fbf9261ae2cbaf730313af34868d12ad25d4..c87af4187d4d566777bd95cdaccc64c0a9d5a40b 100644
--- a/drivers/ltc4150/Makefile
+++ b/drivers/ltc4150/Makefile
@@ -1,5 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/core/include -I../include/
 MODULE =ltc4150
 include $(MAKEBASE)/Makefile.base
 
-
diff --git a/drivers/sht11/Makefile b/drivers/sht11/Makefile
index 51acccc9827fc8ac4eb445d9a5cfd8a0019a6a68..71ca4388be1e554322b1680d667825cd82a3a9ef 100644
--- a/drivers/sht11/Makefile
+++ b/drivers/sht11/Makefile
@@ -1,5 +1,3 @@
-INCLUDES += -I$(RIOTBASE)/core/include -I../include -I$(RIOTBOARD)/$(BOARD)
 MODULE =sht11
 include $(MAKEBASE)/Makefile.base
 
-
diff --git a/drivers/srf02/Makefile b/drivers/srf02/Makefile
index 2f8bb4541c3f0e3018c21108bec5fc6cd510fddf..55d8977687f95bf61c9b9220d4853b4c408c5972 100644
--- a/drivers/srf02/Makefile
+++ b/drivers/srf02/Makefile
@@ -1,5 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include
 MODULE =srf02
 include $(MAKEBASE)/Makefile.base
 
-
diff --git a/drivers/srf08/Makefile b/drivers/srf08/Makefile
index b5919cbf30142ec280f53c091391cce0466caae0..7980d3ed2b517583da6ea643ab38dedc5abd8641 100644
--- a/drivers/srf08/Makefile
+++ b/drivers/srf08/Makefile
@@ -1,5 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include
 MODULE =srf08
 include $(MAKEBASE)/Makefile.base
 
-
diff --git a/sys/Makefile b/sys/Makefile
index 433d97beaca38414053c1d5b8833910e6921ff8e..020f0c24ec0795f443de9efb915cbe57c952db89 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,4 +1,4 @@
-INCLUDES += -Iinclude -I$(RIOTBASE)/drivers/ -I$(RIOTBASE)/drivers/include -Ilib -I$(RIOTCPU)/$(CPU)/include -Inet -I../core/include
+export INCLUDES = -Iinclude -I$(CURDIR)/include -I$(RIOTBASE)/sys/net/include -I$(RIOTBASE)/drivers/include -I$(RIOTCPU)/$(CPU)/include -I$(RIOTBASE)/core/include
 
 MODULE =sys
 ifneq (,$(findstring auto_init,$(USEMODULE)))
@@ -10,27 +10,12 @@ endif
 ifneq (,$(findstring lib,$(USEMODULE)))
     DIRS += lib
 endif
-ifneq (,$(findstring cmdd,$(USEMODULE)))
-    DIRS += cmdd
-endif
-ifneq (,$(findstring mprint,$(USEMODULE)))
-    DIRS += mprint
-endif
 ifneq (,$(findstring ping,$(USEMODULE)))
     DIRS += ping
 endif
 ifneq (,$(findstring ps,$(USEMODULE)))
     DIRS += ps
 endif
-ifneq (,$(findstring sync_read,$(USEMODULE)))
-    DIRS += sync_read
-endif
-ifneq (,$(findstring sysmon,$(USEMODULE)))
-    DIRS += sysmon
-endif
-ifneq (,$(findstring mqueue,$(USEMODULE)))
-    DIRS += mqueue
-endif
 ifneq (,$(findstring posix,$(USEMODULE)))
     DIRS += posix
 endif
@@ -55,9 +40,6 @@ endif
 ifneq (,$(findstring destiny,$(USEMODULE)))
     DIRS += net/transport_layer/destiny
 endif
-ifneq (,$(findstring net_mm,$(USEMODULE)))
-    DIRS += net/mm
-endif
 ifneq (,$(findstring net_help,$(USEMODULE)))
     DIRS += net/crosslayer/net_help
 endif
diff --git a/sys/auto_init/Makefile b/sys/auto_init/Makefile
index 8b2b20a9fd5b86299c0a8e74cf2fb3d7119dd516..3d5723287cbfaed0ed24611e1f61a78f29e9f65b 100644
--- a/sys/auto_init/Makefile
+++ b/sys/auto_init/Makefile
@@ -1,4 +1,6 @@
 MODULE = auto_init
 
+INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include
+
 include $(RIOTBASE)/Makefile.base
 
diff --git a/sys/bloom/Makefile b/sys/bloom/Makefile
index 8210b99fe81c1274c39d6e58ae392cea6c715b65..998fbc6c3705c5ff1ec463744afd04ec3f401d36 100644
--- a/sys/bloom/Makefile
+++ b/sys/bloom/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I../include -I$(RIOTBASE)/core/include
 MODULE = bloom
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/config/Makefile b/sys/config/Makefile
index a3329789976d1d6a328f564fe03d1fbef8a5bd59..93a842ac894d48d7e2c856736b3d54eae01bdce0 100644
--- a/sys/config/Makefile
+++ b/sys/config/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I../include -I$(RIOTBASE)/core/include
 MODULE =config
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/hashes/Makefile b/sys/hashes/Makefile
index c14e137b8ba52bdb3b35c2af69e5c49b0084388e..d105e96ecbed2af9e07f685dcdadfaf9b6aa17e3 100644
--- a/sys/hashes/Makefile
+++ b/sys/hashes/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I../include
 MODULE = hashes
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/lib/hash_string.h b/sys/include/hash_string.h
similarity index 100%
rename from sys/lib/hash_string.h
rename to sys/include/hash_string.h
diff --git a/sys/lib/hashtable.h b/sys/include/hashtable.h
similarity index 100%
rename from sys/lib/hashtable.h
rename to sys/include/hashtable.h
diff --git a/sys/lib/hashtable_private.h b/sys/include/hashtable_private.h
similarity index 100%
rename from sys/lib/hashtable_private.h
rename to sys/include/hashtable_private.h
diff --git a/sys/lib/ringbuffer.h b/sys/include/ringbuffer.h
similarity index 100%
rename from sys/lib/ringbuffer.h
rename to sys/include/ringbuffer.h
diff --git a/sys/lib/Makefile b/sys/lib/Makefile
index 2a10bf68c4bcaabda93ec8340f6ebba5a69a88a0..59bee59b8aeeade95442edfc34ea4d7a73a0bc7e 100644
--- a/sys/lib/Makefile
+++ b/sys/lib/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I../include -I../drivers/include -I../lib -I$(RIOTCPU)/$(CPU)/include -I../net -I../../core/include
 MODULE =lib
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/ccn_lite/Makefile b/sys/net/ccn_lite/Makefile
index 6275081efc4068422e206147a361d482293c8bc7..fb713d8cf6ff869cafcbd5335de2c5c8f47916fc 100644
--- a/sys/net/ccn_lite/Makefile
+++ b/sys/net/ccn_lite/Makefile
@@ -1,4 +1,4 @@
 MODULE := ccn_lite
-INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net -I$(RIOTBASE)/cpu/arm_common/include/ -I$(RIOTBASE)/drivers/cc110x_ng/include/ -I$(RIOTBASE)/sys/net/include/
+INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/ccn_lite/util/Makefile b/sys/net/ccn_lite/util/Makefile
index cd74302c3b97b9cf0303274f57224e65b47073c2..14c03c12bf7a8a99e338ad70f972353cd9bb19fb 100644
--- a/sys/net/ccn_lite/util/Makefile
+++ b/sys/net/ccn_lite/util/Makefile
@@ -1,4 +1,3 @@
 MODULE := ccn_lite_client
-INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net -I$(RIOTBASE)/cpu/arm_common/include/ -I$(RIOTBASE)/drivers/cc110x_ng/include/ -I$(RIOTBASE)/sys/net/ccn_lite/ -I$(RIOTBASE)/sys/net/include
-
+INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/ 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/crosslayer/net_help/Makefile b/sys/net/crosslayer/net_help/Makefile
index 026882ed719a58553dc0c4295ec12c113e2ce8fe..0672178a5a16d282ed58df3d81990df76f8c3f80 100644
--- a/sys/net/crosslayer/net_help/Makefile
+++ b/sys/net/crosslayer/net_help/Makefile
@@ -1,4 +1,5 @@
 MODULE:=$(shell basename $(CURDIR))
-INCLUDES += -I$(RIOTBASE)/sys/net/include -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include
+
+INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/link_layer/ieee802154/Makefile b/sys/net/link_layer/ieee802154/Makefile
index ef0639c947821f6f32fa001d0ce4ba04f2a11723..c6e31807e89afcfcae778b012c3aae2940ce857a 100644
--- a/sys/net/link_layer/ieee802154/Makefile
+++ b/sys/net/link_layer/ieee802154/Makefile
@@ -1,4 +1,3 @@
 MODULE:=$(shell basename $(CURDIR))
-INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net/include
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/link_layer/protocol-multiplex/Makefile b/sys/net/link_layer/protocol-multiplex/Makefile
index 07e11ad8799f9f1244105570e3a6a0d521f3d869..10d40e8e0ea785768ceda2cc01233662ef895851 100644
--- a/sys/net/link_layer/protocol-multiplex/Makefile
+++ b/sys/net/link_layer/protocol-multiplex/Makefile
@@ -1,4 +1,3 @@
 MODULE:=protocol_multiplex
-INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/sys/net/include
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/network_layer/sixlowpan/Makefile b/sys/net/network_layer/sixlowpan/Makefile
index cb1b12da88dba7400069d96028ba3b7daefc38d6..619c8e0159150001c7dfba3ce154b8e31c84c8e6 100644
--- a/sys/net/network_layer/sixlowpan/Makefile
+++ b/sys/net/network_layer/sixlowpan/Makefile
@@ -1,4 +1,3 @@
 MODULE:=$(shell basename $(CURDIR))
-INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
-
+INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/routing/rpl/Makefile b/sys/net/routing/rpl/Makefile
index f3edbc5c6bf90e0724f12c3eddadaeb0b3fad01c..0672178a5a16d282ed58df3d81990df76f8c3f80 100644
--- a/sys/net/routing/rpl/Makefile
+++ b/sys/net/routing/rpl/Makefile
@@ -1,4 +1,5 @@
 MODULE:=$(shell basename $(CURDIR))
-INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include  -I$(RIOTBASE)/sys/net/include
+
+INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/transport_layer/destiny/Makefile b/sys/net/transport_layer/destiny/Makefile
index 4541761d71c7fcfd03c17bb1fa633e32480da5fe..bf374f567b3e3c28ac942183873766e54a63dd07 100644
--- a/sys/net/transport_layer/destiny/Makefile
+++ b/sys/net/transport_layer/destiny/Makefile
@@ -1,4 +1,4 @@
 MODULE:=$(shell basename $(CURDIR))
-INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net/include -I$(RIOTBASE)/drivers/cc110x_ng/include  -I$(RIOTBASE)/drivers/cc110x
+INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include  -I$(RIOTBASE)/drivers/cc110x
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/ping/Makefile b/sys/ping/Makefile
index e944af2dce9901ae5aabaa8bcd696c405286907c..037060005c38802b08144bdf27627032fbef114d 100644
--- a/sys/ping/Makefile
+++ b/sys/ping/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
 MODULE =ping
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/posix/Makefile b/sys/posix/Makefile
index bd15ac0af224293dab60dc1f38bb9577f8e4a46c..883763c56e33c76ff1ec0fe076853fcec1523c14 100644
--- a/sys/posix/Makefile
+++ b/sys/posix/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -Iinclude
 MODULE =posix
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/ps/Makefile b/sys/ps/Makefile
index 11d0680982f01aba43255a21adfcdc50ec8976fd..9fec450f4c9b874fd6d31bbb4af8cdfe5bbdc962 100644
--- a/sys/ps/Makefile
+++ b/sys/ps/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
 MODULE =ps
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/semaphore/Makefile b/sys/semaphore/Makefile
index 512a8ea92c61d6ac4d2309aeb1dbf6459c510650..923609e5c9bb77f2f644b168a36de17f8bc70f0c 100644
--- a/sys/semaphore/Makefile
+++ b/sys/semaphore/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I../include -I$(RIOTBASE)/core/include
 MODULE = semaphore
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/shell/Makefile b/sys/shell/Makefile
index ff50b2f7aae61749468bf96c6ede4e4f752e5ad1..0b5b6d05e12659d885a596fbec375b8c6fbbed27 100644
--- a/sys/shell/Makefile
+++ b/sys/shell/Makefile
@@ -1,7 +1,6 @@
 SRC = shell.c
 OBJ = $(SRC:%.c=$(BINDIR)%.o)
 DEP = $(SRC:%.c=$(BINDIR)%.d)
-INCLUDES = -I../include
 
 MODULE =shell
 
diff --git a/sys/shell/commands/Makefile b/sys/shell/commands/Makefile
index 83b0a542134989534180060298bfba7967301cbf..7b7ccb7ae02d5b575d0c3bef197632570b6016b0 100644
--- a/sys/shell/commands/Makefile
+++ b/sys/shell/commands/Makefile
@@ -1,5 +1,4 @@
 SRC = shell_commands.c sc_id.c
-INCLUDES = -I../../../core/include -I../../include -I../../../drivers/include/
 
 ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
 	INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/
diff --git a/sys/timex/Makefile b/sys/timex/Makefile
index 0275f959ac2a304bec2fc181d63f99690e41688f..76b21cf14d04c0b633e7b5ed8775286e45ef45c2 100644
--- a/sys/timex/Makefile
+++ b/sys/timex/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I../include 
 MODULE = timex
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/transceiver/Makefile b/sys/transceiver/Makefile
index 149822e1f155626424a26ff4ef867b94245361d9..7d3cafb276fe1e6f0a98ec32e5e4da4b28f4c491 100644
--- a/sys/transceiver/Makefile
+++ b/sys/transceiver/Makefile
@@ -1,6 +1,6 @@
 MODULE =transceiver
 
-INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
+INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/drivers/at86rf231/include
 
 include $(MAKEBASE)/Makefile.base
 
diff --git a/sys/uart0/Makefile b/sys/uart0/Makefile
index 39ca411fbff335d74d20ff0ffc65be2b6b7aaa35..4d873e0393a683a9171d762c0668150371913476 100644
--- a/sys/uart0/Makefile
+++ b/sys/uart0/Makefile
@@ -1,5 +1,3 @@
-INCLUDES = -I../include -I../drivers/include -I../lib -I$(RIOTCPU)/$(CPU)/include -I../net -I../../core/include 
-
 MODULE =uart0
 
 include $(MAKEBASE)/Makefile.base
diff --git a/sys/vtimer/Makefile b/sys/vtimer/Makefile
index adb12a5d812f2f1b9869cf1198ef2acce293aa0a..35f0910438bdd4dc358d62000cee614b8b201796 100644
--- a/sys/vtimer/Makefile
+++ b/sys/vtimer/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
 MODULE =vtimer
 
 include $(RIOTBASE)/Makefile.base