From b969eeb217dfcd7b69706debdfd41b48b4f66e17 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mlenders@inf.fu-berlin.de>
Date: Mon, 10 Aug 2015 02:41:08 +0200
Subject: [PATCH] gnrc: rename ng_netbase to gnrc

---
 Makefile.dep                                  | 20 +++++++++++--------
 Makefile.pseudomodules                        |  1 -
 cpu/nrf51/radio/nrfmin/nrfmin.c               |  2 +-
 drivers/at86rf2xx/at86rf2xx.c                 |  2 +-
 drivers/at86rf2xx/at86rf2xx_netdev.c          |  2 +-
 drivers/include/xbee.h                        |  2 +-
 drivers/kw2xrf/kw2xrf.c                       |  2 +-
 examples/gnrc_networking/udp.c                |  2 +-
 sys/Makefile                                  |  3 +++
 sys/auto_init/netif/auto_init_at86rf2xx.c     |  2 +-
 sys/auto_init/netif/auto_init_kw2xrf.c        |  2 +-
 sys/auto_init/netif/auto_init_ng_netdev_eth.c |  2 +-
 sys/auto_init/netif/auto_init_slip.c          |  2 +-
 sys/auto_init/netif/auto_init_xbee.c          |  2 +-
 sys/include/net/{ng_netbase.h => gnrc.h}      |  5 +++--
 sys/include/net/ng_ipv6.h                     |  2 +-
 sys/include/net/ng_slip.h                     |  2 +-
 sys/include/net/ng_udp.h                      |  2 +-
 sys/net/application_layer/ng_zep/ng_zep.c     |  2 +-
 sys/net/crosslayer/ng_pktdump/ng_pktdump.c    |  2 +-
 sys/net/gnrc/Makefile                         |  1 +
 sys/net/link_layer/ng_nomac/ng_nomac.c        |  2 +-
 sys/net/link_layer/ng_slip/ng_slip.c          |  2 +-
 .../ng_icmpv6/echo/ng_icmpv6_echo.c           |  2 +-
 sys/net/network_layer/ng_icmpv6/ng_icmpv6.c   |  2 +-
 sys/net/network_layer/ng_ipv6/ng_ipv6.c       |  2 +-
 sys/net/network_layer/ng_ndp/ng_ndp.c         |  2 +-
 .../network_layer/ng_sixlowpan/frag/rbuf.c    |  2 +-
 .../ng_sixlowpan/iphc/ng_sixlowpan_iphc.c     |  2 +-
 .../network_layer/ng_sixlowpan/ng_sixlowpan.c |  2 +-
 sys/net/transport_layer/ng_udp/ng_udp.c       |  2 +-
 sys/shell/commands/sc_icmpv6_echo.c           |  2 +-
 .../auto_init_ng_netif/netif_app.c            |  2 +-
 tests/driver_at86rf2xx/main.c                 |  2 +-
 .../auto_init_ng_netif/netif_app.c            |  2 +-
 tests/driver_kw2xrf/main.c                    |  2 +-
 tests/driver_netdev_eth/Makefile              |  2 +-
 tests/driver_netdev_eth/main.c                |  2 +-
 tests/driver_nrfmin/Makefile                  |  2 +-
 tests/driver_nrfmin/main.c                    |  2 +-
 tests/driver_xbee/main.c                      |  2 +-
 tests/slip/Makefile                           |  2 +-
 tests/slip/main.c                             |  2 +-
 tests/zep/main.c                              |  2 +-
 44 files changed, 58 insertions(+), 50 deletions(-)
 rename sys/include/net/{ng_netbase.h => gnrc.h} (80%)
 create mode 100644 sys/net/gnrc/Makefile

