Move netutils header files from include/net/uip to include/apps/netutils

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3399 42af7a65-404d-4744-a932-0658087f49c3

52 files changed, 172 insertions, 157 deletions

diff --git a/apps/Makefile b/apps/Makefile
index ce00bb667..7f95c5cd3 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -40,6 +40,8 @@ ifeq ($(WINTOOL),y)
 INCDIROPT	= -w
 endif
 
+APPDIR = ${shell pwd}
+
 # Application Directories
 
 # SUBDIRS is the list of all directories containing Makefiles.  It is used
@@ -115,7 +117,7 @@ $(COBJS): %$(OBJEXT): %.c
 	
 $(BUILTIN_APPS_BUILT):
 	@for dir in $(BUILTIN_APPS_DIR) ; do \
-		$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" ; \
+		$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \
 	done
 
 $(BIN):	$(OBJS) $(BUILTIN_APPS_BUILT)
@@ -131,13 +133,13 @@ $(BIN):	$(OBJS) $(BUILTIN_APPS_BUILT)
 	@touch $@
 	@for dir in $(BUILTIN_APPS_DIR) ; do \
 		rm -f $$dir/.depend ; \
-		$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" depend ; \
+		$(MAKE) -C $$dir TOPDIR="$(TOPDIR)"  APPDIR=$(APPDIR) depend ; \
 	done
 
 depend: .depend
 
 define MAKECLEAN
-	@(MAKE) -C $1 $2 TOPDIR="$(TOPDIR)"
+	@(MAKE) -C $1 $2 TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR)
 endef
 
 clean:
diff --git a/apps/vsn/Makefile b/apps/vsn/Makefile
index 50aa42fcc..3dde8e605 100644
--- a/apps/vsn/Makefile
+++ b/apps/vsn/Makefile
@@ -43,7 +43,7 @@ all: nothing
 nothing:
 
 define DOMAKE
-	@(MAKE) -C $1 $2 TOPDIR="$(TOPDIR)"
+	@(MAKE) -C $1 $2 TOPDIR="$(TOPDIR) APPDIR=$(APPDIR)"
 endef
 
 depend:
diff --git a/nuttx/examples/dhcpd/target.c b/nuttx/examples/dhcpd/target.c
index fd0579746..1878c2bc8 100644
--- a/nuttx/examples/dhcpd/target.c
+++ b/nuttx/examples/dhcpd/target.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * examples/dhcpd/target.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,8 +43,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <net/if.h>
-#include <net/uip/uip-lib.h>
-#include <net/uip/dhcpd.h>
+
+#include <apps/netutils/uiplib.h>
+#include <apps/netutils/dhcpd.h>
 
 /****************************************************************************
  * Preprocessor Definitions
diff --git a/nuttx/examples/igmp/igmp.c b/nuttx/examples/igmp/igmp.c
index 8bca7fa4e..734a7e599 100755
--- a/nuttx/examples/igmp/igmp.c
+++ b/nuttx/examples/igmp/igmp.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * examples/igmp/igmp.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,8 +46,8 @@
 
 #include <net/if.h>
 #include <net/uip/uip.h>
-#include <net/uip/uip-lib.h>
-#include <net/uip/ipmsfilter.h>
+#include <apps/netutils/uiplib.h>
+#include <apps/netutils/ipmsfilter.h>
 
 #include "igmp.h"
 
diff --git a/nuttx/examples/nettest/nettest.c b/nuttx/examples/nettest/nettest.c
index a59bccf58..c7492fff6 100644
--- a/nuttx/examples/nettest/nettest.c
+++ b/nuttx/examples/nettest/nettest.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * examples/nettest/nettest.c
  *
- *   Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 
 #include <net/if.h>
 #include <net/uip/uip.h>
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/uiplib.h>
 
 #include "nettest.h"
 
diff --git a/nuttx/examples/poll/net_listener.c b/nuttx/examples/poll/net_listener.c
index 12621de9a..4d425c608 100644
--- a/nuttx/examples/poll/net_listener.c
+++ b/nuttx/examples/poll/net_listener.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * examples/poll/net_listener.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/uiplib.h>
 
 #include "poll_internal.h"
 
diff --git a/nuttx/examples/poll/net_reader.c b/nuttx/examples/poll/net_reader.c
index 1ea8dbe54..b0cf94316 100644
--- a/nuttx/examples/poll/net_reader.c
+++ b/nuttx/examples/poll/net_reader.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * examples/poll/net_reader.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/uiplib.h>
 
 #include "poll_internal.h"
 
diff --git a/nuttx/examples/sendmail/host.c b/nuttx/examples/sendmail/host.c
index ecae2b6a1..67a541b0c 100644
--- a/nuttx/examples/sendmail/host.c
+++ b/nuttx/examples/sendmail/host.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * examples/sendmail/host.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <net/uip/smtp.h>
+#include <apps/netutils/smtp.h>
 
 /****************************************************************************
  * Private Data
diff --git a/nuttx/examples/sendmail/target.c b/nuttx/examples/sendmail/target.c
index a68db0b26..d8643106b 100644
--- a/nuttx/examples/sendmail/target.c
+++ b/nuttx/examples/sendmail/target.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * examples/sendmail/target.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009. 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,8 +45,8 @@
 #include <errno.h>
 
 #include <net/if.h>
-#include <net/uip/uip-lib.h>
-#include <net/uip/smtp.h>
+#include <apps/netutils/uiplib.h>
+#include <apps/netutils/smtp.h>
 
 /****************************************************************************
  * Pre-processor Defintitions
diff --git a/nuttx/examples/thttpd/main.c b/nuttx/examples/thttpd/main.c
index f9d0ee055..e2fdda4f4 100644
--- a/nuttx/examples/thttpd/main.c
+++ b/nuttx/examples/thttpd/main.c
@@ -49,11 +49,12 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <net/uip/thttpd.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-lib.h>
 #include <netinet/ether.h>
 
+#include <net/uip/uip-arp.h>
+#include <apps/netutils/uiplib.h>
+#include <apps/netutils/thttpd.h>
+
 #include <nuttx/ramdisk.h>
 #include <nuttx/binfmt.h>
 #include <nuttx/nxflat.h>
diff --git a/nuttx/examples/udp/target.c b/nuttx/examples/udp/target.c
index 929c34883..5e31fdb36 100644
--- a/nuttx/examples/udp/target.c
+++ b/nuttx/examples/udp/target.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * examples/udp/nettest.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <net/uip/uip.h>
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/uiplib.h>
 
 #include "udp-internal.h"
 
diff --git a/nuttx/examples/uip/main.c b/nuttx/examples/uip/main.c
index 226e75c69..21a01998b 100644
--- a/nuttx/examples/uip/main.c
+++ b/nuttx/examples/uip/main.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * examples/uip/main.c
  *
- *   Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Based on uIP which also has a BSD style license:
@@ -56,7 +56,9 @@
 #include <net/if.h>
 #include <net/uip/uip.h>
 #include <net/uip/uip-arp.h>
-#include <net/uip/uip-lib.h>
+
+#include <apps/netutils/uiplib.h>
+
 #ifdef CONFIG_EXAMPLE_UIP_DHCPC
 #include <arpa/inet.h>
 #endif
@@ -68,13 +70,13 @@
 /* DHCPC may be used in conjunction with any other feature (or not) */
 
 #ifdef CONFIG_EXAMPLE_UIP_DHCPC
-# include <net/uip/resolv.h>
-# include <net/uip/dhcpc.h>
+# include <apps/netutils/resolv.h>
+# include <apps/netutils/dhcpc.h>
 #endif
 
 /* Include uIP webserver definitions */
 
-#include <net/uip/httpd.h>
+#include <apps/netutils/httpd.h>
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/examples/wget/Makefile.host b/nuttx/examples/wget/Makefile.host
index e99f12503..73a1c7ce6 100644
--- a/nuttx/examples/wget/Makefile.host
+++ b/nuttx/examples/wget/Makefile.host
@@ -50,14 +50,14 @@ all: $(BIN)
 $(OBJS): %.o1: %.c
 	$(HOSTCC) -c $(HOSTCFLAGS) $< -o $@
 
-net/uip:
-	@mkdir -p net/uip
+apps/netutils:
+	@mkdir -p apps/netutils
 
-net/uip/webclient.h: net/uip $(TOPDIR)/include/net/uip/webclient.h
-	@cp -a $(TOPDIR)/include/net/uip/webclient.h net/uip/.
+apps/netutils/webclient.h: apps/netutils $(TOPDIR)/include/apps/netutils/webclient.h
+	@cp -a $(TOPDIR)/include/apps/netutils/webclient.h apps/netutils/.
 
-net/uip/uip-lib.h: net/uip $(TOPDIR)/include/net/uip/uip-lib.h
-	@cp -a $(TOPDIR)/include/net/uip/uip-lib.h net/uip/.
+apps/netutils/uiplib.h: apps/netutils $(TOPDIR)/include/apps/netutils/uiplib.h
+	@cp -a $(TOPDIR)/include/apps/netutils/uiplib.h apps/netutils/.
 
 nuttx:
 	@mkdir nuttx
@@ -65,7 +65,7 @@ nuttx:
 nuttx/config.h: nuttx
 	@touch nuttx/config.h
 
