diff --git a/Makefile.modules b/Makefile.modules
index 5f21180645126adf0e55d28ec8c114054fcf62b5..37bef54fde0fa0405b0c8262f529eea66d791265 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -4,6 +4,8 @@ include $(RIOTBASE)/Makefile.defaultmodules
 USEMODULE := $(filter-out $(filter-out $(FEATURES_PROVIDED), $(FEATURES_OPTIONAL)), $(sort $(USEMODULE)))
 
 INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
+INCLUDES += -I$(RIOTCPU)/$(CPU)/include
+INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
 ED = $(patsubst %,-DMODULE_%,$(subst -,_,$(USEMODULE) $(USEPKG)))
 ED += $(patsubst %,-DFEATURE_%,$(subst -,_,$(filter $(FEATURES_PROVIDED), $(FEATURES_REQUIRED))))
 EXTDEFINES = $(shell echo $(sort $(ED))|tr 'a-z' 'A-Z')
diff --git a/boards/Makefile.include.msp430_common b/boards/Makefile.include.msp430_common
index 385f771f100366fb2a0fb86f6cda2852bab1ed62..5b9014b8e00b506dc524392d255166f757c3e884 100644
--- a/boards/Makefile.include.msp430_common
+++ b/boards/Makefile.include.msp430_common
@@ -16,6 +16,3 @@ export LINKFLAGS += $(CFLAGS_CPU) -lgcc
 
 # Import all toolchain settings
 include $(RIOTBOARD)/Makefile.include.gnu
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/airfy-beacon/Makefile.include b/boards/airfy-beacon/Makefile.include
index 3cdcc1f1cf88dc0b6872e88f2384cc939dc20146..cc8572b7ccbb09ae657335cf6af1a6cbc53213dc 100644
--- a/boards/airfy-beacon/Makefile.include
+++ b/boards/airfy-beacon/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/arduino-due/Makefile.include b/boards/arduino-due/Makefile.include
index 1a3bcc0fe293707f1fcee1e2592f456114ccf005..10b858a74b163a6482570dc2a15ea5893e110c62 100644
--- a/boards/arduino-due/Makefile.include
+++ b/boards/arduino-due/Makefile.include
@@ -12,6 +12,3 @@ export OFLAGS = -O binary
 
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/arduino-mega2560/Makefile.include b/boards/arduino-mega2560/Makefile.include
index 9e8bfa75513ce13f181b7ee2148facf04d672a96..54656f0dff4f3816507df93dc3bfe33d53043bf3 100644
--- a/boards/arduino-mega2560/Makefile.include
+++ b/boards/arduino-mega2560/Makefile.include
@@ -1,4 +1,3 @@
-
 # define the cpu used by the arduino mega2560 board
 export CPU = atmega2560
 
@@ -50,6 +49,3 @@ export ASFLAGS += -ggdb -g3 $(CPU_USAGE) $(FPU_USAGE)
 export LINKFLAGS += -g3 -ggdb -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -static -lgcc -e reset_handler
 export OFLAGS += -j .text -j .data -O ihex
 export FFLAGS += -p m2560 -c $(PROGRAMMER) $(PROGRAMMER_FLAGS) -F -U flash:w:bin/$(BOARD)/$(PROJECT)$(APPLICATION).hex
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/avsextrem/Makefile.include b/boards/avsextrem/Makefile.include
index 3fa007f117565ec8cdee66f71ca9938c127c05d4..814b729673a42d547343290d7bbfccd5dc43df4f 100644
--- a/boards/avsextrem/Makefile.include
+++ b/boards/avsextrem/Makefile.include
@@ -1,2 +1 @@
-export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/
 include $(RIOTBOARD)/msba2-common/Makefile.include
