diff --git a/platform/z1/Makefile.common b/platform/z1/Makefile.common
index ed98d22c9..8374573fa 100644
--- a/platform/z1/Makefile.common
+++ b/platform/z1/Makefile.common
@@ -1,7 +1,5 @@
 # $Id: Makefile.z1,v 1.5 2011/02/26 enricmcalvo Exp $
 
-PROJECT_SOURCEFILES += i2cmaster.c adxl345.c
-
 ifdef GCC
 CFLAGS+=-Os -g
 endif
@@ -13,9 +11,6 @@ LDFLAGS += -Wl,--defsym -Wl,__P1SEL2=0x0041 -Wl,--defsym -Wl,__P5SEL2=0x0045
 endif
 
 CLEAN += symbols.c symbols.h
-#CFLAGS += -ffunction-sections
-#LDFLAGS += -Wl,--gc-sections,--undefined=_reset_vector__,--undefined=InterruptVectors,--undefined=_copy_data_init__,--undefined=_clear_bss_init__,--undefined=_end_of_init__
-
 
 ARCH=msp430.c leds.c watchdog.c xmem.c \
      spi.c cc2420.c cc2420-aes.c cc2420-arch.c cc2420-arch-sfd.c\
@@ -39,6 +34,7 @@ CFLAGS += -DMACID=$(nodemac)
 endif
 
 CONTIKI_TARGET_SOURCEFILES += $(ARCH) $(UIPDRIVERS)
+CONTIKI_TARGET_SOURCEFILES += i2cmaster.c adxl345.c
 CONTIKI_TARGET_SOURCEFILES += contiki-z1-platform.c
 
 MCU=msp430x2617