diff --git a/Makefile.include b/Makefile.include
index f20b48346..daf58393a 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -58,16 +58,18 @@ UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ
 TARGET_UPPERCASE := ${strip ${shell echo $(TARGET) | sed y!$(LOWERCASE)!$(UPPERCASE)!}}
 CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1
 
-MODULES += core/net/ipv6 core/net/ipv4 core/net/rime core/net/mac core/net/mac/contikimac
+MODULES += \
+          core/sys core/dev \
+          core/net/ipv6 core/net/ipv4 core/net/rime core/net/mac core/net/mac/contikimac
 
 #include $(CONTIKI)/core/net/rime/Makefile.rime
 #include $(CONTIKI)/core/net/mac/Makefile.mac
-SYSTEM  = process.c procinit.c autostart.c elfloader.c \
-          compower.c serial-line.c
-THREADS = mt.c
+#SYSTEM  = process.c procinit.c autostart.c elfloader.c \
+#          compower.c serial-line.c
+#THREADS = mt.c
 LIBS    = memb.c mmem.c timer.c list.c etimer.c ctimer.c energest.c rtimer.c stimer.c trickle-timer.c \
           print-stats.c ifft.c crc16.c random.c ringbuf.c settings.c
-DEV     = nullradio.c
+#DEV     = nullradio.c
 
 #include $(CONTIKI)/core/net/Makefile.uip
 include $(CONTIKI)/core/net/rpl/Makefile.rpl