diff --git a/core/net/ipv6/uip-nd6.c b/core/net/ipv6/uip-nd6.c
index 44ae7a280..aa651893a 100644
--- a/core/net/ipv6/uip-nd6.c
+++ b/core/net/ipv6/uip-nd6.c
@@ -123,7 +123,7 @@ static uip_ds6_nbr_t *nbr; /**  Pointer to a nbr cache entry*/
 static uip_ds6_addr_t *addr; /**  Pointer to an interface address */
 #endif /* UIP_ND6_SEND_NS || UIP_ND6_SEND_NA || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER */
 
-#if UIP_ND6_SEND_NS || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER
+#if UIP_ND6_SEND_NS || !UIP_CONF_ROUTER
 static uip_ds6_defrt_t *defrt; /**  Pointer to a router list entry */
 #endif /* UIP_ND6_SEND_NS || UIP_ND6_SEND_RA || !UIP_CONF_ROUTER */
 
diff --git a/drivers/platform/cooja-ip64/contiki-cooja-ip64-main.c b/drivers/platform/cooja-ip64/contiki-cooja-ip64-main.c
index fa77851b6..13d37ca5e 100644
--- a/drivers/platform/cooja-ip64/contiki-cooja-ip64-main.c
+++ b/drivers/platform/cooja-ip64/contiki-cooja-ip64-main.c
@@ -50,19 +50,24 @@
 #include "lib/simEnvChange.h"
 
 #include "net/netstack.h"
+#include "net/queuebuf.h"
 #include "net/ip/uip-nameserver.h"
+#include "net/ip/ip64-addr.h"
 
 #include "dev/serial-line.h"
 #include "dev/cooja-radio.h"
 #include "dev/button-sensor.h"
 #include "dev/pir-sensor.h"
 #include "dev/vib-sensor.h"
+#include "dev/rs232.h"
 
 #include "sys/node-id.h"
 
 #include "ip64.h"
 #include "dev/slip.h"
 
+void log_set_putchar_with_slip(int with);
+
 /* JNI-defined functions, depends on the environment variable CLASSNAME */
 #ifndef CLASSNAME
 #error CLASSNAME is undefined, required by contiki-cooja-main.c
@@ -112,8 +117,6 @@ long referenceVar;
 static struct cooja_mt_thread rtimer_thread;
 static struct cooja_mt_thread process_run_thread;
 
-#define MIN(a, b)   ( (a)<(b) ? (a) : (b) )
-
 /*---------------------------------------------------------------------------*/
 static void
 print_processes(struct process * const processes[])
@@ -199,7 +202,7 @@ contiki_init(void)
     addr[i + 1] = node_id & 0xff;
     addr[i + 0] = node_id >> 8;
   }
-  linkaddr_copy(addr, &linkaddr_node_addr);
+  linkaddr_copy((linkaddr_t *)addr, &linkaddr_node_addr);
   memcpy(&uip_lladdr.addr, addr, sizeof(uip_lladdr.addr));
 
   process_start(&tcpip_process, NULL);
diff --git a/examples/ip64-router/ip64-router.c b/examples/ip64-router/ip64-router.c
index 391b5038b..844afdc1c 100644
--- a/examples/ip64-router/ip64-router.c
+++ b/examples/ip64-router/ip64-router.c
@@ -2,6 +2,7 @@
 #include "contiki-net.h"
 #include "ip64.h"
 #include "net/netstack.h"
+#include "net/rpl/rpl-dag-root.h"
 
 /*---------------------------------------------------------------------------*/
 PROCESS(router_node_process, "Router node");
diff --git a/regression-tests/08-ipv6/04-cooja-ipv64-http-socket.csc b/regression-tests/08-ipv6/04-cooja-ipv64-http-socket.csc
index cec228b5e..3939fa388 100644
--- a/regression-tests/08-ipv6/04-cooja-ipv64-http-socket.csc
+++ b/regression-tests/08-ipv6/04-cooja-ipv64-http-socket.csc
@@ -26,7 +26,8 @@
       <identifier>mtype503</identifier>
       <description>ip64-router/ip64-router.c TARGET=cooja-ip64</description>
       <source>[CONTIKI_DIR]/examples/ip64-router/ip64-router.c</source>
-      <commands>make ip64-router.cooja-ip64 TARGET=cooja-ip64</commands>
+      <commands>make TARGET=cooja-ip64 clean
+make ip64-router.cooja-ip64 TARGET=cooja-ip64</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
       <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>
@@ -50,7 +51,8 @@
       <identifier>mtype555</identifier>
       <description>examples/http-socket/http-example.c</description>
       <source>[CONTIKI_DIR]/examples/http-socket/http-example.c</source>
-      <commands>make http-example.cooja TARGET=cooja</commands>
+      <commands>make TARGET=cooja clean
+make http-example.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
       <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>