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

26 files changed, 67 insertions, 60 deletions

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"