diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index fe79c0e90db..36b79a9d386 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -54,10 +54,11 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+#include <net/ethernet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-
-#include <net/ethernet.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 407228c842d..8b46150a172 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -49,10 +49,11 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
-
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c
index 08dc10c4e54..1b726da2a9d 100644
--- a/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -48,10 +48,11 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
-
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c
index aaeeefeb67d..dc881c605cb 100644
--- a/arch/arm/src/sam34/sam_emac.c
+++ b/arch/arm/src/sam34/sam_emac.c
@@ -59,6 +59,8 @@
 #include <queue.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c
index 2daf5f48a65..e4149c131f7 100644
--- a/arch/arm/src/sama5/sam_emaca.c
+++ b/arch/arm/src/sama5/sam_emaca.c
@@ -60,6 +60,8 @@
 #include <queue.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c
index a7567e794ca..fb06788c5dc 100644
--- a/arch/arm/src/sama5/sam_emacb.c
+++ b/arch/arm/src/sama5/sam_emacb.c
@@ -74,6 +74,8 @@
 #include <queue.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c
index 1aef6a032a8..8e2e4f8f1a7 100644
--- a/arch/arm/src/sama5/sam_gmac.c
+++ b/arch/arm/src/sama5/sam_gmac.c
@@ -57,6 +57,8 @@
 #include <queue.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index 082ebfd9794..64aa3d39ae8 100644
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -49,6 +49,8 @@
 #include <queue.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
diff --git a/arch/arm/src/tiva/tiva_ethernet.c b/arch/arm/src/tiva/tiva_ethernet.c
index f1ebd705484..e200f7d7518 100644
--- a/arch/arm/src/tiva/tiva_ethernet.c
+++ b/arch/arm/src/tiva/tiva_ethernet.c
@@ -48,6 +48,8 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c
index 1c98c8d87b3..b6587601051 100644
--- a/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -48,9 +48,10 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index 91ddb93c681..ecc9e169791 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -51,10 +51,11 @@
 #include <errno.h>
 #include <assert.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
-
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
diff --git a/arch/sim/src/up_wpcap.c b/arch/sim/src/up_wpcap.c
index 87f376e7035..dabbe0dab01 100644
--- a/arch/sim/src/up_wpcap.c
+++ b/arch/sim/src/up_wpcap.c
@@ -54,6 +54,9 @@
 #include <stdlib.h>
 #include <malloc.h>
 
+#include <netinet/in.h>
+
+
 extern int netdriver_setmacaddr(unsigned char *macaddr);
 
 /****************************************************************************
diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c
index a4777ed501d..7f0ba5757ee 100644
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@@ -52,15 +52,16 @@
 #include <errno.h>
 #include <assert.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
-
-#include <arch/io.h>
-
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
+#include <arch/io.h>
+
 #include "chip.h"
 #include "up_internal.h"
 
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 3bc3462e468..6af54d7b055 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -48,9 +48,10 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c
index 76293386f3f..093a8480747 100644
--- a/drivers/net/dm90x0.c
+++ b/drivers/net/dm90x0.c
@@ -60,10 +60,11 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+#include <net/ethernet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-
-#include <net/ethernet.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index e302f744e33..21a58d2e3af 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -50,10 +50,11 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
-
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
@@ -63,6 +64,7 @@
 #include <rgmp/utils.h>
 #include <rgmp/arch/pci.h>
 #include <rgmp/memio.h>
+
 #include "e1000.h"
 
 /****************************************************************************
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 3303f40067d..ed5ea8379e7 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -54,13 +54,14 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/clock.h>
 #include <nuttx/net/enc28j60.h>
-
 #include <nuttx/net/net.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c
index c995a75fbfa..3c1b5c43a9d 100644
--- a/drivers/net/encx24j600.c
+++ b/drivers/net/encx24j600.c
@@ -60,16 +60,17 @@
 #include <errno.h>
 #include <queue.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/clock.h>
-#include <nuttx/net/encx24j600.h>
-
 #include <nuttx/net/net.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
+#include <nuttx/net/encx24j600.h>
 
 #include "encx24j600.h"
 
diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c
index cf51181bab8..fe28be60376 100644
--- a/drivers/net/skeleton.c
+++ b/drivers/net/skeleton.c
@@ -48,9 +48,10 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index b67bd9f058a..b7c70af36ae 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -56,8 +56,8 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/net/net.h>
-
 #include <nuttx/net/netdev.h>
+#include <nuttx/net/ip.h>
 
 #if defined(CONFIG_NET) && defined(CONFIG_NET_SLIP)
 
@@ -708,7 +708,7 @@ static int slip_rxtask(int argc, char *argv[])
        * enough to hold an IP header.
        */
 
