diff --git a/boards/chronos/Makefile b/boards/chronos/Makefile
index 1b8144cb49..243f8300b3 100644
--- a/boards/chronos/Makefile
+++ b/boards/chronos/Makefile
@@ -1,21 +1,22 @@
-SRC = $(wildcard *.c)
-BINDIR = bin/
-OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
+export ARCH = chronos_base.a
 
+SRC = $(wildcard *.c)
+BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
+OBJ = $(SRC:%.c=$(BINDIR)%.o)
 DEP = $(SRC:%.c=$(BINDIR)%.d)
 
-INCLUDES += -Iinclude -I$(RIOTBASE)/sys/lib -I$(RIOTBASE)/sys/drivers/include
+INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/sys/lib -I$(RIOTBASE)/sys/drivers/include
 INCLUDES += -I$(RIOTBASE)/sys/drivers/cc110x_ng/include
 INCLUDES += -I$(RIOTBASE)/core/include
-INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/
-INCLUDES += -I$(RIOTBASE)/cpu/cc430/include/
-#INCLUDES += -I/usr/msp430/include/
+INCLUDES += -I$(RIOTCPU)/msp430-common/include/
+INCLUDES += -I$(RIOTCPU)/cc430/include/
 
-all: $(BINDIR)chronos_base.a 
+all: $(BINDIR)$(ARCH)
 	$(MAKE) -C drivers
 
-$(BINDIR)chronos_base.a: $(OBJ)
-	$(AR) rcs $(BINDIR)chronos_base.a $(OBJ)
+$(BINDIR)$(ARCH): $(OBJ)
+	mkdir -p $(BINDIR)
+	$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
 
 # pull in dependency info for *existing* .o files
 -include $(OBJ:.o=.d)
@@ -28,8 +29,6 @@ $(BINDIR)%.o: %.c
 
 # remove compilation products
 clean:
-	rm -f $(BINDIR)chronos_base.a $(OBJ) $(DEP)
 	$(MAKE) -C drivers clean
-
-
-
+	rm -f $(OBJ) $(DEP)
+	rm -f $(BINDIR)$(ARCH)
diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include
index 04b77c5d4c..08989fc09a 100644
--- a/boards/chronos/Makefile.include
+++ b/boards/chronos/Makefile.include
@@ -1,3 +1,6 @@
+export INCLUDES += -I$(RIOTBOARD)/chronos/include -I$(RIOTBOARD)/chronos/drivers/include/
+export INCLUDES += -I$(RIOTCPU)/msp430-common/include/ -I$(RIOTCPU)/cc430/include/
+
 ## the cpu to build for
 export CPU = cc430
 export MCU = cc430f6137
diff --git a/boards/msb-430/Makefile b/boards/msb-430/Makefile
index 66dcd277d1..196aeceab7 100644
--- a/boards/msb-430/Makefile
+++ b/boards/msb-430/Makefile
@@ -32,6 +32,3 @@ clean:
 	@if [ -d $(BINDIR) ] ; \
 	then rmdir $(BINDIR) ; \
 	fi 
-
-
-
diff --git a/boards/wsn430-v1_3b/Makefile.dep b/boards/wsn430-v1_3b/Makefile.dep
index 5463317289..4a8dfc510e 100644
--- a/boards/wsn430-v1_3b/Makefile.dep
+++ b/boards/wsn430-v1_3b/Makefile.dep
@@ -4,4 +4,4 @@ ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
     endif
 endif
 
-USEMODULE += msp430_common
\ No newline at end of file
+USEMODULE += msp430_common
diff --git a/boards/wsn430-v1_3b/Makefile.include b/boards/wsn430-v1_3b/Makefile.include
index 267a2fb9cd..aec438bae0 100644
--- a/boards/wsn430-v1_3b/Makefile.include
+++ b/boards/wsn430-v1_3b/Makefile.include
@@ -1,4 +1,4 @@
-export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
-include $(RIOTBOARD)/$(BOARD)/Makefile.dep
+export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_3b/include -I$(RIOTBOARD)/wsn430-common/include
 
+include $(RIOTBOARD)/$(BOARD)/Makefile.dep
 include $(RIOTBOARD)/wsn430-common/Makefile.include
diff --git a/boards/wsn430-v1_4/Makefile.include b/boards/wsn430-v1_4/Makefile.include
index 267a2fb9cd..b8e4e4a3b9 100644
--- a/boards/wsn430-v1_4/Makefile.include
+++ b/boards/wsn430-v1_4/Makefile.include
@@ -1,4 +1,4 @@
-export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
-include $(RIOTBOARD)/$(BOARD)/Makefile.dep
+export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include
 
+include $(RIOTBOARD)/$(BOARD)/Makefile.dep
 include $(RIOTBOARD)/wsn430-common/Makefile.include
diff --git a/cpu/cc430/Makefile b/cpu/cc430/Makefile
index 7a82d0ad68..544f9f6896 100644
--- a/cpu/cc430/Makefile
+++ b/cpu/cc430/Makefile
@@ -1,6 +1,6 @@
 MODULE =cpu
 
-INCLUDES += -Iinclude -Idrivers/include -I../arm_common/include -I../../sys/lib -I../../sys/drivers/include -I../../core/include -I../../sys/include -I../../hal/include -I../../.. 
+INCLUDES += -Iinclude -Idrivers/include -I../msp430-common/include -I../../sys/lib -I../../sys/drivers/include -I../../core/include -I../../sys/include -I../../hal/include -I../../..
 INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
 DIRS =