diff --git a/boards/Makefile.include.cortexm_common b/boards/Makefile.include.cortexm_common
deleted file mode 100644
index e3824ca988c630b136cdb77f797c11b31689b8d8..0000000000000000000000000000000000000000
--- a/boards/Makefile.include.cortexm_common
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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 f6d5be3298deac4e5331337a395557a1f489d6f3..3cdcc1f1cf88dc0b6872e88f2384cc939dc20146 100644
--- a/boards/airfy-beacon/Makefile.include
+++ b/boards/airfy-beacon/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 50f448cb264560019f493ef823157245055b2d70..1a3bcc0fe293707f1fcee1e2592f456114ccf005 100644
--- a/boards/arduino-due/Makefile.include
+++ b/boards/arduino-due/Makefile.include
@@ -13,5 +13,5 @@ export OFLAGS = -O binary
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# export board specific includes to the global includes-listing
+export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/cc2538dk/Makefile.include b/boards/cc2538dk/Makefile.include
index 4003e74cbd2a3af6301823fbc9167f55e204da63..248c29c1b45bb233f9b3fcde3f0b6048f8857e51 100644
--- a/boards/cc2538dk/Makefile.include
+++ b/boards/cc2538dk/Makefile.include
@@ -29,5 +29,5 @@ export RESET_FLAGS = $(BINDIR)
 
 export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# export board specific includes to the global includes-listing
+export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/ek-lm4f120xl/Makefile.include b/boards/ek-lm4f120xl/Makefile.include
index ead9f0a41d7f2080c0b4667ecc4605812c27c35f..03b0a11584f5970be50ca774fec0301c57e424df 100644
--- a/boards/ek-lm4f120xl/Makefile.include
+++ b/boards/ek-lm4f120xl/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 ec0c76870b33a845a18d9c63a828581b88a4f6d9..e976ab3b4103d248d9b63cf15c7106f22caae6b3 100644
--- a/boards/f4vi1/Makefile.include
+++ b/boards/f4vi1/Makefile.include
@@ -19,5 +19,5 @@ export OFLAGS = -O binary
 export FFLAGS = write bin/$(BOARD)/$(APPLICATION).hex 0x8000000
 export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(BINDIR)/$(APPLICATION).elf
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 736a5ee29a394e35f76f298537df6ceb2f669d05..a05abe4dae7dcbf2aa8bd748813ccec345991b86 100644
--- a/boards/fox/Makefile.include
+++ b/boards/fox/Makefile.include
@@ -15,5 +15,5 @@ include $(RIOTBOARD)/Makefile.include.openocd
 # include board dependencies
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 53e3e970539f3c5e40d6836df28d59de13e6fbc8..ee6c642370474d9f946226ad6b87fc374ddb7dd6 100644
--- a/boards/frdm-k64f/Makefile.include
+++ b/boards/frdm-k64f/Makefile.include
@@ -24,9 +24,12 @@ export OPENOCD_EXTRA_INIT
 export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/kinetis_common/dist/check-fcfield-elf.sh
 
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
+
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
+
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+
+# 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 57206e0f1b70349f42f80c39f4a89b020b9fe76b..42a0be92f4add3748b19ecd577b8355fc678fcdc 100644
--- a/boards/iotlab-m3/Makefile.include
+++ b/boards/iotlab-m3/Makefile.include
@@ -16,5 +16,5 @@ include $(RIOTBOARD)/Makefile.include.openocd
 # include board dependencies
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 40ab5264018db766d8238496dc4219415d0b07cf..a935b0a03d12ffd7187d5d51b2c49f5c2182cc43 100644
--- a/boards/limifrog-v1/Makefile.include
+++ b/boards/limifrog-v1/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 8dd9ed1e9b7aa040447415917917f1e4bc8bb428..517e252823fd6ab8f3a442ecdc53a6a1715e1234 100644
--- a/boards/mbed_lpc1768/Makefile.include
+++ b/boards/mbed_lpc1768/Makefile.include
@@ -17,5 +17,5 @@ PORT_DARWIN ?= $(shell ls -1 /dev/tty.SLAB_USBtoUART* | head -n 1)
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# export board specific includes to the global includes-listing
+export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/msbiot/Makefile.include b/boards/msbiot/Makefile.include
index 54b3e4817ea32ab630574d477337f66dbbc5bb40..9b05cc5cacb5f9f6cc8e3895998c21e2aa25493b 100644
--- a/boards/msbiot/Makefile.include
+++ b/boards/msbiot/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# export board specific includes to the global includes-listing
+export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/mulle/Makefile.dep b/boards/mulle/Makefile.dep
index d83b5bf3bef161351f6cae34baa26d8d43995f7c..6a590a70e4cce67b9c19957a0ff083bd7937172a 100644
--- a/boards/mulle/Makefile.dep
+++ b/boards/mulle/Makefile.dep
@@ -6,9 +6,6 @@ endif
 # The RTT clock drives the core clock in the default configuration
 FEATURES_REQUIRED += periph_rtt
 
