diff --git a/Makefile.include b/Makefile.include
index daee2f2db8b0..43713b27b4a6 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -20,7 +20,7 @@ PROJBINDIR =$(CURDIR)/bin
 
 ## make script for your project. Build RIOT-base here!
 all: $(PROJBINDIR)/$(PROJECT).a
-	@echo "Building project $(PROJECT) for $(BOARD) w/ MCU $(CPU)."
+	@echo "Building project $(PROJECT) for $(BOARD) w/ MCU $(MCU)."
 	$(MAKE) -C $(RIOTBOARD)
 	$(MAKE) -C $(RIOTBASE)
 	@$(LINK) $(UNDEF) -o $(PROJBINDIR)/$(PROJECT).elf -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group  -Wl,-Map=$(PROJBINDIR)/$(PROJECT).map $(LINKFLAGS) 
diff --git a/cpu/Makefile b/cpu/Makefile
index 25ef332df1b0..b0f6e8f4df5e 100644
--- a/cpu/Makefile
+++ b/cpu/Makefile
@@ -7,7 +7,7 @@ ifeq ($(CPU),lpc214x)
 endif
 
 ifeq ($(CPU),cc430)
- DIRS = msp430 cc430
+ DIRS = msp430-common cc430
 endif
 
 ifeq ($(CPU),msp430x16x)
diff --git a/cpu/cc430/Makefile b/cpu/cc430/Makefile
index 05b082a94bb3..52c5485470cd 100644
--- a/cpu/cc430/Makefile
+++ b/cpu/cc430/Makefile
@@ -1,6 +1,7 @@
 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../arm_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 =
 
 all: $(BINDIR)$(MODULE).a
diff --git a/cpu/cc430/cc430-adc.c b/cpu/cc430/cc430-adc.c
index 3617d155c64a..8621cbce3aaa 100644
--- a/cpu/cc430/cc430-adc.c
+++ b/cpu/cc430/cc430-adc.c
@@ -36,7 +36,7 @@
  * ************************************************************************************************/
 
 
-#include <signal.h>
+#include <legacymsp430.h>
 #include <cpu.h>
 #include <cc430-adc.h>
 #include <hwtimer.h>
diff --git a/cpu/cc430/cc430-gpioint.c b/cpu/cc430/cc430-gpioint.c
index 6775b81f9e3e..8c12842e8cdb 100644
--- a/cpu/cc430/cc430-gpioint.c
+++ b/cpu/cc430/cc430-gpioint.c
@@ -25,13 +25,13 @@ and the mailinglist (subscription via web site)
 *******************************************************************************/
 
 #include <stdlib.h>
-#include <signal.h>
+#include <legacymsp430.h>
 #include <gpioint.h>
 #include <bitarithm.h>
 #include <cpu.h>
 #include <irq.h>
 #include <hwtimer.h>
-#include <cc430x613x.h>
+#include <cc430f6137.h>
 
 /** min and max portnumber to generate interrupts */
 #define PORTINT_MIN     (1)
@@ -222,9 +222,10 @@ interrupt (PORT2_VECTOR) __attribute__ ((naked)) port2_isr(void) {
             cb[1][ifg_num]();
         }
     }
-    else {
-        cb[1][ifg_num]();
-    }
+    
+    //else {
+    //    cb[1][ifg_num]();
+    //}
 
 	P2IFG = 0x00; 	
     P2IE  = int_enable; 	
diff --git a/cpu/cc430/cc430-rtc.c b/cpu/cc430/cc430-rtc.c
index c34dcddd5fdb..c96daf6cc323 100644
--- a/cpu/cc430/cc430-rtc.c
+++ b/cpu/cc430/cc430-rtc.c
@@ -29,10 +29,10 @@ and the mailinglist (subscription via web site)
  */
 
 #include <string.h>
-#include <signal.h>
+#include <legacymsp430.h>
 #include <irq.h>
 #include <cpu.h>
-#include <cc430x613x.h>
+#include <cc430f6137.h>
 #include <cc430-rtc.h>
 
 //static volatile time_t epoch;
diff --git a/cpu/cc430/hwtimer_cc430.c b/cpu/cc430/hwtimer_cc430.c
index 64a7a9bb0d62..2469b4e208fd 100644
--- a/cpu/cc430/hwtimer_cc430.c
+++ b/cpu/cc430/hwtimer_cc430.c
@@ -1,4 +1,4 @@
-#include <signal.h>
+#include <legacymsp430.h>
 #include <board.h>
 #include <hwtimer.h>
 #include <hwtimer_arch.h>
