diff --git a/ChangeLog b/ChangeLog
index 79919b917c8..95acb0450b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2526,4 +2526,6 @@
 	  low level, thread-independent socket interfaces for use within the OS.
 	  Some of these are currently used by the FTP controlling terminal.  More will
 	  be used to support the NFS file system currenly underwork.
-
+	* include/nuttx/net/:  Major re-organization of networking headerf files.
+	  Moved all non-standard, NuttX-specific header files from include/net and
+	  include/nuttx into include/nuttx/net.
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 1966409a601..f99cf45ad71 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -12,7 +12,7 @@
       <h1><big><font color="#3c34ec">
         <i>NuttX RTOS Porting Guide</i>
       </font></big></h1>
-      <p>Last Updated: February 28, 2011</p>
+      <p>Last Updated: March 3, 2011</p>
     </td>
   </tr>
 </table>
@@ -1113,12 +1113,12 @@ include/
 |   `-- <i>(Standard header files)</i>
 |-- cxx/
 |   `-- <i>(C++ standard header files)</i>
-|-- net/
-|   `-- uip/
-|       `-- <i>(uIP specific header files)</i>
 |-- netinet/
 |   `-- <i>(Standard header files)</i>
 |-- nuttx/
+|   |-net/
+|   | `-- uip/
+|   |     `-- <i>(uIP specific header files)</i>
 |   `-- <i>(NuttX specific header files)</i>
 `- sys/
     `-- <i>(More standard header files)</i>
@@ -1185,7 +1185,7 @@ lib/
 
 <h2>2.12 <a name="DirStructNet">nuttx/net</a></h2>
 <p>
-  This directory contains the implementation of the socket APIs.
+  This directory contains the implementation of the NuttX internal socket APIs.
   The subdirectory, <code>uip</code> contains the uIP port.
 </P>
 
@@ -2424,7 +2424,7 @@ extern void up_ledoff(int led);
 <ul>
   <li>
     <p>
-    <b><code>include/net/uip/uip-arch.h</code></b>.
+    <b><code>include/nuttx/net/uip/uip-arch.h</code></b>.
     All structures and APIs needed to work with Ethernet drivers are provided in this header file.
     The structure <code>struct uip_driver_s</code> defines the interface and is passed to uIP via
     <code>netdev_register()</code>.
diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index bcf7b89b596..507f63cf9f3 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -58,9 +58,9 @@
 #include <nuttx/arch.h>
 
 #include <net/ethernet.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "chip.h"
 #include "up_arch.h"
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 06ecff06c31..3e0a3677980 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * drivers/net/kinetis_enet.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -51,11 +51,11 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "up_arch.h"
 #include "chip.h"
diff --git a/arch/arm/src/lm3s/lm3s_ethernet.c b/arch/arm/src/lm3s/lm3s_ethernet.c
index 4f78c9e8514..be38a7b26a2 100644
--- a/arch/arm/src/lm3s/lm3s_ethernet.c
+++ b/arch/arm/src/lm3s/lm3s_ethernet.c
@@ -51,9 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "chip.h"
 #include "up_arch.h"
diff --git a/arch/arm/src/lm3s/lm3s_ethernet.h b/arch/arm/src/lm3s/lm3s_ethernet.h
index ea98c8b0713..71833b27163 100644
--- a/arch/arm/src/lm3s/lm3s_ethernet.h
+++ b/arch/arm/src/lm3s/lm3s_ethernet.h
@@ -1,8 +1,8 @@
 /************************************************************************************
  * arch/arm/src/lm3s/lm3s_ethernet.h
  *
- *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,7 +41,7 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>
 
 #include "chip.h"
 
@@ -72,7 +72,7 @@
 #  define LM3S_MAC_TS_OFFSET  0x03c /* Ethernet MAC Time Stamp Configuration */
 #endif
 
-/* MII Management Register Offsets (see include/nuttx/mii.h) */
+/* MII Management Register Offsets (see include/nuttx/net/mii.h) */
 
 /* Ethernet Controller Register Addresses *******************************************/
 
diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c
index 5a2971130d0..a3bc9d95152 100644
--- a/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * arch/arm/src/lpc17xx/lpc17_ethernet.c
  *
- *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -50,12 +50,12 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "chip.h"
 #include "up_arch.h"
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index 055893f8819..68ee78fd5f4 100755
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -51,11 +51,11 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "up_internal.h"
 
diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c
index ca9840360c2..a2b890d22b9 100644
--- a/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -51,9 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 /****************************************************************************
  * Definitions
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index d7a9612ee27..d4dee038c58 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -52,12 +52,12 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include <arch/irq.h>
 #include <arch/board/board.h>
diff --git a/arch/sim/src/up_uipdriver.c b/arch/sim/src/up_uipdriver.c
index e6dec219d75..99f37b22ffa 100644
--- a/arch/sim/src/up_uipdriver.c
+++ b/arch/sim/src/up_uipdriver.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * up_uipdriver.c
  *
- *   Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2009-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Based on code from uIP which also has a BSD-like license:
  *
@@ -50,12 +50,12 @@
 #include <stdbool.h>
 #include <string.h>
 #include <sched.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 
 #include <net/ethernet.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arp.h>
 
 #include "up_internal.h"
 
diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c
index c758cfb1b05..23542e2798b 100644
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * drivers/net/ez80_emac.c
  *
- *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * References:
  *   eZ80F91 MCU Product Specification, PS019214-0808, Zilig, Inc., 2008.
@@ -54,13 +54,13 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>
 
 #include <arch/io.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "chip.h"
 #include "up_internal.h"
diff --git a/configs/olimex-strp711/src/up_enc28j60.c b/configs/olimex-strp711/src/up_enc28j60.c
index fcb68b5bb59..c6ffdd36864 100755
--- a/configs/olimex-strp711/src/up_enc28j60.c
+++ b/configs/olimex-strp711/src/up_enc28j60.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * configs/olimex-strp711/src/up_enc28j60.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -86,7 +86,7 @@
 #include <debug.h>
 
 #include <nuttx/spi.h>
-#include <nuttx/enc28j60.h>
+#include <nuttx/net/enc28j60.h>
 
 #include <arch/board/board.h>
 
diff --git a/drivers/README.txt b/drivers/README.txt
index 0cddb93115e..9bde312f410 100644
--- a/drivers/README.txt
+++ b/drivers/README.txt
@@ -88,7 +88,7 @@ mtd/
 	aware of any other common way to refer to this class of devices).
 
 net/
-	Network interface drivers.  See also include/nuttx/net.h
+	Network interface drivers.  See also include/nuttx/net/net.h
 
 pipes/
 	FIFO and named pipe drivers.  Standard interfaces are declared
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 5b616233d05..0f301ee0037 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -51,9 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 /****************************************************************************
  * Definitions
diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c
index 32dc93069e1..15433e0f807 100644
--- a/drivers/net/dm90x0.c
+++ b/drivers/net/dm90x0.c
@@ -64,9 +64,9 @@
 #include <nuttx/arch.h>
 
 #include <net/ethernet.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 /****************************************************************************
  * Definitions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index ce6192ac0ee..ec2b29b6ad8 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -53,9 +53,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include <rgmp/pmap.h>
 #include <rgmp/string.h>
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 448decbf894..76b0f205b1c 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * drivers/net/enc28j60.c
  *
- *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * References:
  * - ENC28J60 Data Sheet, Stand-Alone Ethernet Controller with SPI Interface,
@@ -58,11 +58,11 @@
 #include <nuttx/spi.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/clock.h>
-#include <nuttx/enc28j60.h>
+#include <nuttx/net/enc28j60.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "enc28j60.h"
 
diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c
index 118f0acd170..00ebea35f04 100644
--- a/drivers/net/skeleton.c
+++ b/drivers/net/skeleton.c
@@ -51,9 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 /****************************************************************************
  * Definitions
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index a1880db8ea5..31f44cbb9e3 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * drivers/net/slip.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Reference: RFC 1055
  *
@@ -55,10 +55,10 @@
 #include <debug.h>
 
 #include <nuttx/irq.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #if defined(CONFIG_NET) && defined(CONFIG_NET_SLIP)
 
diff --git a/drivers/net/vnet.c b/drivers/net/vnet.c
index c12976a0f8a..f1e2465b963 100644
--- a/drivers/net/vnet.c
+++ b/drivers/net/vnet.c
@@ -55,9 +55,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include <rgmp/vnet.h>
 #include <rgmp/stdio.h>
diff --git a/fs/fs_close.c b/fs/fs_close.c
index a6d6dfc68aa..d6f8bf54a43 100644
--- a/fs/fs_close.c
+++ b/fs/fs_close.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * fs/fs_close.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -45,7 +45,7 @@
 #include <nuttx/fs.h>
 
 #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
-# include <nuttx/net.h>
+# include <nuttx/net/net.h>
 #endif
 
 #include "fs_internal.h"
diff --git a/fs/fs_fcntl.c b/fs/fs_fcntl.c
index 668d7e40ead..686b8331981 100644
--- a/fs/fs_fcntl.c
+++ b/fs/fs_fcntl.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * fs/fs_fcntl.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -44,7 +44,7 @@
 #include <errno.h>
 
 #include <nuttx/fs.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 #include <nuttx/sched.h>
 
 #include "fs_internal.h"
diff --git a/fs/fs_fdopen.c b/fs/fs_fdopen.c
index 930aec26fff..8201ebbaeca 100644
--- a/fs/fs_fdopen.c
+++ b/fs/fs_fdopen.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * fs/fs_fdopen.c
  *
- *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -47,7 +47,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 
 /****************************************************************************
  * Private Functions
diff --git a/fs/fs_ioctl.c b/fs/fs_ioctl.c
index 79362c34fa7..409c168b1c6 100644
--- a/fs/fs_ioctl.c
+++ b/fs/fs_ioctl.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * fs/fs_ioctl.c
  *
- *   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -46,7 +46,7 @@
 #include <net/if.h>
 
 #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
-# include <nuttx/net.h>
+# include <nuttx/net/net.h>
 #endif
 
 #include "fs_internal.h"
diff --git a/include/netinet/arp.h b/include/netinet/arp.h
index 4c2ad205d47..f2a9a036652 100644
--- a/include/netinet/arp.h
+++ b/include/netinet/arp.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * netinet/arp.h
+ * include/netinet/arp.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NETINET_ARP_H
-#define __NETINET_ARP_H
+#ifndef __INCLUDE_NETINET_ARP_H
+#define __INCLUDE_NETINET_ARP_H
 
 /****************************************************************************
  * Included Files
@@ -99,7 +99,7 @@ extern "C" {
 
 /* If CONFIG_NET_ARPIOCTLS is defined then the semi-standard ioctl commands
  * described above are supported.  If not, you can call the uIP ARP interfaces
- * directly in a very non-standard way.  See include/net/uip/uip-arp.h for
+ * directly in a very non-standard way.  See include/nuttx/net/uip/uip-arp.h for
  * prototypes.
  */
 