-      if (priv->rxlen >= UIP_IPH_LEN)
+      if (priv->rxlen >= IPHDR_LEN)
         {
           /* Handle the IP input.  Get exclusive access to uIP. */
 
diff --git a/drivers/net/vnet.c b/drivers/net/vnet.c
index b1ed8e30432..f0d7af8f225 100644
--- a/drivers/net/vnet.c
+++ b/drivers/net/vnet.c
@@ -52,9 +52,10 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c
index fca03aa0946..54bfcd1539c 100644
--- a/fs/nfs/nfs_vfsops.c
+++ b/fs/nfs/nfs_vfsops.c
@@ -73,6 +73,7 @@
 
 #include <net/if.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include "nfs.h"
 #include "rpc.h"
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 7428c76f283..e3ff44acac5 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -91,42 +91,43 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
 
 /* Functions to convert between nost and network byte ordering */
 
-EXTERN uint32_t    ntohl(uint32_t nl);
-EXTERN uint16_t    ntohs(uint16_t ns);
-EXTERN uint32_t    htonl(uint32_t hl);
-EXTERN uint16_t    htons(uint16_t hs);
+uint32_t    ntohl(uint32_t nl);
+uint16_t    ntohs(uint16_t ns);
+uint32_t    htonl(uint32_t hl);
+uint16_t    htons(uint16_t hs);
 
 /* Functions to manipulate address representations */
 
-EXTERN int         inet_aton(FAR const char *cp, FAR struct in_addr *inp);
-EXTERN in_addr_t   inet_addr(FAR const char *cp);
-EXTERN in_addr_t   inet_network(FAR const char *cp);
+int         inet_aton(FAR const char *cp, FAR struct in_addr *inp);
+in_addr_t   inet_addr(FAR const char *cp);
+in_addr_t   inet_network(FAR const char *cp);
 
 #ifdef CONFIG_CAN_PASS_STRUCTS
-EXTERN FAR char   *inet_ntoa(struct in_addr in);
-EXTERN in_addr_t   inet_lnaof(struct in_addr in);
-EXTERN in_addr_t   inet_netof(struct in_addr in);
+FAR char   *inet_ntoa(struct in_addr in);
+in_addr_t   inet_lnaof(struct in_addr in);
+in_addr_t   inet_netof(struct in_addr in);
 #else
-EXTERN FAR char   *_inet_ntoa(in_addr_t in);
+FAR char   *_inet_ntoa(in_addr_t in);
 # define inet_ntoa(in) _inet_ntoa(in.s_addr);
 
-EXTERN in_addr_t   _inet_lnaof(in_addr_t in);
+in_addr_t   _inet_lnaof(in_addr_t in);
 # define inet_lnaof(in) _inet_lnaof(in.s_addr);
 
-EXTERN in_addr_t   _inet_netof(in_addr_t in);
+in_addr_t   _inet_netof(in_addr_t in);
 # define inet_netof(in) _inet_netof(in.s_addr);
 #endif
-EXTERN struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host);
+struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host);
 
-EXTERN int         inet_pton(int af, FAR const char *src, FAR void *dst);
-EXTERN const char *inet_ntop(int af, FAR const void *src, FAR char *dst, socklen_t size);
+int         inet_pton(int af, FAR const char *src, FAR void *dst);
+const char *inet_ntop(int af, FAR const void *src, FAR char *dst, socklen_t size);
 
 #undef EXTERN
 #ifdef __cplusplus
diff --git a/include/nuttx/net/arp.h b/include/nuttx/net/arp.h
index b1ecf027729..7b75007aca2 100644
--- a/include/nuttx/net/arp.h
+++ b/include/nuttx/net/arp.h
@@ -50,7 +50,9 @@
 
 #include <stdint.h>
 
+#include <netinet/in.h>
 #include <net/ethernet.h>
+
 #include <nuttx/net/netconfig.h>
 
 /****************************************************************************
diff --git a/include/nuttx/net/icmp.h b/include/nuttx/net/icmp.h
index a7dfe7b42f2..ae8dcf9db4d 100644
--- a/include/nuttx/net/icmp.h
+++ b/include/nuttx/net/icmp.h
@@ -48,7 +48,9 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+
 #include <nuttx/net/netconfig.h>
+#include <nuttx/net/ip.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -101,8 +103,8 @@
 
 /* Header sizes */
 