diff --git a/Makefile.dep b/Makefile.dep
index 3bc6d2bd6a..416e754d98 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -1,13 +1,17 @@
+ifneq (,$(filter gnrc_%,$(filter-out gnrc_netapi gnrc_netreg gnrc_netif% gnrc_pktbuf,$(USEMODULE))))
+  USEMODULE += gnrc
+endif
+
 ifneq (,$(filter ng_netif_default,$(USEMODULE)))
   USEMODULE += ng_netif
 endif
 
 ifneq (,$(filter ng_netif,$(USEMODULE)))
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
 endif
 
 ifneq (,$(filter ng_nomac,$(USEMODULE)))
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
 endif
 
 ifneq (,$(filter at86rf2%,$(USEMODULE)))
@@ -66,7 +70,7 @@ endif
 ifneq (,$(filter ng_sixlowpan,$(USEMODULE)))
   USEMODULE += ng_ipv6
   USEMODULE += ng_sixlowpan_netif
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
 endif
 
 ifneq (,$(filter ng_sixlowpan_ctx,$(USEMODULE)))
@@ -99,7 +103,7 @@ endif
 
 ifneq (,$(filter ng_icmpv6_echo,$(USEMODULE)))
   USEMODULE += ng_icmpv6
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
 endif
 
 ifneq (,$(filter ng_icmpv6,$(USEMODULE)))
@@ -130,7 +134,7 @@ ifneq (,$(filter ng_ipv6,$(USEMODULE)))
   USEMODULE += ng_ipv6_hdr
   USEMODULE += ng_ipv6_nc
   USEMODULE += ng_ipv6_netif
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
 endif
 
 ifneq (,$(filter ng_ipv6_hdr,$(USEMODULE)))
@@ -152,7 +156,7 @@ ifneq (,$(filter ng_ipv6_netif,$(USEMODULE)))
 endif
 
 ifneq (,$(filter ng_udp,$(USEMODULE)))
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
   USEMODULE += inet_csum
   USEMODULE += udp
 endif
@@ -165,7 +169,7 @@ ifneq (,$(filter ng_nettest,$(USEMODULE)))
   USEMODULE += vtimer
 endif
 
-ifneq (,$(filter ng_netbase,$(USEMODULE)))
+ifneq (,$(filter gnrc,$(USEMODULE)))
   USEMODULE += ng_netapi
   USEMODULE += ng_netreg
   USEMODULE += ng_netif
@@ -189,7 +193,7 @@ ifneq (,$(filter ng_pktbuf_%, $(USEMODULE)))
 endif
 
 ifneq (,$(filter ng_slip,$(USEMODULE)))
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
 endif
 
 ifneq (,$(filter uart0,$(USEMODULE)))
diff --git a/Makefile.pseudomodules b/Makefile.pseudomodules
index 79ffcb8724..a415f69dd4 100644
--- a/Makefile.pseudomodules
+++ b/Makefile.pseudomodules
@@ -4,7 +4,6 @@ PSEUDOMODULES += ng_ipv6_default
 PSEUDOMODULES += ng_ipv6_router
 PSEUDOMODULES += ng_ipv6_router_default
 PSEUDOMODULES += pktqueue
-PSEUDOMODULES += ng_netbase
 PSEUDOMODULES += ng_pktbuf
 PSEUDOMODULES += newlib
 PSEUDOMODULES += ng_sixlowpan_default
diff --git a/cpu/nrf51/radio/nrfmin/nrfmin.c b/cpu/nrf51/radio/nrfmin/nrfmin.c
index d12317d8a7..047b10fc65 100644
--- a/cpu/nrf51/radio/nrfmin/nrfmin.c
+++ b/cpu/nrf51/radio/nrfmin/nrfmin.c
@@ -26,7 +26,7 @@
 #include "periph_conf.h"
 #include "periph/cpuid.h"
 #include "nrfmin.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #define ENABLE_DEBUG    (0)
 #include "debug.h"
diff --git a/drivers/at86rf2xx/at86rf2xx.c b/drivers/at86rf2xx/at86rf2xx.c
index d90c090bdf..0b18afb9f1 100644
--- a/drivers/at86rf2xx/at86rf2xx.c
+++ b/drivers/at86rf2xx/at86rf2xx.c
@@ -27,7 +27,7 @@
 #include "periph/cpuid.h"
 #include "byteorder.h"
 #include "net/ieee802154.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "at86rf2xx_registers.h"
 #include "at86rf2xx_internal.h"
 #include "at86rf2xx_netdev.h"
