diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c
index 0217700b4..e0bd305c9 100644
--- a/core/net/rpl/rpl-dag.c
+++ b/core/net/rpl/rpl-dag.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rpl-dag.c,v 1.25 2010/06/08 21:37:22 nvt-se Exp $
+ * $Id: rpl-dag.c,v 1.26 2010/06/14 11:35:21 adamdunkels Exp $
  */
 /**
  * \file
@@ -45,7 +45,7 @@
 
 #include "net/uip.h"
 #include "net/uip-nd6.h"
-#include "net/rime/ctimer.h"
+#include "sys/ctimer.h"
 #include "lib/list.h"
 #include "lib/memb.h"
 
@@ -127,6 +127,7 @@ remove_parents(rpl_dag_t *dag, rpl_parent_t *exception, int poison_routes)
 static int
 should_send_dao(rpl_dag_t *dag, rpl_dio_t *dio, rpl_parent_t *p)
 {
+  return 1;
   return dio->dst_adv_supported && dio->dst_adv_trigger &&
          dio->dtsn > p->dtsn && p == dag->best_parent;
 }
diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c
index d523acace..1302cb441 100644
--- a/core/net/rpl/rpl-timers.c
+++ b/core/net/rpl/rpl-timers.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: rpl-timers.c,v 1.8 2010/06/02 16:55:00 joxe Exp $
+ * $Id: rpl-timers.c,v 1.9 2010/06/14 11:35:21 adamdunkels Exp $
  */
 /**
  * \file
@@ -42,7 +42,7 @@
  */
 
 #include "contiki-conf.h"
-#include "net/rime/ctimer.h"
+#include "sys/ctimer.h"
 #include "net/rpl/rpl.h"
 #include "lib/random.h"
 
diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h
index ad3788f82..dd9d63981 100644
--- a/core/net/rpl/rpl.h
+++ b/core/net/rpl/rpl.h
@@ -30,7 +30,7 @@
  *
  * Author: Joakim Eriksson, Nicolas Tsiftes
  *
- * $Id: rpl.h,v 1.17 2010/06/12 10:55:46 joxe Exp $
+ * $Id: rpl.h,v 1.18 2010/06/14 11:33:58 adamdunkels Exp $
  */
 
 #ifndef RPL_H
@@ -49,7 +49,7 @@
 #include "lib/list.h"
 #include "net/uip.h"
 #include "sys/clock.h"
-#include "net/rime/ctimer.h"
+#include "sys/ctimer.h"
 #include "net/uip-ds6.h"
 
 /* set to 1 for some statistics on trickle / DIO */