-#define UIP_ICMPH_LEN   4                             /* Size of ICMP header */
-#define UIP_IPICMPH_LEN (UIP_ICMPH_LEN + UIP_IPH_LEN) /* Size of IP + ICMP header */
+#define UIP_ICMPH_LEN   4                           /* Size of ICMP header */
+#define UIP_IPICMPH_LEN (UIP_ICMPH_LEN + IPHDR_LEN) /* Size of IP + ICMP header */
 
 /****************************************************************************
  * Public Type Definitions
diff --git a/include/nuttx/net/igmp.h b/include/nuttx/net/igmp.h
index 6fe0f1fd737..5770e585ded 100644
--- a/include/nuttx/net/igmp.h
+++ b/include/nuttx/net/igmp.h
@@ -54,8 +54,9 @@
 
 #include <netinet/in.h>
 
-#include <nuttx/net/netdev.h>
 #include <nuttx/net/netconfig.h>
+#include <nuttx/net/netdev.h>
+#include <nuttx/net/ip.h>
 
 #ifdef CONFIG_NET_IGMP
 
@@ -82,7 +83,7 @@
  */
 
 #define UIP_IGMPH_LEN            8
-#define UIP_IPIGMPH_LEN          (UIP_IGMPH_LEN + UIP_IPH_LEN + 4)
+#define UIP_IPIGMPH_LEN          (UIP_IGMPH_LEN + IPHDR_LEN + 4)
 
 /* Group flags */
 
diff --git a/include/nuttx/net/ip.h b/include/nuttx/net/ip.h
index 4b7339dc5b5..12f8f9c037f 100644
--- a/include/nuttx/net/ip.h
+++ b/include/nuttx/net/ip.h
@@ -55,6 +55,7 @@
 #include <queue.h>
 
 #include <arpa/inet.h>
+#include <netinet/in.h>
 
 #include <nuttx/net/netconfig.h>
 
diff --git a/include/nuttx/net/net.h b/include/nuttx/net/net.h
index 416582e6d8a..e2c465a2145 100644
--- a/include/nuttx/net/net.h
+++ b/include/nuttx/net/net.h
@@ -43,6 +43,7 @@
 #include <nuttx/config.h>
 #ifdef CONFIG_NET
 
+#include <sys/socket.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdarg.h>
diff --git a/include/nuttx/net/netdev.h b/include/nuttx/net/netdev.h
index 3380bf273eb..efe74f818d8 100644
--- a/include/nuttx/net/netdev.h
+++ b/include/nuttx/net/netdev.h
@@ -52,12 +52,15 @@
 #include <stdint.h>
 #include <net/if.h>
 
+#include <net/ethernet.h>
+#include <arpa/inet.h>
+
 #ifdef CONFIG_NET_IGMP
 #  include <nuttx/net/igmp.h>
 #endif
 
 #include <nuttx/net/netconfig.h>
-#include <net/ethernet.h>
+#include <nuttx/net/ip.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/include/nuttx/net/tcp.h b/include/nuttx/net/tcp.h
index 30cccdc4316..d34ee03ea5e 100644
--- a/include/nuttx/net/tcp.h
+++ b/include/nuttx/net/tcp.h
@@ -58,6 +58,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/iob.h>
+#include <nuttx/net/ip.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -103,9 +104,9 @@
 
 /* TCP header sizes */
 
-#define UIP_TCPH_LEN    20    /* Size of TCP header */
-#define UIP_IPTCPH_LEN (UIP_TCPH_LEN + UIP_IPH_LEN)    /* Size of IP + TCP header */
-#define UIP_TCPIP_HLEN UIP_IPTCPH_LEN
+#define UIP_TCPH_LEN    20                         /* Size of TCP header */
+#define UIP_IPTCPH_LEN  (UIP_TCPH_LEN + IPHDR_LEN) /* Size of IP + TCP header */
+#define UIP_TCPIP_HLEN  UIP_IPTCPH_LEN
 
 /* Initial minimum MSS according to RFC 879
  *
diff --git a/include/nuttx/net/udp.h b/include/nuttx/net/udp.h
index 4fac3ab76fe..05b5c21057d 100644
--- a/include/nuttx/net/udp.h
+++ b/include/nuttx/net/udp.h
@@ -52,7 +52,9 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+
 #include <nuttx/net/netconfig.h>
+#include <nuttx/net/ip.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -60,8 +62,8 @@
 
 /* Header sizes */
 