-# The RTT clock drives the core clock in the default configuration
-FEATURES_REQUIRED += periph_rtt
-
 # The Mulle uses NVRAM to store persistent variables, such as boot count.
 USEMODULE += nvram_spi
 FEATURES_REQUIRED += periph_spi
diff --git a/boards/mulle/Makefile.include b/boards/mulle/Makefile.include
index 9fa9489a418d800baddef5bcd9fff03c501cd59c..50025b3d4bf3d992c6a2ab569d412d1d4e776ddb 100644
--- a/boards/mulle/Makefile.include
+++ b/boards/mulle/Makefile.include
@@ -115,5 +115,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # include board dependencies
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 4f63a0059107831d93ef84bfeb3920cbbafcb605..19103c1cb5d272caf9d75a56971b341b7ba7d1ee 100644
--- a/boards/nrf51dongle/Makefile.include
+++ b/boards/nrf51dongle/Makefile.include
@@ -22,5 +22,5 @@ export RESET_FLAGS = $(BINDIR)
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 1f2e0e464cadbe112df19fadf1e69a5c3aa5e13d..9841ec1256e28dbe06e652bb4807ebda5bcfb8a7 100644
--- a/boards/nrf52dk/Makefile.include
+++ b/boards/nrf52dk/Makefile.include
@@ -16,5 +16,5 @@ include $(RIOTBOARD)/Makefile.include.jlink
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 6293664add7240227a7a8254dab91afd2b1f9534..6d78a23280aa5bed859aa644afc411c07846556c 100644
--- a/boards/nrf6310/Makefile.include
+++ b/boards/nrf6310/Makefile.include
@@ -22,5 +22,5 @@ export RESET_FLAGS = $(BINDIR)
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 cf2396f504b3ec4434a1aa1d9aa104ebbdabe02f..82ed8e988beff225f8d57ac9d211e446b7f62a5f 100644
--- a/boards/nucleo-f091/Makefile.include
+++ b/boards/nucleo-f091/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 56acab42742c910a2ffad21481a6b5cb31a52c78..1ae8f0012d68e93169162cd08049108193148965 100755
--- a/boards/nucleo-f103/Makefile.include
+++ b/boards/nucleo-f103/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 abc0f862d924252fc7d6bd0a9cb43256b631e72a..63e3e02739e34853b1b9ebb6bff360feede14a48 100755
--- a/boards/nucleo-f303/Makefile.include
+++ b/boards/nucleo-f303/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 9fe952f6b31bb076c83cff328815cc35404773fa..4feabd92029c65f33d4be268ab86859be169e94f 100644
--- a/boards/nucleo-f334/Makefile.include
+++ b/boards/nucleo-f334/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 a80e9dff7d2e8c634f9c88f2733a538a42ff4dbf..da3438372ba7a17bae296f272b8c060c0ef098b0 100644
--- a/boards/nucleo-f401/Makefile.include
+++ b/boards/nucleo-f401/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 d7343135019a503566ed65186a5ba520dc96e9d6..d2bf5ec65648832df7bd2d9ec1887fa917168acd 100644
--- a/boards/nucleo-l1/Makefile.include
+++ b/boards/nucleo-l1/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 faf17d41e837891440b25c61796b27e6d820a054..2ed848a1c7fe6a42c4300d626234015bcb8d22d1 100644
--- a/boards/openmote-cc2538/Makefile.include
+++ b/boards/openmote-cc2538/Makefile.include
@@ -21,5 +21,5 @@ export RESET_FLAGS = $(BINDIR)
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 49dd30be4a042cc98a7c051649999861d2db213b..2f0d9dd9d0794a68422eb92ebad2068bd3873d12 100644
--- a/boards/pba-d-01-kw2x/Makefile.include
+++ b/boards/pba-d-01-kw2x/Makefile.include
@@ -28,9 +28,12 @@ export OPENOCD_EXTRA_INIT
 export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/kinetis_common/dist/check-fcfield-elf.sh
 
 include $(RIOTBOARD)/$(BOARD)/Makefile.dep