-headers: net/uip/webclient.h net/uip/uip-lib.h nuttx/config.h
+headers: apps/netutils/webclient.h apps/netutils/uiplib.h nuttx/config.h
 
 $(BIN): headers $(OBJS)
 	$(HOSTCC) $(HOSTLDFLAGS) $(OBJS) -o $@
diff --git a/nuttx/examples/wget/host.c b/nuttx/examples/wget/host.c
index fe8109051..a7b416db5 100644
--- a/nuttx/examples/wget/host.c
+++ b/nuttx/examples/wget/host.c
@@ -37,13 +37,14 @@
  * Included Files
  ****************************************************************************/
 
-#include <net/uip/webclient.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 
+#include <apps/netutils/webclient.h>
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
diff --git a/nuttx/examples/wget/target.c b/nuttx/examples/wget/target.c
index c135a1d57..b378e9944 100644
--- a/nuttx/examples/wget/target.c
+++ b/nuttx/examples/wget/target.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * examples/wget/target.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,9 +47,10 @@
 #include <net/if.h>
 
 #include <net/uip/uip.h>
-#include <net/uip/uip-lib.h>
-#include <net/uip/resolv.h>
-#include <net/uip/webclient.h>
+
+#include <apps/netutils/uiplib.h>
+#include <apps/netutils/resolv.h>
+#include <apps/netutils/webclient.h>
 
 /****************************************************************************
  * Preprocessor Definitions
diff --git a/nuttx/include/net/uip/dhcpc.h b/nuttx/include/apps/netutils/dhcpc.h
index 3d2fe4109..994a6713e 100644
--- a/nuttx/include/net/uip/dhcpc.h
+++ b/nuttx/include/apps/netutils/dhcpc.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uip/dhcpc.n
+ * apps/netutils/dhcpc.n
  *
- *   Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * This logic was leveraged from uIP which also has a BSD-style license:
@@ -35,8 +35,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef __NET_UIP_DHCPC_H
-#define __NET_UIP_DHCPC_H
+#ifndef __APPS_NETUTILS_DHCPC_H
+#define __APPS_NETUTILS_DHCPC_H
 
 /****************************************************************************
  * Included Files
@@ -82,4 +82,4 @@ EXTERN void  dhcpc_close(void *handle);
 }
 #endif
 
-#endif /* __NET_UIP_DHCPC_H */
+#endif /* __APPS_NETUTILS_DHCPC_H */
diff --git a/nuttx/include/net/uip/dhcpd.h b/nuttx/include/apps/netutils/dhcpd.h
index f9aea86f3..b03415b20 100644
--- a/nuttx/include/net/uip/dhcpd.h
+++ b/nuttx/include/apps/netutils/dhcpd.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uipt/dhcpd.h
+ * apps/netutils/dhcpd.h
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * This logic was leveraged from uIP which also has a BSD-style license:
@@ -35,8 +35,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef __NET_UIP_DHCPD_H
-#define __NET_UIP_DHCPD_H
+#ifndef __APPS_NETUTILS_DHCPD_H
+#define __APPS_NETUTILS_DHCPD_H
 
 /****************************************************************************
  * Included Files
@@ -68,4 +68,4 @@ EXTERN int dhcpd_run(void);
 }
 #endif
 
-#endif /* __NET_UIP_DHCPD_H */
+#endif /* __APPS_NETUTILS_DHCPD_H */
diff --git a/nuttx/include/net/uip/httpd.h b/nuttx/include/apps/netutils/httpd.h
index cd850e51d..12f2a1511 100644
--- a/nuttx/include/net/uip/httpd.h
+++ b/nuttx/include/apps/netutils/httpd.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uip/httpd.h
+ * apps/netutils/httpd.h
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Based on uIP which also has a BSD style license:
@@ -37,8 +37,8 @@
  *
  ****************************************************************************/
 
-#ifndef _NET_UIP_HTTPD_H
-#define _NET_UIP_HTTPD_H
+#ifndef __APPS_NETUTILS_HTTPD_H
+#define __APPS_NETUTILS_HTTPD_H
 
 /****************************************************************************
  * Included Files
@@ -51,4 +51,4 @@
 extern void httpd_init(void);
 extern int httpd_listen(void);
 
-#endif /* _NET_UIP_HTTPD_H */
+#endif /* __APPS_NETUTILS_HTTPD_H */
diff --git a/nuttx/include/net/uip/ipmsfilter.h b/nuttx/include/apps/netutils/ipmsfilter.h
index df792d50b..56088eca7 100755
--- a/nuttx/include/net/uip/ipmsfilter.h
+++ b/nuttx/include/apps/netutils/ipmsfilter.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * net/uip/ipmsfilter.h
+ * apps/netutils/ipmsfilter.h
  * User interface to add/remove IP multicast address
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_IPMSFILTER_H
-#define __NET_UIP_IPMSFILTER_H
+#ifndef __APPS_NETUTILS_IPMSFILTER_H
+#define __APPS_NETUTILS_IPMSFILTER_H
 
 /****************************************************************************
  * Included Files
@@ -98,4 +98,4 @@ EXTERN int ipmsfilter(FAR const char *ifname,
 #endif
 
 #endif /* CONFIG_NET_IGMP */