@@ -12,7 +12,7 @@ static uint32_t ticks = 0;
 extern void (*int_handler)(int);
 extern void TA0_unset(short timer);
 
-void timerA_init()
+void timerA_init(void)
 {
   	ticks = 0;								 // Set tick counter value to 0
 	TA0CTL = TASSEL_1 + TACLR;   	  		 // Clear the timer counter, set ACLK
diff --git a/cpu/msp430-common/Makefile b/cpu/msp430-common/Makefile
index fd8276dbbaff..344b27a4bfdf 100644
--- a/cpu/msp430-common/Makefile
+++ b/cpu/msp430-common/Makefile
@@ -1,6 +1,6 @@
 MODULE =cpu
 
-INCLUDES = -Iinclude -I$(RIOTBASE)/core/include/ -I$(RIOTBOARD)/$(BOARD)/include
+INCLUDES += -Iinclude -I$(RIOTBASE)/core/include/ -I$(RIOTBOARD)/$(BOARD)/include
 DIRS =
 
 all: $(BINDIR)$(MODULE).a
diff --git a/cpu/msp430-common/cpu.c b/cpu/msp430-common/cpu.c
index 7602d85184d3..3a70177552f0 100644
--- a/cpu/msp430-common/cpu.c
+++ b/cpu/msp430-common/cpu.c
@@ -23,8 +23,11 @@ For further information and questions please use the web site
 and the mailinglist (subscription via web site)
 	scatterweb@lists.spline.inf.fu-berlin.de
 *******************************************************************************/
-
-#include <msp430x16x.h>
+#ifdef CC430
+	#include <cc430f6137.h>
+#else
+	#include <msp430x16x.h>
+#endif
 #include "cpu.h"
 #include "kernel.h"
 #include "kernel_intern.h"
diff --git a/cpu/msp430-common/flashrom.c b/cpu/msp430-common/flashrom.c
index 3419fcfc70f2..686e0cc3dd99 100644
--- a/cpu/msp430-common/flashrom.c
+++ b/cpu/msp430-common/flashrom.c
@@ -1,6 +1,6 @@
 #include <stddef.h>
 #include <stdint.h>
-#include  <msp430x16x.h>
+#include <msp430x16x.h>
 #include <irq.h>
 
 uint8_t ie1, ie2;
diff --git a/cpu/msp430-common/include/cpu.h b/cpu/msp430-common/include/cpu.h
index a3e0a1df8c85..8d262db64044 100644
--- a/cpu/msp430-common/include/cpu.h
+++ b/cpu/msp430-common/include/cpu.h
@@ -39,7 +39,7 @@ and the mailinglist (subscription via web site)
 
 #include <sched.h>
 #include <stdio.h>
-#include <signal.h>
+#include <legacymsp430.h>
 #include <cpu-conf.h>
 
 #define WORDSIZE 16
diff --git a/cpu/msp430-common/include/hwtimer_cpu.h b/cpu/msp430-common/include/hwtimer_cpu.h
index a60012b02ea7..b9db594f3299 100644
--- a/cpu/msp430-common/include/hwtimer_cpu.h
+++ b/cpu/msp430-common/include/hwtimer_cpu.h
@@ -27,7 +27,11 @@ and the mailinglist (subscription via web site)
 #ifndef __HWTIMER_CPU_H
 #define __HWTIMER_CPU_H
 
-#include <msp430x16x.h>
+#ifdef CC430
+	#include <cc430f6137.h>
+#else
+	#include <msp430x16x.h>
+#endif
 #include <stdint.h>
 
 #ifdef __MSP430_HAS_TA2__
diff --git a/cpu/msp430-common/irq.c b/cpu/msp430-common/irq.c
index 9bff92e3da58..8a31d913d0a3 100644
--- a/cpu/msp430-common/irq.c
+++ b/cpu/msp430-common/irq.c
@@ -1,5 +1,9 @@
 #include <irq.h>
-#include <msp430x16x.h>
+#ifdef CC430
+	#include <cc430f6137.h>
+#else
+	#include <msp430x16x.h>
+#endif
 #include <cpu.h>
 
 unsigned int disableIRQ() {
diff --git a/cpu/msp430-common/msp430-main.c b/cpu/msp430-common/msp430-main.c
index a77f81759784..969094c9caab 100644
--- a/cpu/msp430-common/msp430-main.c
+++ b/cpu/msp430-common/msp430-main.c
@@ -34,7 +34,11 @@
  */
 
 #include "cpu.h"
-#include <msp430x16x.h>
+#ifdef CC430
+	#include <cc430f6137.h>
+#else
+	#include <msp430x16x.h>
+#endif
 #include "msp430.h"