diff --git a/msb-430-common/Makefile b/msb-430-common/Makefile
index 7f3a80971..4ca6a9248 100644
--- a/msb-430-common/Makefile
+++ b/msb-430-common/Makefile
@@ -3,7 +3,7 @@ BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
 OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
 DEP = $(SRC:%.c=$(BINDIR)%.d)
 
-INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/
+INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/ -I${RIOTBOARD}/${BOARD}/include/
 INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/
 INCLUDES += -I$(RIOTBASE)/cpu/mspx16x/include/
 INCLUDES += -I$(RIOTBASE)/drivers/include/
diff --git a/msb-430h/Makefile b/msb-430h/Makefile
index 91c5da588..2bd0f63c2 100644
--- a/msb-430h/Makefile
+++ b/msb-430h/Makefile
@@ -5,9 +5,9 @@ export ARCH = msb-430h_base.a
 
 DEP = $(SRC:%.c=$(BINDIR)%.d)
 
-INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/
-INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/
-INCLUDES += -I$(RIOTBASE)/cpu/msp430x16x/include/
+INCLUDES += -I${RIOTBASE}/core/include/
+INCLUDES += -Iinclude/ -I$(RIOTBOARD)/msb-430-common/include/
+INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/ -I$(RIOTBASE)/cpu/msp430x16x/include/
 INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/ -I$(RIOTBASE)/sys/include
 
 all: $(BINDIR)$(ARCH)