diff --git a/sys/net/routing/nhdp/nhdp.c b/sys/net/routing/nhdp/nhdp.c
index 35f1a48124c7dd1ea62746d2d3ad05ddfdb9541b..3644d6643c5ba441e12e41ba242e7fa1f4842cc9 100644
--- a/sys/net/routing/nhdp/nhdp.c
+++ b/sys/net/routing/nhdp/nhdp.c
@@ -18,13 +18,15 @@
  * @}
  */
 
-#include "conn/udp.h"
+#include "net/gnrc/conn.h"
+#include "net/conn/udp.h"
 #include "msg.h"
-#include "netapi.h"
+#include "net/gnrc/netapi.h"
 #include "net/gnrc/netif.h"
 #include "thread.h"
 #include "utlist.h"
 #include "mutex.h"
+#include "net/ipv6/addr.h"
 
 #include "rfc5444/rfc5444_writer.h"
 
diff --git a/sys/net/routing/nhdp/nhdp.h b/sys/net/routing/nhdp/nhdp.h
index 1943dda3e95d66154ac14545126a4df3e75b242d..bbd828f8db88812cccd7cb85645104fcaa0f6992 100644
--- a/sys/net/routing/nhdp/nhdp.h
+++ b/sys/net/routing/nhdp/nhdp.h
@@ -22,6 +22,7 @@
 #define NHDP_H_
 
 #include "timex.h"
+#include "vtimer.h"
 #include "kernel_types.h"
 
 #include "nhdp_metric.h"