diff --git a/drivers/at86rf2xx/at86rf2xx_netdev.c b/drivers/at86rf2xx/at86rf2xx_netdev.c
index 3be39058f5..d77dc529e1 100644
--- a/drivers/at86rf2xx/at86rf2xx_netdev.c
+++ b/drivers/at86rf2xx/at86rf2xx_netdev.c
@@ -21,7 +21,7 @@
 
 #include "net/eui64.h"
 #include "net/ieee802154.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "at86rf2xx.h"
 #include "at86rf2xx_netdev.h"
 #include "at86rf2xx_internal.h"
diff --git a/drivers/include/xbee.h b/drivers/include/xbee.h
index 5f5bec545a..a4b590a221 100644
--- a/drivers/include/xbee.h
+++ b/drivers/include/xbee.h
@@ -29,7 +29,7 @@
 #include "mutex.h"
 #include "periph/uart.h"
 #include "periph/gpio.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ieee802154.h"
 
 #ifdef __cplusplus
diff --git a/drivers/kw2xrf/kw2xrf.c b/drivers/kw2xrf/kw2xrf.c
index b41ed5fc5e..8df534245c 100644
--- a/drivers/kw2xrf/kw2xrf.c
+++ b/drivers/kw2xrf/kw2xrf.c
@@ -24,7 +24,7 @@
 #include "msg.h"
 #include "periph/gpio.h"
 #include "periph/cpuid.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ieee802154.h"
 
 #define ENABLE_DEBUG    (0)
diff --git a/examples/gnrc_networking/udp.c b/examples/gnrc_networking/udp.c
index 3365ea1ea4..a727cb6412 100644
--- a/examples/gnrc_networking/udp.c
+++ b/examples/gnrc_networking/udp.c
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "kernel.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_ipv6.h"
 #include "net/ng_udp.h"
 #include "net/ng_pktdump.h"
diff --git a/sys/Makefile b/sys/Makefile
index 6343af63fe..49f950f3f2 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -28,6 +28,9 @@ endif
 ifneq (,$(filter ipv6_hdr,$(USEMODULE)))
     DIRS += net/network_layer/ipv6/hdr
 endif
+ifneq (,$(filter gnrc gnrc_%,$(USEMODULE)))
+    DIRS += net/gnrc
+endif
 ifneq (,$(filter ng_icmpv6,$(USEMODULE)))
     DIRS += net/network_layer/ng_icmpv6
 endif
diff --git a/sys/auto_init/netif/auto_init_at86rf2xx.c b/sys/auto_init/netif/auto_init_at86rf2xx.c
index a605e3660a..a14d7a1977 100644
--- a/sys/auto_init/netif/auto_init_at86rf2xx.c
+++ b/sys/auto_init/netif/auto_init_at86rf2xx.c
@@ -21,7 +21,7 @@
 
 #include "board.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #include "at86rf2xx.h"
 #include "at86rf2xx_params.h"
diff --git a/sys/auto_init/netif/auto_init_kw2xrf.c b/sys/auto_init/netif/auto_init_kw2xrf.c
index 3b522803e0..1a2f291164 100644
--- a/sys/auto_init/netif/auto_init_kw2xrf.c
+++ b/sys/auto_init/netif/auto_init_kw2xrf.c
@@ -23,7 +23,7 @@
 
 #include "board.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #include "kw2xrf.h"
 #include "kw2xrf_params.h"
diff --git a/sys/auto_init/netif/auto_init_ng_netdev_eth.c b/sys/auto_init/netif/auto_init_ng_netdev_eth.c
index e998a577e6..196e0a83ea 100644
--- a/sys/auto_init/netif/auto_init_ng_netdev_eth.c
+++ b/sys/auto_init/netif/auto_init_ng_netdev_eth.c
@@ -22,7 +22,7 @@
 
 #include "board.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #include "net/ng_netdev_eth.h"
 #include "net/dev_eth.h"