-#endif /* __NET_UIP_IPMSFILTER_H */
+#endif /* __APPS_NETUTILS_IPMSFILTER_H */
diff --git a/nuttx/include/net/uip/resolv.h b/nuttx/include/apps/netutils/resolv.h
index 8b9f3bace..a427c5394 100644
--- a/nuttx/include/net/uip/resolv.h
+++ b/nuttx/include/apps/netutils/resolv.h
@@ -1,4 +1,4 @@
-/* resolv.h
+/* includes/apps/netutils/resolv.h
  * DNS resolver code header file.
  * Authtor Adam Dunkels <adam@dunkels.com>
  *
@@ -30,8 +30,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __UIP_RESOLV_H__
-#define __UIP_RESOLV_H__
+#ifndef __APPS_NETUTILS_RESOLVE_H
+#define __APPS_NETUTILS_RESOLVE_H
 
 #include <net/uip/uipopt.h>
 
@@ -62,4 +62,4 @@ EXTERN int  resolv_query(const char *name, struct sockaddr_in *addr);
 }
 #endif
 
-#endif /* __UIP_RESOLV_H__ */
+#endif /* __APPS_NETUTILS_RESOLVE_H */
diff --git a/nuttx/include/net/uip/smtp.h b/nuttx/include/apps/netutils/smtp.h
index 4653443ff..d1ea0c5d9 100644
--- a/nuttx/include/net/uip/smtp.h
+++ b/nuttx/include/apps/netutils/smtp.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * smtp.h
+ * include/apps/netutils/smtp.h
  * SMTP header file
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Heavily leveraged from uIP 1.0 which also has a BSD-like license:
@@ -37,8 +37,8 @@
  *
  ****************************************************************************/
 
-#ifndef __SMTP_H__
-#define __SMTP_H__
+#ifndef __APPS_NETUTILS_SMTP_H
+#define __APPS_NETUTILS_SMTP_H
 
 /****************************************************************************
  * Included Files
@@ -63,4 +63,4 @@ extern int   smtp_send(void *handle, const char *to, const char *cc,
                        const char *msg, int msglen);
 extern void  smtp_close(void *handle);
 
-#endif /* __SMTP_H__ */
+#endif /* __APPS_NETUTILS_SMTP_H */
diff --git a/nuttx/include/net/uip/telnetd.h b/nuttx/include/apps/netutils/telnetd.h
index 32247c206..9d3d6feaf 100644
--- a/nuttx/include/net/uip/telnetd.h
+++ b/nuttx/include/apps/netutils/telnetd.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * include/net/uip/telnetd.h
+ * include/apps/netutils/telnetd.h
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * This is a leverage of similar logic from uIP:
@@ -36,8 +36,8 @@
  * SUCH DAMAGE.
  ****************************************************************************/
 
-#ifndef __NET_UIP_TELNETD_H
-#define __NET_UIP_TELNETD_H
+#ifndef __APPS_NETUTILS_TELNETD_H
+#define __APPS_NETUTILS_TELNETD_H
 
 /****************************************************************************
  * Included Files
@@ -67,4 +67,4 @@ EXTERN void telnetd_init(void);
 }
 #endif
 
-#endif /* __NET_UIP_TELNETD_H */
+#endif /* __APPS_NETUTILS_TELNETD_H */
diff --git a/nuttx/include/net/uip/tftp.h b/nuttx/include/apps/netutils/tftp.h
index 7aa77c109..c00e37c72 100644
--- a/nuttx/include/net/uip/tftp.h
+++ b/nuttx/include/apps/netutils/tftp.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * include/net/uip/tftp.h
+ * include/apps/netutils/tftp.h
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_TFTP_H
-#define __NET_UIP_TFTP_H
+#ifndef __APPS_NETUTILS_TFTP_H
+#define __APPS_NETUTILS_TFTP_H
 
 /****************************************************************************
  * Included Files
@@ -70,4 +70,4 @@ EXTERN int tftpput(const char *local, const char *remote, in_addr_t addr, bool b
 }
 #endif
 
-#endif /* __NET_UIP_TFTP_H */
\ No newline at end of file
+#endif /* __APPS_NETUTILS_TFTP_H */
\ No newline at end of file
diff --git a/nuttx/include/net/uip/thttpd.h b/nuttx/include/apps/netutils/thttpd.h
index bd445766c..959177219 100644
--- a/nuttx/include/net/uip/thttpd.h
+++ b/nuttx/include/apps/netutils/thttpd.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uip/thttpd.h
+ * apps/netutils/thttpd.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_THTTPD_H
-#define __NET_UIP_THTTPD_H
+#ifndef __APPS_NETUTILS_THTTPD_H
+#define __APPS_NETUTILS_THTTPD_H
 
 /****************************************************************************
  * Included Files
@@ -98,4 +98,4 @@ EXTERN int thttpd_main(int argc, char **argv);
 }
 #endif
 
-#endif /* __NET_UIP_THTTPD_H */
+#endif /* __APPS_NETUTILS_THTTPD_H */
diff --git a/nuttx/include/net/uip/uip-lib.h b/nuttx/include/apps/netutils/uiplib.h
index 813245953..a149de63b 100644
--- a/nuttx/include/net/uip/uip-lib.h
+++ b/nuttx/include/apps/netutils/uiplib.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uiplib.h
+ * apps/netutils/uiplib.h
  * Various non-standard APIs to support netutils.  All non-standard and
  * intended only for internal use.
  *
