Remove all inclusion of uip.h

83 files changed, 0 insertions, 92 deletions

diff --git a/apps/examples/discover/discover_main.c b/apps/examples/discover/discover_main.c
index da0a476d6..cd0cfc4e4 100644
--- a/apps/examples/discover/discover_main.c
+++ b/apps/examples/discover/discover_main.c
@@ -48,7 +48,6 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 
 #include <apps/netutils/netlib.h>
diff --git a/apps/examples/igmp/igmp.c b/apps/examples/igmp/igmp.c
index 7eb751788..730edce97 100644
--- a/apps/examples/igmp/igmp.c
+++ b/apps/examples/igmp/igmp.c
@@ -45,7 +45,6 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <nuttx/net/uip.h>
 #include <apps/netutils/netlib.h>
 #include <apps/netutils/ipmsfilter.h>
 
diff --git a/apps/examples/nettest/nettest.c b/apps/examples/nettest/nettest.c
index 48cd1e0b6..b1596ec61 100644
--- a/apps/examples/nettest/nettest.c
+++ b/apps/examples/nettest/nettest.c
@@ -44,7 +44,6 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <nuttx/net/uip.h>
 #include <apps/netutils/netlib.h>
 
 #include "nettest.h"
diff --git a/apps/examples/tcpecho/tcpecho_main.c b/apps/examples/tcpecho/tcpecho_main.c
index 4bf09d739..cbcafcce5 100644
--- a/apps/examples/tcpecho/tcpecho_main.c
+++ b/apps/examples/tcpecho/tcpecho_main.c
@@ -54,7 +54,6 @@
 #include <unistd.h>
 
 #include <net/if.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 
 #include <apps/netutils/netlib.h>
diff --git a/apps/examples/udp/target.c b/apps/examples/udp/target.c
index 6c6358edf..8b31fc8cd 100644
--- a/apps/examples/udp/target.c
+++ b/apps/examples/udp/target.c
@@ -41,7 +41,6 @@
 #include <stdio.h>
 #include <debug.h>
 
-#include <nuttx/net/uip.h>
 #include <apps/netutils/netlib.h>
 
 #include "udp-internal.h"
diff --git a/apps/examples/webserver/webserver_main.c b/apps/examples/webserver/webserver_main.c
index 15d162a30..6b5f81127 100644
--- a/apps/examples/webserver/webserver_main.c
+++ b/apps/examples/webserver/webserver_main.c
@@ -54,7 +54,6 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 
 #include <apps/netutils/netlib.h>
diff --git a/apps/examples/wget/target.c b/apps/examples/wget/target.c
index cc8d896e5..8d04bd769 100644
--- a/apps/examples/wget/target.c
+++ b/apps/examples/wget/target.c
@@ -46,8 +46,6 @@
 #include <arpa/inet.h>
 #include <net/if.h>
 
-#include <nuttx/net/uip.h>
-
 #include <apps/netutils/netlib.h>
 #include <apps/netutils/dnsclient.h>
 #include <apps/netutils/webclient.h>
diff --git a/apps/examples/xmlrpc/xmlrpc_main.c b/apps/examples/xmlrpc/xmlrpc_main.c
index c2c7d1826..025185531 100644
--- a/apps/examples/xmlrpc/xmlrpc_main.c
+++ b/apps/examples/xmlrpc/xmlrpc_main.c
@@ -63,7 +63,6 @@
 #include <unistd.h>
 
 #include <net/if.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 
 #include <apps/netutils/netlib.h>
diff --git a/apps/include/netutils/httpd.h b/apps/include/netutils/httpd.h
index 5da5ff762..d5a9b21c4 100644
--- a/apps/include/netutils/httpd.h
+++ b/apps/include/netutils/httpd.h
@@ -45,7 +45,6 @@
  ****************************************************************************/
 
 #include <nuttx/net/tcp.h>