diff --git a/sys/auto_init/netif/auto_init_slip.c b/sys/auto_init/netif/auto_init_slip.c
index aa05a6da41..691dcc4761 100644
--- a/sys/auto_init/netif/auto_init_slip.c
+++ b/sys/auto_init/netif/auto_init_slip.c
@@ -21,7 +21,7 @@
 
 #include "board.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #include "slip.h"
 #include "slip_params.h"
diff --git a/sys/auto_init/netif/auto_init_xbee.c b/sys/auto_init/netif/auto_init_xbee.c
index e106bd91ec..ebabbf8613 100644
--- a/sys/auto_init/netif/auto_init_xbee.c
+++ b/sys/auto_init/netif/auto_init_xbee.c
@@ -21,7 +21,7 @@
 
 #include "board.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #include "xbee.h"
 #include "xbee_params.h"
diff --git a/sys/include/net/ng_netbase.h b/sys/include/net/gnrc.h
similarity index 80%
rename from sys/include/net/ng_netbase.h
rename to sys/include/net/gnrc.h
index 70083e19e1..e39f16ae77 100644
--- a/sys/include/net/ng_netbase.h
+++ b/sys/include/net/gnrc.h
@@ -7,12 +7,13 @@
  */
 
 /**
- * @defgroup    net_ng_netbase  Network Stack Pseudo Header
+ * @defgroup    net_gnrc    Generic (gnrc) network stack.
  * @ingroup     net
+ * @brief       RIOT's modular default IP network stack.
  * @{
  *
  * @file
- * @brief       Pseudo header that includes all network stack base modules
+ * @brief       Pseudo header that includes all gnrc network stack base modules
  *
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
diff --git a/sys/include/net/ng_ipv6.h b/sys/include/net/ng_ipv6.h
index 990be25e37..ee65d72767 100644
--- a/sys/include/net/ng_ipv6.h
+++ b/sys/include/net/ng_ipv6.h
@@ -29,7 +29,7 @@
 #define NG_IPV6_H_
 
 #include "kernel_types.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "thread.h"
 
 #include "net/ipv6.h"
diff --git a/sys/include/net/ng_slip.h b/sys/include/net/ng_slip.h
index 51fa3a3715..b72d6e6dba 100644
--- a/sys/include/net/ng_slip.h
+++ b/sys/include/net/ng_slip.h
@@ -26,7 +26,7 @@
 
 #include <inttypes.h>
 
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "periph/uart.h"
 #include "ringbuffer.h"
 
diff --git a/sys/include/net/ng_udp.h b/sys/include/net/ng_udp.h
index 259d642d11..9df0ba9ba6 100644
--- a/sys/include/net/ng_udp.h
+++ b/sys/include/net/ng_udp.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 #include "byteorder.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/udp.h"
 
 #ifdef __cplusplus
diff --git a/sys/net/application_layer/ng_zep/ng_zep.c b/sys/net/application_layer/ng_zep/ng_zep.c
index 1faabc89fe..29188d4302 100644
--- a/sys/net/application_layer/ng_zep/ng_zep.c
+++ b/sys/net/application_layer/ng_zep/ng_zep.c
@@ -26,7 +26,7 @@
 #include "net/ieee802154.h"
 #include "net/ipv6/addr.h"
 #include "net/ng_ipv6/hdr.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_udp.h"
 #include "periph/cpuid.h"
 #include "random.h"
diff --git a/sys/net/crosslayer/ng_pktdump/ng_pktdump.c b/sys/net/crosslayer/ng_pktdump/ng_pktdump.c
index 2bc6decb3b..d17b14fa9c 100644
--- a/sys/net/crosslayer/ng_pktdump/ng_pktdump.c
+++ b/sys/net/crosslayer/ng_pktdump/ng_pktdump.c
@@ -27,7 +27,7 @@
 #include "msg.h"
 #include "kernel.h"
 #include "net/ng_pktdump.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ipv6/addr.h"
 #include "net/ipv6/hdr.h"
 #include "net/ng_sixlowpan.h"
diff --git a/sys/net/gnrc/Makefile b/sys/net/gnrc/Makefile
new file mode 100644
index 0000000000..48422e909a
--- /dev/null
+++ b/sys/net/gnrc/Makefile
@@ -0,0 +1 @@
+include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/link_layer/ng_nomac/ng_nomac.c b/sys/net/link_layer/ng_nomac/ng_nomac.c
index 90ea92048d..a5c03a9e2f 100644
--- a/sys/net/link_layer/ng_nomac/ng_nomac.c
+++ b/sys/net/link_layer/ng_nomac/ng_nomac.c
@@ -22,7 +22,7 @@
 #include "msg.h"
 #include "thread.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #define ENABLE_DEBUG    (0)
 #include "debug.h"
diff --git a/sys/net/link_layer/ng_slip/ng_slip.c b/sys/net/link_layer/ng_slip/ng_slip.c
index ead9715d34..6255c8ce6f 100644
--- a/sys/net/link_layer/ng_slip/ng_slip.c
+++ b/sys/net/link_layer/ng_slip/ng_slip.c
@@ -27,7 +27,7 @@
 #include "kernel.h"
 #include "kernel_types.h"
 #include "msg.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "periph/uart.h"
 #include "ringbuffer.h"
 #include "thread.h"
diff --git a/sys/net/network_layer/ng_icmpv6/echo/ng_icmpv6_echo.c b/sys/net/network_layer/ng_icmpv6/echo/ng_icmpv6_echo.c
index 85a5dfed90..b005ad66f7 100644
--- a/sys/net/network_layer/ng_icmpv6/echo/ng_icmpv6_echo.c
+++ b/sys/net/network_layer/ng_icmpv6/echo/ng_icmpv6_echo.c
@@ -12,7 +12,7 @@
  * @file
  */
 
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #include "od.h"
 #include "net/ng_icmpv6.h"