diff --git a/boards/cc2538dk/Makefile.include b/boards/cc2538dk/Makefile.include
index 248c29c1b45bb233f9b3fcde3f0b6048f8857e51..22796de1eec399096517bd6b91d20cc353df1493 100644
--- a/boards/cc2538dk/Makefile.include
+++ b/boards/cc2538dk/Makefile.include
@@ -28,6 +28,3 @@ export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
 export RESET_FLAGS = $(BINDIR)
 
 export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/chronos/Makefile b/boards/chronos/Makefile
index 2c34df46265245117d07d0ee3d307947d6b6b5fb..1f64a6ab76208b2ce1f3a9ba5cd656944a9c8620 100644
--- a/boards/chronos/Makefile
+++ b/boards/chronos/Makefile
@@ -1,6 +1,5 @@
 MODULE = board
 
-INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
 DIRS = drivers
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include
index c09da249964b91bed95da0985d40c480c4e047e6..af3734e43dce12071aed1ca403a99c9660ad908c 100644
--- a/boards/chronos/Makefile.include
+++ b/boards/chronos/Makefile.include
@@ -9,3 +9,5 @@ export FFLAGS = rf2500 "prog $(HEXFILE)"
 
 # include msp430 base makefile
 include $(RIOTBOARD)/Makefile.include.msp430_common
+
+INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
diff --git a/boards/ek-lm4f120xl/Makefile.include b/boards/ek-lm4f120xl/Makefile.include
index 03b0a11584f5970be50ca774fec0301c57e424df..94d73953881f21bdc2f9e5cc10729d3b9db61fac 100644
--- a/boards/ek-lm4f120xl/Makefile.include
+++ b/boards/ek-lm4f120xl/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/f4vi1/Makefile.include b/boards/f4vi1/Makefile.include
index e976ab3b4103d248d9b63cf15c7106f22caae6b3..1d9b4b020060194cba8f96af1f8e182d9afcdc74 100644
--- a/boards/f4vi1/Makefile.include
+++ b/boards/f4vi1/Makefile.include
@@ -18,6 +18,3 @@ export DEBUGSERVER = st-util
 export OFLAGS = -O binary
 export FFLAGS = write bin/$(BOARD)/$(APPLICATION).hex 0x8000000
 export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(BINDIR)/$(APPLICATION).elf
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/fox/Makefile.include b/boards/fox/Makefile.include
index a05abe4dae7dcbf2aa8bd748813ccec345991b86..fe9d27d1083dedcc4087e06caa88a16e7f8387f5 100644
--- a/boards/fox/Makefile.include
+++ b/boards/fox/Makefile.include
@@ -14,6 +14,3 @@ include $(RIOTBOARD)/Makefile.include.openocd
 
 # include board dependencies
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/frdm-k64f/Makefile.include b/boards/frdm-k64f/Makefile.include
index ee6c642370474d9f946226ad6b87fc374ddb7dd6..1ade26105795f72d32c5349fc50b7e278f7fc9e3 100644
--- a/boards/frdm-k64f/Makefile.include
+++ b/boards/frdm-k64f/Makefile.include
@@ -30,6 +30,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/iotlab-m3/Makefile.include b/boards/iotlab-m3/Makefile.include
index 42a0be92f4add3748b19ecd577b8355fc678fcdc..f291c025ca0e853af3ef637d74ff16cc8ac35877 100644
--- a/boards/iotlab-m3/Makefile.include
+++ b/boards/iotlab-m3/Makefile.include
@@ -15,6 +15,3 @@ include $(RIOTBOARD)/Makefile.include.openocd
 
 # include board dependencies
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/limifrog-v1/Makefile.include b/boards/limifrog-v1/Makefile.include
index a935b0a03d12ffd7187d5d51b2c49f5c2182cc43..e40282f74acb1afc6c000cec4d3e27604c7ca50f 100644
--- a/boards/limifrog-v1/Makefile.include
+++ b/boards/limifrog-v1/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include
index 517e252823fd6ab8f3a442ecdc53a6a1715e1234..630e0528f227a81ae6c22a8421eeea512341f153 100644
--- a/boards/mbed_lpc1768/Makefile.include
+++ b/boards/mbed_lpc1768/Makefile.include
@@ -16,6 +16,3 @@ PORT_DARWIN ?= $(shell ls -1 /dev/tty.SLAB_USBtoUART* | head -n 1)
 
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/msba2/Makefile.include b/boards/msba2/Makefile.include
index 2a3412a209f0c0f6f1c9e0c76f34b78b1f3d3fc7..3d18799b8cdca8860996ae08e6c9410e8be25862 100644
--- a/boards/msba2/Makefile.include
+++ b/boards/msba2/Makefile.include
@@ -1,5 +1,3 @@
-export INCLUDES += -I$(RIOTBOARD)/msba2/include
-
 ifneq (,$(filter gnrc_netif_default,$(USEMODULE)))
 	USEMODULE += cc110x gnrc_netdev2 gnrc_cc110x
 endif