-#include <nuttx/net/uip.h>
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/apps/include/netutils/smtp.h b/apps/include/netutils/smtp.h
index cb344b9df..e33d914fb 100644
--- a/apps/include/netutils/smtp.h
+++ b/apps/include/netutils/smtp.h
@@ -45,7 +45,6 @@
  ****************************************************************************/
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 
 /****************************************************************************
  * Type Definitions
diff --git a/apps/netutils/dhcpc/dhcpc.c b/apps/netutils/dhcpc/dhcpc.c
index dab1ed8e3..44f4d1747 100644
--- a/apps/netutils/dhcpc/dhcpc.c
+++ b/apps/netutils/dhcpc/dhcpc.c
@@ -52,7 +52,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/net/uip.h>
 #include <apps/netutils/dhcpc.h>
 #include <apps/netutils/netlib.h>
 
diff --git a/apps/netutils/netlib/netlib.c b/apps/netutils/netlib/netlib.c
index 691c94546..2d2a67838 100644
--- a/apps/netutils/netlib/netlib.c
+++ b/apps/netutils/netlib/netlib.c
@@ -48,7 +48,6 @@
 #include <string.h>
 #include <debug.h>
 
-#include <nuttx/net/uip.h>
 #include <apps/netutils/netlib.h>
 
 
diff --git a/apps/netutils/smtp/smtp.c b/apps/netutils/smtp/smtp.c
index 4b9ddd52e..add48de3c 100644
--- a/apps/netutils/smtp/smtp.c
+++ b/apps/netutils/smtp/smtp.c
@@ -57,7 +57,6 @@
 #include <semaphore.h>
 #include <sys/socket.h>
 
-#include <nuttx/net/uip.h>
 #include <apps/netutils/smtp.h>
 
 /****************************************************************************
diff --git a/apps/netutils/tftpc/tftpc_get.c b/apps/netutils/tftpc/tftpc_get.c
index 96ed2b4eb..3847b2aad 100644
--- a/apps/netutils/tftpc/tftpc_get.c
+++ b/apps/netutils/tftpc/tftpc_get.c
@@ -50,7 +50,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <apps/netutils/tftp.h>
 
 #include "tftpc_internal.h"
diff --git a/apps/netutils/tftpc/tftpc_packets.c b/apps/netutils/tftpc/tftpc_packets.c
index 1df916a6a..f2f1a0a22 100644
--- a/apps/netutils/tftpc/tftpc_packets.c
+++ b/apps/netutils/tftpc/tftpc_packets.c
@@ -52,7 +52,6 @@
 #include <netinet/in.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <apps/netutils/tftp.h>
 
 #include "tftpc_internal.h"
diff --git a/apps/netutils/tftpc/tftpc_put.c b/apps/netutils/tftpc/tftpc_put.c
index 19f33676e..1c22a5e80 100644
--- a/apps/netutils/tftpc/tftpc_put.c
+++ b/apps/netutils/tftpc/tftpc_put.c
@@ -50,7 +50,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <apps/netutils/tftp.h>
 
 #include "tftpc_internal.h"
diff --git a/apps/netutils/webserver/httpd.c b/apps/netutils/webserver/httpd.c
index e9b9f96d5..29dd1f336 100644
--- a/apps/netutils/webserver/httpd.c
+++ b/apps/netutils/webserver/httpd.c
@@ -61,7 +61,6 @@
 #  include <pthread.h>
 #endif
 
-#include <nuttx/net/uip.h>
 #include <apps/netutils/netlib.h>
 #include <apps/netutils/httpd.h>
 
diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c
index 92aa7a0a5..c5834f55c 100644
--- a/apps/nshlib/nsh_netcmds.c
+++ b/apps/nshlib/nsh_netcmds.c
@@ -59,14 +59,9 @@
 
 #include <nuttx/net/net.h>
 #include <nuttx/clock.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
 
-#ifdef CONFIG_NET_STATISTICS
-#  include <nuttx/net/uip.h>
-#endif
-
 #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \
    !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS)
 #  include <apps/netutils/netlib.h>
diff --git a/nuttx/arch/arm/src/c5471/c5471_ethernet.c b/nuttx/arch/arm/src/c5471/c5471_ethernet.c
index 798b9dcde..fe79c0e90 100644
--- a/nuttx/arch/arm/src/c5471/c5471_ethernet.c
+++ b/nuttx/arch/arm/src/c5471/c5471_ethernet.c
@@ -58,7 +58,6 @@
 #include <nuttx/arch.h>
 
 #include <net/ethernet.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_enet.c b/nuttx/arch/arm/src/kinetis/kinetis_enet.c
index fcd90d988..407228c84 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_enet.c
+++ b/nuttx/arch/arm/src/kinetis/kinetis_enet.c
@@ -53,7 +53,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c
index 11a796739..08dc10c4e 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -52,7 +52,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
diff --git a/nuttx/arch/arm/src/sam34/sam_emac.c b/nuttx/arch/arm/src/sam34/sam_emac.c
index cd85d7710..aaeeefeb6 100644
--- a/nuttx/arch/arm/src/sam34/sam_emac.c
+++ b/nuttx/arch/arm/src/sam34/sam_emac.c
@@ -63,7 +63,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/arch/arm/src/sama5/sam_emaca.c b/nuttx/arch/arm/src/sama5/sam_emaca.c
index acaac9b8c..2daf5f48a 100644
--- a/nuttx/arch/arm/src/sama5/sam_emaca.c
+++ b/nuttx/arch/arm/src/sama5/sam_emaca.c
@@ -64,7 +64,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/arch/arm/src/sama5/sam_emacb.c b/nuttx/arch/arm/src/sama5/sam_emacb.c
index c459b526e..a7567e794 100644
--- a/nuttx/arch/arm/src/sama5/sam_emacb.c
+++ b/nuttx/arch/arm/src/sama5/sam_emacb.c
@@ -78,7 +78,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/arch/arm/src/sama5/sam_gmac.c b/nuttx/arch/arm/src/sama5/sam_gmac.c
index 992e3d72d..1aef6a032 100644
--- a/nuttx/arch/arm/src/sama5/sam_gmac.c
+++ b/nuttx/arch/arm/src/sama5/sam_gmac.c
@@ -61,7 +61,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/net/gmii.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c
index 29f589e15..082ebfd97 100644
--- a/nuttx/arch/arm/src/stm32/stm32_eth.c
+++ b/nuttx/arch/arm/src/stm32/stm32_eth.c
@@ -53,7 +53,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #if defined(CONFIG_NET_PKT)
diff --git a/nuttx/arch/arm/src/tiva/tiva_ethernet.c b/nuttx/arch/arm/src/tiva/tiva_ethernet.c
index 6e97070bf..f1ebd7054 100644
--- a/nuttx/arch/arm/src/tiva/tiva_ethernet.c
+++ b/nuttx/arch/arm/src/tiva/tiva_ethernet.c
@@ -51,7 +51,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c
index ebf4cc28f..1c98c8d87 100644
--- a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -51,7 +51,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c
index b76d0d2e9..91ddb93c6 100644
--- a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -55,7 +55,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
diff --git a/nuttx/arch/sim/src/up_netdriver.c b/nuttx/arch/sim/src/up_netdriver.c
index 8b22c00f9..7102e05d8 100644
--- a/nuttx/arch/sim/src/up_netdriver.c
+++ b/nuttx/arch/sim/src/up_netdriver.c
@@ -53,7 +53,6 @@
 #include <nuttx/net/net.h>
 
 #include <net/ethernet.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/arp.h>
 
diff --git a/nuttx/arch/z80/src/ez80/ez80_emac.c b/nuttx/arch/z80/src/ez80/ez80_emac.c
index 1926786bf..a4777ed50 100644
--- a/nuttx/arch/z80/src/ez80/ez80_emac.c
+++ b/nuttx/arch/z80/src/ez80/ez80_emac.c
@@ -58,7 +58,6 @@
 
 #include <arch/io.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/drivers/net/cs89x0.c b/nuttx/drivers/net/cs89x0.c
index f53430ede..3bc3462e4 100644
--- a/nuttx/drivers/net/cs89x0.c
+++ b/nuttx/drivers/net/cs89x0.c
@@ -51,7 +51,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/drivers/net/dm90x0.c b/nuttx/drivers/net/dm90x0.c
index 5db1a4870..76293386f 100644
--- a/nuttx/drivers/net/dm90x0.c
+++ b/nuttx/drivers/net/dm90x0.c
@@ -64,7 +64,6 @@
 #include <nuttx/arch.h>
 
 #include <net/ethernet.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/drivers/net/e1000.c b/nuttx/drivers/net/e1000.c
index fe9f5acde..e302f744e 100644
--- a/nuttx/drivers/net/e1000.c
+++ b/nuttx/drivers/net/e1000.c
@@ -54,7 +54,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/drivers/net/skeleton.c b/nuttx/drivers/net/skeleton.c
index 19eeca5ab..cf51181ba 100644
--- a/nuttx/drivers/net/skeleton.c
+++ b/nuttx/drivers/net/skeleton.c
@@ -51,7 +51,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/drivers/net/slip.c b/nuttx/drivers/net/slip.c
index 083eb4ec2..b67bd9f05 100644
--- a/nuttx/drivers/net/slip.c
+++ b/nuttx/drivers/net/slip.c
@@ -57,7 +57,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/net/net.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 
 #if defined(CONFIG_NET) && defined(CONFIG_NET_SLIP)
diff --git a/nuttx/drivers/net/vnet.c b/nuttx/drivers/net/vnet.c
index aa8c85424..b1ed8e304 100644
--- a/nuttx/drivers/net/vnet.c
+++ b/nuttx/drivers/net/vnet.c
@@ -55,7 +55,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/nuttx/fs/nfs/nfs_vfsops.c b/nuttx/fs/nfs/nfs_vfsops.c
index 7a35c1317..fca03aa09 100644
--- a/nuttx/fs/nfs/nfs_vfsops.c
+++ b/nuttx/fs/nfs/nfs_vfsops.c
@@ -68,7 +68,6 @@
 #include <nuttx/fs/dirent.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/nfs.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/udp.h>
 #include <nuttx/net/netconfig.h>
 
diff --git a/nuttx/include/nuttx/net/arp.h b/nuttx/include/nuttx/net/arp.h
index ebc8e9dc4..b1ecf0277 100644
--- a/nuttx/include/nuttx/net/arp.h
+++ b/nuttx/include/nuttx/net/arp.h
@@ -52,7 +52,6 @@
 
 #include <net/ethernet.h>
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/nuttx/include/nuttx/net/igmp.h b/nuttx/include/nuttx/net/igmp.h
index f2cc4a409..6fe0f1fd7 100644
--- a/nuttx/include/nuttx/net/igmp.h
+++ b/nuttx/include/nuttx/net/igmp.h
@@ -54,7 +54,6 @@
 
 #include <netinet/in.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netconfig.h>
 
diff --git a/nuttx/include/nuttx/net/net.h b/nuttx/include/nuttx/net/net.h
index 14a4216ed..416582e6d 100644
--- a/nuttx/include/nuttx/net/net.h
+++ b/nuttx/include/nuttx/net/net.h
@@ -48,8 +48,6 @@
 #include <stdarg.h>
 #include <semaphore.h>
 
-#include <nuttx/net/uip.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/nuttx/include/nuttx/net/netdev.h b/nuttx/include/nuttx/net/netdev.h
index 30f404d62..3380bf273 100644
--- a/nuttx/include/nuttx/net/netdev.h
+++ b/nuttx/include/nuttx/net/netdev.h
@@ -52,7 +52,6 @@
 #include <stdint.h>
 #include <net/if.h>
 
-#include <nuttx/net/uip.h>
 #ifdef CONFIG_NET_IGMP
 #  include <nuttx/net/igmp.h>
 #endif
diff --git a/nuttx/include/nuttx/net/tcp.h b/nuttx/include/nuttx/net/tcp.h
index 38c259002..30cccdc43 100644
--- a/nuttx/include/nuttx/net/tcp.h
+++ b/nuttx/include/nuttx/net/tcp.h
@@ -58,7 +58,6 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/iob.h>
-#include <nuttx/net/uip.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/net/devif/devif.h b/nuttx/net/devif/devif.h
index c3f18cd81..ad4b10cb8 100644
--- a/nuttx/net/devif/devif.h
+++ b/nuttx/net/devif/devif.h
@@ -51,7 +51,6 @@
 #include <errno.h>
 #include <arch/irq.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/arp.h>
 
 /****************************************************************************
diff --git a/nuttx/net/devif/devif_initialize.c b/nuttx/net/devif/devif_initialize.c
index 861573c19..406662021 100644
--- a/nuttx/net/devif/devif_initialize.c
+++ b/nuttx/net/devif/devif_initialize.c
@@ -45,7 +45,6 @@
 #ifdef CONFIG_NET
 
 #include <stdint.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netstats.h>
 
 #include "devif/devif.h"
diff --git a/nuttx/net/devif/devif_input.c b/nuttx/net/devif/devif_input.c
index e2da0defd..eecad4b9f 100644
--- a/nuttx/net/devif/devif_input.c
+++ b/nuttx/net/devif/devif_input.c
@@ -86,7 +86,6 @@
 #include <string.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
 
diff --git a/nuttx/net/devif/devif_iobsend.c b/nuttx/net/devif/devif_iobsend.c
index 249823b96..424cd94ec 100644
--- a/nuttx/net/devif/devif_iobsend.c
+++ b/nuttx/net/devif/devif_iobsend.c
@@ -44,7 +44,6 @@
 #include <debug.h>
 
 #include <nuttx/net/iob.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_IOB
diff --git a/nuttx/net/devif/devif_pktsend.c b/nuttx/net/devif/devif_pktsend.c
index 2f54e4889..5c453fb4d 100644
--- a/nuttx/net/devif/devif_pktsend.c
+++ b/nuttx/net/devif/devif_pktsend.c
@@ -43,7 +43,6 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT
diff --git a/nuttx/net/devif/devif_poll.c b/nuttx/net/devif/devif_poll.c
index 95698eaad..1809fc5fa 100644
--- a/nuttx/net/devif/devif_poll.c
+++ b/nuttx/net/devif/devif_poll.c
@@ -43,7 +43,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 
 #include "devif/devif.h"
diff --git a/nuttx/net/devif/devif_send.c b/nuttx/net/devif/devif_send.c
index f4be2ffaa..41ecd3361 100644
--- a/nuttx/net/devif/devif_send.c
+++ b/nuttx/net/devif/devif_send.c
@@ -45,7 +45,6 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 
 /****************************************************************************
diff --git a/nuttx/net/devif/net_setipid.c b/nuttx/net/devif/net_setipid.c
index 11707f609..79e9c25b3 100644
--- a/nuttx/net/devif/net_setipid.c
+++ b/nuttx/net/devif/net_setipid.c
@@ -43,8 +43,6 @@
 #include <stdint.h>
 #include <debug.h>
 
-#include <nuttx/net/uip.h>
-
 #include "devif/devif.h"
 
 /****************************************************************************
diff --git a/nuttx/net/icmp/icmp_input.c b/nuttx/net/icmp/icmp_input.c
index ab250e7bf..c4eb4a397 100644
--- a/nuttx/net/icmp/icmp_input.c
+++ b/nuttx/net/icmp/icmp_input.c
@@ -50,7 +50,6 @@
 
 #include <net/if.h>
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
 
diff --git a/nuttx/net/icmp/icmp_poll.c b/nuttx/net/icmp/icmp_poll.c
index 849f8acd7..0bd4aa10e 100644
--- a/nuttx/net/icmp/icmp_poll.c
+++ b/nuttx/net/icmp/icmp_poll.c
@@ -43,7 +43,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/icmp.h>
 
diff --git a/nuttx/net/icmp/icmp_send.c b/nuttx/net/icmp/icmp_send.c
index 3bb3a884a..1a16ae282 100644
--- a/nuttx/net/icmp/icmp_send.c
+++ b/nuttx/net/icmp/icmp_send.c
@@ -43,7 +43,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
 
diff --git a/nuttx/net/igmp/igmp_initialize.c b/nuttx/net/igmp/igmp_initialize.c
index e9a280f58..2dd9df654 100644
--- a/nuttx/net/igmp/igmp_initialize.c
+++ b/nuttx/net/igmp/igmp_initialize.c
@@ -47,7 +47,6 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/igmp.h>
 
 #include "devif/devif.h"
diff --git a/nuttx/net/igmp/igmp_input.c b/nuttx/net/igmp/igmp_input.c
index 7668f81c5..c7825d643 100644
--- a/nuttx/net/igmp/igmp_input.c
+++ b/nuttx/net/igmp/igmp_input.c
@@ -48,7 +48,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/igmp.h>
 #include <nuttx/net/netstats.h>
 
diff --git a/nuttx/net/igmp/igmp_join.c b/nuttx/net/igmp/igmp_join.c
index 1f40acc17..6c7c5abf4 100644
--- a/nuttx/net/igmp/igmp_join.c
+++ b/nuttx/net/igmp/igmp_join.c
@@ -47,7 +47,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netstats.h>
 #include <nuttx/net/igmp.h>
 
diff --git a/nuttx/net/igmp/igmp_mcastmac.c b/nuttx/net/igmp/igmp_mcastmac.c
index 799b839ed..f053ba56f 100644
--- a/nuttx/net/igmp/igmp_mcastmac.c
+++ b/nuttx/net/igmp/igmp_mcastmac.c
@@ -47,7 +47,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/igmp.h>
 
 #include "devif/devif.h"
diff --git a/nuttx/net/igmp/igmp_poll.c b/nuttx/net/igmp/igmp_poll.c
index 8d998bdab..482f54cdb 100644
--- a/nuttx/net/igmp/igmp_poll.c
+++ b/nuttx/net/igmp/igmp_poll.c
@@ -47,7 +47,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
 
diff --git a/nuttx/net/igmp/igmp_send.c b/nuttx/net/igmp/igmp_send.c
index 3df662920..dcbc0d15b 100644
--- a/nuttx/net/igmp/igmp_send.c
+++ b/nuttx/net/igmp/igmp_send.c
@@ -43,7 +43,6 @@
 #include <arpa/inet.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
 #include <nuttx/net/ipopt.h>
diff --git a/nuttx/net/ipv6/ipv6.h b/nuttx/net/ipv6/ipv6.h
index 9ddecef07..25e2dc610 100644
--- a/nuttx/net/ipv6/ipv6.h
+++ b/nuttx/net/ipv6/ipv6.h
@@ -46,7 +46,6 @@
  ****************************************************************************/
 
 #include <stdint.h>