diff --git a/sys/net/network_layer/ng_icmpv6/ng_icmpv6.c b/sys/net/network_layer/ng_icmpv6/ng_icmpv6.c
index 3c811976da..aa4e16223d 100644
--- a/sys/net/network_layer/ng_icmpv6/ng_icmpv6.c
+++ b/sys/net/network_layer/ng_icmpv6/ng_icmpv6.c
@@ -22,7 +22,7 @@
 #include "byteorder.h"
 #include "kernel_types.h"
 #include "net/ipv6/hdr.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_ndp.h"
 #include "net/protnum.h"
 #include "od.h"
diff --git a/sys/net/network_layer/ng_ipv6/ng_ipv6.c b/sys/net/network_layer/ng_ipv6/ng_ipv6.c
index a6664aecbc..cc4ac45160 100644
--- a/sys/net/network_layer/ng_ipv6/ng_ipv6.c
+++ b/sys/net/network_layer/ng_ipv6/ng_ipv6.c
@@ -19,7 +19,7 @@
 #include "cpu_conf.h"
 #include "kernel_types.h"
 #include "net/ng_icmpv6.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_ndp.h"
 #include "net/protnum.h"
 #include "thread.h"
diff --git a/sys/net/network_layer/ng_ndp/ng_ndp.c b/sys/net/network_layer/ng_ndp/ng_ndp.c
index 895708531e..45ba40bee6 100644
--- a/sys/net/network_layer/ng_ndp/ng_ndp.c
+++ b/sys/net/network_layer/ng_ndp/ng_ndp.c
@@ -23,7 +23,7 @@
 #include "net/ipv6/ext/rh.h"
 #include "net/ng_icmpv6.h"
 #include "net/ng_ipv6.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "random.h"
 #include "utlist.h"
 #include "thread.h"
