diff --git a/ChangeLog b/ChangeLog
index 605c9f76755..396f3ae88b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1942,4 +1942,6 @@
 	* tools/bdf-converter.c.  This C file is used to build the bdf-converter
 	  program.  The bdf-converter program be used to convert fonts in Bitmap
 	  Distribution Format (BDF) into fonts that can be used in the NX graphics
-	  system.
\ No newline at end of file
+	  system.
+	* include/nuttx/nx:  Move all NX header files from include/nuttx to 
+	  include/nuttx/nx.
\ No newline at end of file
diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html
index 99ffda846fa..1c3305be574 100644
--- a/Documentation/NXGraphicsSubsystem.html
+++ b/Documentation/NXGraphicsSubsystem.html
@@ -12,7 +12,7 @@
       <h1><big><font color="#3c34ec">
         <i>NX Graphics Subsystem</i>
       </font></big></h1>
-      <p>Last Updated: July 23, 2011</p>
+      <p>Last Updated: July 24, 2011</p>
     </td>
   </tr>
 </table>
@@ -332,7 +332,7 @@
   graphics memory).
   NX includes both a small-footprint, single user implementaton (NXSU) and a somewhat
   larger multi-user implentation (NXMU as described below).
-  Both conform to the same APIs as defined in <code>include/nuttx/nx.h</code> and, hence,
+  Both conform to the same APIs as defined in <code>include/nuttx/nx/nx.h</code> and, hence,
   are interchangable<sup>1</sup>.
   NX can be used without NXWIDGETS and without NXTOOLKIT for raw window displays.
 </p>
@@ -404,15 +404,15 @@
 <h2>2.1 <a name="nxheaders">NX Header Files</a></h2>
 
 <ul><dl>
-  <dt><code>include/nuttx/nxglib.h</code>
+  <dt><code>include/nuttx/nx/nxglib.h</code>
     <dd>Describes the NXGLIB C interfaces
-  <dt><code>include/nuttx/nx.h</code>
+  <dt><code>include/nuttx/nx/nx.h</code>
     <dd>Describes the NX C interfaces
   <dt><code>include/nutt/nxtk.h</code>
     <dd>Describe the NXTOOLKIT C interfaces
   <dt><code>include/nutt/nxfont.h</code>
     <dd>Describe sthe NXFONT C interfaces
-  <dt><code>include/nuttx/nxwidgets.h</code>
+  <dt><code>include/nuttx/nx/nxwidgets.h</code>
     <dd>Will describe the NXWIDGETS classes (no longer planned)
 </dl></ul>
 
@@ -422,7 +422,7 @@
   NXGL provides many APIs, some available for use internally by NX and
   others for use by applications as well.
   Only those APIs intended for application usage are documented here
-  See <code>include/nuttx/nxglib.h</code> for the full set of APIs;
+  See <code>include/nuttx/nx/nxglib.h</code> for the full set of APIs;
   those APIs might be of interest if you are rendering directly into
   framebuffer or LCD memory.
 </p>
@@ -512,7 +512,7 @@ struct nxgl_trapezoid_s
 <h3>2.2.1 <a name="nxglrgb2yuv"><code>nxgl_rgb2yuv()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_rgb2yuv(uint8_t r, uint8_t g, uint8_t b, uint8_t *y, uint8_t *u, uint8_t *v);
 </pre></ul>
 <p>