@@ -42,8 +42,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_UIP_LIB_H
-#define __NET_UIP_UIP_LIB_H
+#ifndef __APPS_NETUTILS_UIPLIB_H
+#define __APPS_NETUTILS_UIPLIB_H
 
 /****************************************************************************
  * Included Files
@@ -126,4 +126,4 @@ extern int  uip_parsehttpurl(const char *url, uint16_t *port,
 
 extern void uip_server(uint16_t portno, pthread_startroutine_t handler, int stacksize);
 
-#endif /* __NET_UIP_UIP_LIB_H */
+#endif /* __APPS_NETUTILS_UIPLIB_H */
diff --git a/nuttx/include/net/uip/webclient.h b/nuttx/include/apps/netutils/webclient.h
index 6e91bfb23..c80626e3b 100644
--- a/nuttx/include/net/uip/webclient.h
+++ b/nuttx/include/apps/netutils/webclient.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * include/net/uip/webclient.h
+ * include/apps/netutils/webclient.h
  * Header file for the HTTP client
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Based remotely on the uIP webclient which also has a BSD style license:
@@ -39,8 +39,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_WEBCLIENT_H
-#define __NET_UIP_WEBCLIENT_H
+#ifndef __APPS_NETUTILS_WEBCLIENT_H
+#define __APPS_NETUTILS_WEBCLIENT_H
 
 /****************************************************************************
  * Included Files
@@ -146,4 +146,4 @@ EXTERN int wget(FAR const char *url, FAR char *buffer, int buflen,
 }
 #endif
 
-#endif /* __NET_UIP_WEBCLIENT_H */
+#endif /* __APPS_NETUTILS_WEBCLIENT_H */
diff --git a/nuttx/netutils/dhcpc/dhcpc.c b/nuttx/netutils/dhcpc/dhcpc.c
index 79f806ad5..dc80988bb 100644
--- a/nuttx/netutils/dhcpc/dhcpc.c
+++ b/nuttx/netutils/dhcpc/dhcpc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netutils/dhcpc/dhcpc.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Based heavily on portions of uIP:
@@ -53,8 +53,8 @@
 #include <debug.h>
 
 #include <net/uip/uip.h>
-#include <net/uip/dhcpc.h>
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/dhcpc.h>
+#include <apps/netutils/uiplib.h>
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/netutils/dhcpd/dhcpd.c b/nuttx/netutils/dhcpd/dhcpd.c
index 0e498541c..39050bd62 100644
--- a/nuttx/netutils/dhcpd/dhcpd.c
+++ b/nuttx/netutils/dhcpd/dhcpd.c
@@ -52,12 +52,12 @@
 # define ERROR (-1)
 # define OK    (0)
 #else
-# include <nuttx/config.h>    /* NuttX configuration */
-# include <debug.h>           /* For ndbg, vdbg */
-# include <nuttx/compiler.h>  /* For CONFIG_CPP_HAVE_WARNING */
-# include <arch/irq.h>        /* For irqstore() and friends -- REVISIT */
-# include <net/uip/uip-arp.h> /* For low-level ARP interfaces -- REVISIT */
-# include <net/uip/dhcpd.h>   /* Advertised DHCPD APIs */
+# include <nuttx/config.h>        /* NuttX configuration */
+# include <debug.h>               /* For ndbg, vdbg */
+# include <nuttx/compiler.h>      /* For CONFIG_CPP_HAVE_WARNING */
+# include <arch/irq.h>            /* For irqstore() and friends -- REVISIT */
+# include <net/uip/uip-arp.h>     /* For low-level ARP interfaces -- REVISIT */
+# include <apps/netutils/dhcpd.h> /* Advertised DHCPD APIs */
 #endif
 
 #include <sys/socket.h>