diff --git a/sys/net/network_layer/ng_sixlowpan/frag/rbuf.c b/sys/net/network_layer/ng_sixlowpan/frag/rbuf.c
index 50b7d72bcd..96f31a53b8 100644
--- a/sys/net/network_layer/ng_sixlowpan/frag/rbuf.c
+++ b/sys/net/network_layer/ng_sixlowpan/frag/rbuf.c
@@ -16,7 +16,7 @@
 #include <stdbool.h>
 
 #include "rbuf.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_ipv6/hdr.h"
 #include "net/ng_ipv6/netif.h"
 #include "net/ng_sixlowpan.h"
diff --git a/sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c b/sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c
index 0a07348553..9fcff995f2 100644
--- a/sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c
+++ b/sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c
@@ -17,7 +17,7 @@
 #include "byteorder.h"
 #include "net/ieee802154.h"
 #include "net/ipv6/hdr.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_sixlowpan/ctx.h"
 #include "utlist.h"
 
diff --git a/sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c b/sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
index 8730a3f340..7d7be3fb3d 100644
--- a/sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
+++ b/sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
@@ -13,7 +13,7 @@
  */
 
 #include "kernel_types.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "thread.h"
 #include "utlist.h"
 
diff --git a/sys/net/transport_layer/ng_udp/ng_udp.c b/sys/net/transport_layer/ng_udp/ng_udp.c
index 9c165518a9..29bd1d04c9 100644
--- a/sys/net/transport_layer/ng_udp/ng_udp.c
+++ b/sys/net/transport_layer/ng_udp/ng_udp.c
@@ -27,7 +27,7 @@
 #include "utlist.h"
 #include "net/ipv6/hdr.h"
 #include "net/ng_udp.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/inet_csum.h"
 
 
diff --git a/sys/shell/commands/sc_icmpv6_echo.c b/sys/shell/commands/sc_icmpv6_echo.c
index c5332aa724..c307b1970c 100644
--- a/sys/shell/commands/sc_icmpv6_echo.c
+++ b/sys/shell/commands/sc_icmpv6_echo.c
@@ -26,7 +26,7 @@
 #include "net/ipv6/addr.h"
 #include "net/ng_ipv6/nc.h"
 #include "net/ng_ipv6/hdr.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "thread.h"
 #include "utlist.h"
 #include "vtimer.h"
diff --git a/tests/driver_at86rf2xx/auto_init_ng_netif/netif_app.c b/tests/driver_at86rf2xx/auto_init_ng_netif/netif_app.c
index 644992b053..e2f8f20f54 100644
--- a/tests/driver_at86rf2xx/auto_init_ng_netif/netif_app.c
+++ b/tests/driver_at86rf2xx/auto_init_ng_netif/netif_app.c
@@ -23,7 +23,7 @@
 #include "kernel.h"
 #include "at86rf2xx.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 /* make sure the SPI port and the needed GPIO pins are defined */
 #ifndef ATRF_SPI
diff --git a/tests/driver_at86rf2xx/main.c b/tests/driver_at86rf2xx/main.c
index 6c10603ab9..c6f7c9c8db 100644
--- a/tests/driver_at86rf2xx/main.c
+++ b/tests/driver_at86rf2xx/main.c
@@ -25,7 +25,7 @@
 #include "posix_io.h"
 #include "board_uart0.h"
 #include "net/ng_pktdump.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 /**
  * @brief   Buffer size used by the shell
diff --git a/tests/driver_kw2xrf/auto_init_ng_netif/netif_app.c b/tests/driver_kw2xrf/auto_init_ng_netif/netif_app.c
index ae54951c2f..38a03497ad 100644
--- a/tests/driver_kw2xrf/auto_init_ng_netif/netif_app.c
+++ b/tests/driver_kw2xrf/auto_init_ng_netif/netif_app.c
@@ -25,7 +25,7 @@
 #include "kernel.h"
 #include "kw2xrf.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 /* make sure the SPI port and the needed GPIO pins are defined */
 #ifndef KWRF_SPI