@@ -108,4 +108,4 @@ extern "C" {
 }
 #endif
 
-#endif /*   __NETINET_ARP_H */
+#endif /*   __INCLUDE_NETINET_ARP_H */
diff --git a/include/nuttx/cs89x0.h b/include/nuttx/net/cs89x0.h
similarity index 95%
rename from include/nuttx/cs89x0.h
rename to include/nuttx/net/cs89x0.h
index ec79b157dca..4b2a52a5c94 100644
--- a/include/nuttx/cs89x0.h
+++ b/include/nuttx/net/cs89x0.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * include/nuttx/cs89x0.h
+ * include/nuttx/net/cs89x0.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_CS89x0_H
-#define __INCLUDE_NUTTX_CS89x0_H
+#ifndef __INCLUDE_NUTTX_NET_CS89x0_H
+#define __INCLUDE_NUTTX_NET_CS89x0_H
 
 /****************************************************************************
  * Included Files
@@ -165,4 +165,4 @@ EXTERN int cs89x0_initialize(FAR const cs89x0_driver_s *cs89x0, int devno);
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_CS89x0_H */
+#endif /* __INCLUDE_NUTTX_NET_CS89x0_H */
diff --git a/include/nuttx/enc28j60.h b/include/nuttx/net/enc28j60.h
similarity index 97%
rename from include/nuttx/enc28j60.h
rename to include/nuttx/net/enc28j60.h
index f668b6cc6bd..6cc911ce5a0 100644
--- a/include/nuttx/enc28j60.h
+++ b/include/nuttx/net/enc28j60.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/enc28j60.h
+ * include/nuttx/net/enc28j60.h
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_ENC28J60_H
-#define __INCLUDE_NUTTX_ENC28J60_H
+#ifndef __INCLUDE_NUTTX_NET_ENC28J60_H
+#define __INCLUDE_NUTTX_NET_ENC28J60_H
 
 /****************************************************************************
  * Included Files
@@ -148,4 +148,4 @@ EXTERN int enc_stats(unsigned int devno, struct enc_stats_s *stats);
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_ENC28J60_H */
+#endif /* __INCLUDE_NUTTX_NET_ENC28J60_H */
diff --git a/include/net/ioctls.h b/include/nuttx/net/ioctl.h
similarity index 96%
rename from include/net/ioctls.h
rename to include/nuttx/net/ioctl.h
index 8398e51eddd..40222651964 100644
--- a/include/net/ioctls.h
+++ b/include/nuttx/net/ioctl.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * include/net/ioctls.h
+ * include/nuttx/net/ioctl.h
  *
- *   Copyright (C) 2007-2008, 2010-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2008, 2010-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_IOCTLS_H
-#define __NET_IOCTLS_H
+#ifndef __INCLUDE_NUTTX_NET_IOCTL_H
+#define __INCLUDE_NUTTX_NET_IOCTL_H
 
 /****************************************************************************
  * Included Files
@@ -140,4 +140,4 @@
  * Public Function Prototypes
  ****************************************************************************/
 
-#endif /* __NET_IOCTLS_H */
+#endif /* __INCLUDE_NUTTX_NET_IOCTL_H */
diff --git a/include/nuttx/mii.h b/include/nuttx/net/mii.h
similarity index 99%
rename from include/nuttx/mii.h
rename to include/nuttx/net/mii.h
index 59458ec3f02..50c57245aab 100644
--- a/include/nuttx/mii.h
+++ b/include/nuttx/net/mii.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * include/nuttx/mii.h
+ * include/nuttx/net/mii.h
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2008-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_MII_H
-#define __INCLUDE_NUTTX_MII_H
+#ifndef __INCLUDE_NUTTX_NET_MII_H
+#define __INCLUDE_NUTTX_NET_MII_H
 
 /****************************************************************************
  * Included Files
@@ -444,4 +444,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_MII_H */
+#endif /* __INCLUDE_NUTTX_NET_MII_H */
diff --git a/include/nuttx/net.h b/include/nuttx/net/net.h
similarity index 97%
rename from include/nuttx/net.h
rename to include/nuttx/net/net.h
index bcbcd627baa..a78ce1251bc 100644
--- a/include/nuttx/net.h
+++ b/include/nuttx/net/net.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * nuttx/net.h
+ * nuttx/net/net.h
  *
  *   Copyright (C) 2007, 2009-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NUTTX_NET_H
-#define __NUTTX_NET_H
+#ifndef __INCLUDE_NUTTX_NET_NET_H
+#define __INCLUDE_NUTTX_NET_NET_H
 
 /****************************************************************************
  * Included Files
@@ -48,7 +48,7 @@
 #include <stdarg.h>
 #include <semaphore.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 
 /****************************************************************************
  * Definitions
@@ -113,7 +113,7 @@ struct socketlist
 
 /* Callback from netdev_foreach() */
 
-struct uip_driver_s; /* Forward reference.  See net/uip/uip-arch.h */
+struct uip_driver_s; /* Forward reference.  See nuttx/net/uip/uip-arch.h */
 typedef int (*netdev_callback_t)(FAR struct uip_driver_s *dev, void *arg);
 
 /****************************************************************************
@@ -286,4 +286,4 @@ EXTERN int slip_initialize(int intf, const char *devname);
 #endif
 
 #endif /* CONFIG_NET */
-#endif /* __NUTTX_NET_H */
+#endif /* __INCLUDE_NUTTX_NET_NET_H */
diff --git a/include/net/uip/uip-arch.h b/include/nuttx/net/uip/uip-arch.h
similarity index 96%
rename from include/net/uip/uip-arch.h
rename to include/nuttx/net/uip/uip-arch.h
index 3cb2904ea3b..9546de04eb2 100644
--- a/include/net/uip/uip-arch.h
+++ b/include/nuttx/net/uip/uip-arch.h
@@ -1,9 +1,9 @@
 /****************************************************************************
- * uip-arch.h
+ * include/nuttx/net/uip/uip-arch.h
  * Defines architecture-specific device driver interfaces to uIP
  *
- *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Derived largely from portions of uIP with has a similar BSD-styple license:
  *
@@ -39,8 +39,12 @@
  *
  ****************************************************************************/
 
-#ifndef __UIP_ARCH_H
-#define __UIP_ARCH_H
+#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_ARCH_H
+#define __INCLUDE_NUTTX_NET_UIP_UIP_ARCH_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <nuttx/config.h>
 
@@ -48,16 +52,12 @@
 #include <stdint.h>
 #include <net/if.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #ifdef CONFIG_NET_IGMP
-#  include <net/uip/uip-igmp.h>
+#  include <nuttx/net/uip/uip-igmp.h>
 #endif
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <net/uip/uipopt.h>
+#include <nuttx/net/uip/uipopt.h>
 #include <net/ethernet.h>
 
 /****************************************************************************
@@ -366,5 +366,5 @@ extern uint16_t uip_tcpchksum(struct uip_driver_s *dev);
 extern uint16_t uip_udpchksum(struct uip_driver_s *dev);
 extern uint16_t uip_icmpchksum(struct uip_driver_s *dev, int len);
 
-#endif /* __UIP_ARCH_H */
+#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_ARCH_H */
 
diff --git a/include/net/uip/uip-arp.h b/include/nuttx/net/uip/uip-arp.h
similarity index 97%
rename from include/net/uip/uip-arp.h
rename to include/nuttx/net/uip/uip-arp.h
index 3afe1b2526b..8484c7d5a7d 100644
--- a/include/net/uip/uip-arp.h
+++ b/include/nuttx/net/uip/uip-arp.h
@@ -1,9 +1,9 @@
 /****************************************************************************
- * include/net/uip/uip-arch.h
+ * include/nuttx/net/uip/uip-arch.h
  * Macros and definitions for the ARP module.
  *
- *   Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2009-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Derived from uIP with has a similar BSD-styple license:
  *
@@ -51,8 +51,8 @@
 #include <stdint.h>
 
 #include <net/ethernet.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/include/net/uip/uip-icmp.h b/include/nuttx/net/uip/uip-icmp.h
similarity index 95%
rename from include/net/uip/uip-icmp.h
rename to include/nuttx/net/uip/uip-icmp.h
index c9d4d90ee04..27098d5d367 100644
--- a/include/net/uip/uip-icmp.h
+++ b/include/nuttx/net/uip/uip-icmp.h
@@ -1,9 +1,9 @@
 /****************************************************************************
- * net/uip/uip-icmp.h
+ * include/nuttx/net/uip/uip-icmp.h
  * Header file for the uIP ICMP stack.
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * This logic was leveraged from uIP which also has a BSD-style license:
  *
@@ -38,8 +38,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_UIP_ICMP_H
-#define __NET_UIP_UIP_ICMP_H
+#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_ICMP_H
+#define __INCLUDE_NUTTX_NET_UIP_UIP_ICMP_H
 
 /****************************************************************************
  * Included Files
@@ -48,7 +48,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
-#include <net/uip/uipopt.h>
+#include <nuttx/net/uip/uipopt.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -208,4 +208,4 @@ EXTERN int uip_ping(uip_ipaddr_t addr, uint16_t id, uint16_t seqno, uint16_t dat
 #ifdef __cplusplus
 }
 #endif
-#endif /* __NET_UIP_UIP_ICMP_H */
+#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_ICMP_H */
diff --git a/include/net/uip/uip-igmp.h b/include/nuttx/net/uip/uip-igmp.h
old mode 100755
new mode 100644
similarity index 96%
rename from include/net/uip/uip-igmp.h
rename to include/nuttx/net/uip/uip-igmp.h
index 29a3d533480..8b6d79e619e
--- a/include/net/uip/uip-igmp.h
+++ b/include/nuttx/net/uip/uip-igmp.h
@@ -1,10 +1,10 @@
 /****************************************************************************
- * net/uip/uip-igmp.h
+ * include/nuttx/net/uip/uip-igmp.h
  * The definitions in this header file are intended only for internal use
  * by the NuttX port of the uIP stack.
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * The NuttX implementation of IGMP was inspired by the IGMP add-on for the
  * lwIP TCP/IP stack by Steve Reynolds:
@@ -39,8 +39,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_IGMP_H
-#define __NET_UIP_IGMP_H
+#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_IGMP_H
+#define __INCLUDE_NUTTX_NET_UIP_UIP_IGMP_H
 
 /****************************************************************************
  * Included Files
@@ -54,8 +54,8 @@
 
 #include <netinet/in.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #ifdef CONFIG_NET_IGMP
 
@@ -255,4 +255,4 @@ EXTERN int  igmp_leavegroup(struct uip_driver_s *dev, FAR const struct in_addr *
 #endif
 
 #endif /* CONFIG_NET_IGMP */