-#define UIP_UDPH_LEN    8     /* Size of UDP header */
-#define UIP_IPUDPH_LEN (UIP_UDPH_LEN + UIP_IPH_LEN)    /* Size of IP + UDP header */
+#define UIP_UDPH_LEN   8                             /* Size of UDP header */
+#define UIP_IPUDPH_LEN (UIP_UDPH_LEN + IPHDR_LEN)    /* Size of IP + UDP header */
 
 /****************************************************************************
  * Public Type Definitions
diff --git a/libc/net/lib_inetntoa.c b/libc/net/lib_inetntoa.c
index e2d92d8648b..f7152d15456 100644
--- a/libc/net/lib_inetntoa.c
+++ b/libc/net/lib_inetntoa.c
@@ -38,8 +38,11 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
 #include <stdio.h>
+
 #include <arpa/inet.h>
+#include <netinet/in.h>
 
 #ifndef CONFIG_NET_IPv6
 
diff --git a/libc/net/lib_inetpton.c b/libc/net/lib_inetpton.c
index a0eca934b26..2805a70476f 100644
--- a/libc/net/lib_inetpton.c
+++ b/libc/net/lib_inetpton.c
@@ -53,6 +53,7 @@
 #include <errno.h>
 
 #include <arpa/inet.h>
+#include <netinet/in.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/net/arp/arp_inout.c b/net/arp/arp_inout.c
index 09d17b944eb..4bd9970e6c2 100644
--- a/net/arp/arp_inout.c
+++ b/net/arp/arp_inout.c
@@ -61,11 +61,13 @@
 #include <debug.h>
 
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include <net/ethernet.h>
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/arp.h>
+#include <nuttx/net/ip.h>
 
 #include "netdev/netdev.h"
 #include "route/route.h"
diff --git a/net/arp/arp_table.c b/net/arp/arp_table.c
index b6c361285c5..ffe2ec214e6 100644
--- a/net/arp/arp_table.c
+++ b/net/arp/arp_table.c
@@ -56,6 +56,7 @@
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/arp.h>
+#include <nuttx/net/ip.h>
 
 #ifdef CONFIG_NET_ARP
 
diff --git a/net/devif/devif.h b/net/devif/devif.h
index ad4b10cb843..a66bcd6c035 100644
--- a/net/devif/devif.h
+++ b/net/devif/devif.h
@@ -52,6 +52,7 @@
 #include <arch/irq.h>
 
 #include <nuttx/net/arp.h>
+#include <nuttx/net/ip.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/net/devif/devif_initialize.c b/net/devif/devif_initialize.c
index 4066620212b..f46f78d7c30 100644
--- a/net/devif/devif_initialize.c
+++ b/net/devif/devif_initialize.c
@@ -45,7 +45,9 @@
 #ifdef CONFIG_NET
 
 #include <stdint.h>
+
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
 
 #include "devif/devif.h"
 
diff --git a/net/devif/devif_input.c b/net/devif/devif_input.c
index eecad4b9f06..f1c2cdbe699 100644
--- a/net/devif/devif_input.c
+++ b/net/devif/devif_input.c
@@ -88,6 +88,7 @@
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
 
 #ifdef CONFIG_NET_IPv6
 #  include "net_neighbor.h"
diff --git a/net/icmp/icmp.h b/net/icmp/icmp.h
index e0c2c756c23..a5cad2b1935 100644
--- a/net/icmp/icmp.h
+++ b/net/icmp/icmp.h
@@ -44,6 +44,8 @@
 
 #include <sys/types.h>
 
+#include <nuttx/net/ip.h>
+
 #ifdef CONFIG_NET_ICMP
 
 /****************************************************************************
diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c
index c4eb4a397ea..5107dbfdfe3 100644
--- a/net/icmp/icmp_input.c
+++ b/net/icmp/icmp_input.c
@@ -49,9 +49,12 @@
 #include <debug.h>
 
 #include <net/if.h>
+#include <arpa/inet.h>
+
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
 
 #include "devif/devif.h"
 #include "icmp/icmp.h"
diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c
index 9a9a57179d4..4b460a21017 100644
--- a/net/icmp/icmp_ping.c
+++ b/net/icmp/icmp_ping.c
@@ -48,10 +48,12 @@
 #include <debug.h>
 
 #include <net/if.h>
+
 #include <nuttx/clock.h>
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
+#include <nuttx/net/ip.h>
 #include <nuttx/net/icmp.h>
 
 #include "netdev/netdev.h"
diff --git a/net/icmp/icmp_poll.c b/net/icmp/icmp_poll.c
index 0bd4aa10e23..b6604117fea 100644
--- a/net/icmp/icmp_poll.c
+++ b/net/icmp/icmp_poll.c
@@ -47,6 +47,7 @@
 #include <nuttx/net/icmp.h>
 
 #include "devif/devif.h"
+#include "icmp/icmp.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/net/icmp/icmp_send.c b/net/icmp/icmp_send.c
index 1a16ae28210..d5cdbc4d333 100644
--- a/net/icmp/icmp_send.c
+++ b/net/icmp/icmp_send.c
@@ -42,9 +42,12 @@
 
 #include <debug.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
 
 #include "devif/devif.h"
 #include "utils/utils.h"
@@ -118,7 +121,7 @@ void icmp_send(FAR struct net_driver_s *dev, FAR net_ipaddr_t *destaddr)
       picmp->flow        = 0x00;
       picmp->len[0]      = (dev->d_sndlen >> 8);
       picmp->len[1]      = (dev->d_sndlen & 0xff);
-      picmp->nexthdr     = UIP_PROTO_ICMP;
+      picmp->nexthdr     = IP_PROTO_ICMP;
       picmp->hoplimit    = UIP_TTL;
 
       net_ipaddr_copy(picmp->srcipaddr, &dev->d_ipaddr);
@@ -136,7 +139,7 @@ void icmp_send(FAR struct net_driver_s *dev, FAR net_ipaddr_t *destaddr)
       picmp->ipoffset[0] = UIP_TCPFLAG_DONTFRAG >> 8;
       picmp->ipoffset[1] = UIP_TCPFLAG_DONTFRAG & 0xff;
       picmp->ttl         = UIP_TTL;
-      picmp->proto       = UIP_PROTO_ICMP;
+      picmp->proto       = IP_PROTO_ICMP;
 
       net_ipaddr_hdrcopy(picmp->srcipaddr, &dev->d_ipaddr);
       net_ipaddr_hdrcopy(picmp->destipaddr, destaddr);
diff --git a/net/igmp/igmp.h b/net/igmp/igmp.h
index a1b33c8b209..0bd5edd2db1 100644
--- a/net/igmp/igmp.h
+++ b/net/igmp/igmp.h
@@ -44,6 +44,8 @@
 
 #include <sys/types.h>
 
+#include <nuttx/net/ip.h>
+
 #ifdef CONFIG_NET_IGMP
 
 /****************************************************************************
diff --git a/net/igmp/igmp_group.c b/net/igmp/igmp_group.c
index 865462afde3..0d70c10b1fb 100644
--- a/net/igmp/igmp_group.c
+++ b/net/igmp/igmp_group.c
@@ -56,6 +56,7 @@
 #include <nuttx/kmalloc.h>
 
 #include <nuttx/net/net.h>
+#include <nuttx/net/ip.h>
 #include <nuttx/net/igmp.h>
 
 #include "devif/devif.h"
diff --git a/net/igmp/igmp_initialize.c b/net/igmp/igmp_initialize.c
index 2dd9df6540f..1d51f452262 100644
--- a/net/igmp/igmp_initialize.c
+++ b/net/igmp/igmp_initialize.c
@@ -47,6 +47,7 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <nuttx/net/ip.h>
 #include <nuttx/net/igmp.h>
 
 #include "devif/devif.h"
diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c
index c7825d64348..1eb09b193c6 100644
--- a/net/igmp/igmp_input.c
+++ b/net/igmp/igmp_input.c
@@ -48,8 +48,9 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/igmp.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
+#include <nuttx/net/igmp.h>
 
 #include "devif/devif.h"
 #include "igmp/igmp.h"
diff --git a/net/igmp/igmp_join.c b/net/igmp/igmp_join.c
index 6c7c5abf452..5a97e2df675 100644
--- a/net/igmp/igmp_join.c
+++ b/net/igmp/igmp_join.c
@@ -46,8 +46,11 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <netinet/in.h>
+
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
 #include <nuttx/net/igmp.h>
 
 #include "devif/devif.h"
diff --git a/net/igmp/igmp_leave.c b/net/igmp/igmp_leave.c
index 0f64d24dc2c..50742a18f24 100644
--- a/net/igmp/igmp_leave.c
+++ b/net/igmp/igmp_leave.c
@@ -47,9 +47,12 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <netinet/in.h>
+
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
 #include <nuttx/net/igmp.h>
 
 #include "devif/devif.h"
diff --git a/net/igmp/igmp_mcastmac.c b/net/igmp/igmp_mcastmac.c
index f053ba56f7e..62df7e72c80 100644
--- a/net/igmp/igmp_mcastmac.c
+++ b/net/igmp/igmp_mcastmac.c
@@ -47,6 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
+#include <nuttx/net/ip.h>
 #include <nuttx/net/igmp.h>
 
 #include "devif/devif.h"
diff --git a/net/igmp/igmp_poll.c b/net/igmp/igmp_poll.c
index 482f54cdb9d..8a16e47e499 100644
--- a/net/igmp/igmp_poll.c
+++ b/net/igmp/igmp_poll.c
@@ -49,6 +49,7 @@
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
 
 #include "devif/devif.h"
 #include "igmp/igmp.h"
diff --git a/net/igmp/igmp_send.c b/net/igmp/igmp_send.c
index dcbc0d15b2a..c9ba71aa61a 100644
--- a/net/igmp/igmp_send.c
+++ b/net/igmp/igmp_send.c
@@ -45,6 +45,7 @@
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
 #include <nuttx/net/ipopt.h>
 #include <nuttx/net/igmp.h>
 
@@ -151,7 +152,7 @@ void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group,
   IGMPBUF->ipoffset[0] = UIP_TCPFLAG_DONTFRAG >> 8;
   IGMPBUF->ipoffset[1] = UIP_TCPFLAG_DONTFRAG & 0xff;
   IGMPBUF->ttl         = IGMP_TTL;
-  IGMPBUF->proto       = UIP_PROTO_IGMP;
+  IGMPBUF->proto       = IP_PROTO_IGMP;
 
   net_ipaddr_hdrcopy(IGMPBUF->srcipaddr, &dev->d_ipaddr);
   net_ipaddr_hdrcopy(IGMPBUF->destipaddr, destipaddr);
diff --git a/net/ipv6/ipv6.h b/net/ipv6/ipv6.h
index 25e2dc61027..41004505d7a 100644
--- a/net/ipv6/ipv6.h
+++ b/net/ipv6/ipv6.h
@@ -46,8 +46,11 @@
  ****************************************************************************/
 
 #include <stdint.h>
