diff --git a/os/net/ipv6/tcpip.c b/os/net/ipv6/tcpip.c
index eec3068ad..41d317d17 100644
--- a/os/net/ipv6/tcpip.c
+++ b/os/net/ipv6/tcpip.c
@@ -38,11 +38,13 @@
  * \author  Julien Abeille <jabeille@cisco.com> (IPv6 related code)
  */
 
+#include "contiki.h"
 #include "contiki-net.h"
 #include "net/ipv6/uip-packetqueue.h"
 
 #include "net/ipv6/uip-nd6.h"
 #include "net/ipv6/uip-ds6.h"
+#include "net/ipv6/uip-ds6-nbr.h"
 #include "net/linkaddr.h"
 #include "net/routing/routing.h"
 
diff --git a/os/net/ipv6/uip-ds6-nbr.h b/os/net/ipv6/uip-ds6-nbr.h
index f10a415b0..9aec47b4a 100644
--- a/os/net/ipv6/uip-ds6-nbr.h
+++ b/os/net/ipv6/uip-ds6-nbr.h
@@ -46,7 +46,9 @@
 #ifndef UIP_DS6_NEIGHBOR_H_
 #define UIP_DS6_NEIGHBOR_H_
 
+#include "contiki.h"
 #include "net/ipv6/uip.h"
+#include "net/ipv6/uip-nd6.h"
 #include "net/nbr-table.h"
 #include "sys/stimer.h"
 #if UIP_CONF_IPV6_QUEUE_PKT