-#endif /* __NET_UIP_IGMP_H */
+#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_IGMP_H */
diff --git a/include/net/uip/uip-ipopt.h b/include/nuttx/net/uip/uip-ipopt.h
old mode 100755
new mode 100644
similarity index 98%
rename from include/net/uip/uip-ipopt.h
rename to include/nuttx/net/uip/uip-ipopt.h
index 1625fbab670..5e600d8b118
--- a/include/net/uip/uip-ipopt.h
+++ b/include/nuttx/net/uip/uip-ipopt.h
@@ -1,5 +1,5 @@
 /************************************************************************************************************
- * net/uip/uip-ipopt.h
+ * include/nuttx/net/uip/uip-ipopt.h
  *
  * Defines values for the IP header options
  *
@@ -35,8 +35,8 @@
  *
  ************************************************************************************************************/
 
-#ifndef __NET_UIP_UIP_IPOPT_H
-#define __NET_UIP_UIP_IPOPT_H
+#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_IPOPT_H
+#define __INCLUDE_NUTTX_NET_UIP_UIP_IPOPT_H
 
 /************************************************************************************************************
  * Included Files
@@ -248,4 +248,4 @@
  * Public Function Prototypes
  ************************************************************************************************************/
 
-#endif /* __NET_UIP_UIP_IPOPT_H */
+#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_IPOPT_H */
diff --git a/include/net/uip/uip-tcp.h b/include/nuttx/net/uip/uip-tcp.h
similarity index 98%
rename from include/net/uip/uip-tcp.h
rename to include/nuttx/net/uip/uip-tcp.h
index 2fcf7390c7d..c3c800d7bdc 100644
--- a/include/net/uip/uip-tcp.h
+++ b/include/nuttx/net/uip/uip-tcp.h
@@ -1,13 +1,13 @@
 /****************************************************************************
- * net/uip/uip-tcp.h
+ * include/nuttx/net/uip/uip-tcp.h
  * Header file for the uIP TCP/IP stack.
  *
  * The uIP TCP/IP stack header file contains definitions for a number
  * of C macros that are used by uIP programs as well as internal uIP
  * structures, TCP/IP header structures and function declarations.
  *
- *   Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2009-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * This logic was leveraged from uIP which also has a BSD-style license:
  *
@@ -42,8 +42,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_UIP_TCP_H
-#define __NET_UIP_UIP_TCP_H
+#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_TCP_H
+#define __INCLUDE_NUTTX_NET_UIP_UIP_TCP_H
 
 /****************************************************************************
  * Included Files
@@ -54,7 +54,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <net/uip/uipopt.h>
+#include <nuttx/net/uip/uipopt.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -457,4 +457,4 @@ extern int uip_backlogdelete(FAR struct uip_conn *conn, FAR struct uip_conn *blc
 #define uip_mss(conn) ((conn)->mss)
 
 #endif /* CONFIG_NET_TCP */
-#endif /* __NET_UIP_UIP_TCP_H */
+#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_TCP_H */
diff --git a/include/net/uip/uip-udp.h b/include/nuttx/net/uip/uip-udp.h
similarity index 95%
rename from include/net/uip/uip-udp.h
rename to include/nuttx/net/uip/uip-udp.h
index a27e1a3b54b..5eb7f171160 100644
--- a/include/net/uip/uip-udp.h
+++ b/include/nuttx/net/uip/uip-udp.h
@@ -1,13 +1,13 @@
 /****************************************************************************
- * net/uip/uip-udp.h
+ * include/nuttx/net/uip/uip-udp.h
  * Header file for the uIP UDP stack.
  *
  * The uIP UDP stack header file contains definitions for a number
  * of C macros that are used by uIP programs as well as internal uIP
  * structures, UDP header structures and function declarations.
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * This logic was leveraged from uIP which also has a BSD-style license:
  *
@@ -42,8 +42,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_UIP_UDP_H
-#define __NET_UIP_UIP_UDP_H
+#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_UDP_H
+#define __INCLUDE_NUTTX_NET_UIP_UIP_UDP_H
 
 /****************************************************************************
  * Included Files
@@ -52,7 +52,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
-#include <net/uip/uipopt.h>
+#include <nuttx/net/uip/uipopt.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -203,4 +203,4 @@ extern int uip_udpconnect(struct uip_udp_conn *conn, const struct sockaddr_in *a
 extern void uip_udpenable(struct uip_udp_conn *conn);
 extern void uip_udpdisable(struct uip_udp_conn *conn);
 
-#endif /* __NET_UIP_UIP_UDP_H */
+#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_UDP_H */
diff --git a/include/net/uip/uip.h b/include/nuttx/net/uip/uip.h
similarity index 98%
rename from include/net/uip/uip.h
rename to include/nuttx/net/uip/uip.h
index c36efa355d2..392793e68d7 100644
--- a/include/net/uip/uip.h
+++ b/include/nuttx/net/uip/uip.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip.h
+ * include/nuttx/net/uip/uip.h
  *
  * The uIP header file contains definitions for a number of C macros that
  * are used by uIP programs as well as internal uIP structures and function
@@ -41,8 +41,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NET_UIP_UIP_H
-#define __NET_UIP_UIP_H
+#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_H
+#define __INCLUDE_NUTTX_NET_UIP_UIP_H
 
 /****************************************************************************
  * Included Files
@@ -60,7 +60,7 @@
 
 #include <arpa/inet.h>
 
-#include <net/uip/uipopt.h>
+#include <nuttx/net/uip/uipopt.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -228,16 +228,16 @@ struct uip_callback_s
 /* Protocol-specific support */
 
 #ifdef CONFIG_NET_TCP
-#  include <net/uip/uip-tcp.h>
+#  include <nuttx/net/uip/uip-tcp.h>
 #endif
 #ifdef CONFIG_NET_UDP
-#  include <net/uip/uip-udp.h>
+#  include <nuttx/net/uip/uip-udp.h>
 #endif
 #ifdef CONFIG_NET_ICMP
-#  include <net/uip/uip-icmp.h>
+#  include <nuttx/net/uip/uip-icmp.h>
 #endif
 #ifdef CONFIG_NET_IGMP
-#  include <net/uip/uip-igmp.h>
+#  include <nuttx/net/uip/uip-igmp.h>
 #endif
 
 /* The structure holding the uIP statistics that are gathered if
@@ -565,4 +565,4 @@ extern bool uip_ipaddr_maskcmp(uip_ipaddr_t addr1, uip_ipaddr_t addr2,
     (in_addr_t)(dest) = (in_addr_t)(src) & (in_addr_t)(mask); \
   } while(0)
 
-#endif /* __NET_UIP_UIP_H */
+#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_H */
diff --git a/include/net/uip/uipopt.h b/include/nuttx/net/uip/uipopt.h
similarity index 98%
rename from include/net/uip/uipopt.h
rename to include/nuttx/net/uip/uipopt.h
index a0ba62ee100..eee1dac4c5c 100644
--- a/include/net/uip/uipopt.h
+++ b/include/nuttx/net/uip/uipopt.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * uipopt.h
+ * include/nuttx/net/uip/uipopt.h
  * Configuration options for uIP.
  *
  * This file is used for tweaking various configuration options for
@@ -51,8 +51,8 @@
  *
  ****************************************************************************/
 
-#ifndef __UIPOPT_H__
-#define __UIPOPT_H__
+#ifndef __INCLUDE_NUTTX_NET_UIP_UIPOPT_H
+#define __INCLUDE_NUTTX_NET_UIP_UIPOPT_H
 
 /****************************************************************************
  * Included Files
@@ -311,4 +311,4 @@
 
 typedef uint16_t uip_stats_t;
 
-#endif /* __UIPOPT_H__ */
+#endif /* __INCLUDE_NUTTX_NET_UIP_UIPOPT_H */
diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h
index 4cfca9dbcd9..6459ec02a69 100644
--- a/include/nuttx/sched.h
+++ b/include/nuttx/sched.h
@@ -1,8 +1,8 @@
 /********************************************************************************
  * nuttx/sched.h
  *
- *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,8 +33,8 @@
  *
  ********************************************************************************/
 
-#ifndef __NUTTX_SCHED_H
-#define __NUTTX_SCHED_H
+#ifndef __INCLUDE_NUTTX_SCHED_H
+#define __INCLUDE_NUTTX_SCHED_H
 
 /********************************************************************************
  * Included Files
@@ -52,7 +52,7 @@
 #include <time.h>
 
 #include <nuttx/irq.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 
 /********************************************************************************
  * Pre-processor Definitions
@@ -361,4 +361,4 @@ EXTERN void sched_foreach(sched_foreach_t handler, FAR void *arg);
 #endif
 #endif /* __ASSEMBLY__ */
 
