diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include
index 08989fc09a..124ab609bb 100644
--- a/boards/chronos/Makefile.include
+++ b/boards/chronos/Makefile.include
@@ -1,5 +1,5 @@
 export INCLUDES += -I$(RIOTBOARD)/chronos/include -I$(RIOTBOARD)/chronos/drivers/include/
-export INCLUDES += -I$(RIOTCPU)/msp430-common/include/ -I$(RIOTCPU)/cc430/include/
+export INCLUDES += -I$(RIOTCPU)/cc430/include/ -I$(RIOTCPU)/msp430-common/include/
 
 ## the cpu to build for
 export CPU = cc430
@@ -21,5 +21,6 @@ ifeq ($(strip $(PORT)),)
 	export PORT = /dev/ttyUSB0
 endif
 export HEXFILE = bin/$(PROJECT).hex
+export USEMODULE += msp430_common
 export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
 export OFLAGS = -O ihex
diff --git a/cpu/cc430/Makefile b/cpu/cc430/Makefile
index 544f9f6896..14776b83ff 100644
--- a/cpu/cc430/Makefile
+++ b/cpu/cc430/Makefile
@@ -1,7 +1,6 @@
-MODULE =cpu
+MODULE = cpu
 
-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
+INCLUDES += -I$(RIOTCPU)/$(CPU)/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/cc110x_ng/include
 DIRS =
 
 all: $(BINDIR)$(MODULE).a
@@ -11,4 +10,3 @@ include $(RIOTBASE)/Makefile.base
 
 clean::
 	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
-
diff --git a/drivers/include/rtc.h b/drivers/include/rtc.h
index 475d983562..5514f007e1 100644
--- a/drivers/include/rtc.h
+++ b/drivers/include/rtc.h
@@ -24,7 +24,16 @@ and Telematics group (http://cst.mi.fu-berlin.de).
 #define RTC_SECOND 10001U
 
 #include <time.h>
+
+/* TODO: remove once msp430 libc supports struct timeval */
+#ifdef MSP430
+struct timeval {
+    time_t tv_sec;
+    time_t tv_usec;
+};
+#else
 #include <sys/time.h>
+#endif
 
 /**
  * @brief Initializes the RTC for calendar mode