diff --git a/tests/driver_kw2xrf/main.c b/tests/driver_kw2xrf/main.c
index 3977d07c10..295c72f784 100644
--- a/tests/driver_kw2xrf/main.c
+++ b/tests/driver_kw2xrf/main.c
@@ -23,7 +23,7 @@
 #include "shell_commands.h"
 #include "posix_io.h"
 #include "board_uart0.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_pktdump.h"
 
 /**
diff --git a/tests/driver_netdev_eth/Makefile b/tests/driver_netdev_eth/Makefile
index a2fcc6e80a..c663b08962 100644
--- a/tests/driver_netdev_eth/Makefile
+++ b/tests/driver_netdev_eth/Makefile
@@ -4,7 +4,7 @@ include ../Makefile.tests_common
 BOARD_WHITELIST := native
 
 USEMODULE += dev_eth_tap
-USEMODULE += ng_netbase
+USEMODULE += gnrc
 USEMODULE += ng_nomac
 USEMODULE += ng_pktdump
 USEMODULE += ng_netdev_eth
diff --git a/tests/driver_netdev_eth/main.c b/tests/driver_netdev_eth/main.c
index 0f200b096c..1d903982d1 100644
--- a/tests/driver_netdev_eth/main.c
+++ b/tests/driver_netdev_eth/main.c
@@ -26,7 +26,7 @@
 #include "kernel.h"
 #include "shell.h"
 #include "shell_commands.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_nomac.h"
 #include "net/ng_pktdump.h"
 #include "net/ng_netdev_eth.h"
diff --git a/tests/driver_nrfmin/Makefile b/tests/driver_nrfmin/Makefile
index f20c9800dc..d07a681829 100644
--- a/tests/driver_nrfmin/Makefile
+++ b/tests/driver_nrfmin/Makefile
@@ -8,7 +8,7 @@ USEMODULE += shell_commands
 USEMODULE += ps
 USEMODULE += uart0
 USEMODULE += radio_nrfmin
-USEMODULE += ng_netbase
+USEMODULE += gnrc
 USEMODULE += ng_nomac
 USEMODULE += ng_pktdump
 
diff --git a/tests/driver_nrfmin/main.c b/tests/driver_nrfmin/main.c
index c4356684f9..7ef04605ba 100644
--- a/tests/driver_nrfmin/main.c
+++ b/tests/driver_nrfmin/main.c
@@ -24,7 +24,7 @@
 #include "posix_io.h"
 #include "board_uart0.h"
 #include "nrfmin.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_nomac.h"
 #include "net/ng_pktdump.h"
 
diff --git a/tests/driver_xbee/main.c b/tests/driver_xbee/main.c
index a95c0f0dfd..81dfad5c60 100644
--- a/tests/driver_xbee/main.c
+++ b/tests/driver_xbee/main.c
@@ -22,7 +22,7 @@
 
 #include "shell.h"
 #include "shell_commands.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_pktdump.h"
 
 /**
diff --git a/tests/slip/Makefile b/tests/slip/Makefile
index d86efb34df..3d70963e0f 100644
--- a/tests/slip/Makefile
+++ b/tests/slip/Makefile
@@ -3,7 +3,7 @@ include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := stm32f0discovery
 
-USEMODULE += ng_netbase
+USEMODULE += gnrc
 USEMODULE += ng_pktdump
 USEMODULE += ng_slip
 USEMODULE += shell
diff --git a/tests/slip/main.c b/tests/slip/main.c
index f137b1bb90..f7cf62a563 100644
--- a/tests/slip/main.c
+++ b/tests/slip/main.c
@@ -22,7 +22,7 @@
 
 #include "shell.h"
 #include "shell_commands.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_pktdump.h"
 
 /**
diff --git a/tests/zep/main.c b/tests/zep/main.c
index 2f7343f489..fd9b087743 100644
--- a/tests/zep/main.c
+++ b/tests/zep/main.c
@@ -22,7 +22,7 @@
 
 #include "shell.h"
 #include "shell_commands.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_pktdump.h"
 
 /**
-- 
GitLab