-#endif /* __NUTTX_SCHED_H */
+#endif /* __INCLUDE_NUTTX_SCHED_H */
diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h
index 03c79ebefaf..73564dc5a78 100644
--- a/include/sys/ioctl.h
+++ b/include/sys/ioctl.h
@@ -1,8 +1,8 @@
 /****************************************************************************
  * include/sys/ioctl.h
  *
- *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2008, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __SYS_IOCTL_H
-#define __SYS_IOCTL_H
+#ifndef __INCLUDE_SYS_IOCTL_H
+#define __INCLUDE_SYS_IOCTL_H
 
 /****************************************************************************
  * Included Files
@@ -48,7 +48,7 @@
 /* Include network ioctls info */
 
 #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
-# include <net/ioctls.h>
+# include <nuttx/net/ioctl.h>
 #endif
 
 /****************************************************************************
@@ -80,4 +80,4 @@ EXTERN int ioctl(int fd, int req, unsigned long arg);
 }
 #endif
 
-#endif /* __SYS_IOCTL_H */
+#endif /* __INCLUDE_SYS_IOCTL_H */
diff --git a/include/sys/sockio.h b/include/sys/sockio.h
index a63833756f5..e6942592632 100644
--- a/include/sys/sockio.h
+++ b/include/sys/sockio.h
@@ -1,8 +1,8 @@
 /****************************************************************************
  * include/sys/sockio.h
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __SYS_SOCKIO_H
-#define __SYS_SOCKIO_H
+#ifndef __INCLUDE_SYS_SOCKIO_H
+#define __INCLUDE_SYS_SOCKIO_H
 
 /****************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/ioctl.h>
-#include <net/ioctls.h>
+#include <nuttx/net/ioctl.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
@@ -117,4 +117,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __SYS_SOCKIO_H */
+#endif /* __INCLUDE_SYS_SOCKIO_H */
diff --git a/net/connect.c b/net/connect.c
index b0d67613bf9..cffdb12e5bf 100644
--- a/net/connect.c
+++ b/net/connect.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <arch/irq.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "net_internal.h"
 #include "uip/uip_internal.h"
diff --git a/net/getsockname.c b/net/getsockname.c
index 3af89b7621a..6706e5e1eb9 100644
--- a/net/getsockname.c
+++ b/net/getsockname.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * net/getsockname.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -44,8 +44,8 @@
 
 #include <errno.h>
 
-#include <nuttx/net.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/net.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "net_internal.h"
 
diff --git a/net/net_arptimer.c b/net/net_arptimer.c
index fe835d0fe56..89db9f65624 100644
--- a/net/net_arptimer.c
+++ b/net/net_arptimer.c
@@ -45,8 +45,8 @@
 #include <wdog.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip-arp.h>
 
 #include "net_internal.h"
 
diff --git a/net/net_close.c b/net/net_close.c
index 3fc16067a8c..dce87ba4757 100644
--- a/net/net_close.c
+++ b/net/net_close.c
@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <arch/irq.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "net_internal.h"
 #include "uip/uip_internal.h"
diff --git a/net/net_internal.h b/net/net_internal.h
index d12397e7490..b0e34d57768 100644
--- a/net/net_internal.h
+++ b/net/net_internal.h
@@ -47,8 +47,8 @@
 #include <stdint.h>
 #include <time.h>
 
-#include <nuttx/net.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/net.h>
+#include <nuttx/net/uip/uip.h>
 
 /****************************************************************************
  * Definitions
diff --git a/net/net_poll.c b/net/net_poll.c
index da953fc9fa4..ca594c10fcb 100644
--- a/net/net_poll.c
+++ b/net/net_poll.c
@@ -48,8 +48,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <net/uip/uip.h>
-#include <nuttx/net.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/net.h>
 #include <nuttx/arch.h>
 
 #include <uip/uip_internal.h>
diff --git a/net/net_sockets.c b/net/net_sockets.c
index 05363167c29..b3a894e2b95 100644
--- a/net/net_sockets.c
+++ b/net/net_sockets.c
@@ -47,8 +47,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <net/uip/uip.h>
-#include <nuttx/net.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/net.h>
 #include <nuttx/kmalloc.h>
 
 #include "net_internal.h"
diff --git a/net/net_vfcntl.c b/net/net_vfcntl.c
index e1f84a419c4..7650264bf2b 100644
--- a/net/net_vfcntl.c
+++ b/net/net_vfcntl.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * net/net_vfcntl.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -46,7 +46,7 @@
 #include <errno.h>
 
 #include <arch/irq.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 #include "net_internal.h"
 
 #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
diff --git a/net/netdev_count.c b/net/netdev_count.c
index c738b51b3c9..17f0894da69 100644
--- a/net/netdev_count.c
+++ b/net/netdev_count.c
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "net_internal.h"
 
diff --git a/net/netdev_findbyaddr.c b/net/netdev_findbyaddr.c
index 2565aed5a86..49fc17c20fd 100644
--- a/net/netdev_findbyaddr.c
+++ b/net/netdev_findbyaddr.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "net_internal.h"
 
diff --git a/net/netdev_findbyname.c b/net/netdev_findbyname.c
index c482f57818e..a6ddf0452df 100644
--- a/net/netdev_findbyname.c
+++ b/net/netdev_findbyname.c
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "net_internal.h"
 
diff --git a/net/netdev_foreach.c b/net/netdev_foreach.c
index f7d92ce650f..f88444ad848 100644
--- a/net/netdev_foreach.c
+++ b/net/netdev_foreach.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * net/netdev_foreach.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,8 +41,8 @@
 #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
 
 #include <debug.h>
-#include <nuttx/net.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/net.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "net_internal.h"
 
diff --git a/net/netdev_ioctl.c b/net/netdev_ioctl.c
index d32f6a24fd7..af0367c50a6 100644
--- a/net/netdev_ioctl.c
+++ b/net/netdev_ioctl.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * net/netdev_ioctl.c
  *
- *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -48,16 +48,16 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 
 #include <net/if.h>
 #include <net/ethernet.h>
-#include <net/uip/uip-arch.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
 
 #ifdef CONFIG_NET_IGMP
 #  include "sys/sockio.h"
-#  include "net/uip/uip-igmp.h"
+#  include "nuttx/net/uip/uip-igmp.h"
 #endif
 
 #include "net_internal.h"
diff --git a/net/netdev_register.c b/net/netdev_register.c
index d9a5edc5308..0307d8f64fb 100644
--- a/net/netdev_register.c
+++ b/net/netdev_register.c
@@ -50,7 +50,7 @@
 
 #include <net/if.h>
 #include <net/ethernet.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "net_internal.h"
 
diff --git a/net/netdev_txnotify.c b/net/netdev_txnotify.c
index fb6f1289355..d2ecae58f41 100644
--- a/net/netdev_txnotify.c
+++ b/net/netdev_txnotify.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "net_internal.h"
 
diff --git a/net/netdev_unregister.c b/net/netdev_unregister.c
index e5c2f3ce5bc..e1aec0e4d8d 100644
--- a/net/netdev_unregister.c
+++ b/net/netdev_unregister.c
@@ -50,7 +50,7 @@
 
 #include <net/if.h>
 #include <net/ethernet.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "net_internal.h"
 
diff --git a/net/recvfrom.c b/net/recvfrom.c
index d7b7c561efd..2414b69ab00 100644
--- a/net/recvfrom.c
+++ b/net/recvfrom.c
@@ -50,7 +50,7 @@
 
 #include <arch/irq.h>
 #include <nuttx/clock.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "net_internal.h"
 #include "uip/uip_internal.h"
diff --git a/net/send.c b/net/send.c
index 087b4335177..950b3fc0bc3 100644
--- a/net/send.c
+++ b/net/send.c
@@ -49,10 +49,10 @@
 
 #include <arch/irq.h>
 #include <nuttx/clock.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #ifdef CONFIG_NET_ARP_IPIN
-#  include <net/uip/uip-arp.h>
+#  include <nuttx/net/uip/uip-arp.h>
 #endif
 
 #include "net_internal.h"
diff --git a/net/sendto.c b/net/sendto.c
index cd3026eacf6..320eacc1951 100644
--- a/net/sendto.c
+++ b/net/sendto.c
@@ -47,7 +47,7 @@
 #include <errno.h>
 #include <debug.h>
 #include <arch/irq.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "net_internal.h"
 #include "uip/uip_internal.h"
diff --git a/net/uip/uip_arp.c b/net/uip/uip_arp.c
index 2428ba128f4..c731ff0de3a 100644
--- a/net/uip/uip_arp.c
+++ b/net/uip/uip_arp.c
@@ -63,9 +63,9 @@
 #include <netinet/in.h>
 
 #include <net/ethernet.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip-arch.h>
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arp.h>
 
 #ifdef CONFIG_NET_ARP
 
diff --git a/net/uip/uip_arptab.c b/net/uip/uip_arptab.c
index b93ea761aa8..1a29f25df41 100644
--- a/net/uip/uip_arptab.c
+++ b/net/uip/uip_arptab.c
@@ -53,9 +53,9 @@
 #include <netinet/in.h>
 
 #include <net/ethernet.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip-arch.h>
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arp.h>
 
 #ifdef CONFIG_NET_ARP
 
diff --git a/net/uip/uip_callback.c b/net/uip/uip_callback.c
index 1270fd567ae..730aa7758c8 100644
--- a/net/uip/uip_callback.c
+++ b/net/uip/uip_callback.c
@@ -44,9 +44,9 @@
 #include <string.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_chksum.c b/net/uip/uip_chksum.c
index 65b9e588931..7a4eee79026 100644
--- a/net/uip/uip_chksum.c
+++ b/net/uip/uip_chksum.c
@@ -43,9 +43,9 @@
 #include <stdint.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_icmpinput.c b/net/uip/uip_icmpinput.c
index 8a37dd75c07..60ff75ea8e0 100644
--- a/net/uip/uip_icmpinput.c
+++ b/net/uip/uip_icmpinput.c
@@ -49,9 +49,9 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_icmpping.c b/net/uip/uip_icmpping.c
index 2832a4a83c8..5627b148af0 100644
--- a/net/uip/uip_icmpping.c
+++ b/net/uip/uip_icmpping.c
@@ -49,9 +49,9 @@
 
 #include <net/if.h>
 #include <nuttx/clock.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 #include "../net_internal.h" /* Should not include this! */