diff --git a/nuttx/netutils/resolv/resolv.c b/nuttx/netutils/resolv/resolv.c
index 60da2015b..db9e00085 100644
--- a/nuttx/netutils/resolv/resolv.c
+++ b/nuttx/netutils/resolv/resolv.c
@@ -63,7 +63,7 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
-#include <net/uip/resolv.h>
+#include <apps/netutils/resolv.h>
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/netutils/smtp/smtp.c b/nuttx/netutils/smtp/smtp.c
index cd0b6b1e0..d758c6f6b 100644
--- a/nuttx/netutils/smtp/smtp.c
+++ b/nuttx/netutils/smtp/smtp.c
@@ -1,8 +1,8 @@
 /****************************************************************************
- * smtp.c
+ * apps/netutitls/smtp/smtp.c
  * smtp SMTP E-mail sender
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Heavily leveraged from uIP 1.0 which also has a BSD-like license:
@@ -58,7 +58,7 @@
 #include <sys/socket.h>
 
 #include <net/uip/uip.h>
-#include <net/uip/smtp.h>
+#include <apps/netutils/smtp.h>
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/netutils/telnetd/telnetd.c b/nuttx/netutils/telnetd/telnetd.c
index 00151713c..ccadd60dd 100644
--- a/nuttx/netutils/telnetd/telnetd.c
+++ b/nuttx/netutils/telnetd/telnetd.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netutils/telnetd/telnetd.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * This is a leverage of similar logic from uIP:
@@ -53,8 +53,8 @@
 #include <pthread.h>
 #include <debug.h>
 
-#include <net/uip/telnetd.h>
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/telnetd.h>
+#include <apps/netutils/uiplib.h>
 
 #include "shell.h"
 
diff --git a/nuttx/netutils/tftpc/tftpc_get.c b/nuttx/netutils/tftpc/tftpc_get.c
index 39040cd7d..e0779d17d 100644
--- a/nuttx/netutils/tftpc/tftpc_get.c
+++ b/nuttx/netutils/tftpc/tftpc_get.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netuils/tftp/tftpc_get.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@
 
 #include <net/uip/uipopt.h>
 #include <net/uip/uip.h>
-#include <net/uip/tftp.h>
+#include <apps/netutils/tftp.h>
 
 #include "tftpc_internal.h"
 
diff --git a/nuttx/netutils/tftpc/tftpc_packets.c b/nuttx/netutils/tftpc/tftpc_packets.c
index 169f068cc..d43410ff4 100644
--- a/nuttx/netutils/tftpc/tftpc_packets.c
+++ b/nuttx/netutils/tftpc/tftpc_packets.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netuils/tftp/tftpc_packets.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@
 
 #include <net/uip/uipopt.h>
 #include <net/uip/uip.h>
-#include <net/uip/tftp.h>
+#include <apps/netutils/tftp.h>
 
 #include "tftpc_internal.h"
 
diff --git a/nuttx/netutils/tftpc/tftpc_put.c b/nuttx/netutils/tftpc/tftpc_put.c
index d16fc95bd..4d87ba908 100644
--- a/nuttx/netutils/tftpc/tftpc_put.c
+++ b/nuttx/netutils/tftpc/tftpc_put.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netuils/tftp/tftpc_put.c
  *
- *   Copyright (C) 2008-2009Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@
 
 #include <net/uip/uipopt.h>
 #include <net/uip/uip.h>
-#include <net/uip/tftp.h>
+#include <apps/netutils/tftp.h>
 
 #include "tftpc_internal.h"
 
diff --git a/nuttx/netutils/thttpd/libhttpd.c b/nuttx/netutils/thttpd/libhttpd.c
index f258b81ed..05831b335 100644
--- a/nuttx/netutils/thttpd/libhttpd.c
+++ b/nuttx/netutils/thttpd/libhttpd.c
@@ -2,7 +2,7 @@
  * netutils/thttpd/libhttpd.c
  * HTTP Protocol Library
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Derived from the file of the same name in the original THTTPD package:
@@ -59,7 +59,7 @@
 #include <debug.h>
 
 #include <nuttx/regex.h>
-#include <net/uip/thttpd.h>
+#include <apps/netutils/thttpd.h>
 
 #include "config.h"
 #include "libhttpd.h"
diff --git a/nuttx/netutils/thttpd/thttpd.c b/nuttx/netutils/thttpd/thttpd.c
index cd2092fa8..3b49c0141 100644
--- a/nuttx/netutils/thttpd/thttpd.c
+++ b/nuttx/netutils/thttpd/thttpd.c
@@ -2,7 +2,7 @@
  * netutils/thttpd/thttpd.c
  * Tiny HTTP Server
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Derived from the file of the same name in the original THTTPD package:
@@ -55,7 +55,7 @@
 
 #include <nuttx/compiler.h>
 #include <nuttx/symtab.h>
-#include <net/uip/thttpd.h>
+#include <apps/netutils/thttpd.h>
 
 #include "config.h"
 #include "fdwatch.h"
diff --git a/nuttx/netutils/thttpd/thttpd_cgi.c b/nuttx/netutils/thttpd/thttpd_cgi.c
index 739fd7712..ee126795a 100755
--- a/nuttx/netutils/thttpd/thttpd_cgi.c
+++ b/nuttx/netutils/thttpd/thttpd_cgi.c
@@ -2,7 +2,7 @@
  * netutils/thttpd/thttpd_cgi.c
  * CGI support
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Derived from the file libhttpd.c in the original THTTPD package:
@@ -55,7 +55,7 @@
 
 #include <nuttx/symtab.h>
 #include <nuttx/binfmt.h>
-#include <net/uip/thttpd.h>
+#include <apps/netutils/thttpd.h>
 
 #include "config.h"
 #include "libhttpd.h"
diff --git a/nuttx/netutils/uiplib/uip_gethostaddr.c b/nuttx/netutils/uiplib/uip_gethostaddr.c
index a04df437c..0de639d6c 100644
--- a/nuttx/netutils/uiplib/uip_gethostaddr.c
+++ b/nuttx/netutils/uiplib/uip_gethostaddr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netutils/uiplib/uip_gethostaddr.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/uiplib.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/netutils/uiplib/uip_getmacaddr.c b/nuttx/netutils/uiplib/uip_getmacaddr.c
index 05dbf34f4..c99bc7a7d 100644
--- a/nuttx/netutils/uiplib/uip_getmacaddr.c
+++ b/nuttx/netutils/uiplib/uip_getmacaddr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netutils/uiplib/uip_getmacaddr.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/uiplib.h>
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/netutils/uiplib/uip_ipmsfilter.c b/nuttx/netutils/uiplib/uip_ipmsfilter.c
index 11f15a180..ccae4a680 100755
--- a/nuttx/netutils/uiplib/uip_ipmsfilter.c
+++ b/nuttx/netutils/uiplib/uip_ipmsfilter.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netutils/uiplib/uip_setmultiaddr.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,8 +50,8 @@
 #include <netinet/in.h>
 #include <sys/sockio.h>
 
-#include <net/uip/uip-lib.h>
-#include <net/uip/ipmsfilter.h>
+#include <apps/netutils/uiplib.h>
+#include <apps/netutils/ipmsfilter.h>
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/netutils/uiplib/uip_parsehttpurl.c b/nuttx/netutils/uiplib/uip_parsehttpurl.c
index 22fcf0e5f..bda5502b7 100644
--- a/nuttx/netutils/uiplib/uip_parsehttpurl.c
+++ b/nuttx/netutils/uiplib/uip_parsehttpurl.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netutils/uiplib/uip_parsehttpurl.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,10 +38,12 @@
  *****************************************************************************/
 
 #include <nuttx/config.h>
