diff --git a/apps/deluge/deluge.c b/apps/deluge/deluge.c
index 12d1866f7..6699f19a9 100644
--- a/apps/deluge/deluge.c
+++ b/apps/deluge/deluge.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: deluge.c,v 1.9 2010/04/12 14:39:52 nvt-se Exp $
+ * $Id: deluge.c,v 1.10 2010/06/14 18:58:45 adamdunkels Exp $
  */
 
 /**
@@ -43,7 +43,6 @@
 
 #include "contiki.h"
 #include "net/rime.h"
-#include "net/rime/ctimer.h"
 #include "cfs/cfs.h"
 #include "loader/elfloader.h"
 #include "lib/crc16.h"
diff --git a/core/net/mac/ctdma_mac.c b/core/net/mac/ctdma_mac.c
index 6ce287f1d..ee21e5055 100644
--- a/core/net/mac/ctdma_mac.c
+++ b/core/net/mac/ctdma_mac.c
@@ -28,14 +28,14 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: ctdma_mac.c,v 1.4 2009/06/22 11:14:11 nifi Exp $
+ * $Id: ctdma_mac.c,v 1.5 2010/06/14 18:58:45 adamdunkels Exp $
  */
 
 #include "contiki.h"
 #include "net/mac/ctdma_mac.h"
 #include "net/rime/packetbuf.h"
 #include "net/uip-fw.h"
-#include "net/rime/ctimer.h"
+#include "sys/ctimer.h"
 #include "net/rime.h"
 #include "lib/memb.h"
 #include "lib/list.h"
diff --git a/examples/ipv6/rpl-udp/udp-client.c b/examples/ipv6/rpl-udp/udp-client.c
index a97198097..ec3dd60fe 100644
--- a/examples/ipv6/rpl-udp/udp-client.c
+++ b/examples/ipv6/rpl-udp/udp-client.c
@@ -29,6 +29,7 @@
 
 #include "contiki.h"
 #include "lib/random.h"
+#include "sys/ctimer.h"
 #include "net/uip.h"
 #include "net/uip-ds6.h"
 #include "net/uip-udp-packet.h"
diff --git a/platform/cooja/testapps/testctimer.c b/platform/cooja/testapps/testctimer.c
index 9a6c6e8de..ed98e8209 100644
--- a/platform/cooja/testapps/testctimer.c
+++ b/platform/cooja/testapps/testctimer.c
@@ -26,11 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: testctimer.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $
+ * $Id: testctimer.c,v 1.3 2010/06/14 18:58:45 adamdunkels Exp $
  */
 
 #include "contiki.h"
-#include "net/rime/ctimer.h"
+#include "sys/ctimer.h"
 
 #include <stdio.h>
 
diff --git a/platform/native/contiki-main.c b/platform/native/contiki-main.c
index 81e84cfc9..21bcda454 100644
--- a/platform/native/contiki-main.c
+++ b/platform/native/contiki-main.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: contiki-main.c,v 1.12 2010/02/23 18:43:21 adamdunkels Exp $
+ * $Id: contiki-main.c,v 1.13 2010/06/14 18:58:45 adamdunkels Exp $
  *
  */
 
@@ -39,7 +39,6 @@
 
 #include "contiki.h"
 #include "net/netstack.h"
-#include "net/rime/ctimer.h"
 
 #include "dev/serial-line.h"