diff --git a/net/uip/uip_icmppoll.c b/net/uip/uip_icmppoll.c
index 8648b509a43..ca1d684c01d 100644
--- a/net/uip/uip_icmppoll.c
+++ b/net/uip/uip_icmppoll.c
@@ -42,9 +42,9 @@
 
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_icmpsend.c b/net/uip/uip_icmpsend.c
index f24d78008e5..0167ee9c45c 100644
--- a/net/uip/uip_icmpsend.c
+++ b/net/uip/uip_icmpsend.c
@@ -42,9 +42,9 @@
 
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_igmpgroup.c b/net/uip/uip_igmpgroup.c
index 076e990f912..220de047e50 100755
--- a/net/uip/uip_igmpgroup.c
+++ b/net/uip/uip_igmpgroup.c
@@ -1,391 +1,391 @@
-/****************************************************************************
- * net/uip/uip_igmpgroup.c
- * IGMP group data structure management logic
- *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
- *
- * The NuttX implementation of IGMP was inspired by the IGMP add-on for the
- * lwIP TCP/IP stack by Steve Reynolds:
- *
- *   Copyright (c) 2002 CITEL Technologies Ltd.
- *   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
- * 3. Neither the name of CITEL Technologies Ltd nor the names of its contributors 
- *    may be used to endorse or promote products derived from this software 
- *    without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY CITEL TECHNOLOGIES AND CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED.  IN NO EVENT SHALL CITEL TECHNOLOGIES OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE. 
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <nuttx/compiler.h>
-
-#include <stdlib.h>
-#include <string.h>
-#include <wdog.h>
-#include <queue.h>
-#include <debug.h>
-
-#include <arch/irq.h>
-#include <nuttx/arch.h>
-#include <nuttx/kmalloc.h>
-
-#include <net/uip/uip.h>
-#include <net/uip/uip-igmp.h>
-
-#include "uip_internal.h"
-
-#ifdef CONFIG_NET_IGMP
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Configuration ************************************************************/
-
-#ifdef CONFIG_NET_IPv6
-#  error "IGMP for IPv6 not supported"
-#endif
-
-#ifndef CONFIG_PREALLOC_IGMPGROUPS
-#  define CONFIG_PREALLOC_IGMPGROUPS 4
-#endif
-
-/* Debug ********************************************************************/
-
-#undef IGMP_GRPDEBUG /* Define to enable detailed IGMP group debug */
-
-#ifndef CONFIG_NET_IGMP
-#  undef IGMP_GRPDEBUG
-#endif
-
-#ifdef CONFIG_CPP_HAVE_VARARGS
-#  ifdef IGMP_GRPDEBUG
-#    define grpdbg(format, arg...)    ndbg(format, ##arg)
-#    define grplldbg(format, arg...)  nlldbg(format, ##arg)
-#    define grpvdbg(format, arg...)   nvdbg(format, ##arg)
-#    define grpllvdbg(format, arg...) nllvdbg(format, ##arg)
-#  else
-#    define grpdbg(x...)
-#    define grplldbg(x...)
-#    define grpvdbg(x...)
-#    define grpllvdbg(x...)
-#  endif
-#else
-#  ifdef IGMP_GRPDEBUG
-#    define grpdbg    ndbg
-#    define grplldbg  nlldbg
-#    define grpvdbg   nvdbg
-#    define grpllvdbg nllvdbg
-#  else
-#    define grpdbg    (void)
-#    define grplldbg  (void)
-#    define grpvdbg   (void)
-#    define grpllvdbg (void)
-#  endif
-#endif
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/* malloc() cannot be called from an interrupt handler.  To work around this,
- * a small number of IGMP groups are preallocated just for use in interrupt
- * handling logic.
- */
-
-#if CONFIG_PREALLOC_IGMPGROUPS > 0
-static struct igmp_group_s g_preallocgrps[CONFIG_PREALLOC_IGMPGROUPS];
-static FAR sq_queue_t g_freelist;
-#endif
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name:  uip_grpalloc
- *
- * Description:
- *   Allocate a new group from heap memory.
- *
- * Assumptions:
- *   Calls malloc and so cannot be called from an interrupt handler.
- *
- ****************************************************************************/
-
-static inline FAR struct igmp_group_s *uip_grpheapalloc(void)
-{
-  return (FAR struct igmp_group_s *)zalloc(sizeof(struct igmp_group_s));
-}
-
-/****************************************************************************
- * Name:  uip_grpprealloc
- *
- * Description:
- *   Allocate a new group from the pre-allocated groups.
- *
- * Assumptions:
- *   This function should only be called from an interrupt handler (or with
- *   interrupts disabled).
- *
- ****************************************************************************/
-
-#if CONFIG_PREALLOC_IGMPGROUPS > 0
-static inline FAR struct igmp_group_s *uip_grpprealloc(void)
-{
-  FAR struct igmp_group_s *group = (FAR struct igmp_group_s *)sq_remfirst(&g_freelist);
-  if (group)
-    {
-      memset(group, 0, sizeof(struct igmp_group_s));
-      group->flags = IGMP_PREALLOCATED;
-    }
-  return group;
-}
-#endif
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name:  uip_grpinit
- *
- * Description:
- *   One-time initialization of group data.
- *
- * Assumptions:
- *   Called only during early boot phases (pre-multitasking).
- *
- ****************************************************************************/
-
-void uip_grpinit(void)
-{
-  FAR struct igmp_group_s *group;
-  int i;
-
-  grplldbg("Initializing\n");
-
-#if CONFIG_PREALLOC_IGMPGROUPS > 0
-  for (i = 0; i < CONFIG_PREALLOC_IGMPGROUPS; i++)
-    {
-      group = &g_preallocgrps[i];
-      sq_addfirst((FAR sq_entry_t *)group, &g_freelist);
-    }
-#endif
-}
-
-/****************************************************************************
- * Name:  uip_grpalloc
- *
- * Description:
- *   Allocate a new group from heap memory.
- *
- * Assumptions:
- *   May be called from either user or interrupt level processing.
- *
- ****************************************************************************/
-
-FAR struct igmp_group_s *uip_grpalloc(FAR struct uip_driver_s *dev,
-                                      FAR const uip_ipaddr_t *addr)
-{
-  FAR struct igmp_group_s *group;
-  uip_lock_t flags;
-
-  nllvdbg("addr: %08x dev: %p\n", *addr, dev);
-  if (up_interrupt_context())
-    {
-#if CONFIG_PREALLOC_IGMPGROUPS > 0
-      grplldbg("Use a pre-allocated group entry\n");
-      group = uip_grpprealloc();
-#else
-      grplldbg("Cannot allocate from interrupt handler\n");
-      group = NULL;
-#endif
-    }
-  else
-    {
-      grplldbg("Allocate from the heap\n");
-      group = uip_grpheapalloc();
-    }
-  grplldbg("group: %p\n", group);
-
-  /* Check if we succesfully allocated a group structure */
-
-  if (group)
-    {
-      /* Initialize the non-zero elements of the group structure */
-
-      uip_ipaddr_copy(group->grpaddr, *addr);
-      sem_init(&group->sem, 0, 0);
-
-      /* Initialize the group timer (but don't start it yet) */
-
-      group->wdog = wd_create();
-      DEBUGASSERT(group->wdog);
-
-      /* Interrupts must be disabled in order to modify the group list */
-
-      flags = uip_lock();
-
-      /* Add the group structure to the list in the device structure */
-
-      sq_addfirst((FAR sq_entry_t*)group, &dev->grplist);
-      uip_unlock(flags);
-    }
-  return group;
-}
-
-/****************************************************************************
- * Name:  uip_grpfind
- *
- * Description:
- *   Find an existing group.
- *
- * Assumptions:
- *   May be called from either user or interrupt level processing.
- *
- ****************************************************************************/
-
-FAR struct igmp_group_s *uip_grpfind(FAR struct uip_driver_s *dev,
-                                     FAR const uip_ipaddr_t *addr)
-{
-  FAR struct igmp_group_s *group;
-  uip_lock_t flags;
-
-  grplldbg("Searching for addr %08x\n", (int)*addr);
-
-  /* We must disable interrupts because we don't which context we were
-   * called from.
-   */
-
-  flags = uip_lock();
-  for (group = (FAR struct igmp_group_s *)dev->grplist.head;
-       group;
-       group = group->next)
-    {
-      grplldbg("Compare: %08x vs. %08x\n", group->grpaddr, *addr);
-      if (uip_ipaddr_cmp(group->grpaddr, *addr))
-        {
-          grplldbg("Match!\n");
-          break;
-        }
-    }
-  uip_unlock(flags);
-  return group;
-}
-
-/****************************************************************************
- * Name:  uip_grpallocfind
- *
- * Description:
- *   Find an existing group.  If not found, create a new group for the
- *   address.
- *
- * Assumptions:
- *   May be called from either user or interrupt level processing.
- *
- ****************************************************************************/
-
-FAR struct igmp_group_s *uip_grpallocfind(FAR struct uip_driver_s *dev,
-                                          FAR const uip_ipaddr_t *addr)
-{
-  FAR struct igmp_group_s *group = uip_grpfind(dev, addr);
-
-  grplldbg("group: %p addr: %08x\n", group, (int)*addr);
-  if (!group)
-    {
-      group = uip_grpalloc(dev, addr);
-    }
-  grplldbg("group: %p\n", group);
-  return group;
-}
-
-/****************************************************************************
- * Name:  uip_grpfree
- *
- * Description:
- *   Release a previously allocated group.
- *
- * Assumptions:
- *   May be called from either user or interrupt level processing.
- *
- ****************************************************************************/
-
-void uip_grpfree(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group)
-{
-  uip_lock_t flags;
-
-  grplldbg("Free: %p flags: %02x\n", group, group->flags);
-
-  /* Cancel the wdog */
-
-  flags = uip_lock();
-  wd_cancel(group->wdog);
-  
-  /* Remove the group structure from the group list in the device structure */
-
-  sq_rem((FAR sq_entry_t*)group, &dev->grplist);
-  
-  /* Destroy the wait semapore */
-
-  (void)sem_destroy(&group->sem);
-
-  /* Destroy the wdog */
-
-  wd_delete(group->wdog);
-  
-  /* Then release the group structure resources.  Check first if this is one
-   * of the pre-allocated group structures that we will retain in a free list.
-   */
-
-#if CONFIG_PREALLOC_IGMPGROUPS > 0
-  if (IS_PREALLOCATED(group->flags))
-    {
-      grplldbg("Put back on free list\n");
-      sq_addlast((FAR sq_entry_t*)group, &g_freelist);
-      uip_unlock(flags);
-    }
-  else
-#endif
-    {
-      /* No.. deallocate the group structure.  Use sched_free() just in case
-       * this function is executing within an interrupt handler.
-       */
-
-      uip_unlock(flags);
-      grplldbg("Call sched_free()\n");
-      sched_free(group);
-    }
-}
-
-#endif /* CONFIG_NET_IGMP */
+/****************************************************************************
+ * net/uip/uip_igmpgroup.c
+ * IGMP group data structure management logic
+ *
+ *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * The NuttX implementation of IGMP was inspired by the IGMP add-on for the
+ * lwIP TCP/IP stack by Steve Reynolds:
+ *
+ *   Copyright (c) 2002 CITEL Technologies Ltd.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ *
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the distribution. 
+ * 3. Neither the name of CITEL Technologies Ltd nor the names of its contributors 
+ *    may be used to endorse or promote products derived from this software 
+ *    without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY CITEL TECHNOLOGIES AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED.  IN NO EVENT SHALL CITEL TECHNOLOGIES OR CONTRIBUTORS BE LIABLE 
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE. 
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/compiler.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <wdog.h>
+#include <queue.h>
+#include <debug.h>
+
+#include <arch/irq.h>
+#include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
+
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-igmp.h>
+
+#include "uip_internal.h"
+
+#ifdef CONFIG_NET_IGMP
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Configuration ************************************************************/
+
+#ifdef CONFIG_NET_IPv6
+#  error "IGMP for IPv6 not supported"
+#endif
+
+#ifndef CONFIG_PREALLOC_IGMPGROUPS
+#  define CONFIG_PREALLOC_IGMPGROUPS 4
+#endif
+
+/* Debug ********************************************************************/
+
+#undef IGMP_GRPDEBUG /* Define to enable detailed IGMP group debug */
+
+#ifndef CONFIG_NET_IGMP
+#  undef IGMP_GRPDEBUG
+#endif
+
+#ifdef CONFIG_CPP_HAVE_VARARGS
+#  ifdef IGMP_GRPDEBUG
+#    define grpdbg(format, arg...)    ndbg(format, ##arg)
+#    define grplldbg(format, arg...)  nlldbg(format, ##arg)
+#    define grpvdbg(format, arg...)   nvdbg(format, ##arg)
+#    define grpllvdbg(format, arg...) nllvdbg(format, ##arg)
+#  else
+#    define grpdbg(x...)
+#    define grplldbg(x...)
+#    define grpvdbg(x...)
+#    define grpllvdbg(x...)
+#  endif
+#else
+#  ifdef IGMP_GRPDEBUG
+#    define grpdbg    ndbg
+#    define grplldbg  nlldbg
+#    define grpvdbg   nvdbg
+#    define grpllvdbg nllvdbg
+#  else
+#    define grpdbg    (void)
+#    define grplldbg  (void)
+#    define grpvdbg   (void)
+#    define grpllvdbg (void)
+#  endif
+#endif
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* malloc() cannot be called from an interrupt handler.  To work around this,
+ * a small number of IGMP groups are preallocated just for use in interrupt
+ * handling logic.
+ */
+
+#if CONFIG_PREALLOC_IGMPGROUPS > 0
+static struct igmp_group_s g_preallocgrps[CONFIG_PREALLOC_IGMPGROUPS];
+static FAR sq_queue_t g_freelist;
+#endif
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name:  uip_grpalloc
+ *
+ * Description:
+ *   Allocate a new group from heap memory.
+ *
+ * Assumptions:
+ *   Calls malloc and so cannot be called from an interrupt handler.
+ *
+ ****************************************************************************/
+
+static inline FAR struct igmp_group_s *uip_grpheapalloc(void)
+{
+  return (FAR struct igmp_group_s *)zalloc(sizeof(struct igmp_group_s));
+}
+
+/****************************************************************************
+ * Name:  uip_grpprealloc
+ *
+ * Description:
+ *   Allocate a new group from the pre-allocated groups.
+ *
+ * Assumptions:
+ *   This function should only be called from an interrupt handler (or with
+ *   interrupts disabled).
+ *
+ ****************************************************************************/
+
+#if CONFIG_PREALLOC_IGMPGROUPS > 0
+static inline FAR struct igmp_group_s *uip_grpprealloc(void)
+{
+  FAR struct igmp_group_s *group = (FAR struct igmp_group_s *)sq_remfirst(&g_freelist);
+  if (group)
+    {
+      memset(group, 0, sizeof(struct igmp_group_s));
+      group->flags = IGMP_PREALLOCATED;
+    }
+  return group;
+}
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name:  uip_grpinit
+ *
+ * Description:
+ *   One-time initialization of group data.
+ *
+ * Assumptions:
+ *   Called only during early boot phases (pre-multitasking).
+ *
+ ****************************************************************************/
+
+void uip_grpinit(void)
+{
+  FAR struct igmp_group_s *group;
+  int i;
+
+  grplldbg("Initializing\n");
+
+#if CONFIG_PREALLOC_IGMPGROUPS > 0
+  for (i = 0; i < CONFIG_PREALLOC_IGMPGROUPS; i++)
+    {
+      group = &g_preallocgrps[i];
+      sq_addfirst((FAR sq_entry_t *)group, &g_freelist);
+    }
+#endif
+}
+
+/****************************************************************************
+ * Name:  uip_grpalloc
+ *
+ * Description:
+ *   Allocate a new group from heap memory.
+ *
+ * Assumptions:
+ *   May be called from either user or interrupt level processing.
+ *
+ ****************************************************************************/
+
+FAR struct igmp_group_s *uip_grpalloc(FAR struct uip_driver_s *dev,
+                                      FAR const uip_ipaddr_t *addr)
+{
+  FAR struct igmp_group_s *group;
+  uip_lock_t flags;
+
+  nllvdbg("addr: %08x dev: %p\n", *addr, dev);
+  if (up_interrupt_context())
+    {
+#if CONFIG_PREALLOC_IGMPGROUPS > 0
+      grplldbg("Use a pre-allocated group entry\n");
+      group = uip_grpprealloc();
+#else
+      grplldbg("Cannot allocate from interrupt handler\n");
+      group = NULL;
+#endif
+    }
+  else
+    {
+      grplldbg("Allocate from the heap\n");
+      group = uip_grpheapalloc();
+    }
+  grplldbg("group: %p\n", group);
+
+  /* Check if we succesfully allocated a group structure */
+
+  if (group)
+    {
+      /* Initialize the non-zero elements of the group structure */
+
+      uip_ipaddr_copy(group->grpaddr, *addr);
+      sem_init(&group->sem, 0, 0);
+
+      /* Initialize the group timer (but don't start it yet) */
+
+      group->wdog = wd_create();
+      DEBUGASSERT(group->wdog);
+
+      /* Interrupts must be disabled in order to modify the group list */
+
+      flags = uip_lock();
+
+      /* Add the group structure to the list in the device structure */
+
+      sq_addfirst((FAR sq_entry_t*)group, &dev->grplist);
+      uip_unlock(flags);
+    }
+  return group;
+}
+
+/****************************************************************************
+ * Name:  uip_grpfind
+ *
+ * Description:
+ *   Find an existing group.
+ *
+ * Assumptions:
+ *   May be called from either user or interrupt level processing.
+ *
+ ****************************************************************************/
+
+FAR struct igmp_group_s *uip_grpfind(FAR struct uip_driver_s *dev,
+                                     FAR const uip_ipaddr_t *addr)
+{
+  FAR struct igmp_group_s *group;
+  uip_lock_t flags;
+
+  grplldbg("Searching for addr %08x\n", (int)*addr);
+
+  /* We must disable interrupts because we don't which context we were
+   * called from.
+   */
+
+  flags = uip_lock();
+  for (group = (FAR struct igmp_group_s *)dev->grplist.head;
+       group;
+       group = group->next)
+    {
+      grplldbg("Compare: %08x vs. %08x\n", group->grpaddr, *addr);
+      if (uip_ipaddr_cmp(group->grpaddr, *addr))
+        {
+          grplldbg("Match!\n");
+          break;
+        }
+    }
+  uip_unlock(flags);
+  return group;
+}
+
+/****************************************************************************
+ * Name:  uip_grpallocfind
+ *
+ * Description:
+ *   Find an existing group.  If not found, create a new group for the
+ *   address.
+ *
+ * Assumptions:
+ *   May be called from either user or interrupt level processing.
+ *
+ ****************************************************************************/
+
+FAR struct igmp_group_s *uip_grpallocfind(FAR struct uip_driver_s *dev,
+                                          FAR const uip_ipaddr_t *addr)
+{
+  FAR struct igmp_group_s *group = uip_grpfind(dev, addr);
+
+  grplldbg("group: %p addr: %08x\n", group, (int)*addr);
+  if (!group)
+    {
+      group = uip_grpalloc(dev, addr);
+    }
+  grplldbg("group: %p\n", group);
+  return group;
+}
+
+/****************************************************************************
+ * Name:  uip_grpfree
+ *
+ * Description:
+ *   Release a previously allocated group.
+ *
+ * Assumptions:
+ *   May be called from either user or interrupt level processing.
+ *
+ ****************************************************************************/
+
+void uip_grpfree(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group)
+{
+  uip_lock_t flags;
+
+  grplldbg("Free: %p flags: %02x\n", group, group->flags);
+
+  /* Cancel the wdog */
+
+  flags = uip_lock();
+  wd_cancel(group->wdog);
+  
+  /* Remove the group structure from the group list in the device structure */
+
+  sq_rem((FAR sq_entry_t*)group, &dev->grplist);
+  
+  /* Destroy the wait semapore */
+
+  (void)sem_destroy(&group->sem);
+
+  /* Destroy the wdog */
+
+  wd_delete(group->wdog);
+  
+  /* Then release the group structure resources.  Check first if this is one
+   * of the pre-allocated group structures that we will retain in a free list.
+   */
+
+#if CONFIG_PREALLOC_IGMPGROUPS > 0
+  if (IS_PREALLOCATED(group->flags))
+    {
+      grplldbg("Put back on free list\n");
+      sq_addlast((FAR sq_entry_t*)group, &g_freelist);
+      uip_unlock(flags);
+    }
+  else
+#endif
+    {
+      /* No.. deallocate the group structure.  Use sched_free() just in case
+       * this function is executing within an interrupt handler.
+       */
+
+      uip_unlock(flags);
+      grplldbg("Call sched_free()\n");
+      sched_free(group);
+    }
+}
+
+#endif /* CONFIG_NET_IGMP */
diff --git a/net/uip/uip_igmpinit.c b/net/uip/uip_igmpinit.c
index b6483b0a74e..7954e7b3e83 100755
--- a/net/uip/uip_igmpinit.c
+++ b/net/uip/uip_igmpinit.c
@@ -47,8 +47,8 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-igmp.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-igmp.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_igmpinput.c b/net/uip/uip_igmpinput.c
index ba70af5bfb9..5b4fbefa426 100755
--- a/net/uip/uip_igmpinput.c
+++ b/net/uip/uip_igmpinput.c
@@ -47,9 +47,9 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-igmp.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-igmp.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_igmpjoin.c b/net/uip/uip_igmpjoin.c
index a7118051a01..eb6e8883793 100755
--- a/net/uip/uip_igmpjoin.c
+++ b/net/uip/uip_igmpjoin.c
@@ -46,9 +46,9 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-igmp.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-igmp.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_igmpleave.c b/net/uip/uip_igmpleave.c
index bbc25a830d7..7e2a31a1962 100755
--- a/net/uip/uip_igmpleave.c
+++ b/net/uip/uip_igmpleave.c
@@ -47,9 +47,9 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-igmp.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-igmp.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_igmpmsg.c b/net/uip/uip_igmpmsg.c
index 182d7b92d22..9ea3daa4eb2 100755
--- a/net/uip/uip_igmpmsg.c
+++ b/net/uip/uip_igmpmsg.c
@@ -46,9 +46,9 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-igmp.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-igmp.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_igmppoll.c b/net/uip/uip_igmppoll.c
index 9ec96ed43fe..cec2a5e1b7c 100755
--- a/net/uip/uip_igmppoll.c
+++ b/net/uip/uip_igmppoll.c
@@ -46,9 +46,9 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_igmpsend.c b/net/uip/uip_igmpsend.c
index 568794f1fad..21fc2beb039 100755
--- a/net/uip/uip_igmpsend.c
+++ b/net/uip/uip_igmpsend.c
@@ -42,11 +42,11 @@
 #include <debug.h>
 #include <arpa/inet.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