+
 #include <net/ethernet.h>
 
+#include <nuttx/net/ip.h>
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
diff --git a/net/ipv6/net_neighbor.c b/net/ipv6/net_neighbor.c
index c85f2421207..7070acc1cf9 100644
--- a/net/ipv6/net_neighbor.c
+++ b/net/ipv6/net_neighbor.c
@@ -43,6 +43,8 @@
 #include <string.h>
 #include <debug.h>
 
+#include <nuttx/net/ip.h>
+
 #include "ipv6/ipv6.h"
 
 /****************************************************************************
diff --git a/net/netdev/netdev.h b/net/netdev/netdev.h
index 010d82ce107..3fc2d5eb0f2 100644
--- a/net/netdev/netdev.h
+++ b/net/netdev/netdev.h
@@ -44,6 +44,8 @@
 
 #include <sys/types.h>
 
+#include <nuttx/net/ip.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/net/netdev/netdev_findbyaddr.c b/net/netdev/netdev_findbyaddr.c
index 9aa868b81c5..9130166c712 100644
--- a/net/netdev/netdev_findbyaddr.c
+++ b/net/netdev/netdev_findbyaddr.c
@@ -46,6 +46,7 @@
 #include <debug.h>
 
 #include <nuttx/net/netdev.h>
+#include <nuttx/net/ip.h>
 
 #include "netdev/netdev.h"
 #include "route/route.h"
diff --git a/net/netdev/netdev_ioctl.c b/net/netdev/netdev_ioctl.c
index f2bcff957ea..af32a8052f0 100644
--- a/net/netdev/netdev_ioctl.c
+++ b/net/netdev/netdev_ioctl.c
@@ -49,6 +49,7 @@
 #include <debug.h>
 
 #include <nuttx/net/net.h>
+#include <nuttx/net/ip.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/net/netdev/netdev_rxnotify.c b/net/netdev/netdev_rxnotify.c
index bb8d90368ce..d3eba2d1eae 100644
--- a/net/netdev/netdev_rxnotify.c
+++ b/net/netdev/netdev_rxnotify.c
@@ -46,6 +46,7 @@
 #include <debug.h>
 
 #include <nuttx/net/netdev.h>
+#include <nuttx/net/ip.h>
 
 #include "netdev/netdev.h"
 
diff --git a/net/netdev/netdev_txnotify.c b/net/netdev/netdev_txnotify.c
index 81679ac93d9..c19f0a7d5eb 100644
--- a/net/netdev/netdev_txnotify.c
+++ b/net/netdev/netdev_txnotify.c
@@ -46,6 +46,7 @@
 #include <debug.h>
 
 #include <nuttx/net/netdev.h>
+#include <nuttx/net/ip.h>
 
 #include "netdev/netdev.h"
 
diff --git a/net/pkt/pkt_send.c b/net/pkt/pkt_send.c
index daee8c44553..1d3f94f7fd4 100644
--- a/net/pkt/pkt_send.c
+++ b/net/pkt/pkt_send.c
@@ -50,10 +50,12 @@
 #include <debug.h>
 
 #include <arch/irq.h>
+
 #include <nuttx/clock.h>
+#include <nuttx/net/netdev.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/netdev.h>
+#include <nuttx/net/ip.h>
 #include <nuttx/net/pkt.h>
 
 #include "netdev/netdev.h"
diff --git a/net/route/net_addroute.c b/net/route/net_addroute.c
index 32d5c2063c3..7053ffb9800 100644
--- a/net/route/net_addroute.c
+++ b/net/route/net_addroute.c
@@ -45,6 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/net/net.h>
+#include <nuttx/net/ip.h>
 
 #include <arch/irq.h>
 
diff --git a/net/route/net_delroute.c b/net/route/net_delroute.c
index f8b71498406..9e3d271bdde 100644
--- a/net/route/net_delroute.c
+++ b/net/route/net_delroute.c
@@ -43,6 +43,8 @@
 #include <string.h>
 #include <errno.h>
 
+#include <nuttx/net/ip.h>
+
 #include "route/route.h"
 
 #if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE)
diff --git a/net/route/net_router.c b/net/route/net_router.c
index 6dab94664ef..1181262e744 100644
--- a/net/route/net_router.c
+++ b/net/route/net_router.c
@@ -43,6 +43,8 @@
 #include <string.h>
 #include <errno.h>
 
+#include <nuttx/net/ip.h>
+
 #include "route/route.h"
 
 #if defined(CONFIG_NET) && defined(CONFIG_NET_ROUTE)
diff --git a/net/route/netdev_router.c b/net/route/netdev_router.c
index 3adaa3bdbc9..d49c1e4d0da 100644
--- a/net/route/netdev_router.c
+++ b/net/route/netdev_router.c
@@ -44,6 +44,7 @@
 #include <errno.h>
 
 #include <nuttx/net/netdev.h>
+#include <nuttx/net/ip.h>
 
 #include "netdev/netdev.h"
 #include "route/route.h"
diff --git a/net/route/route.h b/net/route/route.h
index a6e457c2f78..046a7e9de00 100644
--- a/net/route/route.h
+++ b/net/route/route.h
@@ -43,8 +43,11 @@
 #include <nuttx/config.h>
 
 #include <queue.h>
+
 #include <net/if.h>
 
+#include <nuttx/net/ip.h>
+
 #ifdef CONFIG_NET_ROUTE
 
 /****************************************************************************
diff --git a/net/socket/accept.c b/net/socket/accept.c
index b30f61373b6..48e06851074 100644
--- a/net/socket/accept.c
+++ b/net/socket/accept.c
@@ -52,6 +52,7 @@
 #include <arch/irq.h>
 
 #include <nuttx/net/net.h>
+#include <nuttx/net/ip.h>
 #include <nuttx/net/tcp.h>
 
 #include "socket/socket.h"
diff --git a/net/socket/connect.c b/net/socket/connect.c
index d851b7b223a..eff1d3cb450 100644
--- a/net/socket/connect.c
+++ b/net/socket/connect.c
@@ -56,7 +56,7 @@
 #include "devif/devif.h"
 #include "tcp/tcp.h"
 #include "udp/udp.h"
-#include "socket/socket.h
+#include "socket/socket.h"
 
 /****************************************************************************
  * Private Types
diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c
index 6c636092809..ccc037f4e16 100644
--- a/net/socket/recvfrom.c
+++ b/net/socket/recvfrom.c
@@ -53,10 +53,12 @@
 #endif
 
 #include <arch/irq.h>
+
 #include <nuttx/clock.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/iob.h>
 #include <nuttx/net/netdev.h>
+#include <nuttx/net/ip.h>
 #include <nuttx/net/tcp.h>
 #include <nuttx/net/udp.h>
 #include <nuttx/net/pkt.h>
diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c
index 2d87f8d4fd6..f1bc3655769 100644
--- a/net/tcp/tcp_conn.c
+++ b/net/tcp/tcp_conn.c
@@ -54,6 +54,7 @@
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
+#include <nuttx/net/ip.h>
 #include <nuttx/net/tcp.h>
 
 #include "devif/devif.h"
diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c
index 09b0c3111d6..7182275d17d 100644
--- a/net/tcp/tcp_input.c
+++ b/net/tcp/tcp_input.c
@@ -52,8 +52,9 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/tcp.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
+#include <nuttx/net/tcp.h>
 
 #include "devif/devif.h"
 #include "utils/utils.h"
diff --git a/net/tcp/tcp_send.c b/net/tcp/tcp_send.c
index 80a8cd9656d..ae8c31becc8 100644
--- a/net/tcp/tcp_send.c
+++ b/net/tcp/tcp_send.c
@@ -51,6 +51,7 @@
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
 
 #include "devif/devif.h"
 #include "utils/utils.h"
@@ -180,7 +181,7 @@ static void tcp_sendcommon(FAR struct net_driver_s *dev,
   memcpy(pbuf->ackno, conn->rcvseq, 4);
   memcpy(pbuf->seqno, conn->sndseq, 4);
 
-  pbuf->proto    = UIP_PROTO_TCP;
+  pbuf->proto    = IP_PROTO_TCP;
   pbuf->srcport  = conn->lport;
   pbuf->destport = conn->rport;
 
diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c
index 66893edba16..51c9a1fc522 100644
--- a/net/udp/udp_conn.c
+++ b/net/udp/udp_conn.c
@@ -53,7 +53,9 @@
 #include <arch/irq.h>
 
 #include <nuttx/net/netconfig.h>
+#include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
+#include <nuttx/net/ip.h>
 #include <nuttx/net/udp.h>
 
 #include "devif/devif.h"
diff --git a/net/udp/udp_send.c b/net/udp/udp_send.c
index f2f58f41fb0..a56c91467f5 100644
--- a/net/udp/udp_send.c
+++ b/net/udp/udp_send.c
@@ -46,10 +46,13 @@
 
 #include <debug.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/udp.h>
 #include <nuttx/net/netstats.h>
+#include <nuttx/net/ip.h>
+#include <nuttx/net/udp.h>
 
 #include "devif/devif.h"
 #include "utils/utils.h"
@@ -118,7 +121,7 @@ void udp_send(struct net_driver_s *dev, struct udp_conn_s *conn)
       pudpbuf->flow        = 0x00;
       pudpbuf->len[0]      = (dev->d_sndlen >> 8);
       pudpbuf->len[1]      = (dev->d_sndlen & 0xff);
-      pudpbuf->nexthdr     = UIP_PROTO_UDP;
+      pudpbuf->nexthdr     = IP_PROTO_UDP;
       pudpbuf->hoplimit    = conn->ttl;
 
       net_ipaddr_copy(pudpbuf->srcipaddr, &dev->d_ipaddr);
@@ -136,7 +139,7 @@ void udp_send(struct net_driver_s *dev, struct udp_conn_s *conn)
       pudpbuf->ipoffset[0] = 0;
       pudpbuf->ipoffset[1] = 0;
       pudpbuf->ttl         = conn->ttl;
-      pudpbuf->proto       = UIP_PROTO_UDP;
+      pudpbuf->proto       = IP_PROTO_UDP;
 
       net_ipaddr_hdrcopy(pudpbuf->srcipaddr, &dev->d_ipaddr);
       net_ipaddr_hdrcopy(pudpbuf->destipaddr, &conn->ripaddr);
diff --git a/net/utils/net_chksum.c b/net/utils/net_chksum.c
index 960d364a7bd..188ec1bf1f5 100644
--- a/net/utils/net_chksum.c
+++ b/net/utils/net_chksum.c
@@ -45,6 +45,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
+#include <nuttx/net/ip.h>
 #include <nuttx/net/icmp.h>
 
 #include "utils/utils.h"
@@ -158,7 +159,7 @@ static uint16_t upper_layer_chksum(FAR struct net_driver_s *dev, uint8_t proto)
 #ifdef CONFIG_NET_IPv6
 static uint16_t icmp_6chksum(FAR struct net_driver_s *dev)
 {
-  return upper_layer_chksum(dev, UIP_PROTO_ICMP6);
+  return upper_layer_chksum(dev, IP_PROTO_ICMP6);
 }
 #endif /* CONFIG_NET_IPv6 */
 #endif /* CONFIG_NET_ARCH_CHKSUM */
@@ -311,7 +312,7 @@ uint16_t ip_chksum(FAR struct net_driver_s *dev)
 #if !CONFIG_NET_ARCH_CHKSUM
 uint16_t tcp_chksum(FAR struct net_driver_s *dev)
 {
-  return upper_layer_chksum(dev, UIP_PROTO_TCP);
+  return upper_layer_chksum(dev, IP_PROTO_TCP);
 }
 #endif /* CONFIG_NET_ARCH_CHKSUM */
 
@@ -326,7 +327,7 @@ uint16_t tcp_chksum(FAR struct net_driver_s *dev)
 #if defined(CONFIG_NET_UDP_CHECKSUMS) && !defined(CONFIG_NET_ARCH_CHKSUM)
 uint16_t udp_chksum(FAR struct net_driver_s *dev)
 {
-  return upper_layer_chksum(dev, UIP_PROTO_UDP);
+  return upper_layer_chksum(dev, IP_PROTO_UDP);
 }
 #endif /* CONFIG_NET_UDP_CHECKSUMS && !CONFIG_NET_ARCH_CHKSUM */