From 47a02d9d07730731f472c12f602fec10e63fb5ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= <cnkgndgn@gmail.com>
Date: Wed, 28 Oct 2015 21:09:29 +0100
Subject: [PATCH] ipv6: ndp: sixlowpan: remove vtimer includes

---
 sys/net/gnrc/network_layer/ipv6/nc/gnrc_ipv6_nc.c             | 2 +-
 sys/net/gnrc/network_layer/ndp/gnrc_ndp.c                     | 2 +-
 sys/net/gnrc/network_layer/ndp/host/gnrc_ndp_host.c           | 2 +-
 sys/net/gnrc/network_layer/ndp/internal/gnrc_ndp_internal.c   | 2 +-
 sys/net/gnrc/network_layer/ndp/router/gnrc_ndp_router.c       | 2 +-
 sys/net/gnrc/network_layer/sixlowpan/ctx/gnrc_sixlowpan_ctx.c | 1 -
 sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.c              | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/sys/net/gnrc/network_layer/ipv6/nc/gnrc_ipv6_nc.c b/sys/net/gnrc/network_layer/ipv6/nc/gnrc_ipv6_nc.c
index d5658296ae..4926e1e97a 100644
--- a/sys/net/gnrc/network_layer/ipv6/nc/gnrc_ipv6_nc.c
+++ b/sys/net/gnrc/network_layer/ipv6/nc/gnrc_ipv6_nc.c
@@ -24,7 +24,7 @@
 #include "net/gnrc/sixlowpan/nd.h"
 #include "thread.h"
 #include "timex.h"
-#include "vtimer.h"
+#include "xtimer.h"
 
 #define ENABLE_DEBUG    (0)
 #include "debug.h"
diff --git a/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c b/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c
index 49954c9876..495a9afe64 100644
--- a/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c
+++ b/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c
@@ -30,7 +30,7 @@
 #include "random.h"
 #include "utlist.h"
 #include "thread.h"
-#include "vtimer.h"
+#include "xtimer.h"
 
 #include "net/gnrc/ndp/internal.h"
 
diff --git a/sys/net/gnrc/network_layer/ndp/host/gnrc_ndp_host.c b/sys/net/gnrc/network_layer/ndp/host/gnrc_ndp_host.c
index 8e330e32ac..19c410e1f8 100644
--- a/sys/net/gnrc/network_layer/ndp/host/gnrc_ndp_host.c
+++ b/sys/net/gnrc/network_layer/ndp/host/gnrc_ndp_host.c
@@ -17,7 +17,7 @@
 #include "net/gnrc/ipv6.h"
 #include "net/gnrc/ndp.h"
 #include "net/gnrc/ndp/internal.h"
-#include "vtimer.h"
+#include "xtimer.h"
 
 #include "net/gnrc/ndp/host.h"
 
diff --git a/sys/net/gnrc/network_layer/ndp/internal/gnrc_ndp_internal.c b/sys/net/gnrc/network_layer/ndp/internal/gnrc_ndp_internal.c
index e6d84ae2cc..ef8c6e60b0 100644
--- a/sys/net/gnrc/network_layer/ndp/internal/gnrc_ndp_internal.c
+++ b/sys/net/gnrc/network_layer/ndp/internal/gnrc_ndp_internal.c
@@ -21,7 +21,7 @@
 #include "net/gnrc/sixlowpan/nd.h"
 #include "random.h"
 #include "timex.h"
-#include "vtimer.h"
+#include "xtimer.h"
 
 #include "net/gnrc/ndp/internal.h"
 
diff --git a/sys/net/gnrc/network_layer/ndp/router/gnrc_ndp_router.c b/sys/net/gnrc/network_layer/ndp/router/gnrc_ndp_router.c
index 48813e88ef..1302bb6452 100644
--- a/sys/net/gnrc/network_layer/ndp/router/gnrc_ndp_router.c
+++ b/sys/net/gnrc/network_layer/ndp/router/gnrc_ndp_router.c
@@ -17,7 +17,7 @@
 #include "net/gnrc/ndp/internal.h"
 #include "random.h"
 #include "timex.h"
-#include "vtimer.h"
+#include "xtimer.h"
 
 #include "net/gnrc/ndp/router.h"
 
diff --git a/sys/net/gnrc/network_layer/sixlowpan/ctx/gnrc_sixlowpan_ctx.c b/sys/net/gnrc/network_layer/sixlowpan/ctx/gnrc_sixlowpan_ctx.c
index 00717dfee8..988b71426e 100644
--- a/sys/net/gnrc/network_layer/sixlowpan/ctx/gnrc_sixlowpan_ctx.c
+++ b/sys/net/gnrc/network_layer/sixlowpan/ctx/gnrc_sixlowpan_ctx.c
@@ -17,7 +17,6 @@
 
 #include "mutex.h"
 #include "net/gnrc/sixlowpan/ctx.h"
-#include "vtimer.h"
 #include "xtimer.h"
 
 #define ENABLE_DEBUG    (0)
diff --git a/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.c b/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.c
index 61dfb3af3f..e27a63c384 100644
--- a/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.c
+++ b/sys/net/gnrc/network_layer/sixlowpan/frag/rbuf.c
@@ -24,7 +24,7 @@
 #include "net/sixlowpan.h"
 #include "thread.h"
 #include "timex.h"
-#include "vtimer.h"
+#include "xtimer.h"
 #include "utlist.h"
 
 #define ENABLE_DEBUG    (0)
-- 
GitLab