diff --git a/drivers/encx24j600/encx24j600.c b/drivers/encx24j600/encx24j600.c
index 378d8c3d44d94091eaab9a2dfee5cced204d6a30..104c8f6aa375cb1cf4813a4395913fd924b4febe 100644
--- a/drivers/encx24j600/encx24j600.c
+++ b/drivers/encx24j600/encx24j600.c
@@ -22,10 +22,6 @@
 #include <assert.h>
 #include <errno.h>
 
-#ifdef MODULE_NETSTATS_L2
-#include <string.h>
-#endif
-
 #include "mutex.h"
 #include "encx24j600.h"
 #include "encx24j600_internal.h"
@@ -36,7 +32,11 @@
 #include "net/netdev/eth.h"
 #include "net/eui64.h"
 #include "net/ethernet.h"
+
+#ifdef MODULE_NETSTATS_L2
+#include <string.h>
 #include "net/netstats.h"
+#endif
 
 #define ENABLE_DEBUG (0)
 #include "debug.h"
diff --git a/drivers/include/net/netdev.h b/drivers/include/net/netdev.h
index b512df9ee802734f7da2078ac5a22460f06696cb..57ac3178d022e5b02f938c9e0aeec70b71a53ddc 100644
--- a/drivers/include/net/netdev.h
+++ b/drivers/include/net/netdev.h
@@ -53,9 +53,14 @@ extern "C" {
 #include <stdint.h>
 #include <sys/uio.h>
 
+#include "net/netopt.h"
+
+#ifdef MODULE_NETSTATS_L2
 #include "net/netstats.h"
+#endif
+#ifdef MODULE_L2FILTER
 #include "net/l2filter.h"
-#include "net/netopt.h"
+#endif
 
 enum {
     NETDEV_TYPE_UNKNOWN,
diff --git a/sys/include/net/gnrc/ipv6/netif.h b/sys/include/net/gnrc/ipv6/netif.h
index 7e513dfa3d45fe4d29cb97235c94abb116ad2b41..15357c4cbf828700e72c1bcc2b5be938e45cd2c4 100644
--- a/sys/include/net/gnrc/ipv6/netif.h
+++ b/sys/include/net/gnrc/ipv6/netif.h
@@ -30,9 +30,12 @@
 #include "mutex.h"
 #include "net/ipv6.h"
 #include "net/ipv6/addr.h"
-#include "net/netstats.h"
 #include "xtimer.h"
 
+#ifdef MODULE_NETSTATS_IPV6
+#include "net/netstats.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -605,7 +608,9 @@ void gnrc_ipv6_netif_init_by_dev(void);
  * @return  A @ref netstats_t pointer to the statistics.
  * @return  NULL if no statistics are available.
  */
+#if defined(MODULE_NETSTATS_IPV6) || DOXYGEN
 netstats_t *gnrc_ipv6_netif_get_stats(kernel_pid_t pid);
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/sys/shell/commands/sc_netif.c b/sys/shell/commands/sc_netif.c
index 64fc8657b934eb1973cd2e60a9470425a089fc3b..8c4f57286996d083a1c68a762ac87ef8c71422e5 100644
--- a/sys/shell/commands/sc_netif.c
+++ b/sys/shell/commands/sc_netif.c
@@ -26,8 +26,6 @@
 #include <inttypes.h>
 
 #include "thread.h"
-#include "net/netstats.h"
-#include "net/l2filter.h"
 #include "net/ipv6/addr.h"
 #include "net/gnrc/ipv6/netif.h"
 #include "net/gnrc/netif.h"
@@ -38,6 +36,13 @@
 #include "net/gnrc/netif/hdr.h"
 #include "net/gnrc/sixlowpan/netif.h"
 
+#ifdef MODULE_NETSTATS
+#include "net/netstats.h"
+#endif
+#ifdef MODULE_L2FILTER
+#include "net/l2filter.h"
+#endif
+
 /**
  * @brief   The maximal expected link layer address length in byte
  */