diff --git a/boards/avsextrem/Makefile.include b/boards/avsextrem/Makefile.include
index 814b72967..3fa007f11 100644
--- a/boards/avsextrem/Makefile.include
+++ b/boards/avsextrem/Makefile.include
@@ -1 +1,2 @@
+export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/
 include $(RIOTBOARD)/msba2-common/Makefile.include
diff --git a/boards/redbee-econotag/Makefile.include b/boards/redbee-econotag/Makefile.include
index 979d8d23b..55cad8e4c 100644
--- a/boards/redbee-econotag/Makefile.include
+++ b/boards/redbee-econotag/Makefile.include
@@ -28,6 +28,7 @@ export FFLAGS = -t $(PORT) -f $(HEXFILE) -c 'bbmc -l redbee-econotag reset'
 export OFLAGS = -O binary --gap-fill=0xff
 export TERMFLAGS += -p "$(PORT)"
 
+export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/
 export INCLUDES += -I$(RIOTCPU)/$(CPU)/maca/include
 export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
 
diff --git a/boards/spark-core/Makefile.include b/boards/spark-core/Makefile.include
index 6a3da008c..8ca76ff9c 100644
--- a/boards/spark-core/Makefile.include
+++ b/boards/spark-core/Makefile.include
@@ -16,6 +16,8 @@ export OFLAGS = -O binary
 export FFLAGS = -d 1d50:607f -a 0 -s 0x08005000:leave -D "$(HEXFILE)"
 export TERMFLAGS = -p $(PORT)
 
+export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/
+
 # setup serial terminal
 include $(RIOTBOARD)/Makefile.include.serial
 
diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include
index 09cba3c00..1abab2c6c 100644
--- a/boards/telosb/Makefile.include
+++ b/boards/telosb/Makefile.include
@@ -22,6 +22,7 @@ endif
 export FFLAGS = --telosb -c $(PORT) -r -e -I -p $(HEXFILE)
 export TERMFLAGS += -p "$(PORT)"
 
+export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/
 export INCLUDES += -I$(RIOTCPU)/msp430-common/include
 export OFLAGS = -O ihex
 
diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include
index 40770dbb2..746279c67 100644
--- a/boards/z1/Makefile.include
+++ b/boards/z1/Makefile.include
@@ -23,6 +23,7 @@ export FFLAGS = --z1 -I -c $(PORT) -r -e -p $(HEXFILE)
 export OFLAGS = -O ihex
 export TERMFLAGS += -p "$(PORT)"
 
+export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/
 export INCLUDES += -I $(RIOTCPU)/msp430-common/include
 
 export UNDEF += $(BINDIR)msp430_common/startup.o