diff --git a/boards/msbiot/Makefile.include b/boards/msbiot/Makefile.include
index 9b05cc5cacb5f9f6cc8e3895998c21e2aa25493b..2f8ee328ffa1e0ff008beaed11eb79e9ad5d253f 100644
--- a/boards/msbiot/Makefile.include
+++ b/boards/msbiot/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/mulle/Makefile.include b/boards/mulle/Makefile.include
index 50025b3d4bf3d992c6a2ab569d412d1d4e776ddb..89f73f7287641f0e9b32917a0fd46a17b010f6fd 100644
--- a/boards/mulle/Makefile.include
+++ b/boards/mulle/Makefile.include
@@ -114,6 +114,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # include board dependencies
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/nrf51dongle/Makefile.include b/boards/nrf51dongle/Makefile.include
index 19103c1cb5d272caf9d75a56971b341b7ba7d1ee..618102262203febd6d88783e71815253f5582076 100644
--- a/boards/nrf51dongle/Makefile.include
+++ b/boards/nrf51dongle/Makefile.include
@@ -21,6 +21,3 @@ export RESET_FLAGS = $(BINDIR)
 
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/nrf52dk/Makefile.include b/boards/nrf52dk/Makefile.include
index 9841ec1256e28dbe06e652bb4807ebda5bcfb8a7..e6a37d3ae95efc2030b8572732da5cb086961248 100644
--- a/boards/nrf52dk/Makefile.include
+++ b/boards/nrf52dk/Makefile.include
@@ -15,6 +15,3 @@ include $(RIOTBOARD)/Makefile.include.jlink
 
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/nrf6310/Makefile.include b/boards/nrf6310/Makefile.include
index 6d78a23280aa5bed859aa644afc411c07846556c..6fcf0d217d2618db2d1feb155898ec3279da263a 100644
--- a/boards/nrf6310/Makefile.include
+++ b/boards/nrf6310/Makefile.include
@@ -21,6 +21,3 @@ export RESET_FLAGS = $(BINDIR)
 
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/nucleo-f091/Makefile.include b/boards/nucleo-f091/Makefile.include
index 82ed8e988beff225f8d57ac9d211e446b7f62a5f..97b59fc9e07b6ec7c53b4c24a3d7dcfb3251b6ed 100644
--- a/boards/nucleo-f091/Makefile.include
+++ b/boards/nucleo-f091/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/nucleo-f103/Makefile.include b/boards/nucleo-f103/Makefile.include
index 1ae8f0012d68e93169162cd08049108193148965..a23e997856912c0cb4ef89d22d71aaf3cfd3d7bd 100755
--- a/boards/nucleo-f103/Makefile.include
+++ b/boards/nucleo-f103/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/nucleo-f303/Makefile.include b/boards/nucleo-f303/Makefile.include
index 63e3e02739e34853b1b9ebb6bff360feede14a48..b65ef8a2c5c003faf1ffa9b414b4bb2b8a4a1b5c 100755
--- a/boards/nucleo-f303/Makefile.include
+++ b/boards/nucleo-f303/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/nucleo-f334/Makefile.include b/boards/nucleo-f334/Makefile.include
index 4feabd92029c65f33d4be268ab86859be169e94f..b3d8ea9bea2ac043eb5572dbb347fced5c2d3861 100644
--- a/boards/nucleo-f334/Makefile.include
+++ b/boards/nucleo-f334/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/nucleo-f401/Makefile.include b/boards/nucleo-f401/Makefile.include
index da3438372ba7a17bae296f272b8c060c0ef098b0..5d99f17c20f458b65b0f2d461b6236450ee6be14 100644
--- a/boards/nucleo-f401/Makefile.include
+++ b/boards/nucleo-f401/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/nucleo-l1/Makefile.include b/boards/nucleo-l1/Makefile.include
index d2bf5ec65648832df7bd2d9ec1887fa917168acd..dd05d8f352b9b141bba9cf5ca0160c5216a7fd55 100644
--- a/boards/nucleo-l1/Makefile.include
+++ b/boards/nucleo-l1/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/openmote-cc2538/Makefile.include b/boards/openmote-cc2538/Makefile.include
index 2ed848a1c7fe6a42c4300d626234015bcb8d22d1..0054a3f41915398320d8379791fd08688c043f74 100644
--- a/boards/openmote-cc2538/Makefile.include
+++ b/boards/openmote-cc2538/Makefile.include
@@ -20,6 +20,3 @@ export RESET_FLAGS = $(BINDIR)
 
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/pba-d-01-kw2x/Makefile.include b/boards/pba-d-01-kw2x/Makefile.include
index 2f0d9dd9d0794a68422eb92ebad2068bd3873d12..649e536d1b85d619325d34c8d44ab532e7d6a37c 100644
--- a/boards/pba-d-01-kw2x/Makefile.include
+++ b/boards/pba-d-01-kw2x/Makefile.include
@@ -34,6 +34,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/pca10000/Makefile.include b/boards/pca10000/Makefile.include
index 021d33363e57b2fcfd8572443d547858a45792c9..a596a23c7c17592d0bb9eb517853346b12e344d4 100644
--- a/boards/pca10000/Makefile.include
+++ b/boards/pca10000/Makefile.include
@@ -21,6 +21,3 @@ export RESET_FLAGS = $(BINDIR)
 
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/pca10005/Makefile.include b/boards/pca10005/Makefile.include
index 6d78a23280aa5bed859aa644afc411c07846556c..6fcf0d217d2618db2d1feb155898ec3279da263a 100644
--- a/boards/pca10005/Makefile.include
+++ b/boards/pca10005/Makefile.include
@@ -21,6 +21,3 @@ export RESET_FLAGS = $(BINDIR)
 
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/pttu/Makefile.include b/boards/pttu/Makefile.include
index cb34c2c317342d34528469d89b604048e14cc6dd..814b729673a42d547343290d7bbfccd5dc43df4f 100644
--- a/boards/pttu/Makefile.include
+++ b/boards/pttu/Makefile.include
@@ -1,3 +1 @@
-export INCLUDES += -I$(RIOTBOARD)/pttu/include
-
 include $(RIOTBOARD)/msba2-common/Makefile.include
