diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index d00bbaa1ef1..d127ae5e5b6 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -38,7 +38,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#if defined(CONFIG_NET) && defined(CONFIG_NET_TUN)
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -55,19 +54,22 @@
 
 #include <arpa/inet.h>
 
+#include <net/if.h>
+
+#ifdef CONFIG_NET_PKT
+#  include <nuttx/net/pkt.h>
+#endif
+
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
+#include <nuttx/net/ethernet.h>
 #include <nuttx/net/tun.h>
 
-#include <net/if.h>
-
-#ifdef CONFIG_NET_PKT
-#  include <nuttx/net/pkt.h>
-#endif
+#if defined(CONFIG_NET) && defined(CONFIG_NET_TUN)
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/net/ipforward/ipv6_forward.c b/net/ipforward/ipv6_forward.c
index 81cca68956d..b2fea28f4ac 100644
--- a/net/ipforward/ipv6_forward.c
+++ b/net/ipforward/ipv6_forward.c
@@ -151,7 +151,6 @@ static int ipv6_hdrsize(FAR struct ipv6_hdr_s *ipv6)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_NET_6LOWPAN
 static int ipv6_decr_ttl(FAR struct ipv6_hdr_s *ipv6)
 {
   int ttl = (int)ipv6->ttl - 1;
@@ -179,7 +178,6 @@ static int ipv6_decr_ttl(FAR struct ipv6_hdr_s *ipv6)
 
   return ttl;
 }
-#endif
 
 /****************************************************************************
  * Name: ipv6_packet_conversion