-#include <nuttx/net/uip.h>
 #include <net/ethernet.h>
 
 /****************************************************************************
diff --git a/nuttx/net/netdev/netdev.h b/nuttx/net/netdev/netdev.h
index abc453fae..010d82ce1 100644
--- a/nuttx/net/netdev/netdev.h
+++ b/nuttx/net/netdev/netdev.h
@@ -44,8 +44,6 @@
 
 #include <sys/types.h>
 
-#include <nuttx/net/uip.h>
-
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/nuttx/net/netdev/netdev_ioctl.c b/nuttx/net/netdev/netdev_ioctl.c
index b212da59e..f2bcff957 100644
--- a/nuttx/net/netdev/netdev_ioctl.c
+++ b/nuttx/net/netdev/netdev_ioctl.c
@@ -56,7 +56,6 @@
 #include <netinet/in.h>
 
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/uip.h>
 
 #ifdef CONFIG_NET_IGMP
 #  include "sys/sockio.h"
diff --git a/nuttx/net/pkt/pkt_callback.c b/nuttx/net/pkt/pkt_callback.c
index 0412bdcb9..dcc9e2c59 100644
--- a/nuttx/net/pkt/pkt_callback.c
+++ b/nuttx/net/pkt/pkt_callback.c
@@ -44,7 +44,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/pkt.h>
 
diff --git a/nuttx/net/pkt/pkt_input.c b/nuttx/net/pkt/pkt_input.c
index 46c6b8daa..c1aa03a86 100644
--- a/nuttx/net/pkt/pkt_input.c
+++ b/nuttx/net/pkt/pkt_input.c
@@ -47,7 +47,6 @@
 
 #include <debug.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/pkt.h>
 #include <nuttx/net/arp.h>
diff --git a/nuttx/net/pkt/pkt_poll.c b/nuttx/net/pkt/pkt_poll.c
index 060ea75fd..9019b1ddd 100644
--- a/nuttx/net/pkt/pkt_poll.c
+++ b/nuttx/net/pkt/pkt_poll.c
@@ -48,7 +48,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/udp.h>
 #include <nuttx/net/pkt.h>
diff --git a/nuttx/net/route/route.h b/nuttx/net/route/route.h
index 73b2c02f2..a6e457c2f 100644
--- a/nuttx/net/route/route.h
+++ b/nuttx/net/route/route.h
@@ -45,8 +45,6 @@
 #include <queue.h>
 #include <net/if.h>
 
-#include <nuttx/net/uip.h>
-
 #ifdef CONFIG_NET_ROUTE
 
 /****************************************************************************
diff --git a/nuttx/net/socket/net_poll.c b/nuttx/net/socket/net_poll.c
index 3bfed4dd5..04a4cae99 100644
--- a/nuttx/net/socket/net_poll.c
+++ b/nuttx/net/socket/net_poll.c
@@ -52,7 +52,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
 #include <nuttx/net/iob.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/tcp.h>
 
diff --git a/nuttx/net/socket/net_sockets.c b/nuttx/net/socket/net_sockets.c
index d1ece6c18..a52dd38a8 100644
--- a/nuttx/net/socket/net_sockets.c
+++ b/nuttx/net/socket/net_sockets.c
@@ -47,7 +47,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/net/uip.h>
 #include <nuttx/net/net.h>
 #include <nuttx/kmalloc.h>
 
diff --git a/nuttx/net/socket/socket.h b/nuttx/net/socket/socket.h
index 6989d32ee..73d738d3f 100644
--- a/nuttx/net/socket/socket.h
+++ b/nuttx/net/socket/socket.h
@@ -48,7 +48,6 @@
 #include <time.h>
 
 #include <nuttx/net/net.h>
-#include <nuttx/net/uip.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/net/tcp/tcp_appsend.c b/nuttx/net/tcp/tcp_appsend.c
index 2349c9f67..48f67a65a 100644
--- a/nuttx/net/tcp/tcp_appsend.c
+++ b/nuttx/net/tcp/tcp_appsend.c
@@ -49,7 +49,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/tcp.h>
 
diff --git a/nuttx/net/tcp/tcp_callback.c b/nuttx/net/tcp/tcp_callback.c
index 6f7035aef..6ddcce361 100644
--- a/nuttx/net/tcp/tcp_callback.c
+++ b/nuttx/net/tcp/tcp_callback.c
@@ -46,7 +46,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/tcp.h>
 #include <nuttx/net/netstats.h>
diff --git a/nuttx/net/tcp/tcp_input.c b/nuttx/net/tcp/tcp_input.c
index ecda48c51..09b0c3111 100644
--- a/nuttx/net/tcp/tcp_input.c
+++ b/nuttx/net/tcp/tcp_input.c
@@ -51,7 +51,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/tcp.h>
 #include <nuttx/net/netstats.h>
diff --git a/nuttx/net/tcp/tcp_poll.c b/nuttx/net/tcp/tcp_poll.c
index b02ccd762..df8099a7f 100644
--- a/nuttx/net/tcp/tcp_poll.c
+++ b/nuttx/net/tcp/tcp_poll.c
@@ -49,7 +49,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/tcp.h>
 
diff --git a/nuttx/net/tcp/tcp_send.c b/nuttx/net/tcp/tcp_send.c
index 713371e11..80a8cd965 100644
--- a/nuttx/net/tcp/tcp_send.c
+++ b/nuttx/net/tcp/tcp_send.c
@@ -49,7 +49,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/netstats.h>
 
diff --git a/nuttx/net/tcp/tcp_seqno.c b/nuttx/net/tcp/tcp_seqno.c
index 2324cba3b..6eb9141ce 100644
--- a/nuttx/net/tcp/tcp_seqno.c
+++ b/nuttx/net/tcp/tcp_seqno.c
@@ -51,7 +51,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 
 #include "devif/devif.h"
diff --git a/nuttx/net/tcp/tcp_timer.c b/nuttx/net/tcp/tcp_timer.c
index 7bed2764e..d508ab989 100644
--- a/nuttx/net/tcp/tcp_timer.c
+++ b/nuttx/net/tcp/tcp_timer.c
@@ -49,7 +49,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/tcp.h>
 #include <nuttx/net/netstats.h>
diff --git a/nuttx/net/udp/udp_callback.c b/nuttx/net/udp/udp_callback.c
index 47ba5dea2..a1553adb2 100644
--- a/nuttx/net/udp/udp_callback.c
+++ b/nuttx/net/udp/udp_callback.c
@@ -44,7 +44,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/udp.h>
 
diff --git a/nuttx/net/udp/udp_conn.c b/nuttx/net/udp/udp_conn.c
index e8cb87371..66893edba 100644
--- a/nuttx/net/udp/udp_conn.c
+++ b/nuttx/net/udp/udp_conn.c
@@ -53,7 +53,6 @@
 #include <arch/irq.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/udp.h>
 
diff --git a/nuttx/net/udp/udp_input.c b/nuttx/net/udp/udp_input.c
index 3183ccd98..95376586a 100644
--- a/nuttx/net/udp/udp_input.c
+++ b/nuttx/net/udp/udp_input.c
@@ -48,7 +48,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/udp.h>
 #include <nuttx/net/netstats.h>
diff --git a/nuttx/net/udp/udp_poll.c b/nuttx/net/udp/udp_poll.c
index e09520fd5..468878206 100644
--- a/nuttx/net/udp/udp_poll.c
+++ b/nuttx/net/udp/udp_poll.c
@@ -48,7 +48,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/udp.h>
 
diff --git a/nuttx/net/udp/udp_send.c b/nuttx/net/udp/udp_send.c
index b8d0457d1..f2f58f41f 100644
--- a/nuttx/net/udp/udp_send.c
+++ b/nuttx/net/udp/udp_send.c
@@ -47,7 +47,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/udp.h>
 #include <nuttx/net/netstats.h>
diff --git a/nuttx/net/utils/net_chksum.c b/nuttx/net/utils/net_chksum.c
index a772ea89c..960d364a7 100644
--- a/nuttx/net/utils/net_chksum.c
+++ b/nuttx/net/utils/net_chksum.c
@@ -44,7 +44,6 @@
 #include <debug.h>
 
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/icmp.h>