diff --git a/boards/qemu-i386/Makefile.include b/boards/qemu-i386/Makefile.include
index 581b8a87833f054302d372fff9dd2b55ccea7ac9..fdcbc47a76c831b0d5a9e722d182c4b297b96cbb 100644
--- a/boards/qemu-i386/Makefile.include
+++ b/boards/qemu-i386/Makefile.include
@@ -1,7 +1,6 @@
 include $(RIOTBOARD)/x86-multiboot-common/Makefile.include
 
 CFLAGS += -march=i686 -mtune=i686
-CFLAGS += -I$(RIOTBOARD)/qemu-i386/include
 
 TERMPROG = exec $(RIOTBOARD)/qemu-i386/dist/term.py qemu-system-i386 $(BINDIRBASE) $(HEXFILE)
 
diff --git a/boards/remote/Makefile.include b/boards/remote/Makefile.include
index bdc2f0efb7ad2d541b979438a1b29ebc0ad12e4e..7eb3015c0ecf30899130bdf836c9865f03df1294 100644
--- a/boards/remote/Makefile.include
+++ b/boards/remote/Makefile.include
@@ -34,6 +34,3 @@ export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
 
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/saml21-xpro/Makefile.include b/boards/saml21-xpro/Makefile.include
index 88238eb814139a4ee367564d16f15e1508bf988b..988b77ad764da9b2360fc7aaa94216e905ae6e52 100644
--- a/boards/saml21-xpro/Makefile.include
+++ b/boards/saml21-xpro/Makefile.include
@@ -12,6 +12,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/samr21-xpro/Makefile.include b/boards/samr21-xpro/Makefile.include
index a30b8f2fd51bd8a0e3fc423e7cf06d06333915d4..f16f5d8744aeac5f34ed4468eb8c895d0bba621d 100644
--- a/boards/samr21-xpro/Makefile.include
+++ b/boards/samr21-xpro/Makefile.include
@@ -26,6 +26,3 @@ endif
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/slwstk6220a/Makefile.include b/boards/slwstk6220a/Makefile.include
index 8352d79ad250cb2d849015796019f526274e5e4e..59057d72b3a81f8922b5b7d1fd5cb606221d678d 100644
--- a/boards/slwstk6220a/Makefile.include
+++ b/boards/slwstk6220a/Makefile.include
@@ -15,6 +15,3 @@ include $(RIOTBOARD)/Makefile.include.jlink
 
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/spark-core/Makefile.include b/boards/spark-core/Makefile.include
index 57149595ebf1f89fc4c31ec30376bf653b3110bc..7ab641a02356dc3684c579d49029ebc0ec71c1e1 100644
--- a/boards/spark-core/Makefile.include
+++ b/boards/spark-core/Makefile.include
@@ -23,6 +23,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/stm32f0discovery/Makefile.include b/boards/stm32f0discovery/Makefile.include
index b7f480a9b2f476cdff97ffb09a37da471b21324a..9bce9d87bbe8a70a7dc6d94ad5ccef28ee1a5a75 100644
--- a/boards/stm32f0discovery/Makefile.include
+++ b/boards/stm32f0discovery/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/stm32f3discovery/Makefile.include b/boards/stm32f3discovery/Makefile.include
index 642cfe7a4d9873f7cebeaa8473df2581e6a6d346..fa0286a2569c3cf899949372c250c797c2e9fe52 100644
--- a/boards/stm32f3discovery/Makefile.include
+++ b/boards/stm32f3discovery/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/stm32f4discovery/Makefile.include b/boards/stm32f4discovery/Makefile.include
index bcecac524a82c7ed98fe5036e3b0cdab1bec1c4c..a06d871f3e63997865fe767af116b63223fa840e 100644
--- a/boards/stm32f4discovery/Makefile.include
+++ b/boards/stm32f4discovery/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/udoo/Makefile.include b/boards/udoo/Makefile.include
index 11b417d86262b3fb8e21cbaa539bd37c9970bda9..c732861485264c73513677bcf7b029195dc79b01 100644
--- a/boards/udoo/Makefile.include
+++ b/boards/udoo/Makefile.include
@@ -22,6 +22,3 @@ export FFLAGS = -R -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex
 
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/weio/Makefile.include b/boards/weio/Makefile.include
index 85e9b4381092eee98ee02a61005fe399a577e08f..87461024c1f7ed4330a91da246a25ea490c1343f 100644
--- a/boards/weio/Makefile.include
+++ b/boards/weio/Makefile.include
@@ -16,6 +16,3 @@ PORT_DARWIN ?= $(shell ls -1 /dev/tty.SLAB_USBtoUART* | head -n 1)
 
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/yunjia-nrf51822/Makefile.include b/boards/yunjia-nrf51822/Makefile.include
index 3cdcc1f1cf88dc0b6872e88f2384cc939dc20146..cc8572b7ccbb09ae657335cf6af1a6cbc53213dc 100644
--- a/boards/yunjia-nrf51822/Makefile.include
+++ b/boards/yunjia-nrf51822/Makefile.include
@@ -11,6 +11,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-
-# export board specific includes to the global includes-listing
-export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/cpu/Makefile.include.cortexm_common b/cpu/Makefile.include.cortexm_common
index 1d586fb170f9034c16bb855fbb74a93a8b3e3d41..c19cf959d2c417cf55276005ebb55c797defed2a 100644
--- a/cpu/Makefile.include.cortexm_common
+++ b/cpu/Makefile.include.cortexm_common
@@ -108,9 +108,6 @@ export CFLAGS += -DARM_MATH_CM7
 endif
 endif
 