-#include <net/uip/uip-ipopt.h>
-#include <net/uip/uip-igmp.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-ipopt.h>
+#include <nuttx/net/uip/uip-igmp.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_igmptimer.c b/net/uip/uip_igmptimer.c
index 4d454b0917d..27e2f9ff057 100755
--- a/net/uip/uip_igmptimer.c
+++ b/net/uip/uip_igmptimer.c
@@ -48,9 +48,9 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-igmp.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-igmp.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_initialize.c b/net/uip/uip_initialize.c
index 765a20ecdce..8839836c443 100644
--- a/net/uip/uip_initialize.c
+++ b/net/uip/uip_initialize.c
@@ -45,7 +45,7 @@
 #ifdef CONFIG_NET
 
 #include <stdint.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_input.c b/net/uip/uip_input.c
index 99e2379293a..7ae2f273996 100644
--- a/net/uip/uip_input.c
+++ b/net/uip/uip_input.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip_input.c
+ * netuip/uip_input.c
  * The uIP TCP/IP stack code.
  *
  *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
@@ -85,9 +85,9 @@
 #include <debug.h>
 #include <string.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #ifdef CONFIG_NET_IPv6
 # include "uip_neighbor.h"
diff --git a/net/uip/uip_internal.h b/net/uip/uip_internal.h
index 01c018c51cc..eee99a22245 100644
--- a/net/uip/uip_internal.h
+++ b/net/uip/uip_internal.h
@@ -50,7 +50,7 @@
 #include <stdbool.h>
 #include <errno.h>
 #include <arch/irq.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 
 /****************************************************************************
  * Public Macro Definitions
diff --git a/net/uip/uip_listen.c b/net/uip/uip_listen.c
index 8052ca23650..5f867fef2d9 100644
--- a/net/uip/uip_listen.c
+++ b/net/uip/uip_listen.c
@@ -48,7 +48,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
+#include <nuttx/net/uip/uipopt.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_lock.c b/net/uip/uip_lock.c
index f7e218d914c..7ba5f88a0e6 100644
--- a/net/uip/uip_lock.c
+++ b/net/uip/uip_lock.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 
 #if defined(CONFIG_NET) && defined(CONFIG_NET_NOINTS)
 
diff --git a/net/uip/uip_mcastmac.c b/net/uip/uip_mcastmac.c
index ebe97f75f91..7795becab5f 100755
--- a/net/uip/uip_mcastmac.c
+++ b/net/uip/uip_mcastmac.c
@@ -1,132 +1,132 @@
-/****************************************************************************
- * net/uip/uip_mcastmac.c
- *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
- *
- * The NuttX implementation of IGMP was inspired by the IGMP add-on for the
- * lwIP TCP/IP stack by Steve Reynolds:
- *
- *   Copyright (c) 2002 CITEL Technologies Ltd.
- *   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
- * 3. Neither the name of CITEL Technologies Ltd nor the names of its contributors 
- *    may be used to endorse or promote products derived from this software 
- *    without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY CITEL TECHNOLOGIES AND CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED.  IN NO EVENT SHALL CITEL TECHNOLOGIES OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE. 
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <assert.h>
-#include <debug.h>
-
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-
-#include "uip_internal.h"
-
-#ifdef CONFIG_NET_IGMP
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name:  uip_mcastmac
- *
- * Description:
- *   Given an IP address (in network order), create a IGMP multicast MAC
- *   address.
- *
- ****************************************************************************/
-
-static void uip_mcastmac(uip_ipaddr_t *ip, FAR uint8_t *mac)
-{
-  /* This mapping is from the IETF IN RFC 1700 */
-
-  mac[0] = 0x01;
-  mac[1] = 0x00;
-  mac[2] = 0x5e;
-  mac[3] = ip4_addr2(*ip) & 0x7f;
-  mac[4] = ip4_addr3(*ip);
-  mac[5] = ip4_addr4(*ip);
-
-  nvdbg("IP: %08x -> MAC: %02x%02x%02x%02x%02x%02x\n",
-        *ip, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-}
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name:  uip_addmcastmac
- *
- * Description:
- *   Add an IGMP MAC address to the device's MAC filter table.
- *
- ****************************************************************************/
-
-void uip_addmcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip)
-{
-  uint8_t mcastmac[6];
-
-  nvdbg("Adding: IP %08x\n", *ip);
-  if (dev->d_addmac)
-    {
-      uip_mcastmac(ip, mcastmac);
-      dev->d_addmac(dev, mcastmac);
-    }
-}
-
-/****************************************************************************
- * Name:  uip_removemcastmac
- *
- * Description:
- *   Remove an IGMP MAC address from the device's MAC filter table.
- *
- ****************************************************************************/
-
-void uip_removemcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip)
-{
-  uint8_t mcastmac[6];
-
-  nvdbg("Removing: IP %08x\n", *ip);
-  if (dev->d_rmmac)
-    {
-      uip_mcastmac(ip, mcastmac);
-      dev->d_rmmac(dev, mcastmac);
-    }
-}
-
-#endif /* CONFIG_NET_IGMP */
+/****************************************************************************
+ * net/uip/uip_mcastmac.c
+ *
+ *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * The NuttX implementation of IGMP was inspired by the IGMP add-on for the
+ * lwIP TCP/IP stack by Steve Reynolds:
+ *
+ *   Copyright (c) 2002 CITEL Technologies Ltd.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ *
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the distribution. 
+ * 3. Neither the name of CITEL Technologies Ltd nor the names of its contributors 
+ *    may be used to endorse or promote products derived from this software 
+ *    without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY CITEL TECHNOLOGIES AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED.  IN NO EVENT SHALL CITEL TECHNOLOGIES OR CONTRIBUTORS BE LIABLE 
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE. 
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <assert.h>
+#include <debug.h>
+
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+
+#include "uip_internal.h"
+
+#ifdef CONFIG_NET_IGMP
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name:  uip_mcastmac
+ *
+ * Description:
+ *   Given an IP address (in network order), create a IGMP multicast MAC
+ *   address.
+ *
+ ****************************************************************************/
+
+static void uip_mcastmac(uip_ipaddr_t *ip, FAR uint8_t *mac)
+{
+  /* This mapping is from the IETF IN RFC 1700 */
+
+  mac[0] = 0x01;
+  mac[1] = 0x00;
+  mac[2] = 0x5e;
+  mac[3] = ip4_addr2(*ip) & 0x7f;
+  mac[4] = ip4_addr3(*ip);
+  mac[5] = ip4_addr4(*ip);
+
+  nvdbg("IP: %08x -> MAC: %02x%02x%02x%02x%02x%02x\n",
+        *ip, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name:  uip_addmcastmac
+ *
+ * Description:
+ *   Add an IGMP MAC address to the device's MAC filter table.
+ *
+ ****************************************************************************/
+
+void uip_addmcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip)
+{
+  uint8_t mcastmac[6];
+
+  nvdbg("Adding: IP %08x\n", *ip);
+  if (dev->d_addmac)
+    {
+      uip_mcastmac(ip, mcastmac);
+      dev->d_addmac(dev, mcastmac);
+    }
+}
+
+/****************************************************************************
+ * Name:  uip_removemcastmac
+ *
+ * Description:
+ *   Remove an IGMP MAC address from the device's MAC filter table.
+ *
+ ****************************************************************************/
+
+void uip_removemcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip)
+{
+  uint8_t mcastmac[6];
+
+  nvdbg("Removing: IP %08x\n", *ip);
+  if (dev->d_rmmac)
+    {
+      uip_mcastmac(ip, mcastmac);
+      dev->d_rmmac(dev, mcastmac);
+    }
+}
+
+#endif /* CONFIG_NET_IGMP */
diff --git a/net/uip/uip_neighbor.h b/net/uip/uip_neighbor.h
index 355d1fdad9f..eac08f9382e 100644
--- a/net/uip/uip_neighbor.h
+++ b/net/uip/uip_neighbor.h
@@ -40,7 +40,7 @@
 #define __UIP_NEIGHBOR_H__
 
 #include <stdint.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #include <net/ethernet.h>
 
 struct uip_neighbor_addr