+
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
+
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+
+# 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 04bfc45d9e4c9f303062a3b2eedadf21e344410f..021d33363e57b2fcfd8572443d547858a45792c9 100644
--- a/boards/pca10000/Makefile.include
+++ b/boards/pca10000/Makefile.include
@@ -22,5 +22,5 @@ export RESET_FLAGS = $(BINDIR)
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 6293664add7240227a7a8254dab91afd2b1f9534..6d78a23280aa5bed859aa644afc411c07846556c 100644
--- a/boards/pca10005/Makefile.include
+++ b/boards/pca10005/Makefile.include
@@ -22,5 +22,5 @@ export RESET_FLAGS = $(BINDIR)
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# export board specific includes to the global includes-listing
+export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
diff --git a/boards/remote/Makefile.include b/boards/remote/Makefile.include
index f1b1d9c00d97e1227b53293b045f828d99041501..bdc2f0efb7ad2d541b979438a1b29ebc0ad12e4e 100644
--- a/boards/remote/Makefile.include
+++ b/boards/remote/Makefile.include
@@ -35,5 +35,5 @@ export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 6eb631cd1737e01cca64632d5aef658b6dd8a672..88238eb814139a4ee367564d16f15e1508bf988b 100644
--- a/boards/saml21-xpro/Makefile.include
+++ b/boards/saml21-xpro/Makefile.include
@@ -13,5 +13,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 db23d819ac38b00146f5c1191e581ba58cde32b4..a30b8f2fd51bd8a0e3fc423e7cf06d06333915d4 100644
--- a/boards/samr21-xpro/Makefile.include
+++ b/boards/samr21-xpro/Makefile.include
@@ -27,5 +27,5 @@ endif
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 e20b096b01a9950c7aedc08712dce93cccccfb09..8352d79ad250cb2d849015796019f526274e5e4e 100644
--- a/boards/slwstk6220a/Makefile.include
+++ b/boards/slwstk6220a/Makefile.include
@@ -16,5 +16,5 @@ include $(RIOTBOARD)/Makefile.include.jlink
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 8ca76ff9c6809cd5c300fd34b991793a03f78d44..57149595ebf1f89fc4c31ec30376bf653b3110bc 100644
--- a/boards/spark-core/Makefile.include
+++ b/boards/spark-core/Makefile.include
@@ -24,5 +24,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 1916caaabeaa7b7f47d66e5b7c4b69a8a9ff737d..b7f480a9b2f476cdff97ffb09a37da471b21324a 100644
--- a/boards/stm32f0discovery/Makefile.include
+++ b/boards/stm32f0discovery/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 fef01aa1d4b6dfb0ddd494eb48ddc0722e716333..642cfe7a4d9873f7cebeaa8473df2581e6a6d346 100644
--- a/boards/stm32f3discovery/Makefile.include
+++ b/boards/stm32f3discovery/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 fa75792a0da784cb5af1771446343c6021360cd9..bcecac524a82c7ed98fe5036e3b0cdab1bec1c4c 100644
--- a/boards/stm32f4discovery/Makefile.include
+++ b/boards/stm32f4discovery/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 d74211959f12261718f748f0502e333111bf45b6..11b417d86262b3fb8e21cbaa539bd37c9970bda9 100644
--- a/boards/udoo/Makefile.include
+++ b/boards/udoo/Makefile.include
@@ -23,5 +23,5 @@ export FFLAGS = -R -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 072341a49d9925883986445dd4922926c00fc16b..85e9b4381092eee98ee02a61005fe399a577e08f 100644
--- a/boards/weio/Makefile.include
+++ b/boards/weio/Makefile.include
@@ -17,5 +17,5 @@ PORT_DARWIN ?= $(shell ls -1 /dev/tty.SLAB_USBtoUART* | head -n 1)
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# 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 f6d5be3298deac4e5331337a395557a1f489d6f3..3cdcc1f1cf88dc0b6872e88f2384cc939dc20146 100644
--- a/boards/yunjia-nrf51822/Makefile.include
+++ b/boards/yunjia-nrf51822/Makefile.include
@@ -12,5 +12,5 @@ include $(RIOTBOARD)/Makefile.include.serial
 # this board uses openocd
 include $(RIOTBOARD)/Makefile.include.openocd
 
-# include cortex defaults
-include $(RIOTBOARD)/Makefile.include.cortexm_common
+# export board specific includes to the global includes-listing
+export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include