-# Include CPU specific includes:
-export INCLUDES += -I$(RIOTCPU)/$(CPU)/include
-
 # Explicitly tell the linker to link the startup code.
 #   Without this the interrupt vectors will not be linked correctly!
 ifeq ($(COMMON_STARTUP),)
diff --git a/cpu/atmega2560/Makefile.include b/cpu/atmega2560/Makefile.include
index c4c23436554685503104b5193907dab835e1dd31..a3ddf00809f6380176b79a5773afa4cd10198d78 100644
--- a/cpu/atmega2560/Makefile.include
+++ b/cpu/atmega2560/Makefile.include
@@ -16,13 +16,9 @@ export ATMEGA_COMMON = $(RIOTCPU)/atmega_common/
 # define the linker script to use for this CPU
 #export LINKERSCRIPT = $(RIOTCPU)/$(CPU)/ldscripts/atmega2560.ld
 
-# include CPU specific includes
-export INCLUDES += -I$(RIOTCPU)/$(CPU)/include
-
 # explicitly tell the linker to link the syscalls and startup code.
 #   Without this the interrupt vectors will not be linked correctly!
 export UNDEF += $(BINDIR)cpu/startup.o
 
-
 # CPU depends on the atmega common module, so include it
 include $(ATMEGA_COMMON)Makefile.include