diff --git a/net/uip/uip_poll.c b/net/uip/uip_poll.c
index bb45cb94332..5aeb3b7888a 100644
--- a/net/uip/uip_poll.c
+++ b/net/uip/uip_poll.c
@@ -42,9 +42,9 @@
 
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_send.c b/net/uip/uip_send.c
index 2c8044e15fb..fd0f4f7da2d 100644
--- a/net/uip/uip_send.c
+++ b/net/uip/uip_send.c
@@ -44,8 +44,8 @@
 #include <string.h>
 #include <debug.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 /****************************************************************************
  * Definitions
diff --git a/net/uip/uip_setipid.c b/net/uip/uip_setipid.c
index 2cbccece4a0..f9d13cc9d79 100644
--- a/net/uip/uip_setipid.c
+++ b/net/uip/uip_setipid.c
@@ -44,7 +44,7 @@
 #include <stdint.h>
 #include <debug.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_tcpappsend.c b/net/uip/uip_tcpappsend.c
index e887e9efc53..d8a18750349 100644
--- a/net/uip/uip_tcpappsend.c
+++ b/net/uip/uip_tcpappsend.c
@@ -48,9 +48,9 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_tcpbacklog.c b/net/uip/uip_tcpbacklog.c
index 198bbd6b529..459d543128a 100644
--- a/net/uip/uip_tcpbacklog.c
+++ b/net/uip/uip_tcpbacklog.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * net/uip/uip_tcpbacklog.c
  *