+
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
-#include <net/uip/uip-lib.h>
+
+#include <apps/netutils/uiplib.h>
 
 /****************************************************************************
  * Private Data
diff --git a/nuttx/netutils/uiplib/uip_server.c b/nuttx/netutils/uiplib/uip_server.c
index ca062d4dd..f58f063de 100644
--- a/nuttx/netutils/uiplib/uip_server.c
+++ b/nuttx/netutils/uiplib/uip_server.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netutils/uiplib/uip_server.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
 #include <debug.h>
 #include <netinet/in.h>
 
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/uiplib.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/nuttx/netutils/uiplib/uip_setdraddr.c b/nuttx/netutils/uiplib/uip_setdraddr.c
index 36a9c34e1..79eac5b97 100644
--- a/nuttx/netutils/uiplib/uip_setdraddr.c
+++ b/nuttx/netutils/uiplib/uip_setdraddr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netutils/uiplib/uip_setdraddr.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/uiplib.h>
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/netutils/uiplib/uip_sethostaddr.c b/nuttx/netutils/uiplib/uip_sethostaddr.c
index d06b22075..ccc7526b9 100644
--- a/nuttx/netutils/uiplib/uip_sethostaddr.c
+++ b/nuttx/netutils/uiplib/uip_sethostaddr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netutils/uiplib/uip_sethostaddr.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/uiplib.h>
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/netutils/uiplib/uip_setmacaddr.c b/nuttx/netutils/uiplib/uip_setmacaddr.c
index f1bf0d71b..28188b7f8 100644
--- a/nuttx/netutils/uiplib/uip_setmacaddr.c
+++ b/nuttx/netutils/uiplib/uip_setmacaddr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netutils/uiplib/uip_setmacaddr.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/uiplib.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/netutils/uiplib/uip_setnetmask.c b/nuttx/netutils/uiplib/uip_setnetmask.c
index 837bdc1e3..2cdc38474 100644
--- a/nuttx/netutils/uiplib/uip_setnetmask.c
+++ b/nuttx/netutils/uiplib/uip_setnetmask.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netutils/uiplib/uip_setnetmask.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/uiplib.h>
 
 /****************************************************************************
  * Global Functions
diff --git a/nuttx/netutils/uiplib/uiplib.c b/nuttx/netutils/uiplib/uiplib.c
index b45527f45..99f716f5c 100644
--- a/nuttx/netutils/uiplib/uiplib.c
+++ b/nuttx/netutils/uiplib/uiplib.c
@@ -2,7 +2,7 @@
  * netutils/uiplib/uiplib.c
  * Various uIP library functions.
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Based on uIP which also has a BSD style license:
@@ -45,8 +45,13 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+
 #include <net/uip/uip.h>
-#include <net/uip/uip-lib.h>
+#include <apps/netutils/uiplib.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
 
 bool uiplib_ipaddrconv(const char *addrstr, uint8_t *ipaddr)
 {
diff --git a/nuttx/netutils/webclient/webclient.c b/nuttx/netutils/webclient/webclient.c
index 8b5ba107c..2c5108a4a 100644
--- a/nuttx/netutils/webclient/webclient.c
+++ b/nuttx/netutils/webclient/webclient.c
@@ -2,7 +2,7 @@
  * netutils/webclient/webclient.c
  * Implementation of the HTTP client.
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Based on uIP which also has a BSD style license:
@@ -64,13 +64,13 @@
 #ifdef CONFIG_HAVE_GETHOSTBYNAME
 #  include <netdb.h>
 #else
-#  include <net/uip/resolv.h>
+#  include <apps/netutils/resolv.h>
 #endif
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
-#include <net/uip/uip-lib.h>
-#include <net/uip/webclient.h>
+#include <apps/netutils/uiplib.h>
+#include <apps/netutils/webclient.h>
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/netutils/webserver/httpd.c b/nuttx/netutils/webserver/httpd.c
index 91519e1dd..9322b58dc 100644
--- a/nuttx/netutils/webserver/httpd.c
+++ b/nuttx/netutils/webserver/httpd.c
@@ -2,7 +2,7 @@
  * netutils/webserver/httpd.c
  * httpd Web server
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * This is a leverage of similar logic from uIP:
@@ -59,8 +59,8 @@
 #include <debug.h>
 
 #include <net/uip/uip.h>
-#include <net/uip/uip-lib.h>
-#include <net/uip/httpd.h>
+#include <apps/netutils/uiplib.h>
+#include <apps/netutils/httpd.h>
 
 #include "httpd.h"
 #include "httpd_cgi.h"
diff --git a/nuttx/netutils/webserver/httpd_cgi.c b/nuttx/netutils/webserver/httpd_cgi.c
index a51a4e273..967ef9b9c 100644
--- a/nuttx/netutils/webserver/httpd_cgi.c
+++ b/nuttx/netutils/webserver/httpd_cgi.c
@@ -43,7 +43,7 @@
 #include <nuttx/compiler.h>
 
 #include <net/uip/uip.h>
-#include <net/uip/httpd.h>
+#include <apps/netutils/httpd.h>
 
 #include "httpd_cgi.h"
 
diff --git a/nuttx/netutils/webserver/httpd_cgi.h b/nuttx/netutils/webserver/httpd_cgi.h
index f56176778..9547bca33 100644
--- a/nuttx/netutils/webserver/httpd_cgi.h
+++ b/nuttx/netutils/webserver/httpd_cgi.h
@@ -33,7 +33,7 @@
 #ifndef __HTTPD_CGI_H__
 #define __HTTPD_CGI_H__
 
-#include <net/uip/httpd.h>
+#include <apps/netutils/httpd.h>
 
 #include "httpd.h"
 
diff --git a/nuttx/netutils/webserver/httpd_fs.c b/nuttx/netutils/webserver/httpd_fs.c
index f6403fa37..731f19498 100644
--- a/nuttx/netutils/webserver/httpd_fs.c
+++ b/nuttx/netutils/webserver/httpd_fs.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * netutils/webserver/httpd_fs.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Based on uIP which also has a BSD style license:
@@ -43,7 +43,7 @@
 
 #include <stdint.h>
 
-#include <net/uip/httpd.h>
+#include <apps/netutils/httpd.h>
 
 #include "httpd.h"
 #include "httpd_fsdata.h"