diff --git a/cpu/lpc2387/Makefile.include b/cpu/lpc2387/Makefile.include
index 438dbb2c882ce33e3c8d674ff01ed6764fea329f..afbb4778a01e967e0ed0c3c5af50564dc1b2fe69 100644
--- a/cpu/lpc2387/Makefile.include
+++ b/cpu/lpc2387/Makefile.include
@@ -1,5 +1,3 @@
-INCLUDES += -I$(RIOTCPU)/lpc2387/include
-
 include $(RIOTCPU)/arm7_common/Makefile.include
 
 USEMODULE += arm7_common periph periph_common bitfield newlib
diff --git a/cpu/msp430fxyz/Makefile.include b/cpu/msp430fxyz/Makefile.include
index fd4c822745e381f06aaa94fc7bdcfcedea714cb4..b393e72c8765325938365ae0aaf64d210f7497dc 100644
--- a/cpu/msp430fxyz/Makefile.include
+++ b/cpu/msp430fxyz/Makefile.include
@@ -1,5 +1,3 @@
-INCLUDES += -I$(RIOTCPU)/msp430fxyz/include/
-
 include $(RIOTCPU)/msp430-common/Makefile.include
 
 export USEMODULE += periph periph_common uart_stdio
diff --git a/cpu/x86/Makefile.include b/cpu/x86/Makefile.include
index ab760c38e14ea27159e049e2d4723a99c0036142..d977bb3dfffcd056c0e076be004e2e402d21dff0 100644
--- a/cpu/x86/Makefile.include
+++ b/cpu/x86/Makefile.include
@@ -1,4 +1,2 @@
-export INCLUDES += -I$(RIOTCPU)/x86/include
-
 export USEMODULE += quad_math
 export USEPKG += tlsf