- *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <net/uip/uipopt.h>
+#include <nuttx/net/uip/uipopt.h>
 #if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && defined(CONFIG_NET_TCPBACKLOG)
 
 #include <stdint.h>
@@ -46,8 +46,8 @@
 #include <queue.h>
 #include <debug.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-tcp.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-tcp.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_tcpcallback.c b/net/uip/uip_tcpcallback.c
index 099c29bf3b9..9ce8eb132af 100644
--- a/net/uip/uip_tcpcallback.c
+++ b/net/uip/uip_tcpcallback.c
@@ -45,9 +45,9 @@
 #include <string.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_tcpconn.c b/net/uip/uip_tcpconn.c
index 932aad2f782..c2b64ad8982 100644
--- a/net/uip/uip_tcpconn.c
+++ b/net/uip/uip_tcpconn.c
@@ -55,9 +55,9 @@
 
 #include <arch/irq.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_tcpinput.c b/net/uip/uip_tcpinput.c
index a8e8032e944..5b40963b6b7 100644
--- a/net/uip/uip_tcpinput.c
+++ b/net/uip/uip_tcpinput.c
@@ -50,9 +50,9 @@
 #include <string.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_tcppoll.c b/net/uip/uip_tcppoll.c
index de827692d06..29cb6d4b433 100644
--- a/net/uip/uip_tcppoll.c
+++ b/net/uip/uip_tcppoll.c
@@ -48,9 +48,9 @@
 #include <stdint.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_tcpreadahead.c b/net/uip/uip_tcpreadahead.c
index fefe76baec4..21ed58b99ce 100644
--- a/net/uip/uip_tcpreadahead.c
+++ b/net/uip/uip_tcpreadahead.c
@@ -37,13 +37,13 @@
  * Included Files
  ****************************************************************************/
 
-#include <net/uip/uipopt.h>
+#include <nuttx/net/uip/uipopt.h>
 #if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && (CONFIG_NET_NTCP_READAHEAD_BUFFERS > 0)
 
 #include <queue.h>
 #include <debug.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_tcpsend.c b/net/uip/uip_tcpsend.c
index 9ca81a60606..7051d762104 100644
--- a/net/uip/uip_tcpsend.c
+++ b/net/uip/uip_tcpsend.c
@@ -48,9 +48,9 @@
 #include <string.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_tcpseqno.c b/net/uip/uip_tcpseqno.c
index 8c19eb257c0..eab3a054a66 100755
--- a/net/uip/uip_tcpseqno.c
+++ b/net/uip/uip_tcpseqno.c
@@ -50,9 +50,9 @@
 #include <stdint.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_tcptimer.c b/net/uip/uip_tcptimer.c
index 1f29f7b8979..c95376ab0c0 100644
--- a/net/uip/uip_tcptimer.c
+++ b/net/uip/uip_tcptimer.c
@@ -48,9 +48,9 @@
 #include <stdint.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_udpcallback.c b/net/uip/uip_udpcallback.c
index 109f76f5091..f00c5e0f81d 100644
--- a/net/uip/uip_udpcallback.c
+++ b/net/uip/uip_udpcallback.c
@@ -43,9 +43,9 @@
 #include <stdint.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_udpconn.c b/net/uip/uip_udpconn.c
index 0180a9c1424..2babad75f8f 100644
--- a/net/uip/uip_udpconn.c
+++ b/net/uip/uip_udpconn.c
@@ -56,9 +56,9 @@
 
 #include <arch/irq.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_udpinput.c b/net/uip/uip_udpinput.c
index 83950833494..456c34799b1 100644
--- a/net/uip/uip_udpinput.c
+++ b/net/uip/uip_udpinput.c
@@ -47,9 +47,9 @@
 
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_udppoll.c b/net/uip/uip_udppoll.c
index 8b80ab178b2..984566ed46e 100644
--- a/net/uip/uip_udppoll.c
+++ b/net/uip/uip_udppoll.c
@@ -47,9 +47,9 @@
 
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/net/uip/uip_udpsend.c b/net/uip/uip_udpsend.c
index fbdfa89aea7..1dc33bbd180 100644
--- a/net/uip/uip_udpsend.c
+++ b/net/uip/uip_udpsend.c
@@ -46,9 +46,9 @@
 
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "uip_internal.h"
 
diff --git a/sched/os_start.c b/sched/os_start.c
index 412c24ebc80..e99f3c9880a 100644
--- a/sched/os_start.c
+++ b/sched/os_start.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * sched/os_start.c
  *
- *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -45,7 +45,7 @@
 #include  <nuttx/arch.h>
 #include  <nuttx/compiler.h>
 #include  <nuttx/fs.h>
-#include  <nuttx/net.h>
+#include  <nuttx/net/net.h>
 #include  <nuttx/lib.h>
 #include  <nuttx/kmalloc.h>
 #include  <nuttx/init.h>
diff --git a/sched/sched_releasefiles.c b/sched/sched_releasefiles.c
index 3990cd3c6b2..699dfb7b14f 100644
--- a/sched/sched_releasefiles.c
+++ b/sched/sched_releasefiles.c
@@ -41,7 +41,7 @@
 
 #include <sched.h>
 #include <nuttx/fs.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 #include <nuttx/lib.h>
 
 #if CONFIG_NFILE_DESCRIPTORS > 0 || CONFIG_NSOCKET_DESCRIPTORS > 0
diff --git a/sched/sched_setupidlefiles.c b/sched/sched_setupidlefiles.c
index 683a00c7a4d..a8827314c0f 100644
--- a/sched/sched_setupidlefiles.c
+++ b/sched/sched_setupidlefiles.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * sched/sched_setupidlefiles.c
  *
- *   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/fs.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 
 #include "os_internal.h"
 
diff --git a/sched/sched_setuppthreadfiles.c b/sched/sched_setuppthreadfiles.c
index a28a042c003..6af6e8a6640 100644
--- a/sched/sched_setuppthreadfiles.c
+++ b/sched/sched_setuppthreadfiles.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * sched_setuppthreadfiles.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -42,7 +42,7 @@
 #include <sched.h>
 
 #include <nuttx/fs.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 #include <nuttx/lib.h>
 
 #include "os_internal.h"
diff --git a/sched/sched_setupstreams.c b/sched/sched_setupstreams.c
index a30a9259dc3..96d3c393942 100644
--- a/sched/sched_setupstreams.c
+++ b/sched/sched_setupstreams.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * sched_setupstreams.c
  *
- *   Copyright (C) 2007-2008, 2010-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2008, 2010-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,7 +43,7 @@
 #include <fcntl.h>
 
 #include <nuttx/fs.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 #include <nuttx/lib.h>
 
 #if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0
diff --git a/sched/sched_setuptaskfiles.c b/sched/sched_setuptaskfiles.c
index 95c571b4793..2b7e4076378 100644
--- a/sched/sched_setuptaskfiles.c
+++ b/sched/sched_setuptaskfiles.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * sched/sched_setuptaskfiles.c
  *
- *   Copyright (C) 2007-2008, 2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2008, 2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,7 +43,7 @@
 #include <errno.h>
 
 #include <nuttx/fs.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 
 #include "os_internal.h"