@@ -523,7 +523,7 @@ void nxgl_rgb2yuv(uint8_t r, uint8_t g, uint8_t b, uint8_t *y, uint8_t *u, uint8
 <h3>2.2.2 <a name="nxglyuv2rgb"><code>nxgl_yuv2rgb()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_yuv2rgb(uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8_t *b);
 </pre></ul>
 <p>
@@ -534,7 +534,7 @@ void nxgl_yuv2rgb(uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8
 <h3>2.2.3 <a name="nxglrectcopy"><code>nxgl_rectcopy()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_rectcopy(FAR struct nxgl_rect_s *dest,
                    FAR const struct nxgl_rect_s *src);
 </pre></ul>
@@ -547,7 +547,7 @@ void nxgl_rectcopy(FAR struct nxgl_rect_s *dest,
 <h3>2.2.4 <a name="nxglrectoffset"><code>nxgl_rectoffset()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_rectoffset(FAR struct nxgl_rect_s *dest,
                      FAR const struct nxgl_rect_s *src,
                      nxgl_coord_t dx, nxgl_coord_t dy);
@@ -560,7 +560,7 @@ void nxgl_rectoffset(FAR struct nxgl_rect_s *dest,
 <h3>2.2.5 <a name="nxglvectoradd"><code>nxgl_vectoradd()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_vectoradd(FAR struct nxgl_point_s *dest,
                     FAR const struct nxgl_point_s *v1,
                     FAR const struct nxgl_point_s *v2);
@@ -573,7 +573,7 @@ void nxgl_vectoradd(FAR struct nxgl_point_s *dest,
 <h3>2.2.6 <a name="nxglvectorsubtract"><code>nxgl_vectorsubtract()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_vectsubtract(FAR struct nxgl_point_s *dest,
                        FAR const struct nxgl_point_s *v1,
                        FAR const struct nxgl_point_s *v2);
@@ -586,7 +586,7 @@ void nxgl_vectsubtract(FAR struct nxgl_point_s *dest,
 <h3>2.2.7 <a name="nxglrectintersect"><code>nxgl_rectintersect()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_rectintersect(FAR struct nxgl_rect_s *dest,
                         FAR const struct nxgl_rect_s *src1,
                         FAR const struct nxgl_rect_s *src2);
@@ -599,7 +599,7 @@ void nxgl_rectintersect(FAR struct nxgl_rect_s *dest,
 <h3>2.2.8 <a name="nxglrectunion"><code>nxgl_rectunion()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_rectunion(FAR struct nxgl_rect_s *dest,
                     FAR const struct nxgl_rect_s *src1,
                     FAR const struct nxgl_rect_s *src2);
@@ -613,7 +613,7 @@ void nxgl_rectunion(FAR struct nxgl_rect_s *dest,
 <h3>2.2.9 <a name="nxglnonintersecting"><code>nxgl_nonintersecting()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 nxgl_nonintersecting(FAR struct nxgl_rect_s result[4],
                      FAR const struct nxgl_rect_s *rect1,
                      FAR const struct nxgl_rect_s *rect2);
@@ -628,7 +628,7 @@ nxgl_nonintersecting(FAR struct nxgl_rect_s result[4],
 <h3>2.2.10 <a name="nxglrectoverlap"><code>nxgl_rectoverlap()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 bool nxgl_rectoverlap(FAR struct nxgl_rect_s *rect1,
                       FAR struct nxgl_rect_s *rect2);
 </pre></ul>
@@ -640,7 +640,7 @@ bool nxgl_rectoverlap(FAR struct nxgl_rect_s *rect1,
 <h3>2.2.11 <a name="nxglrectinside"><code>nxgl_rectinside()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 bool nxgl_rectinside(FAR const struct nxgl_rect_s *rect,
                      FAR const struct nxgl_point_s *pt);
 </pre></ul>
@@ -652,7 +652,7 @@ bool nxgl_rectinside(FAR const struct nxgl_rect_s *rect,
 <h3>2.2.12 <a name="nxglrectsize"><code>nxgl_rectsize()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_rectsize(FAR struct nxgl_size_s *size,
                    FAR const struct nxgl_rect_s *rect);
 </pre></ul>
@@ -664,7 +664,7 @@ void nxgl_rectsize(FAR struct nxgl_size_s *size,
 <h3>2.2.13 <a name="nxglnullrect"><code>nxgl_nullrect()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 bool nxgl_nullrect(FAR const struct nxgl_rect_s *rect);
 </pre></ul>
 <p>
@@ -675,7 +675,7 @@ bool nxgl_nullrect(FAR const struct nxgl_rect_s *rect);
 <h3>2.2.14 <a name="nxglrunoffset"><code>nxgl_runoffset()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_runoffset(FAR struct nxgl_run_s *dest,
                     FAR const struct nxgl_run_s *src,
                     nxgl_coord_t dx, nxgl_coord_t dy);
@@ -688,7 +688,7 @@ void nxgl_runoffset(FAR struct nxgl_run_s *dest,
 <h3>2.2.15 <a name="nxglruncopy"><code>nxgl_runcopy()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_runcopy(FAR struct nxgl_run_s *dest,
                   FAR const struct nxgl_run_s *src);
 </pre></ul>
@@ -701,7 +701,7 @@ void nxgl_runcopy(FAR struct nxgl_run_s *dest,
 <h3>2.2.16 <a name="nxgltrapoffset"><code>nxgl_trapoffset()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_trapoffset(FAR struct nxgl_trapezoid_s *dest,
                      FAR const struct nxgl_trapezoid_s *src,
                      nxgl_coord_t dx, nxgl_coord_t dy);
@@ -714,7 +714,7 @@ void nxgl_trapoffset(FAR struct nxgl_trapezoid_s *dest,
 <h3>2.2.1 <a name="nxgltrapcopy"><code>nxgl_trapcopy()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 void nxgl_trapcopy(FAR struct nxgl_trapezoid_s *dest,
                    FAR const struct nxgl_trapezoid_s *src);
 </pre></ul>
@@ -727,7 +727,7 @@ void nxgl_trapcopy(FAR struct nxgl_trapezoid_s *dest,
 <h3>2.2.1 <a name="nxglcolorcopy"><code>nxgl_colorcopy</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
 nxgl_colorcopy(nxgl_mxpixel_t dest[CONFIG_NX_NPLANES],
                const nxgl_mxpixel_t src[CONFIG_NX_NPLANES]);
 </pre></ul>
@@ -929,8 +929,8 @@ void (*kbdin)(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch, FAR void *arg);
 <h3>2.3.4 <a name="nxruninstance"><code>nx_runinstance()</code> (and <code>nx_run()</code> macro)</a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 #ifdef CONFIG_NX_MULTIUSER
 int nx_runinstance(FAR const char *mqname, FAR struct fb_vtable_s *fb);
@@ -970,8 +970,8 @@ int nx_runinstance(FAR const char *mqname, FAR struct fb_vtable_s *fb);
 <h3>2.3.5 <a name="nxconnectinstance"><code>nx_connectinstance()</code> (and <code>nx_connect()</code> macro)</a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 #ifdef CONFIG_NX_MULTIUSER
 NXHANDLE nx_connectinstance(FAR const char *svrmqname);
@@ -1024,8 +1024,8 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname);
 <h3>2.3.6 <a name="nxopen"><code>nx_open()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 #ifndef CONFIG_NX_MULTIUSER
 NXHANDLE nx_open(FAR struct fb_vtable_s *dev);
@@ -1061,8 +1061,8 @@ NXHANDLE nx_open(FAR struct fb_vtable_s *dev);
 <h3>2.3.7 <a name="nxdisconnect"><code>nx_disconnect()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 #ifdef CONFIG_NX_MULTIUSER
 void nx_disconnect(NXHANDLE handle);
@@ -1092,8 +1092,8 @@ void nx_disconnect(NXHANDLE handle);
 <h3>2.3.8 <a name="nxclose"><code>nx_close()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 #ifndef CONFIG_NX_MULTIUSER
 void nx_close(NXHANDLE handle);
@@ -1121,8 +1121,8 @@ void nx_close(NXHANDLE handle);
 <h3>2.3.9 <a name="nxeventhandler"><code>nx_eventhandler()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 #ifdef CONFIG_NX_MULTIUSER
 int nx_eventhandler(NXHANDLE handle);
@@ -1169,8 +1169,8 @@ int nx_eventhandler(NXHANDLE handle);
 <h3>2.3.10 <a name="nxeventnotify"><code>nx_eventnotify()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 #if defined(CONFIG_NX_MULTIUSER) && !defined(CONFIG_DISABLE_SIGNALS)
 int nx_eventnotify(NXHANDLE handle, int signo);
@@ -1215,8 +1215,8 @@ int nx_eventnotify(NXHANDLE handle, int signo);
 <h3>2.3.11 <a name="nxopenwindow"><code>nx_openwindow()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 NXWINDOW nx_openwindow(NXHANDLE handle,
                        FAR const struct nx_callback_s *cb,
@@ -1248,8 +1248,8 @@ NXWINDOW nx_openwindow(NXHANDLE handle,
 <h3>2.3.12 <a name="nxclosewindow"><code>nx_closewindow()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_closewindow(NXWINDOW hwnd);
 </pre></ul>
@@ -1276,8 +1276,8 @@ int nx_closewindow(NXWINDOW hwnd);
 <h3>2.3.13 <a name="nxrequestbkgd"><code>nx_requestbkgd()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_requestbkgd(NXHANDLE handle,
                    FAR const struct nx_callback_s *cb,
@@ -1348,8 +1348,8 @@ int nx_requestbkgd(NXHANDLE handle,
 <h3>2.3.14 <a name="nxreleasebkgd"><code>nx_releasebkgd()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_releasebkgd(NXWINDOW hwnd);
 </pre></ul>
@@ -1378,8 +1378,8 @@ int nx_releasebkgd(NXWINDOW hwnd);
 <h3>2.3.15 <a name="nxgetposition"><code>nx_getposition()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_getposition(NXWINDOW hwnd);
 </pre></ul>
@@ -1406,8 +1406,8 @@ int nx_getposition(NXWINDOW hwnd);
 <h3>2.3.16 <a name="nxsetposition"><code>nx_setposition()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_setposition(NXWINDOW hwnd, FAR struct nxgl_point_s *pos);
 </pre></ul>
@@ -1435,8 +1435,8 @@ int nx_setposition(NXWINDOW hwnd, FAR struct nxgl_point_s *pos);
 <h3>2.3.17 <a name="nxsetsize"><code>nx_setsize()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_setsize(NXWINDOW hwnd, FAR struct nxgl_size_s *size);
 </pre></ul>
@@ -1463,8 +1463,8 @@ int nx_setsize(NXWINDOW hwnd, FAR struct nxgl_size_s *size);
 <h3>2.3.18 <a name="nxraise"><code>nx_raise()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_raise(NXWINDOW hwnd);
 </pre></ul>
@@ -1491,8 +1491,8 @@ int nx_raise(NXWINDOW hwnd);
 <h3>2.3.19 <a name="nxlower"><code>nx_lower()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_lower(NXWINDOW hwnd);
 </pre></ul>
@@ -1519,8 +1519,8 @@ int nx_lower(NXWINDOW hwnd);
 <h3>2.3.20 <a name="nxfill"><code>nx_fill()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_fill(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
                    nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
@@ -1550,8 +1550,8 @@ int nx_fill(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
 <h3>2.3.21 <a name="nxfilltrapezoid"><code>nx_filltrapezoid()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip,
                             FAR const struct nxgl_trapezoid_s *trap,
@@ -1584,8 +1584,8 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip,
 <h3>2.3.22 <a name="nxglrgb2yuv"><code>nx_setbgcolor()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_setbgcolor(NXHANDLE handle,
                   nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
@@ -1612,8 +1612,8 @@ int nx_setbgcolor(NXHANDLE handle,
 <h3>2.3.23 <a name="nxmove"><code>nx_move()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
                    FAR const struct nxgl_point_s *offset);
@@ -1643,8 +1643,8 @@ int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
 <h3>2.3.24 <a name="nxbitmap"><code>nx_bitmap()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,
                      FAR const void *src[CONFIG_NX_NPLANES],
@@ -1685,8 +1685,8 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,
 <h3>2.3.25 <a name="nxkbdin"><code>nx_kbdin()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 #ifdef CONFIG_NX_KBD
 int nx_kbdchin(NXHANDLE handle, uint8_t ch);
@@ -1708,8 +1708,8 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch);
 <h3>2.3.26 <a name="nxmousein"><code>nx_mousein()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
 
 #ifdef CONFIG_NX_MOUSE
 int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons);
@@ -1785,9 +1785,9 @@ typedef FAR void *NXTKWINDOW;
 <h3>2.4.2 <a name="nxtkopenwindow"><code>nxtk_openwindow()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 NXTKWINDOW nxtk_openwindow(NXHANDLE handle,
                            FAR const struct nx_callback_s *cb,
@@ -1819,9 +1819,9 @@ NXTKWINDOW nxtk_openwindow(NXHANDLE handle,
 <h3>2.4.3 <a name="nxtkclosewindow"><code>nxtk_closewindow()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_closewindow(NXTKWINDOW hfwnd);
 </pre></ul>
@@ -1846,9 +1846,9 @@ int nxtk_closewindow(NXTKWINDOW hfwnd);
 <h3>2.4.4 <a name="nxtkgetposition"><code>nxtk_getposition()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_getposition(NXTKWINDOW hfwnd);
 </pre></ul>
@@ -1875,9 +1875,9 @@ int nxtk_getposition(NXTKWINDOW hfwnd);
 <h3>2.4.5 <a name="nxtksetposition"><code>nxtk_setposition()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_setposition(NXTKWINDOW hfwnd, FAR struct nxgl_point_s *pos);
 </pre></ul>
@@ -1906,9 +1906,9 @@ int nxtk_setposition(NXTKWINDOW hfwnd, FAR struct nxgl_point_s *pos);
 <h3>2.4.6 <a name="nxtksetsize"><code>nxtk_setsize()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_setsize(NXTKWINDOW hfwnd, FAR struct nxgl_size_s *size);
 </pre></ul>
@@ -1937,9 +1937,9 @@ int nxtk_setsize(NXTKWINDOW hfwnd, FAR struct nxgl_size_s *size);
 <h3>2.4.7 <a name="nxtkraise"><code>nxtk_raise()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_raise(NXTKWINDOW hfwnd);
 </pre></ul>
@@ -1968,9 +1968,9 @@ int nxtk_raise(NXTKWINDOW hfwnd);
 <h3>2.4.8 <a name="nxtklower"><code>nxtk_lower()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_lower(NXTKWINDOW hfwnd);
 </pre></ul>
@@ -1999,9 +1999,9 @@ int nxtk_lower(NXTKWINDOW hfwnd);
 <h3>2.4.9 <a name="nxtkfillwindow"><code>nxtk_fillwindow()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_fillwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
                     nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
@@ -2031,9 +2031,9 @@ int nxtk_fillwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
 <h3>2.4.10 <a name="nxtkfilltrapwindow"><code>nxtk_filltrapwindow()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_filltrapwindow(NXTKWINDOW hfwnd,
                         FAR const struct nxgl_trapezoid_s *trap,
@@ -2064,9 +2064,9 @@ int nxtk_filltrapwindow(NXTKWINDOW hfwnd,
 <h3>2.4.11 <a name="nxtkmovewindow"><code>nxtk_movewindow()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
                     FAR const struct nxgl_point_s *offset);
@@ -2097,9 +2097,9 @@ int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
 <h3>2.4.12 <a name="nxtkbitmapwindow"><code>nxtk_bitmapwindow()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_bitmapwindow(NXTKWINDOW hfwnd,
                       FAR const struct nxgl_rect_s *dest,
@@ -2142,9 +2142,9 @@ int nxtk_bitmapwindow(NXTKWINDOW hfwnd,
 <h3>2.4.13 <a name="nxtkopentoolbar"><code>nxtk_opentoolbar()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height,
                      FAR const struct nx_callback_s *cb,
@@ -2177,9 +2177,9 @@ int nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height,
 <h3>2.4.14 <a name="nxtkclosetoolbar"><code>nxtk_closetoolbar()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_closetoolbar(NXTKWINDOW hfwnd);
 </pre></ul>
@@ -2206,9 +2206,9 @@ int nxtk_closetoolbar(NXTKWINDOW hfwnd);
 <h3>2.4.15 <a name="nxtkfilltoolbar"><code>nxtk_filltoolbar()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
                      nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
@@ -2238,9 +2238,9 @@ int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
 <h3>2.4.16 <a name="nxtkfilltraptoolbar"><code>nxtk_filltraptoolbar()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *trap,
                          nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
@@ -2270,9 +2270,9 @@ int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *tr
 <h3>2.4.17 <a name="nxtkmovetoolbar"><code>nxtk_movetoolbar()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
                      FAR const struct nxgl_point_s *offset);
@@ -2304,9 +2304,9 @@ int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
 <h3>2.4.18 <a name="nxtkbitmaptoolbar"><code>nxtk_bitmaptoolbar()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nx.h&gt;
-#include &lt;nuttx/nxtk.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nx.h&gt;
+#include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd,
                        FAR const struct nxgl_rect_s *dest,
@@ -2403,7 +2403,7 @@ struct nx_font_s
 <h3>2.5.2 <a name="nxfgetfonthandle"><code>nxf_getfonthandle()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxfonts.h&gt;
+#include &lt;nuttx/nx/nxfonts.h&gt;
 
 NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid);
 </pre></ul>
@@ -2426,8 +2426,8 @@ NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid);
 <h3>2.5.3 <a name="nxfgetfontset"><code>nxf_getfontset()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nxfonts.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxfonts.h&gt;
 
 FAR const struct nx_font_s *nxf_getfontset(NXHANDLE handle);
 </pre></ul>
@@ -2450,8 +2450,8 @@ FAR const struct nx_font_s *nxf_getfontset(NXHANDLE handle);
 <h3>2.5.4 <a name="nxfgetbitmap"><code>nxf_getbitmap()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nxfonts.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxfonts.h&gt;
 
 FAR const struct nx_fontbitmap_s *nxf_getbitmap(NXHANDLE handle, uint16_t ch);
 </pre></ul>
@@ -2476,8 +2476,8 @@ FAR const struct nx_fontbitmap_s *nxf_getbitmap(NXHANDLE handle, uint16_t ch);
 <h3>2.5.5 <a name="nxfconvertbpp"><code>nxf_convert_*bpp()</code></a></h3>
 <p><b>Function Prototype:</b></p>
 <ul><pre>
-#include &lt;nuttx/nxglib.h&gt;
-#include &lt;nuttx/nxfonts.h&gt;
+#include &lt;nuttx/nx/nxglib.h&gt;
+#include &lt;nuttx/nx/nxfonts.h&gt;
 
 int nxf_convert_2bpp(FAR uint8_t *dest, uint16_t height,
                      uint16_t width, uint16_t stride,
@@ -2595,7 +2595,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
       When combined with the generic <i>back-end</i> (<code>nxbe</code>), it implements a
       single threaded, single user windowing system.
       The files in this directory present the window APIs described in
-      <code>include/nuttx/nx.h</code>.
+      <code>include/nuttx/nx/nx.h</code>.
       The single user front-end is selected when <code>CONFIG_NX_MULTIUSER</code> is not
       defined in the NuttX configuration file.
 
@@ -2604,7 +2604,7 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
       When combined with the generic <i>back-end</i> (<code>nxbe</code>), it implements a
       multi-threaded, multi-user windowing system.
       The files in this directory present the window APIs described in
-      <code>include/nuttx/nx.h</code>.
+      <code>include/nuttx/nx/nx.h</code>.
       The multi-user front end includes a graphics server that executes on its own thread;
       multiple graphics clients then communicate with the server via a POSIX message
       queue to serialize window operations from many threads.
@@ -2614,13 +2614,13 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
     <dt><code>graphics/nxfonts</code>
       <dd>This is where the NXFONTS implementation resides.
       This is a relatively low-level set of charset set/glyph management APIs.
-      See <code>include/nuttx/nxfonts.h</code>.
+      See <code>include/nuttx/nx/nxfonts.h</code>.
 
     <dt><code>graphics/nxtk</code>
       <dd>This is where the NXTOOLKIT implementation resides.
       This toolkit is built on top of NX and works with either the single-user or
       multi-user NX version.
-      See <code>include/nuttx/nxtk.h</code>.
+      See <code>include/nuttx/nx/nxtk.h</code>.
 
     <dt><code>graphics/nxwidgets</code>
       <dd>At one time, I planned to put NXWIDGETS implementation here, but not anymore.
@@ -2737,17 +2737,29 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
   </tr>
 </table>
 
-<p>
+<p><b>The BDF Font Converter</b>.
   There is a tool called <i>bdf-converter</i> in the directory <code>tools/.</code>.
   The <i>bdf-converter</i> program be used to convert fonts in Bitmap Distribution Format (BDF) into fonts that can be used in the NX graphics system.
+  The BDF format most well known as a font format traditionally used for X-11 bitmap fonts.
 </p>
+<blockquote><small>
+  A Note about Font Copyrights:
+  My understanding is that the underlying bitmap font data for traditional fonts cannot be copyrighted (the same is not true for scalable fonts).
+  This is because a copyright covers only the form of delivery of the font and not the underlying font content and, at least for the traditional typefaces, the underlying font designs are ancient.
+  There could be issues, however, if you convert from modern, trademarked images.
+  However, remember that I am a programmer not an attorney and that my knowledge of font copyright issues is limited to what I glean by Googling.
+</small></blockquote>
 <p>
-  Below are general instructions for creating and installing a new font in the NX graphic system:
+  <b>Font Installation Steps</b>,
+  Below are general instructions for creating and installing a new font in the NX graphic system.
+  The first two steps only appy if you are using the BDF font converter program.
 </p>
 <ol start="1">
   <li>
     <p>
-      Locate a font in BDF format,
+      Locate a font in BDF format.
+      There are many good BDF bitmap fonts bundled with X-11.
+      See <a href="http://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html">this link</a>, as an example, 
     </p>
   </li>
   <li>
@@ -2759,7 +2771,8 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
   </li>
 </ol>
 <p>
-  Create a new NuttX configuration variable.
+  The remaining steps apply however you managed to create the NuttX C font header file.
+  After you have your C font header file, the next thing to do is to create a new NuttX configuration variable to select the font.
   For example, suppose you define the following variable: <code>CONFIG_NXFONT_MYFONT</code>.
   Then you would need to:
 </p>
@@ -2772,14 +2785,14 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
 </ol>
 <p>
   A font ID number has to be assigned for each new font.
-  The font ID is defined in the file <code>include/nuttx/nxfonts.h</code>.
+  The font IDs are defined in the file <code>include/nuttx/nx/nxfonts.h</code>.
   Those definitions have to be extended to support your new font.
   Look at how the font ID enabled by <code>CONFIG_NXFONT_SANS23X27</code> is defined and add an ID for yournew font in a similar fashion:
 </p>
 <ol start="4">
   <li>
     <p>
-      <b><code>include/nuttx/nxfonts.h</code></b>. Add you new font as a possible system default font:
+      <b><code>include/nuttx/nx/nxfonts.h</code></b>. Add you new font as a possible system default font:
     </p>
     <ul><pre>
 #if defined(CONFIG_NXFONT_SANS23X27)
@@ -2816,7 +2829,7 @@ enum nx_fontid_e
     <p>
       <b><code>nuttx/graphics/Makefile</code></b>.
       This file needs logic to auto-generate a C source file from the header file that you generated with the the <i>bdf-converter</i> program.
-      Notice <code>NXFONTS_FONTID=2</code>; this must be set to the same font ID value that you defined in the <code>include/nuttx/nxfonts.h</code> file.
+      Notice <code>NXFONTS_FONTID=2</code>; this must be set to the same font ID value that you defined in the <code>include/nuttx/nx/nxfonts.h</code> file.
     </p>
     <ul><pre>
 genfontsources:
diff --git a/arch/arm/src/dm320/dm320_framebuffer.c b/arch/arm/src/dm320/dm320_framebuffer.c
index 60565deee62..fc29fa007fe 100644
--- a/arch/arm/src/dm320/dm320_framebuffer.c
+++ b/arch/arm/src/dm320/dm320_framebuffer.c
@@ -46,7 +46,7 @@
 #include <debug.h>
 
 #include <nuttx/fb.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "up_arch.h"
 #include "dm320_memorymap.h"
diff --git a/graphics/README.txt b/graphics/README.txt
index 378f71a9d2f..12ac8ffee51 100644
--- a/graphics/README.txt
+++ b/graphics/README.txt
@@ -30,7 +30,7 @@ at the present, but here is the longer term roadmap:
   NX        - The tiny NuttX windowing system.  This includes both a small-footprint,
               single user implementaton (NXSU as described below) and a somewhat
               larger multi-user implentation (NXMU as described below).  Both
-              conform to the same APIs as defined in include/nuttx/nx.h and, hence,
+              conform to the same APIs as defined in include/nuttx/nx/nx.h and, hence,
               are more-or-less interchangable.  NX can be used without NXWIDGETS
               and without NXTOOLKIT for raw access to window memory.
   NXGLIB    - Low level graphics utilities and direct framebuffer rendering logic.
@@ -39,11 +39,11 @@ at the present, but here is the longer term roadmap:
 Related Header Files
 ^^^^^^^^^^^^^^^^^^^^
 
-include/nuttx/nxglib.h    -- Describes the NXGLIB C interfaces
-include/nuttx/nx.h        -- Describes the NX C interfaces
-include/nutt/nxtk.h       -- Describe the NXTOOLKIT C interfaces
-include/nutt/nxfont.h     -- Describe sthe NXFONT C interfaces
-include/nuttx/nxwidgets.h -- Will describe the NXWIDGETS classes (no longer planned)
+include/nuttx/nx/nxglib.h   -- Describes the NXGLIB C interfaces
+include/nuttx/nx/nx.h       -- Describes the NX C interfaces
+include/nuttx/nx/nxtk.h     -- Describe the NXTOOLKIT C interfaces
+include/nuttx/nx/nxfont.h   -- Describe sthe NXFONT C interfaces
+include/nuttx/nx/nxwidgets.h -- Will describe the NXWIDGETS classes (no longer planned)
 
 Directories
 ^^^^^^^^^^^
@@ -63,14 +63,14 @@ graphics/nxbe
 graphics/nxsu
   This is the NX single user "front end".  When combined with the generic "back-end"
   (nxbe), it implements a single thread, single user windowing system.  The files
-  in this directory present the window APIs described in include/nuttx/nx.h.  The
+  in this directory present the window APIs described in include/nuttx/nx/nx.h.  The
   single user front-end is selected when CONFIG_NX_MULTIUSER is not defined in the
   NuttX configuration file.
 
 graphics/nxmu
   This is the NX multi user "front end".  When combined with the generic "back-end"
   (nxbe), it implements a multi-threaded, multi-user windowing system.  The files
-  in this directory present the window APIs described in include/nuttx/nx.h.  The
+  in this directory present the window APIs described in include/nuttx/nx/nx.h.  The
   multi-user front end includes a graphics server that executes on its own thread;
   multiple graphics clients then communicate with the server via a POSIX message
   queue to serialize window operations from many threads. The multi-user front-end
@@ -78,12 +78,12 @@ graphics/nxmu
 
 graphics/nxfonts
   This is where the NXFONTS implementation resides.  This is a relatively low-
-  level set of charset set/glyph management APIs.  See include/nuttx/nxfonts.h
+  level set of charset set/glyph management APIs.  See include/nuttx/nx/nxfonts.h
 
 graphics/nxtk
   This is where the NXTOOLKIT implementation resides.  This toolkit is built on
   top of NX and works with either the single-user or multi-user NX version. See
-  include/nuttx/nxtk.h
+  include/nuttx/nx/nxtk.h
 
 graphics/nxwidgets
   At one time, I planned to put NXWIDGETS implementation here, but not anymore.
@@ -111,12 +111,12 @@ Installing New Fonts
     3. Define CONFIG_NXFONT_MYFONT=y in your NuttX configuration file.
 
   A font ID number has to be assigned for each new font.  The font ID
-  is defined in the file include/nuttx/nxfonts.h.  Those definitions
+  is defined in the file include/nuttx/nx/nxfonts.h.  Those definitions
   have to be extended to support your new font.  Look at how the font ID
   enabled by CONFIG_NXFONT_SANS23X27 is defined and add an ID for your
   new font in a similar fashion:
 
-    4. include/nuttx/nxfonts.h. Add you new font as a possible system
+    4. include/nuttx/nx/nxfonts.h. Add you new font as a possible system
        default font:
  
        #if defined(CONFIG_NXFONT_SANS23X27)
@@ -147,7 +147,7 @@ Installing New Fonts
        a C source file from the header file that you generated with the
        the bdf-converter program.  Notice NXFONTS_FONTID=2; this must be
        set to the same font ID value that you defined in the
-       include/nuttx/nxfonts.h file.
+       include/nuttx/nx/nxfonts.h file.
 
        genfontsources:
          ifeq ($(CONFIG_NXFONT_SANS23X27),y)
diff --git a/graphics/nxbe/nxbe.h b/graphics/nxbe/nxbe.h
index c9e7e638177..d3c3bed8276 100644
--- a/graphics/nxbe/nxbe.h
+++ b/graphics/nxbe/nxbe.h
@@ -45,8 +45,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxbe/nxbe_bitmap.c b/graphics/nxbe/nxbe_bitmap.c
index 6977b97abeb..3076b2c8464 100644
--- a/graphics/nxbe/nxbe_bitmap.c
+++ b/graphics/nxbe/nxbe_bitmap.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 #include "nxbe.h"
 
 /****************************************************************************
diff --git a/graphics/nxbe/nxbe_clipper.c b/graphics/nxbe/nxbe_clipper.c
index d60ee4277cd..580c8bc4c8c 100644
--- a/graphics/nxbe/nxbe_clipper.c
+++ b/graphics/nxbe/nxbe_clipper.c
@@ -44,7 +44,7 @@
 #include <stdlib.h>
 #include <debug.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 #include "nxbe.h"
 
 /****************************************************************************
diff --git a/graphics/nxbe/nxbe_closewindow.c b/graphics/nxbe/nxbe_closewindow.c
index ea87a97a4cc..3c583fcfbf4 100644
--- a/graphics/nxbe/nxbe_closewindow.c
+++ b/graphics/nxbe/nxbe_closewindow.c
@@ -43,7 +43,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 #include "nxbe.h"
 
 /****************************************************************************
diff --git a/graphics/nxbe/nxbe_fill.c b/graphics/nxbe/nxbe_fill.c
index ebec3c886f5..f4aec74773a 100644
--- a/graphics/nxbe/nxbe_fill.c
+++ b/graphics/nxbe/nxbe_fill.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxbe/nxbe_fill.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxbe.h"
 
diff --git a/graphics/nxbe/nxbe_filltrapezoid.c b/graphics/nxbe/nxbe_filltrapezoid.c
index ed7bf322ce8..1936aede691 100644
--- a/graphics/nxbe/nxbe_filltrapezoid.c
+++ b/graphics/nxbe/nxbe_filltrapezoid.c
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include <fixedmath.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxbe.h"
 
diff --git a/graphics/nxbe/nxbe_lower.c b/graphics/nxbe/nxbe_lower.c
index f2f160e832f..0cfcb8f7a13 100644
--- a/graphics/nxbe/nxbe_lower.c
+++ b/graphics/nxbe/nxbe_lower.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxbe/nxbe_lower.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <stddef.h>
 #include <debug.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 #include "nxbe.h"
 
 /****************************************************************************
diff --git a/graphics/nxbe/nxbe_move.c b/graphics/nxbe/nxbe_move.c
index b5c5cc6b77e..c521514210c 100644
--- a/graphics/nxbe/nxbe_move.c
+++ b/graphics/nxbe/nxbe_move.c
@@ -41,7 +41,7 @@
 
 #include <stdint.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxbe.h"
 #include "nxfe.h"
diff --git a/graphics/nxbe/nxbe_raise.c b/graphics/nxbe/nxbe_raise.c
index fccc5965e45..7dc2113fdfd 100644
--- a/graphics/nxbe/nxbe_raise.c
+++ b/graphics/nxbe/nxbe_raise.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxbe/nxbe_raise.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxbe.h"
 #include "nxfe.h"
diff --git a/graphics/nxbe/nxbe_redraw.c b/graphics/nxbe/nxbe_redraw.c
index e844bb72df9..3226ccf3287 100644
--- a/graphics/nxbe/nxbe_redraw.c
+++ b/graphics/nxbe/nxbe_redraw.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxbe/nxbe_redraw.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxbe.h"
 #include "nxfe.h"
diff --git a/graphics/nxbe/nxbe_setposition.c b/graphics/nxbe/nxbe_setposition.c
index 8535704d6ef..f407eea3fa3 100644
--- a/graphics/nxbe/nxbe_setposition.c
+++ b/graphics/nxbe/nxbe_setposition.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxbe/nxbe_setposition.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxbe.h"
 #include "nxfe.h"
diff --git a/graphics/nxbe/nxbe_setsize.c b/graphics/nxbe/nxbe_setsize.c
index b2597b901d1..367f5d7dc97 100644
--- a/graphics/nxbe/nxbe_setsize.c
+++ b/graphics/nxbe/nxbe_setsize.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxbe/nxbe_setsize.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxbe.h"
 #include "nxfe.h"
diff --git a/graphics/nxbe/nxbe_visible.c b/graphics/nxbe/nxbe_visible.c
index 3b43c70ca9d..6b8b9291bbd 100644
--- a/graphics/nxbe/nxbe_visible.c
+++ b/graphics/nxbe/nxbe_visible.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxbe/nxbe_redraw.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxbe.h"
 #include "nxfe.h"
diff --git a/graphics/nxfonts/nxfonts_bitmaps.c b/graphics/nxfonts/nxfonts_bitmaps.c
index edd6703c452..8140e92fc7e 100644
--- a/graphics/nxfonts/nxfonts_bitmaps.c
+++ b/graphics/nxfonts/nxfonts_bitmaps.c
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nxfonts_internal.h"
 
diff --git a/graphics/nxfonts/nxfonts_convert.c b/graphics/nxfonts/nxfonts_convert.c
index b7b99e78ad8..00cd61a6cd0 100644
--- a/graphics/nxfonts/nxfonts_convert.c
+++ b/graphics/nxfonts/nxfonts_convert.c
@@ -43,8 +43,8 @@
 #include <stddef.h>
 #include <debug.h>
 
-#include <nuttx/nxglib.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nxfonts_internal.h"
 
diff --git a/graphics/nxfonts/nxfonts_getfont.c b/graphics/nxfonts/nxfonts_getfont.c
index 964a0c26ebd..b9d77b5a7df 100644
--- a/graphics/nxfonts/nxfonts_getfont.c
+++ b/graphics/nxfonts/nxfonts_getfont.c
@@ -43,8 +43,8 @@
 #include <stddef.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxfonts.h>
 
 #include "nxfonts_internal.h"
 
diff --git a/graphics/nxfonts/nxfonts_internal.h b/graphics/nxfonts/nxfonts_internal.h
index 889d573b10a..fa7864170df 100644
--- a/graphics/nxfonts/nxfonts_internal.h
+++ b/graphics/nxfonts/nxfonts_internal.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxfonts.h>
+#include <nuttx/nx/nxfonts.h>
 
 /****************************************************************************
  * Pre-processor definitions
diff --git a/graphics/nxglib/fb/nxglib_copyrectangle.c b/graphics/nxglib/fb/nxglib_copyrectangle.c
index 70ff8c329ea..4ad792a4cbb 100644
--- a/graphics/nxglib/fb/nxglib_copyrectangle.c
+++ b/graphics/nxglib/fb/nxglib_copyrectangle.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/fb/nxsglib_copyrectangle.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <stdint.h>
 
 #include <nuttx/fb.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"
 
diff --git a/graphics/nxglib/fb/nxglib_fillrectangle.c b/graphics/nxglib/fb/nxglib_fillrectangle.c
index 47fd6096fb7..62b2718ee67 100644
--- a/graphics/nxglib/fb/nxglib_fillrectangle.c
+++ b/graphics/nxglib/fb/nxglib_fillrectangle.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/fb/nxglib_fillrectangle.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <stdint.h>
 
 #include <nuttx/fb.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"
 
diff --git a/graphics/nxglib/fb/nxglib_filltrapezoid.c b/graphics/nxglib/fb/nxglib_filltrapezoid.c
index 89fd5ed6262..dbfdb478039 100644
--- a/graphics/nxglib/fb/nxglib_filltrapezoid.c
+++ b/graphics/nxglib/fb/nxglib_filltrapezoid.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/fb/nxglib_filltrapezoid.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <fixedmath.h>
 
 #include <nuttx/fb.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"
 
diff --git a/graphics/nxglib/fb/nxglib_moverectangle.c b/graphics/nxglib/fb/nxglib_moverectangle.c
index 84e0654c8df..d1bcbe7c9eb 100644
--- a/graphics/nxglib/fb/nxglib_moverectangle.c
+++ b/graphics/nxglib/fb/nxglib_moverectangle.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/fb/nxglib_moverectangle.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <stdint.h>
 
 #include <nuttx/fb.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"
 
diff --git a/graphics/nxglib/lcd/nxglib_copyrectangle.c b/graphics/nxglib/lcd/nxglib_copyrectangle.c
index 084fe5cee6d..988b6cb9442 100755
--- a/graphics/nxglib/lcd/nxglib_copyrectangle.c
+++ b/graphics/nxglib/lcd/nxglib_copyrectangle.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/lcd/nxsglib_copyrectangle.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <assert.h>
 
 #include <nuttx/lcd/lcd.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"
 #include "nxglib_copyrun.h"
diff --git a/graphics/nxglib/lcd/nxglib_fillrectangle.c b/graphics/nxglib/lcd/nxglib_fillrectangle.c
index ddb7fce0334..90271e51c1c 100755
--- a/graphics/nxglib/lcd/nxglib_fillrectangle.c
+++ b/graphics/nxglib/lcd/nxglib_fillrectangle.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/lcd/nxglib_fillrectangle.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <stdint.h>
 
 #include <nuttx/lcd/lcd.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"
 #include "nxglib_fillrun.h"
diff --git a/graphics/nxglib/lcd/nxglib_filltrapezoid.c b/graphics/nxglib/lcd/nxglib_filltrapezoid.c
index c000febb70f..c0e18d116e6 100755
--- a/graphics/nxglib/lcd/nxglib_filltrapezoid.c
+++ b/graphics/nxglib/lcd/nxglib_filltrapezoid.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/lcd/nxglib_filltrapezoid.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <fixedmath.h>
 
 #include <nuttx/lcd/lcd.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"
 #include "nxglib_fillrun.h"
diff --git a/graphics/nxglib/lcd/nxglib_moverectangle.c b/graphics/nxglib/lcd/nxglib_moverectangle.c
index daea90bf631..f82187ae3b5 100755
--- a/graphics/nxglib/lcd/nxglib_moverectangle.c
+++ b/graphics/nxglib/lcd/nxglib_moverectangle.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/lcd/nxglib_moverectangle.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <stdint.h>
 
 #include <nuttx/lcd/lcd.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 #include "nxglib_bitblit.h"
 
diff --git a/graphics/nxglib/nxglib_bitblit.h b/graphics/nxglib/nxglib_bitblit.h
index 9d04f8c78c5..a272b284c24 100644
--- a/graphics/nxglib/nxglib_bitblit.h
+++ b/graphics/nxglib/nxglib_bitblit.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxglib_bitblit.h
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 
 #include <stdint.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_colorcopy.c b/graphics/nxglib/nxglib_colorcopy.c
index ecbb3b6fe0f..f99b9950505 100644
--- a/graphics/nxglib/nxglib_colorcopy.c
+++ b/graphics/nxglib/nxglib_colorcopy.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_colorcopy.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_nonintersecting.c b/graphics/nxglib/nxglib_nonintersecting.c
index 0a77059a08c..9cb2ec29c51 100644
--- a/graphics/nxglib/nxglib_nonintersecting.c
+++ b/graphics/nxglib/nxglib_nonintersecting.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_rectnonintersecting.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_nullrect.c b/graphics/nxglib/nxglib_nullrect.c
index fb0980480f8..3e3355a45f6 100644
--- a/graphics/nxglib/nxglib_nullrect.c
+++ b/graphics/nxglib/nxglib_nullrect.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_nullrect.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 
 #include <stdbool.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_rectcopy.c b/graphics/nxglib/nxglib_rectcopy.c
index 561c18e5c31..998f5b716f6 100644
--- a/graphics/nxglib/nxglib_rectcopy.c
+++ b/graphics/nxglib/nxglib_rectcopy.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_rectcopy.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_rectinside.c b/graphics/nxglib/nxglib_rectinside.c
index 864de7fd6cb..1c1f17a2e37 100644
--- a/graphics/nxglib/nxglib_rectinside.c
+++ b/graphics/nxglib/nxglib_rectinside.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_rectinside.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 
 #include <stdbool.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_rectintersect.c b/graphics/nxglib/nxglib_rectintersect.c
index b4e04e4402c..96163571040 100644
--- a/graphics/nxglib/nxglib_rectintersect.c
+++ b/graphics/nxglib/nxglib_rectintersect.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_rectintersect.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_rectoffset.c b/graphics/nxglib/nxglib_rectoffset.c
index 95502ffc05a..93481b0de57 100644
--- a/graphics/nxglib/nxglib_rectoffset.c
+++ b/graphics/nxglib/nxglib_rectoffset.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_rectoffset.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_rectoverlap.c b/graphics/nxglib/nxglib_rectoverlap.c
index 84d1cec7bad..75d7a464117 100644
--- a/graphics/nxglib/nxglib_rectoverlap.c
+++ b/graphics/nxglib/nxglib_rectoverlap.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_nulloverlap.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 
 #include <stdbool.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_rectsize.c b/graphics/nxglib/nxglib_rectsize.c
index 93cc6861e0b..17a6c9214ac 100644
--- a/graphics/nxglib/nxglib_rectsize.c
+++ b/graphics/nxglib/nxglib_rectsize.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxglib_rectsize.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_rectunion.c b/graphics/nxglib/nxglib_rectunion.c
index fa618f3d960..8500c919cf1 100644
--- a/graphics/nxglib/nxglib_rectunion.c
+++ b/graphics/nxglib/nxglib_rectunion.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_rectunion.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_rgb2yuv.c b/graphics/nxglib/nxglib_rgb2yuv.c
index 055598406cc..c439c4fe00c 100644
--- a/graphics/nxglib/nxglib_rgb2yuv.c
+++ b/graphics/nxglib/nxglib_rgb2yuv.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/color/nxglib_rgb2yuv.c
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <debug.h>
 #include <fixedmath.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_runcopy.c b/graphics/nxglib/nxglib_runcopy.c
index b5f322c9a17..4b5372f149e 100644
--- a/graphics/nxglib/nxglib_runcopy.c
+++ b/graphics/nxglib/nxglib_runcopy.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_runcopy.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_runoffset.c b/graphics/nxglib/nxglib_runoffset.c
index eed9b713f2e..31d0dd163e0 100644
--- a/graphics/nxglib/nxglib_runoffset.c
+++ b/graphics/nxglib/nxglib_runoffset.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_runoffset.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 
 #include <fixedmath.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_trapcopy.c b/graphics/nxglib/nxglib_trapcopy.c
index cfb27ba3034..63bc0ecd81a 100644
--- a/graphics/nxglib/nxglib_trapcopy.c
+++ b/graphics/nxglib/nxglib_trapcopy.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_trapcopy.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_trapoffset.c b/graphics/nxglib/nxglib_trapoffset.c
index 4f409951d18..872a3107287 100644
--- a/graphics/nxglib/nxglib_trapoffset.c
+++ b/graphics/nxglib/nxglib_trapoffset.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_trapoffset.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_vectoradd.c b/graphics/nxglib/nxglib_vectoradd.c
index 031d9cd0a09..b206effa603 100644
--- a/graphics/nxglib/nxglib_vectoradd.c
+++ b/graphics/nxglib/nxglib_vectoradd.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_vectoradd.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_vectsubtract.c b/graphics/nxglib/nxglib_vectsubtract.c
index a30b5c39a27..81ffc86fb09 100644
--- a/graphics/nxglib/nxglib_vectsubtract.c
+++ b/graphics/nxglib/nxglib_vectsubtract.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxglib/nxsglib_vectorsubtract.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxglib/nxglib_yuv2rgb.c b/graphics/nxglib/nxglib_yuv2rgb.c
index 354b18bc899..9a3cb1f2282 100644
--- a/graphics/nxglib/nxglib_yuv2rgb.c
+++ b/graphics/nxglib/nxglib_yuv2rgb.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/color/nxglib_yuv2rgb.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <debug.h>
 #include <fixedmath.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/graphics/nxmu/nx_bitmap.c b/graphics/nxmu/nx_bitmap.c
index 04bbb0d0818..6e16b2c34b5 100644
--- a/graphics/nxmu/nx_bitmap.c
+++ b/graphics/nxmu/nx_bitmap.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_bitmap.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 
 #include "nxbe.h"
 #include "nxfe.h"
diff --git a/graphics/nxmu/nx_closewindow.c b/graphics/nxmu/nx_closewindow.c
index 2b87af87a92..22583f41b64 100644
--- a/graphics/nxmu/nx_closewindow.c
+++ b/graphics/nxmu/nx_closewindow.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_closewindow.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_connect.c b/graphics/nxmu/nx_connect.c
index dcfbd299606..e872f350588 100644
--- a/graphics/nxmu/nx_connect.c
+++ b/graphics/nxmu/nx_connect.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_connect.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_disconnect.c b/graphics/nxmu/nx_disconnect.c
index 82cb318ffc4..24fb114f496 100644
--- a/graphics/nxmu/nx_disconnect.c
+++ b/graphics/nxmu/nx_disconnect.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_disconnect.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_eventhandler.c b/graphics/nxmu/nx_eventhandler.c
index a8b97ffbbe0..d59364c2ee1 100644
--- a/graphics/nxmu/nx_eventhandler.c
+++ b/graphics/nxmu/nx_eventhandler.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_eventhandler.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_eventnotify.c b/graphics/nxmu/nx_eventnotify.c
index 5ea712a703a..1892413618c 100644
--- a/graphics/nxmu/nx_eventnotify.c
+++ b/graphics/nxmu/nx_eventnotify.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_eventnotify.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 #ifndef CONFIG_DISABLE_SIGNALS
diff --git a/graphics/nxmu/nx_fill.c b/graphics/nxmu/nx_fill.c
index f87ed3004b6..1b75cd97487 100644
--- a/graphics/nxmu/nx_fill.c
+++ b/graphics/nxmu/nx_fill.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_fill.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nxglib.h>
-#include <nuttx/nx.h>
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nx.h>
 
 #include "nxfe.h"
 
diff --git a/graphics/nxmu/nx_filltrapezoid.c b/graphics/nxmu/nx_filltrapezoid.c
index b573dce1965..8708225d36a 100644
--- a/graphics/nxmu/nx_filltrapezoid.c
+++ b/graphics/nxmu/nx_filltrapezoid.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_filltrapezoid.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 
 #include "nxfe.h"
 
diff --git a/graphics/nxmu/nx_getposition.c b/graphics/nxmu/nx_getposition.c
index a57645da433..d53ddf14b6a 100644
--- a/graphics/nxmu/nx_getposition.c
+++ b/graphics/nxmu/nx_getposition.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_getposition.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_kbdchin.c b/graphics/nxmu/nx_kbdchin.c
index eb3ed80139c..9393e125394 100644
--- a/graphics/nxmu/nx_kbdchin.c
+++ b/graphics/nxmu/nx_kbdchin.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_kbdchin.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 #ifdef CONFIG_NX_KBD
diff --git a/graphics/nxmu/nx_kbdin.c b/graphics/nxmu/nx_kbdin.c
index d4951bb13e6..c265f86c190 100644
--- a/graphics/nxmu/nx_kbdin.c
+++ b/graphics/nxmu/nx_kbdin.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_kbdin.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 #ifdef CONFIG_NX_KBD
diff --git a/graphics/nxmu/nx_lower.c b/graphics/nxmu/nx_lower.c
index 4b4a61d1c08..6ff57c78207 100644
--- a/graphics/nxmu/nx_lower.c
+++ b/graphics/nxmu/nx_lower.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_lower.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_mousein.c b/graphics/nxmu/nx_mousein.c
index ad3a88a130e..10d32afbb36 100644
--- a/graphics/nxmu/nx_mousein.c
+++ b/graphics/nxmu/nx_mousein.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_mousein.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 #ifdef CONFIG_NX_MOUSE
diff --git a/graphics/nxmu/nx_move.c b/graphics/nxmu/nx_move.c
index 67f4fc3c1ae..6159ce0cac4 100644
--- a/graphics/nxmu/nx_move.c
+++ b/graphics/nxmu/nx_move.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_move.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_openwindow.c b/graphics/nxmu/nx_openwindow.c
index 85fec76fe7e..504d421a359 100644
--- a/graphics/nxmu/nx_openwindow.c
+++ b/graphics/nxmu/nx_openwindow.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_openwindow.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_raise.c b/graphics/nxmu/nx_raise.c
index e60122cea88..78508d7497e 100644
--- a/graphics/nxmu/nx_raise.c
+++ b/graphics/nxmu/nx_raise.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_raise.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_releasebkgd.c b/graphics/nxmu/nx_releasebkgd.c
index 4ad750b6635..1326e951ed1 100644
--- a/graphics/nxmu/nx_releasebkgd.c
+++ b/graphics/nxmu/nx_releasebkgd.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_releasebkgd.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_requestbkgd.c b/graphics/nxmu/nx_requestbkgd.c
index ef1c9987aa8..e6367a4f762 100644
--- a/graphics/nxmu/nx_requestbkgd.c
+++ b/graphics/nxmu/nx_requestbkgd.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_requestbkgd.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_setbgcolor.c b/graphics/nxmu/nx_setbgcolor.c
index 9c3cc66c4c7..c2346fb3906 100644
--- a/graphics/nxmu/nx_setbgcolor.c
+++ b/graphics/nxmu/nx_setbgcolor.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_setbgcolor.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_setposition.c b/graphics/nxmu/nx_setposition.c
index d5ace394d07..d720f00f02c 100644
--- a/graphics/nxmu/nx_setposition.c
+++ b/graphics/nxmu/nx_setposition.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_setposition.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nx_setsize.c b/graphics/nxmu/nx_setsize.c
index aeb40e11c40..5a8a4c582b4 100644
--- a/graphics/nxmu/nx_setsize.c
+++ b/graphics/nxmu/nx_setsize.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_setsize.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nxfe.h b/graphics/nxmu/nxfe.h
index 14fdfb5b5d9..340f772a3e7 100644
--- a/graphics/nxmu/nxfe.h
+++ b/graphics/nxmu/nxfe.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nxfe.h
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 #include <mqueue.h>
 #include <semaphore.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 
 #include "nxbe.h"
 
diff --git a/graphics/nxmu/nxmu_constructwindow.c b/graphics/nxmu/nxmu_constructwindow.c
index ba3b034d052..86df90e286c 100644
--- a/graphics/nxmu/nxmu_constructwindow.c
+++ b/graphics/nxmu/nxmu_constructwindow.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nx_openwindow.c
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nxmu_kbdin.c b/graphics/nxmu/nxmu_kbdin.c
index 1a3ca03efe5..334d525c07b 100644
--- a/graphics/nxmu/nxmu_kbdin.c
+++ b/graphics/nxmu/nxmu_kbdin.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nxmu_kbdin.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 #ifdef CONFIG_NX_KBD
diff --git a/graphics/nxmu/nxmu_mouse.c b/graphics/nxmu/nxmu_mouse.c
index f1ee162d13d..44ec9918a80 100644
--- a/graphics/nxmu/nxmu_mouse.c
+++ b/graphics/nxmu/nxmu_mouse.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nxmu__mouse.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nxglib.h>
-#include <nuttx/nx.h>
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 #ifdef CONFIG_NX_MOUSE
diff --git a/graphics/nxmu/nxmu_openwindow.c b/graphics/nxmu/nxmu_openwindow.c
index da2ec2d6f4d..4cd6e661ce3 100644
--- a/graphics/nxmu/nxmu_openwindow.c
+++ b/graphics/nxmu/nxmu_openwindow.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nxmu_openwindow.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nxmu_redrawreq.c b/graphics/nxmu/nxmu_redrawreq.c
index 3c23d4af6ae..e4f0f7b9ef4 100644
--- a/graphics/nxmu/nxmu_redrawreq.c
+++ b/graphics/nxmu/nxmu_redrawreq.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nxmu_redrawreq.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nxmu_releasebkgd.c b/graphics/nxmu/nxmu_releasebkgd.c
index 3f8f04bdd70..3d1f24b7922 100644
--- a/graphics/nxmu/nxmu_releasebkgd.c
+++ b/graphics/nxmu/nxmu_releasebkgd.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nxmu_releasebkgd.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nxmu_reportposition.c b/graphics/nxmu/nxmu_reportposition.c
index ce206a01d90..904198b2223 100644
--- a/graphics/nxmu/nxmu_reportposition.c
+++ b/graphics/nxmu/nxmu_reportposition.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nxmu_reportposition.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,8 +42,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nxglib.h>
-#include <nuttx/nx.h>
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nxmu_requestbkgd.c b/graphics/nxmu/nxmu_requestbkgd.c
index b8ca3e65d2b..0e69351e6f4 100644
--- a/graphics/nxmu/nxmu_requestbkgd.c
+++ b/graphics/nxmu/nxmu_requestbkgd.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nxmu_requestbkgd.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nxmu_semtake.c b/graphics/nxmu/nxmu_semtake.c
index a0816228633..10fd5bd4a65 100644
--- a/graphics/nxmu/nxmu_semtake.c
+++ b/graphics/nxmu/nxmu_semtake.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nxmu_semtake.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxmu/nxmu_server.c b/graphics/nxmu/nxmu_server.c
index 24132a17f62..38df277e0dd 100644
--- a/graphics/nxmu/nxmu_server.c
+++ b/graphics/nxmu/nxmu_server.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxmu/nxmu_server.c
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_bitmap.c b/graphics/nxsu/nx_bitmap.c
index 532a6a894be..696b94afe01 100644
--- a/graphics/nxsu/nx_bitmap.c
+++ b/graphics/nxsu/nx_bitmap.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 
 #include "nxbe.h"
 #include "nxfe.h"
diff --git a/graphics/nxsu/nx_close.c b/graphics/nxsu/nx_close.c
index 550be1063cb..a3fa9b74d28 100644
--- a/graphics/nxsu/nx_close.c
+++ b/graphics/nxsu/nx_close.c
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_closewindow.c b/graphics/nxsu/nx_closewindow.c
index 27b7725d814..c5a2799eaf4 100644
--- a/graphics/nxsu/nx_closewindow.c
+++ b/graphics/nxsu/nx_closewindow.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_fill.c b/graphics/nxsu/nx_fill.c
index a2156ed9260..9075f82c010 100644
--- a/graphics/nxsu/nx_fill.c
+++ b/graphics/nxsu/nx_fill.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 
 #include "nxfe.h"
 
diff --git a/graphics/nxsu/nx_filltrapezoid.c b/graphics/nxsu/nx_filltrapezoid.c
index 4c89e336363..869ce3e1a0e 100644
--- a/graphics/nxsu/nx_filltrapezoid.c
+++ b/graphics/nxsu/nx_filltrapezoid.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 
 #include "nxfe.h"
 
diff --git a/graphics/nxsu/nx_getposition.c b/graphics/nxsu/nx_getposition.c
index 91bb284e4b2..8760d84c165 100644
--- a/graphics/nxsu/nx_getposition.c
+++ b/graphics/nxsu/nx_getposition.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_kbdchin.c b/graphics/nxsu/nx_kbdchin.c
index 51f4d8ce1f9..7ecea5db95c 100644
--- a/graphics/nxsu/nx_kbdchin.c
+++ b/graphics/nxsu/nx_kbdchin.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 #ifdef CONFIG_NX_KBD
diff --git a/graphics/nxsu/nx_kbdin.c b/graphics/nxsu/nx_kbdin.c
index 066c31c8e5f..9fc8460bdd7 100644
--- a/graphics/nxsu/nx_kbdin.c
+++ b/graphics/nxsu/nx_kbdin.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 #ifdef CONFIG_NX_KBD
diff --git a/graphics/nxsu/nx_lower.c b/graphics/nxsu/nx_lower.c
index a5373a4292e..dbfd278c411 100644
--- a/graphics/nxsu/nx_lower.c
+++ b/graphics/nxsu/nx_lower.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_mousein.c b/graphics/nxsu/nx_mousein.c
index 2d4c9bec92b..01505ee8b43 100644
--- a/graphics/nxsu/nx_mousein.c
+++ b/graphics/nxsu/nx_mousein.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxsu/nx_mousein.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nxglib.h>
-#include <nuttx/nx.h>
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nx.h>
 
 #include "nxfe.h"
 
diff --git a/graphics/nxsu/nx_move.c b/graphics/nxsu/nx_move.c
index ffce178f5d2..b16cf3525e0 100644
--- a/graphics/nxsu/nx_move.c
+++ b/graphics/nxsu/nx_move.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_open.c b/graphics/nxsu/nx_open.c
index 3ba3e602996..f5e07dc5ec0 100644
--- a/graphics/nxsu/nx_open.c
+++ b/graphics/nxsu/nx_open.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_openwindow.c b/graphics/nxsu/nx_openwindow.c
index f960d1a9038..57b47251b7a 100644
--- a/graphics/nxsu/nx_openwindow.c
+++ b/graphics/nxsu/nx_openwindow.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_raise.c b/graphics/nxsu/nx_raise.c
index 971e565f099..cf4e38b64cb 100644
--- a/graphics/nxsu/nx_raise.c
+++ b/graphics/nxsu/nx_raise.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_releasebkgd.c b/graphics/nxsu/nx_releasebkgd.c
index 38772c3e088..a19b85ac421 100644
--- a/graphics/nxsu/nx_releasebkgd.c
+++ b/graphics/nxsu/nx_releasebkgd.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_requestbkgd.c b/graphics/nxsu/nx_requestbkgd.c
index cc56e1019ac..5bd4554bc9d 100644
--- a/graphics/nxsu/nx_requestbkgd.c
+++ b/graphics/nxsu/nx_requestbkgd.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_setbgcolor.c b/graphics/nxsu/nx_setbgcolor.c
index 167d51600d3..d8c2159efa1 100644
--- a/graphics/nxsu/nx_setbgcolor.c
+++ b/graphics/nxsu/nx_setbgcolor.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_setposition.c b/graphics/nxsu/nx_setposition.c
index f54c81fc9d6..44e66061f8d 100644
--- a/graphics/nxsu/nx_setposition.c
+++ b/graphics/nxsu/nx_setposition.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nx_setsize.c b/graphics/nxsu/nx_setsize.c
index 8eafaf3efb3..19d20e5d2f2 100644
--- a/graphics/nxsu/nx_setsize.c
+++ b/graphics/nxsu/nx_setsize.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nxfe.h b/graphics/nxsu/nxfe.h
index aa9fb49a951..59e5c185d9a 100644
--- a/graphics/nxsu/nxfe.h
+++ b/graphics/nxsu/nxfe.h
@@ -45,7 +45,7 @@
 #include <mqueue.h>
 #include <semaphore.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 
 #include "nxbe.h"
 
diff --git a/graphics/nxsu/nxsu_constructwindow.c b/graphics/nxsu/nxsu_constructwindow.c
index 5d7fcc0402c..8ad80300528 100644
--- a/graphics/nxsu/nxsu_constructwindow.c
+++ b/graphics/nxsu/nxsu_constructwindow.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nxsu_redrawreq.c b/graphics/nxsu/nxsu_redrawreq.c
index 627c7f702ca..9efa828a51c 100644
--- a/graphics/nxsu/nxsu_redrawreq.c
+++ b/graphics/nxsu/nxsu_redrawreq.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxsu/nxsu_reportposition.c b/graphics/nxsu/nxsu_reportposition.c
index 71b76aa6368..d87dac0f6bc 100644
--- a/graphics/nxsu/nxsu_reportposition.c
+++ b/graphics/nxsu/nxsu_reportposition.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxfe.h"
 
 /****************************************************************************
diff --git a/graphics/nxtk/nxtk_bitmaptoolbar.c b/graphics/nxtk/nxtk_bitmaptoolbar.c
index 69d1badf436..6a2063a2641 100644
--- a/graphics/nxtk/nxtk_bitmaptoolbar.c
+++ b/graphics/nxtk/nxtk_bitmaptoolbar.c
@@ -42,8 +42,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxtk_internal.h"
 
diff --git a/graphics/nxtk/nxtk_bitmapwindow.c b/graphics/nxtk/nxtk_bitmapwindow.c
index e4670c6f7e7..a439f5f797a 100644
--- a/graphics/nxtk/nxtk_bitmapwindow.c
+++ b/graphics/nxtk/nxtk_bitmapwindow.c
@@ -42,8 +42,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nxtk.h>
-#include <nuttx/nx.h>
+#include <nuttx/nx/nxtk.h>
+#include <nuttx/nx/nx.h>
 
 #include "nxtk_internal.h"
 
diff --git a/graphics/nxtk/nxtk_closetoolbar.c b/graphics/nxtk/nxtk_closetoolbar.c
index eaaef83e771..dff621a44f1 100644
--- a/graphics/nxtk/nxtk_closetoolbar.c
+++ b/graphics/nxtk/nxtk_closetoolbar.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_closewindow.c b/graphics/nxtk/nxtk_closewindow.c
index edc9e457d3d..e921f669e01 100644
--- a/graphics/nxtk/nxtk_closewindow.c
+++ b/graphics/nxtk/nxtk_closewindow.c
@@ -44,8 +44,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_containerclip.c b/graphics/nxtk/nxtk_containerclip.c
index 386425de3c0..3671851f172 100644
--- a/graphics/nxtk/nxtk_containerclip.c
+++ b/graphics/nxtk/nxtk_containerclip.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_drawframe.c b/graphics/nxtk/nxtk_drawframe.c
index d86d553121d..edf3dcac89c 100644
--- a/graphics/nxtk/nxtk_drawframe.c
+++ b/graphics/nxtk/nxtk_drawframe.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxtk/nxtk_drawframe.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,9 +43,9 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nxglib.h>
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_events.c b/graphics/nxtk/nxtk_events.c
index cbcbabe4b63..e778b2736e7 100644
--- a/graphics/nxtk/nxtk_events.c
+++ b/graphics/nxtk/nxtk_events.c
@@ -47,7 +47,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxtk_internal.h"
 
 /****************************************************************************
diff --git a/graphics/nxtk/nxtk_filltoolbar.c b/graphics/nxtk/nxtk_filltoolbar.c
index f151876ec83..c39199e6a89 100644
--- a/graphics/nxtk/nxtk_filltoolbar.c
+++ b/graphics/nxtk/nxtk_filltoolbar.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_filltraptoolbar.c b/graphics/nxtk/nxtk_filltraptoolbar.c
index d3362fa6f0e..1f04e9b43ea 100644
--- a/graphics/nxtk/nxtk_filltraptoolbar.c
+++ b/graphics/nxtk/nxtk_filltraptoolbar.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_filltrapwindow.c b/graphics/nxtk/nxtk_filltrapwindow.c
index a489364c45e..c84c055f885 100644
--- a/graphics/nxtk/nxtk_filltrapwindow.c
+++ b/graphics/nxtk/nxtk_filltrapwindow.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_fillwindow.c b/graphics/nxtk/nxtk_fillwindow.c
index fe0b1c8d462..e971ce06bc9 100644
--- a/graphics/nxtk/nxtk_fillwindow.c
+++ b/graphics/nxtk/nxtk_fillwindow.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_getposition.c b/graphics/nxtk/nxtk_getposition.c
index 24ca26b7013..e6cce602620 100644
--- a/graphics/nxtk/nxtk_getposition.c
+++ b/graphics/nxtk/nxtk_getposition.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_internal.h b/graphics/nxtk/nxtk_internal.h
index fe779247653..f76304b782d 100644
--- a/graphics/nxtk/nxtk_internal.h
+++ b/graphics/nxtk/nxtk_internal.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * graphics/nxtk/nxtk_internal.h
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nxtk.h>
 #include "nxbe.h"
 #include "nxfe.h"
 
diff --git a/graphics/nxtk/nxtk_lower.c b/graphics/nxtk/nxtk_lower.c
index e0b59f285bd..256ed27dabb 100644
--- a/graphics/nxtk/nxtk_lower.c
+++ b/graphics/nxtk/nxtk_lower.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_movetoolbar.c b/graphics/nxtk/nxtk_movetoolbar.c
index 430e5461ee6..088611382ad 100644
--- a/graphics/nxtk/nxtk_movetoolbar.c
+++ b/graphics/nxtk/nxtk_movetoolbar.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_movewindow.c b/graphics/nxtk/nxtk_movewindow.c
index 134d1935edc..4c45c101c5a 100644
--- a/graphics/nxtk/nxtk_movewindow.c
+++ b/graphics/nxtk/nxtk_movewindow.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_opentoolbar.c b/graphics/nxtk/nxtk_opentoolbar.c
index e2de68226bd..0bcc02fa8e7 100644
--- a/graphics/nxtk/nxtk_opentoolbar.c
+++ b/graphics/nxtk/nxtk_opentoolbar.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_openwindow.c b/graphics/nxtk/nxtk_openwindow.c
index c57918869c9..3716e63cab3 100644
--- a/graphics/nxtk/nxtk_openwindow.c
+++ b/graphics/nxtk/nxtk_openwindow.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_raise.c b/graphics/nxtk/nxtk_raise.c
index 33c22b72266..1e35f3ab2af 100644
--- a/graphics/nxtk/nxtk_raise.c
+++ b/graphics/nxtk/nxtk_raise.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_setposition.c b/graphics/nxtk/nxtk_setposition.c
index 053f7425601..dd090e63982 100644
--- a/graphics/nxtk/nxtk_setposition.c
+++ b/graphics/nxtk/nxtk_setposition.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_setsize.c b/graphics/nxtk/nxtk_setsize.c
index 07e9e02427c..054a62c5936 100644
--- a/graphics/nxtk/nxtk_setsize.c
+++ b/graphics/nxtk/nxtk_setsize.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_setsubwindows.c b/graphics/nxtk/nxtk_setsubwindows.c
index 5ddb2ce03d4..25100836106 100644
--- a/graphics/nxtk/nxtk_setsubwindows.c
+++ b/graphics/nxtk/nxtk_setsubwindows.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 #include "nxtk_internal.h"
 
 /****************************************************************************
diff --git a/graphics/nxtk/nxtk_subwindowclip.c b/graphics/nxtk/nxtk_subwindowclip.c
index 7600074ce73..4d453eecafe 100644
--- a/graphics/nxtk/nxtk_subwindowclip.c
+++ b/graphics/nxtk/nxtk_subwindowclip.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/graphics/nxtk/nxtk_subwindowmove.c b/graphics/nxtk/nxtk_subwindowmove.c
index f532c6675df..ed6a264e735 100644
--- a/graphics/nxtk/nxtk_subwindowmove.c
+++ b/graphics/nxtk/nxtk_subwindowmove.c
@@ -43,8 +43,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxtk.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
 
 #include "nxfe.h"
 #include "nxtk_internal.h"
diff --git a/include/nuttx/nx.h b/include/nuttx/nx/nx.h
similarity index 99%
rename from include/nuttx/nx.h
rename to include/nuttx/nx/nx.h
index 8f08de678d4..c031a3bf95c 100644
--- a/include/nuttx/nx.h
+++ b/include/nuttx/nx/nx.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * include/nuttx/nx.h
+ * include/nuttx/nx/nx.h
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_NX_H
-#define _INCLUDE_NUTTX_NX_H
+#ifndef _INCLUDE_NUTTX_NX_NX_H
+#define _INCLUDE_NUTTX_NX_NX_H
 
 /****************************************************************************
  * Included Files
@@ -45,7 +45,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
@@ -710,5 +710,5 @@ EXTERN int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t b
 }
 #endif
 
-#endif /* _INCLUDE_NUTTX_NX_H */
+#endif /* _INCLUDE_NUTTX_NX_NX_H */
 
diff --git a/include/nuttx/nxfonts.h b/include/nuttx/nx/nxfonts.h
similarity index 97%
rename from include/nuttx/nxfonts.h
rename to include/nuttx/nx/nxfonts.h
index 94c94e597fa..4ed62f68e6f 100644
--- a/include/nuttx/nxfonts.h
+++ b/include/nuttx/nx/nxfonts.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/nxfonts.h
+ * include/nuttx/nx/nxfonts.h
  *
  *   Copyright (C) 2008, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_NXFONTS_H
-#define __INCLUDE_NUTTX_NXFONTS_H
+#ifndef __INCLUDE_NUTTX_NX_NXFONTS_H
+#define __INCLUDE_NUTTX_NX_NXFONTS_H
 
 /****************************************************************************
  * Included Files
@@ -44,8 +44,8 @@
 
 #include <stdint.h>
 
-#include <nuttx/nx.h>
-#include <nuttx/nxglib.h>
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxglib.h>
 
 /****************************************************************************
  * Pre-processor definitions
@@ -242,4 +242,4 @@ EXTERN int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_NXFONTS_H */
+#endif /* __INCLUDE_NUTTX_NX_NXFONTS_H */
diff --git a/include/nuttx/nxglib.h b/include/nuttx/nx/nxglib.h
similarity index 99%
rename from include/nuttx/nxglib.h
rename to include/nuttx/nx/nxglib.h
index db07b7743e8..fe73d25364e 100644
--- a/include/nuttx/nxglib.h
+++ b/include/nuttx/nx/nxglib.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * include/nuttx/nxglib.h
+ * include/nuttx/nx/nxglib.h
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_NXGLIB_H
-#define __INCLUDE_NUTTX_NXGLIB_H
+#ifndef __INCLUDE_NUTTX_NX_NXGLIB_H
+#define __INCLUDE_NUTTX_NX_NXGLIB_H
 
 /****************************************************************************
  * Included Files
@@ -552,4 +552,4 @@ EXTERN void nxgl_colorcopy(nxgl_mxpixel_t dest[CONFIG_NX_NPLANES],
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_NXGLIB_H */
+#endif /* __INCLUDE_NUTTX_NX_NXGLIB_H */
diff --git a/include/nuttx/nxtk.h b/include/nuttx/nx/nxtk.h
similarity index 98%
rename from include/nuttx/nxtk.h
rename to include/nuttx/nx/nxtk.h
index d4a5decf30f..76416ecbb93 100644
--- a/include/nuttx/nxtk.h
+++ b/include/nuttx/nx/nxtk.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * include/nuttx/nxtk.h
+ * include/nuttx/nx/nxtk.h
  *
- *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_NXTK_H
-#define __INCLUDE_NUTTX_NXTK_H
+#ifndef __INCLUDE_NUTTX_NX_NXTK_H
+#define __INCLUDE_NUTTX_NX_NXTK_H
 
 /****************************************************************************
  * Included Files
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/nx.h>
+#include <nuttx/nx/nx.h>
 
 /****************************************************************************
  * Pre-processor definitions
@@ -420,4 +420,4 @@ EXTERN int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd,
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_NXTK_H */
+#endif /* __INCLUDE_NUTTX_NX_NXTK_H */
diff --git a/tools/README.txt b/tools/README.txt
index 549b6e31a32..e6f65081d38 100755
--- a/tools/README.txt
+++ b/tools/README.txt
@@ -96,12 +96,12 @@ bdf-convert.c
     3. Define CONFIG_NXFONT_MYFONT=y in your NuttX configuration file.
 
   A font ID number has to be assigned for each new font.  The font ID
-  is defined in the file include/nuttx/nxfonts.h.  Those definitions
+  is defined in the file include/nuttx/nx/nxfonts.h.  Those definitions
   have to be extended to support your new font.  Look at how the font ID
   enabled by CONFIG_NXFONT_SANS23X27 is defined and add an ID for your
   new font in a similar fashion:
 
-    4. include/nuttx/nxfonts.h. Add you new font as a possible system
+    4. include/nuttx/nx/nxfonts.h. Add you new font as a possible system
        default font:
  
        #if defined(CONFIG_NXFONT_SANS23X27)
@@ -132,7 +132,7 @@ bdf-convert.c
        a C source file from the header file that you generated with the
        the bdf-converter program.  Notice NXFONTS_FONTID=2; this must be
        set to the same font ID value that you defined in the
-       include/nuttx/nxfonts.h file.
+       include/nuttx/nx/nxfonts.h file.
 
        genfontsources:
          ifeq ($(CONFIG_NXFONT_SANS23X27),y)