diff --git a/examples/ipv6/rpl-udp/udp-client.c b/examples/ipv6/rpl-udp/udp-client.c
index 58f214818..a97198097 100644
--- a/examples/ipv6/rpl-udp/udp-client.c
+++ b/examples/ipv6/rpl-udp/udp-client.c
@@ -29,10 +29,10 @@
 
 #include "contiki.h"
 #include "lib/random.h"
-#include "net/rime/ctimer.h"
 #include "net/uip.h"
 #include "net/uip-ds6.h"
 #include "net/uip-udp-packet.h"
+#include "sys/ctimer.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -140,10 +140,6 @@ PROCESS_THREAD(udp_client_process, ev, data)
 
   PRINTF("UDP client process started\n");
 
-/* #if UIP_CONF_ROUTER */
-/*   set_global_address(); */
-/* #endif */
-
   print_local_addresses();
 
   set_connection_address(&ipaddr);