Merge branch 'sunweaver-pr/NX-include-path' into 3.6.x

Attributes GH PR #61: https://github.com/ArcticaProject/nx-libs/pull/61
author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2015-12-28 13:17:21 +0100
committer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2015-12-28 13:17:21 +0100
commit: ca0f639a4ef9ad605f0e62577c84f2be73807ff3 (patch)
tree: 1f13c31901460fd31786b6d50b6c9841d25be99e /nx-X11
parent: f58006d932d907dc13d76084e9171de59ee27f16 (diff)
parent: 433d8186588698ce6a435fbff5e9d40a37b78be9 (diff)
download: nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.tar.gz
nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.tar.bz2
nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.zip
498 files changed, 1769 insertions, 1404 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 241bc267f..f54ff84cc 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -1223,7 +1223,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
        PROGRAMSRC = $(TOP)/programs
            LIBSRC = $(XTOP)/lib
        INCLUDESRC = BuildIncDir
-      XINCLUDESRC = $(INCLUDESRC)/X11
+      XINCLUDESRC = $(INCLUDESRC)/nx-X11
         SERVERSRC = $(XTOP)/programs/Xserver
        CONTRIBSRC = ContribDir
    UNSUPPORTEDSRC = UnsupportedDir
diff --git a/nx-X11/include/GL/glx.h b/nx-X11/include/GL/glx.h
index 910504a1d..3a9e942c7 100644
--- a/nx-X11/include/GL/glx.h
+++ b/nx-X11/include/GL/glx.h
@@ -36,8 +36,8 @@
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 */
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xutil.h>
 #include <GL/gl.h>
 #include <GL/glxtokens.h>
 
diff --git a/nx-X11/include/GL/glxint.h b/nx-X11/include/GL/glxint.h
index d9e2581bb..50f4a0eaa 100644
--- a/nx-X11/include/GL/glxint.h
+++ b/nx-X11/include/GL/glxint.h
@@ -23,8 +23,8 @@
 ** $SGI$
 */
 
-#include <X11/X.h>
-#include <X11/Xdefs.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xdefs.h>
 #include "GL/gl.h"
 
 typedef struct __GLXvisualConfigRec __GLXvisualConfig;
diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile
index 26520eab0..76a4daf6d 100644
--- a/nx-X11/include/Imakefile
+++ b/nx-X11/include/Imakefile
@@ -51,10 +51,10 @@ HEADERS = \
 
 all::
 
-BuildIncludes($(HEADERS),X11,..)
+BuildIncludes($(HEADERS),nx-X11,..)
 
 #if BuildLibraries
-InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS))
+InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS))
 #endif
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
diff --git a/nx-X11/include/XWDFile.h b/nx-X11/include/XWDFile.h
index 0ce22e1a8..19a26ea33 100644
--- a/nx-X11/include/XWDFile.h
+++ b/nx-X11/include/XWDFile.h
@@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef XWDFILE_H
 #define XWDFILE_H
 
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 
 #define XWD_FILE_VERSION 7
 #define sz_XWDheader 100
diff --git a/nx-X11/include/Xdefs.h b/nx-X11/include/Xdefs.h
index f32149db5..c06202af3 100644
--- a/nx-X11/include/Xdefs.h
+++ b/nx-X11/include/Xdefs.h
@@ -31,7 +31,7 @@ authorization from The XFree86 Project Inc..
 #define _XDEFS_H
 
 #ifdef _XSERVER64
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 #endif 
 
 #ifndef _XTYPEDEF_ATOM
diff --git a/nx-X11/include/Xfuncs.h b/nx-X11/include/Xfuncs.h
index a059bc710..7582198bb 100644
--- a/nx-X11/include/Xfuncs.h
+++ b/nx-X11/include/Xfuncs.h
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XFUNCS_H_
 #define _XFUNCS_H_
 
-#include <X11/Xosdefs.h>
+#include <nx-X11/Xosdefs.h>
 
 /* the old Xfuncs.h, for pre-R6 */
 #if !(defined(XFree86LOADER) && defined(IN_MODULE))
diff --git a/nx-X11/include/Xos.h b/nx-X11/include/Xos.h
index 04b14b6fc..a2abf156f 100644
--- a/nx-X11/include/Xos.h
+++ b/nx-X11/include/Xos.h
@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XOS_H_
 #define _XOS_H_
 
-#include <X11/Xosdefs.h>
+#include <nx-X11/Xosdefs.h>
 
 /*
  * Get major data types (esp. caddr_t)
@@ -150,7 +150,7 @@ extern int sys_nerr;
 #include <unistd.h>
 #endif
 #ifdef WIN32
-#include <X11/Xw32defs.h>
+#include <nx-X11/Xw32defs.h>
 #else
 #include <sys/file.h>
 #endif
@@ -285,6 +285,6 @@ struct sockaddr_un {
 };
 #endif
 
-#include <X11/Xarch.h>
+#include <nx-X11/Xarch.h>
 
 #endif /* _XOS_H_ */
diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h
index e539aee2a..44b1eaacf 100644
--- a/nx-X11/include/Xos_r.h
+++ b/nx-X11/include/Xos_r.h
@@ -216,7 +216,7 @@ extern void XtProcessUnlock(
  *
  * #define X_INCLUDE_PWD_H
  * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
+ * #include <nx-X11/Xos_r.h>
  *
  * typedef ... _Xgetpwparams;
  *
@@ -394,7 +394,7 @@ typedef int _Xgetpwret;
  *
  * #define X_INCLUDE_NETDB_H
  * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
+ * #include <nx-X11/Xos_r.h>
  *
  * typedef ... _Xgethostbynameparams;
  * typedef ... _Xgetservbynameparams;
@@ -556,7 +556,7 @@ typedef int _Xgetservbynameparams; /* dummy */
  *
  * #define X_INCLUDE_DIRENT_H
  * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
+ * #include <nx-X11/Xos_r.h>
  *
  * typedef ... _Xreaddirparams;
  *
@@ -680,7 +680,7 @@ extern int _Preaddir_r(DIR *, struct dirent *, struct dirent **);
  *
  * #define X_INCLUDE_UNISTD_H
  * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
+ * #include <nx-X11/Xos_r.h>
  *
  * typedef ... _Xgetloginparams;
  * typedef ... _Xttynameparams;
@@ -822,7 +822,7 @@ typedef struct {
  *
  * #define X_INCLUDE_STRING_H
  * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
+ * #include <nx-X11/Xos_r.h>
  *
  * typedef ... _Xstrtokparams;
  *
@@ -868,7 +868,7 @@ typedef char * _Xstrtokparams;
  *
  * #define X_INCLUDE_TIME_H
  * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
+ * #include <nx-X11/Xos_r.h>
  *
  * typedef ... _Xatimeparams;
  * typedef ... _Xctimeparams;
@@ -1036,7 +1036,7 @@ typedef struct tm _Xltimeparams;
  *
  * #define X_INCLUDE_GRP_H
  * #define XOS_USE_..._LOCKING
- * #include <X11/Xos_r.h>
+ * #include <nx-X11/Xos_r.h>
  *
  * typedef ... _Xgetgrparams;
  *
diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in
index 3200c3711..77a0aea3d 100644
--- a/nx-X11/include/Xpoll.h.in
+++ b/nx-X11/include/Xpoll.h.in
@@ -75,7 +75,7 @@ from The Open Group.
 
 #ifndef USE_POLL
 
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 
 /* Below is the monster branch from hell.  Basically, most systems will drop to
  * 'the branch below is the fallthrough for halfway modern systems', and include
@@ -104,7 +104,7 @@ from The Open Group.
 # include <unistd.h>
 #endif
 
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 
 #ifdef CSRG_BASED
 #include <sys/param.h>
@@ -241,7 +241,7 @@ extern int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds,
 #ifndef FD_SETSIZE
 #define FD_SETSIZE	XFD_SETSIZE
 #endif
-#include <X11/Xwinsock.h>
+#include <nx-X11/Xwinsock.h>
 
 #define Select(n,r,w,e,t) select(0,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
 
diff --git a/nx-X11/include/Xproto.h b/nx-X11/include/Xproto.h
index 877aab442..0f7d1f557 100644
--- a/nx-X11/include/Xproto.h
+++ b/nx-X11/include/Xproto.h
@@ -73,8 +73,8 @@ SOFTWARE.
 
 ******************************************************************/
 
-#include <X11/Xmd.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xprotostr.h>
 
 /*
  * Define constants for the sizes of the network packets.  The sz_ prefix is
diff --git a/nx-X11/include/Xprotostr.h b/nx-X11/include/Xprotostr.h
index f343d9849..a0f849874 100644
--- a/nx-X11/include/Xprotostr.h
+++ b/nx-X11/include/Xprotostr.h
@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 
 /* Used by PolySegment */
 
diff --git a/nx-X11/include/Xthreads.h b/nx-X11/include/Xthreads.h
index 54b5440ad..41440a2fb 100644
--- a/nx-X11/include/Xthreads.h
+++ b/nx-X11/include/Xthreads.h
@@ -98,7 +98,7 @@ extern xthread_t (*_x11_thr_self)();
 #define xcondition_broadcast(cv) cond_broadcast(cv)
 #else /* !SVR4 */
 #ifdef WIN32
-#include <X11/Xwindows.h>
+#include <nx-X11/Xwindows.h>
 typedef DWORD xthread_t;
 typedef DWORD xthread_key_t;
 struct _xthread_waiter {
diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile
index ec6c10b98..b7ed23120 100644
--- a/nx-X11/include/extensions/Imakefile
+++ b/nx-X11/include/extensions/Imakefile
@@ -101,10 +101,10 @@ HEADERS = Xext.h \
 
 all::
 
-BuildIncludes($(HEADERS),X11/extensions,../..)
+BuildIncludes($(HEADERS),nx-X11/extensions,../..)
 
 #if BuildLibraries
-InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/extensions,$(INSTINCFLAGS))
+InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11/extensions,$(INSTINCFLAGS))
 #endif
 
 InstallDriverSDKNonExecFile(XI.h,$(DRIVERSDKINCLUDEDIR)/extensions)
diff --git a/nx-X11/include/extensions/MITMisc.h b/nx-X11/include/extensions/MITMisc.h
index 975700e01..d66b8242d 100644
--- a/nx-X11/include/extensions/MITMisc.h
+++ b/nx-X11/include/extensions/MITMisc.h
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XMITMISC_H_
 #define _XMITMISC_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 #define X_MITSetBugMode			0
 #define X_MITGetBugMode			1
diff --git a/nx-X11/include/extensions/XEVI.h b/nx-X11/include/extensions/XEVI.h
index d8e37ff4f..30b2412d9 100644
--- a/nx-X11/include/extensions/XEVI.h
+++ b/nx-X11/include/extensions/XEVI.h
@@ -25,7 +25,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifndef _XEVI_H_
 #define _XEVI_H_
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 #define X_EVIQueryVersion		0
 #define X_EVIGetVisualInfo		1
 #define XEVI_TRANSPARENCY_NONE		0
diff --git a/nx-X11/include/extensions/XEVIstr.h b/nx-X11/include/extensions/XEVIstr.h
index 388ef4bcf..4deb6c113 100644
--- a/nx-X11/include/extensions/XEVIstr.h
+++ b/nx-X11/include/extensions/XEVIstr.h
@@ -26,7 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef _EVISTR_H_
 #define _EVISTR_H_
 
-#include <X11/extensions/XEVI.h>
+#include <nx-X11/extensions/XEVI.h>
 
 #define VisualID CARD32
 #define EVINAME "Extended-Visual-Information"
diff --git a/nx-X11/include/extensions/XInput.h b/nx-X11/include/extensions/XInput.h
index ee4410531..cf4b72ca0 100644
--- a/nx-X11/include/extensions/XInput.h
+++ b/nx-X11/include/extensions/XInput.h
@@ -52,8 +52,8 @@ SOFTWARE.
 #ifndef _XINPUT_H_
 #define _XINPUT_H_
 
-#include <X11/Xlib.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/extensions/XI.h>
 
 #define _deviceKeyPress		0
 #define _deviceKeyRelease	1
diff --git a/nx-X11/include/extensions/XIproto.h b/nx-X11/include/extensions/XIproto.h
index 1da0248f8..cccb11a2c 100644
--- a/nx-X11/include/extensions/XIproto.h
+++ b/nx-X11/include/extensions/XIproto.h
@@ -50,8 +50,8 @@ SOFTWARE.
 #ifndef _XIPROTO_H
 #define _XIPROTO_H
 
-#include <X11/Xproto.h>
-#include <X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/X.h>
 
 /* make sure types have right sizes for protocol structures. */
 #define Window CARD32
diff --git a/nx-X11/include/extensions/XKBgeom.h b/nx-X11/include/extensions/XKBgeom.h
index 89f902fba..6ef114bfe 100644
--- a/nx-X11/include/extensions/XKBgeom.h
+++ b/nx-X11/include/extensions/XKBgeom.h
@@ -29,7 +29,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef _XKBGEOM_H_
 #define	_XKBGEOM_H_
 
-#include <X11/extensions/XKBstr.h>
+#include <nx-X11/extensions/XKBstr.h>
 
 #ifdef XKB_IN_SERVER
 #define XkbAddGeomKeyAlias 		SrvXkbAddGeomKeyAlias
diff --git a/nx-X11/include/extensions/XKBproto.h b/nx-X11/include/extensions/XKBproto.h
index 97dd4d262..2dc3b141e 100644
--- a/nx-X11/include/extensions/XKBproto.h
+++ b/nx-X11/include/extensions/XKBproto.h
@@ -28,8 +28,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef _XKBPROTO_H_
 #define	_XKBPROTO_H_
 
-#include <X11/Xmd.h>
-#include <X11/extensions/XKB.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/extensions/XKB.h>
 
 #define Window CARD32
 #define Atom CARD32
diff --git a/nx-X11/include/extensions/XKBsrv.h b/nx-X11/include/extensions/XKBsrv.h
index 0d262e979..3d335bc88 100644
--- a/nx-X11/include/extensions/XKBsrv.h
+++ b/nx-X11/include/extensions/XKBsrv.h
@@ -69,8 +69,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define XkbUpdateKeyTypeVirtualMods	SrvXkbUpdateKeyTypeVirtualMods
 #endif
 
-#include <X11/extensions/XKBstr.h>
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBstr.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "inputstr.h"
 
 #ifdef NXAGENT_SERVER
@@ -1100,9 +1100,9 @@ extern void XkbSendNewKeyboardNotify(
 
 #ifdef XKBSRV_NEED_FILE_FUNCS
 
-#include <X11/extensions/XKMformat.h>
-#include <X11/extensions/XKBfile.h>
-#include <X11/extensions/XKBrules.h>
+#include <nx-X11/extensions/XKMformat.h>
+#include <nx-X11/extensions/XKBfile.h>
+#include <nx-X11/extensions/XKBrules.h>
 
 #define	_XkbListKeymaps		0
 #define	_XkbListKeycodes	1
diff --git a/nx-X11/include/extensions/XKBstr.h b/nx-X11/include/extensions/XKBstr.h
index 6131c931c..77666f6aa 100644
--- a/nx-X11/include/extensions/XKBstr.h
+++ b/nx-X11/include/extensions/XKBstr.h
@@ -28,7 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef _XKBSTR_H_
 #define	_XKBSTR_H_
 
-#include <X11/extensions/XKB.h>
+#include <nx-X11/extensions/XKB.h>
 
 #define	XkbCharToInt(v)		((v)&0x80?(int)((v)|(~0xff)):(int)((v)&0x7f))
 #define	XkbIntTo2Chars(i,h,l)	(((h)=((i>>8)&0xff)),((l)=((i)&0xff)))
diff --git a/nx-X11/include/extensions/XLbx.h b/nx-X11/include/extensions/XLbx.h
index 01d44f090..6cd867944 100644
--- a/nx-X11/include/extensions/XLbx.h
+++ b/nx-X11/include/extensions/XLbx.h
@@ -25,7 +25,7 @@
 #ifndef _XLBX_H_
 #define _XLBX_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 /*
  * NOTE:  any changes or additions to the opcodes needs to be reflected
@@ -128,8 +128,8 @@
 
 #ifndef _XLBX_SERVER_
 
-#include <X11/Xdefs.h>
-#include <X11/Xlib.h>
+#include <nx-X11/Xdefs.h>
+#include <nx-X11/Xlib.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/include/extensions/XShm.h b/nx-X11/include/extensions/XShm.h
index 4ae14ca8b..4b0d01bef 100644
--- a/nx-X11/include/extensions/XShm.h
+++ b/nx-X11/include/extensions/XShm.h
@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XSHM_H_
 #define _XSHM_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 #define X_ShmQueryVersion		0
 #define X_ShmAttach			1
diff --git a/nx-X11/include/extensions/XTest.h b/nx-X11/include/extensions/XTest.h
index afb1849c3..4817ef132 100644
--- a/nx-X11/include/extensions/XTest.h
+++ b/nx-X11/include/extensions/XTest.h
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XTEST_H_
 #define _XTEST_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 #define X_XTestGetVersion	0
 #define X_XTestCompareCursor	1
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
 
 #ifndef _XTEST_SERVER_
 
-#include <X11/extensions/XInput.h>
+#include <nx-X11/extensions/XInput.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/include/extensions/Xag.h b/nx-X11/include/extensions/Xag.h
index 815f2b9f9..4c1193e3d 100644
--- a/nx-X11/include/extensions/Xag.h
+++ b/nx-X11/include/extensions/Xag.h
@@ -29,7 +29,7 @@ from The Open Group.
 #ifndef _XAG_H_
 #define _XAG_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 #define X_XagQueryVersion		0
 #define X_XagCreate			1
diff --git a/nx-X11/include/extensions/Xagsrv.h b/nx-X11/include/extensions/Xagsrv.h
index b9c50aaa9..daf1af04d 100644
--- a/nx-X11/include/extensions/Xagsrv.h
+++ b/nx-X11/include/extensions/Xagsrv.h
@@ -29,7 +29,7 @@ from The Open Group.
 #ifndef _XAGSRV_H_
 #define _XAGSRV_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/include/extensions/Xagstr.h b/nx-X11/include/extensions/Xagstr.h
index ffb5527a2..4f12027e0 100644
--- a/nx-X11/include/extensions/Xagstr.h
+++ b/nx-X11/include/extensions/Xagstr.h
@@ -29,7 +29,7 @@ from The Open Group.
 #ifndef _XAGSTR_H_ /* { */
 #define _XAGSTR_H_
 
-#include <X11/extensions/Xag.h>
+#include <nx-X11/extensions/Xag.h>
 
 #define XAppGroup CARD32
 
diff --git a/nx-X11/include/extensions/Xcup.h b/nx-X11/include/extensions/Xcup.h
index b1df039e6..fb5fd0887 100644
--- a/nx-X11/include/extensions/Xcup.h
+++ b/nx-X11/include/extensions/Xcup.h
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XCUP_H_
 #define _XCUP_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 #define X_XcupQueryVersion			0
 #define X_XcupGetReservedColormapEntries	1
diff --git a/nx-X11/include/extensions/Xcupstr.h b/nx-X11/include/extensions/Xcupstr.h
index f521c333c..fa77b5aea 100644
--- a/nx-X11/include/extensions/Xcupstr.h
+++ b/nx-X11/include/extensions/Xcupstr.h
@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XCUPSTR_H_ /* { */
 #define _XCUPSTR_H_
 
-#include <X11/extensions/Xcup.h>
+#include <nx-X11/extensions/Xcup.h>
 
 #define XCUPNAME "TOG-CUP"
 
diff --git a/nx-X11/include/extensions/Xdbe.h b/nx-X11/include/extensions/Xdbe.h
index f9205a228..bc43007c6 100644
--- a/nx-X11/include/extensions/Xdbe.h
+++ b/nx-X11/include/extensions/Xdbe.h
@@ -38,8 +38,8 @@
 
 /* INCLUDES */
 
-#include <X11/Xfuncproto.h>
-#include <X11/extensions/Xdbeproto.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/extensions/Xdbeproto.h>
 
 
 /* DEFINES */
diff --git a/nx-X11/include/extensions/Xevie.h b/nx-X11/include/extensions/Xevie.h
index d6d4fab84..5dc48bbfd 100644
--- a/nx-X11/include/extensions/Xevie.h
+++ b/nx-X11/include/extensions/Xevie.h
@@ -35,7 +35,7 @@ of the copyright holder.
 #ifndef _XEVIE_H_
 #define _XEVIE_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 #define XEVIE_UNMODIFIED    0
 #define XEVIE_MODIFIED   1
diff --git a/nx-X11/include/extensions/Xext.h b/nx-X11/include/extensions/Xext.h
index 5b62c8b2d..b0ce292fc 100644
--- a/nx-X11/include/extensions/Xext.h
+++ b/nx-X11/include/extensions/Xext.h
@@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XEXT_H_
 #define _XEXT_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/include/extensions/Xinerama.h b/nx-X11/include/extensions/Xinerama.h
index e1c9445c3..77e7e7444 100644
--- a/nx-X11/include/extensions/Xinerama.h
+++ b/nx-X11/include/extensions/Xinerama.h
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _Xinerama_h
 #define _Xinerama_h
 
-#include <X11/Xlib.h>
+#include <nx-X11/Xlib.h>
 
 typedef struct {
    int   screen_number;
diff --git a/nx-X11/include/extensions/Xv.h b/nx-X11/include/extensions/Xv.h
index 4e85fa719..f07f9d75f 100644
--- a/nx-X11/include/extensions/Xv.h
+++ b/nx-X11/include/extensions/Xv.h
@@ -44,7 +44,7 @@ SOFTWARE.
 **
 */
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 
 #define XvName "XVideo"
 #define XvVersion 2
diff --git a/nx-X11/include/extensions/XvMC.h b/nx-X11/include/extensions/XvMC.h
index 3e621f05a..1709692a1 100644
--- a/nx-X11/include/extensions/XvMC.h
+++ b/nx-X11/include/extensions/XvMC.h
@@ -3,8 +3,8 @@
 #ifndef _XVMC_H_
 #define _XVMC_H_
 
-#include <X11/X.h>
-#include <X11/extensions/Xv.h>
+#include <nx-X11/X.h>
+#include <nx-X11/extensions/Xv.h>
 
 #define XvMCName "XVideo-MotionCompensation"
 #define XvMCNumEvents 0
diff --git a/nx-X11/include/extensions/XvMClib.h b/nx-X11/include/extensions/XvMClib.h
index 1b30a669a..c1e94119e 100644
--- a/nx-X11/include/extensions/XvMClib.h
+++ b/nx-X11/include/extensions/XvMClib.h
@@ -4,9 +4,9 @@
 #ifndef _XVMCLIB_H_
 #define _XVMCLIB_H_
 
-#include <X11/Xfuncproto.h>
-#include <X11/extensions/Xvlib.h>
-#include <X11/extensions/XvMC.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/extensions/Xvlib.h>
+#include <nx-X11/extensions/XvMC.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/include/extensions/Xvlib.h b/nx-X11/include/extensions/Xvlib.h
index 2fd26e55b..98c407e31 100644
--- a/nx-X11/include/extensions/Xvlib.h
+++ b/nx-X11/include/extensions/Xvlib.h
@@ -53,8 +53,8 @@ SOFTWARE.
 **
 */
 
-#include <X11/Xfuncproto.h>
-#include <X11/extensions/Xv.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/extensions/Xv.h>
 
 typedef struct {
   int numerator;
diff --git a/nx-X11/include/extensions/Xvproto.h b/nx-X11/include/extensions/Xvproto.h
index 9112f510e..81e1656a8 100644
--- a/nx-X11/include/extensions/Xvproto.h
+++ b/nx-X11/include/extensions/Xvproto.h
@@ -49,7 +49,7 @@ SOFTWARE.
 **
 */
 
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 
 /* Symbols: These are undefined at the end of this file to restore the
    values they have in Xv.h */
diff --git a/nx-X11/include/extensions/composite.h b/nx-X11/include/extensions/composite.h
index bfdfbee97..d1901750a 100644
--- a/nx-X11/include/extensions/composite.h
+++ b/nx-X11/include/extensions/composite.h
@@ -25,7 +25,7 @@
 #ifndef _COMPOSITE_H_
 #define _COMPOSITE_H_
 
-#include <X11/extensions/xfixeswire.h>
+#include <nx-X11/extensions/xfixeswire.h>
 
 #define COMPOSITE_NAME				"Composite"
 #define COMPOSITE_MAJOR				0
diff --git a/nx-X11/include/extensions/compositeproto.h b/nx-X11/include/extensions/compositeproto.h
index 2304e961d..a851c727e 100644
--- a/nx-X11/include/extensions/compositeproto.h
+++ b/nx-X11/include/extensions/compositeproto.h
@@ -25,8 +25,8 @@
 #ifndef _COMPOSITEPROTO_H_
 #define _COMPOSITEPROTO_H_
 
-#include <X11/Xmd.h>
-#include <X11/extensions/composite.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/extensions/composite.h>
 
 #define Window CARD32
 #define Region CARD32
diff --git a/nx-X11/include/extensions/dpms.h b/nx-X11/include/extensions/dpms.h
index 7555f4ab6..87d7c9c81 100644
--- a/nx-X11/include/extensions/dpms.h
+++ b/nx-X11/include/extensions/dpms.h
@@ -46,8 +46,8 @@ Equipment Corporation.
 
 #ifndef DPMS_SERVER
 
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/include/extensions/extutil.h b/nx-X11/include/extensions/extutil.h
index 825d81e93..de6becfd2 100644
--- a/nx-X11/include/extensions/extutil.h
+++ b/nx-X11/include/extensions/extutil.h
@@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _EXTUTIL_H_
 #define _EXTUTIL_H_
 
-#include <X11/extensions/Xext.h>
+#include <nx-X11/extensions/Xext.h>
 
 /*
  * We need to keep a list of open displays since the Xlib display list isn't
diff --git a/nx-X11/include/extensions/fontcache.h b/nx-X11/include/extensions/fontcache.h
index b767db19b..2a3cf619b 100644
--- a/nx-X11/include/extensions/fontcache.h
+++ b/nx-X11/include/extensions/fontcache.h
@@ -68,7 +68,7 @@ typedef struct {
 
 #ifndef _FONTCACHE_SERVER_
 
-#include <X11/Xlib.h>
+#include <nx-X11/Xlib.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/include/extensions/fontcacheP.h b/nx-X11/include/extensions/fontcacheP.h
index 75677f300..5363ef149 100644
--- a/nx-X11/include/extensions/fontcacheP.h
+++ b/nx-X11/include/extensions/fontcacheP.h
@@ -31,7 +31,7 @@
 #ifndef _FONTCACHEP_H_
 #define _FONTCACHEP_H_
 
-#include <X11/extensions/fontcache.h>
+#include <nx-X11/extensions/fontcache.h>
 
 int	FontCacheChangeSettings(FontCacheSettingsPtr /* cinfo */);
 void	FontCacheGetSettings(FontCacheSettingsPtr /* cinfo */);
diff --git a/nx-X11/include/extensions/fontcachstr.h b/nx-X11/include/extensions/fontcachstr.h
index eab704e23..abead0f2b 100644
--- a/nx-X11/include/extensions/fontcachstr.h
+++ b/nx-X11/include/extensions/fontcachstr.h
@@ -34,7 +34,7 @@
 #ifndef _FONTCACHESTR_H_
 #define _FONTCACHESTR_H_
 
-#include <X11/extensions/fontcache.h>
+#include <nx-X11/extensions/fontcache.h>
 
 #define FONTCACHENAME		"FontCache"
 
diff --git a/nx-X11/include/extensions/lbxbuf.h b/nx-X11/include/extensions/lbxbuf.h
index 63983df16..1a5a7475a 100644
--- a/nx-X11/include/extensions/lbxbuf.h
+++ b/nx-X11/include/extensions/lbxbuf.h
@@ -38,7 +38,7 @@
 
 typedef struct _zlibbuffer  *ZlibBufferPtr;
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/include/extensions/lbxbufstr.h b/nx-X11/include/extensions/lbxbufstr.h
index e1a06f633..d99730e7e 100644
--- a/nx-X11/include/extensions/lbxbufstr.h
+++ b/nx-X11/include/extensions/lbxbufstr.h
@@ -27,7 +27,7 @@
 #ifndef _BUFFERSTR_H_
 #define _BUFFERSTR_H_
 
-#include <X11/extensions/lbxbuf.h>
+#include <nx-X11/extensions/lbxbuf.h>
 
 /*
  * ZLIB Input/Output buffer
diff --git a/nx-X11/include/extensions/lbximage.h b/nx-X11/include/extensions/lbximage.h
index 10627cf29..fff181a69 100644
--- a/nx-X11/include/extensions/lbximage.h
+++ b/nx-X11/include/extensions/lbximage.h
@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _LBX_IMAGE_H_
 #define _LBX_IMAGE_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/include/extensions/lbxstr.h b/nx-X11/include/extensions/lbxstr.h
index a7521b1be..7bde5a766 100644
--- a/nx-X11/include/extensions/lbxstr.h
+++ b/nx-X11/include/extensions/lbxstr.h
@@ -25,7 +25,7 @@
 #ifndef _LBXSTR_H_
 #define _LBXSTR_H_
 
-#include <X11/extensions/XLbx.h>
+#include <nx-X11/extensions/XLbx.h>
 
 #define LBXNAME "LBX"
 
diff --git a/nx-X11/include/extensions/multibuf.h b/nx-X11/include/extensions/multibuf.h
index 96b4c3b14..c35399b01 100644
--- a/nx-X11/include/extensions/multibuf.h
+++ b/nx-X11/include/extensions/multibuf.h
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _MULTIBUF_H_
 #define _MULTIBUF_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 #define MULTIBUFFER_PROTOCOL_NAME "Multi-Buffering"
 
diff --git a/nx-X11/include/extensions/recordstr.h b/nx-X11/include/extensions/recordstr.h
index 246d34f1a..88ff8b66b 100644
--- a/nx-X11/include/extensions/recordstr.h
+++ b/nx-X11/include/extensions/recordstr.h
@@ -29,7 +29,7 @@ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44";
 #ifndef _RECORDSTR_H_
 #define _RECORDSTR_H_
 
-#include <X11/extensions/record.h>
+#include <nx-X11/extensions/record.h>
 
 #define RECORD_NAME			"RECORD"
 #define RECORD_MAJOR_VERSION		1
diff --git a/nx-X11/include/extensions/renderproto.h b/nx-X11/include/extensions/renderproto.h
index bdd4c746f..25c510cd1 100644
--- a/nx-X11/include/extensions/renderproto.h
+++ b/nx-X11/include/extensions/renderproto.h
@@ -26,8 +26,8 @@
 #ifndef _XRENDERP_H_
 #define _XRENDERP_H_
 
-#include <X11/Xmd.h>
-#include <X11/extensions/render.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/extensions/render.h>
 
 #define Window CARD32
 #define Drawable CARD32
diff --git a/nx-X11/include/extensions/saverproto.h b/nx-X11/include/extensions/saverproto.h
index 1a671af91..17f740f4d 100644
--- a/nx-X11/include/extensions/saverproto.h
+++ b/nx-X11/include/extensions/saverproto.h
@@ -31,7 +31,7 @@ in this Software without prior written authorization from the X Consortium.
 #ifndef _SAVERPROTO_H_
 #define _SAVERPROTO_H_
 
-#include <X11/extensions/saver.h>
+#include <nx-X11/extensions/saver.h>
 
 #define Window CARD32
 #define Drawable CARD32
diff --git a/nx-X11/include/extensions/scrnsaver.h b/nx-X11/include/extensions/scrnsaver.h
index 2659edd73..38e5e24df 100644
--- a/nx-X11/include/extensions/scrnsaver.h
+++ b/nx-X11/include/extensions/scrnsaver.h
@@ -31,9 +31,9 @@ in this Software without prior written authorization from the X Consortium.
 #ifndef _SCRNSAVER_H_
 #define _SCRNSAVER_H_
 
-#include <X11/Xfuncproto.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/saver.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/extensions/saver.h>
 
 typedef struct {
     int	type;		    /* of event */
diff --git a/nx-X11/include/extensions/security.h b/nx-X11/include/extensions/security.h
index 188ad55bc..a0aabaf8e 100644
--- a/nx-X11/include/extensions/security.h
+++ b/nx-X11/include/extensions/security.h
@@ -30,7 +30,7 @@ from The Open Group.
 #define _SECURITY_H
 
 #define _XAUTH_STRUCT_ONLY
-#include <X11/Xauth.h>
+#include <nx-X11/Xauth.h>
 
 /* constants that server, library, and application all need */
 
diff --git a/nx-X11/include/extensions/securstr.h b/nx-X11/include/extensions/securstr.h
index 50c764441..3e93fe10e 100644
--- a/nx-X11/include/extensions/securstr.h
+++ b/nx-X11/include/extensions/securstr.h
@@ -29,7 +29,7 @@ from The Open Group.
 #ifndef _SECURSTR_H
 #define _SECURSTR_H
 
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 
 #define SECURITY_EXTENSION_NAME		"SECURITY"
 #define SECURITY_MAJOR_VERSION		1
diff --git a/nx-X11/include/extensions/shape.h b/nx-X11/include/extensions/shape.h
index d173efef8..5e85ffc04 100644
--- a/nx-X11/include/extensions/shape.h
+++ b/nx-X11/include/extensions/shape.h
@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _SHAPE_H_
 #define _SHAPE_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 #define X_ShapeQueryVersion		0
 #define X_ShapeRectangles		1
@@ -59,7 +59,7 @@ in this Software without prior written authorization from The Open Group.
 
 #ifndef _SHAPE_SERVER_
 
-#include <X11/Xutil.h>
+#include <nx-X11/Xutil.h>
 
 typedef struct {
     int	type;		    /* of event */
diff --git a/nx-X11/include/extensions/sync.h b/nx-X11/include/extensions/sync.h
index 9fbe6d72f..8d2861663 100644
--- a/nx-X11/include/extensions/sync.h
+++ b/nx-X11/include/extensions/sync.h
@@ -53,7 +53,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #ifndef _SYNC_H_
 #define _SYNC_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/include/extensions/vldXvMC.h b/nx-X11/include/extensions/vldXvMC.h
index 91fb3b76a..355c662e6 100644
--- a/nx-X11/include/extensions/vldXvMC.h
+++ b/nx-X11/include/extensions/vldXvMC.h
@@ -28,9 +28,9 @@
 #ifndef _VLDXVMC_H
 #define _VLDXVMC_H
 
-#include <X11/Xlib.h>
-#include <X11/extensions/XvMC.h>
-#include <X11/extensions/XvMClib.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/extensions/XvMC.h>
+#include <nx-X11/extensions/XvMClib.h>
 
 /* 
  * New "Motion compensation type".
diff --git a/nx-X11/include/extensions/xf86bigfont.h b/nx-X11/include/extensions/xf86bigfont.h
index 654cc401b..d6be21b6f 100644
--- a/nx-X11/include/extensions/xf86bigfont.h
+++ b/nx-X11/include/extensions/xf86bigfont.h
@@ -11,7 +11,7 @@
 #ifndef _XF86BIGFONT_H_
 #define _XF86BIGFONT_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 #define X_XF86BigfontQueryVersion	0
 #define X_XF86BigfontQueryFont		1
diff --git a/nx-X11/include/extensions/xf86bigfstr.h b/nx-X11/include/extensions/xf86bigfstr.h
index 95f107a2a..6f66e58d9 100644
--- a/nx-X11/include/extensions/xf86bigfstr.h
+++ b/nx-X11/include/extensions/xf86bigfstr.h
@@ -11,7 +11,7 @@
 #ifndef _XF86BIGFSTR_H_
 #define _XF86BIGFSTR_H_
 
-#include <X11/extensions/xf86bigfont.h>
+#include <nx-X11/extensions/xf86bigfont.h>
 
 #define XF86BIGFONTNAME			"XFree86-Bigfont"
 
diff --git a/nx-X11/include/extensions/xf86dga.h b/nx-X11/include/extensions/xf86dga.h
index 720118842..d6e494158 100644
--- a/nx-X11/include/extensions/xf86dga.h
+++ b/nx-X11/include/extensions/xf86dga.h
@@ -6,8 +6,8 @@
 #ifndef _XF86DGA_H_
 #define _XF86DGA_H_
 
-#include <X11/Xfuncproto.h>
-#include <X11/extensions/xf86dga1.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/extensions/xf86dga1.h>
 
 #define X_XDGAQueryVersion		0
 
diff --git a/nx-X11/include/extensions/xf86dga1.h b/nx-X11/include/extensions/xf86dga1.h
index 4f45e74b3..972b18e9e 100644
--- a/nx-X11/include/extensions/xf86dga1.h
+++ b/nx-X11/include/extensions/xf86dga1.h
@@ -15,7 +15,7 @@ Copyright (c) 1995  XFree86 Inc
 #ifndef _XF86DGA1_H_
 #define _XF86DGA1_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 #define X_XF86DGAQueryVersion		0
 #define X_XF86DGAGetVideoLL		1
diff --git a/nx-X11/include/extensions/xf86dgastr.h b/nx-X11/include/extensions/xf86dgastr.h
index 66dd354c8..30e4ff722 100644
--- a/nx-X11/include/extensions/xf86dgastr.h
+++ b/nx-X11/include/extensions/xf86dgastr.h
@@ -9,7 +9,7 @@ Copyright (c) 1995  XFree86 Inc.
 #ifndef _XF86DGASTR_H_
 #define _XF86DGASTR_H_
 
-#include <X11/extensions/xf86dga1str.h>
+#include <nx-X11/extensions/xf86dga1str.h>
 
 #define XF86DGANAME "XFree86-DGA"
 
diff --git a/nx-X11/include/extensions/xf86misc.h b/nx-X11/include/extensions/xf86misc.h
index f5d7a5664..fb01a6357 100644
--- a/nx-X11/include/extensions/xf86misc.h
+++ b/nx-X11/include/extensions/xf86misc.h
@@ -9,7 +9,7 @@
 #ifndef _XF86MISC_H_
 #define _XF86MISC_H_
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 #define X_XF86MiscQueryVersion		0
 #ifdef _XF86MISC_SAVER_COMPAT_
diff --git a/nx-X11/include/extensions/xf86mscstr.h b/nx-X11/include/extensions/xf86mscstr.h
index 637d3a5a0..2b8c0d07e 100644
--- a/nx-X11/include/extensions/xf86mscstr.h
+++ b/nx-X11/include/extensions/xf86mscstr.h
@@ -9,7 +9,7 @@
 #ifndef _XF86MISCSTR_H_
 #define _XF86MISCSTR_H_
 
-#include <X11/extensions/xf86misc.h>
+#include <nx-X11/extensions/xf86misc.h>
 
 #define XF86MISCNAME		"XFree86-Misc"
 
diff --git a/nx-X11/include/extensions/xf86vmode.h b/nx-X11/include/extensions/xf86vmode.h
index 3420ae4c8..624820dea 100644
--- a/nx-X11/include/extensions/xf86vmode.h
+++ b/nx-X11/include/extensions/xf86vmode.h
@@ -35,8 +35,8 @@ from Kaleb S. KEITHLEY
 #ifndef _XF86VIDMODE_H_
 #define _XF86VIDMODE_H_
 
-#include <X11/Xfuncproto.h>
-#include <X11/Xmd.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/Xmd.h>
 
 #define X_XF86VidModeQueryVersion	0
 #define X_XF86VidModeGetModeLine	1
diff --git a/nx-X11/include/extensions/xf86vmstr.h b/nx-X11/include/extensions/xf86vmstr.h
index a80eb8eb6..43c67980f 100644
--- a/nx-X11/include/extensions/xf86vmstr.h
+++ b/nx-X11/include/extensions/xf86vmstr.h
@@ -35,7 +35,7 @@ from Kaleb S. KEITHLEY
 #ifndef _XF86VIDMODESTR_H_
 #define _XF86VIDMODESTR_H_
 
-#include <X11/extensions/xf86vmode.h>
+#include <nx-X11/extensions/xf86vmode.h>
 
 #define XF86VIDMODENAME "XFree86-VidModeExtension"
 
diff --git a/nx-X11/include/extensions/xfixesproto.h b/nx-X11/include/extensions/xfixesproto.h
index 773bc65d1..0ef6a2fd6 100644
--- a/nx-X11/include/extensions/xfixesproto.h
+++ b/nx-X11/include/extensions/xfixesproto.h
@@ -25,10 +25,10 @@
 #ifndef _XFIXESPROTO_H_
 #define _XFIXESPROTO_H_
 
-#include <X11/Xmd.h>
-#include <X11/extensions/xfixeswire.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/extensions/xfixeswire.h>
 #define _SHAPE_SERVER_
-#include <X11/extensions/shape.h>
+#include <nx-X11/extensions/shape.h>
 #undef _SHAPE_SERVER_
 
 #define Window CARD32
diff --git a/nx-X11/include/extensions/xtrapddmi.h b/nx-X11/include/extensions/xtrapddmi.h
index c187a3a0b..71df0712d 100644
--- a/nx-X11/include/extensions/xtrapddmi.h
+++ b/nx-X11/include/extensions/xtrapddmi.h
@@ -42,8 +42,8 @@ SOFTWARE.
  *      contained herein should *not* be visible to clients (xtrapdi.h
  *      is used for this).  The name is historical.
  */
-#include <X11/X.h>
-#include <X11/extensions/xtrapbits.h>
+#include <nx-X11/X.h>
+#include <nx-X11/extensions/xtrapbits.h>
 #include "dix.h"
 
 #ifndef MIN
diff --git a/nx-X11/include/extensions/xtrapdi.h b/nx-X11/include/extensions/xtrapdi.h
index 9db13bb20..34696113d 100644
--- a/nx-X11/include/extensions/xtrapdi.h
+++ b/nx-X11/include/extensions/xtrapdi.h
@@ -48,14 +48,14 @@ SOFTWARE.
 #ifndef IN_MODULE
 #include <stdio.h>
 #endif
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
 #ifdef SMT
 #define NEED_EVENTS
 #define NEED_REPLIES
 #endif
-#include <X11/Xproto.h>
-#include <X11/extensions/xtrapbits.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/extensions/xtrapbits.h>
 #define XTrapExtName "DEC-XTRAP"
 /* Current Release, Version, and Revision of the XTrap Extension */
 #define XETrapRelease      3L
diff --git a/nx-X11/include/extensions/xtrapemacros.h b/nx-X11/include/extensions/xtrapemacros.h
index f59ea3391..f5dc2be31 100644
--- a/nx-X11/include/extensions/xtrapemacros.h
+++ b/nx-X11/include/extensions/xtrapemacros.h
@@ -43,7 +43,7 @@ SOFTWARE.
  *      specified; however, use of Trap Context convenience
  *      routines is strongly encouraged (XETrapContext.c)
  */
-#include <X11/extensions/xtrapbits.h>
+#include <nx-X11/extensions/xtrapbits.h>
 #include <signal.h>
 
 /* msleep macro to replace msleep() for portability reasons */
diff --git a/nx-X11/include/extensions/xtraplib.h b/nx-X11/include/extensions/xtraplib.h
index f3f273aab..b733dac7f 100644
--- a/nx-X11/include/extensions/xtraplib.h
+++ b/nx-X11/include/extensions/xtraplib.h
@@ -47,10 +47,10 @@ SOFTWARE.
 #define NEED_EVENTS
 #define NEED_REPLIES
 #endif
-#include <X11/Xlib.h>
-#include <X11/Intrinsic.h>
-#include <X11/extensions/xtrapdi.h>
-#include <X11/extensions/xtrapemacros.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Intrinsic.h>
+#include <nx-X11/extensions/xtrapdi.h>
+#include <nx-X11/extensions/xtrapemacros.h>
 
 typedef struct  /* Callback structure */
 {
diff --git a/nx-X11/include/keysym.h b/nx-X11/include/keysym.h
index 785fed32e..cd518a792 100644
--- a/nx-X11/include/keysym.h
+++ b/nx-X11/include/keysym.h
@@ -71,5 +71,5 @@ SOFTWARE.
 #define XK_CURRENCY
 #define XK_MATHEMATICAL
 
-#include <X11/keysymdef.h>
+#include <nx-X11/keysymdef.h>
 
diff --git a/nx-X11/lib/X11/ClDisplay.c b/nx-X11/lib/X11/ClDisplay.c
index b7a58751e..dfbc2f518 100644
--- a/nx-X11/lib/X11/ClDisplay.c
+++ b/nx-X11/lib/X11/ClDisplay.c
@@ -32,7 +32,7 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xtrans/Xtrans.h>
+#include <nx-X11/Xtrans/Xtrans.h>
 #include "Xlib.h"
 #include "Xlibint.h"
 #include "Xintconn.h"
diff --git a/nx-X11/lib/X11/ConnDis.c b/nx-X11/lib/X11/ConnDis.c
index 30146a9f1..177ff2c59 100644
--- a/nx-X11/lib/X11/ConnDis.c
+++ b/nx-X11/lib/X11/ConnDis.c
@@ -54,9 +54,9 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xtrans/Xtrans.h>
-#include <X11/Xauth.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xtrans/Xtrans.h>
+#include <nx-X11/Xauth.h>
 #include <X11/Xdmcp.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -68,7 +68,7 @@ in this Software without prior written authorization from The Open Group.
 #include <socket.h>
 #endif
 #else
-#include <X11/Xwindows.h>
+#include <nx-X11/Xwindows.h>
 #endif
 
 #ifndef X_CONNECTION_RETRIES		/* number retries on ECONNREFUSED */
diff --git a/nx-X11/lib/X11/ErrDes.c b/nx-X11/lib/X11/ErrDes.c
index 16183e85e..64373ffd0 100644
--- a/nx-X11/lib/X11/ErrDes.c
+++ b/nx-X11/lib/X11/ErrDes.c
@@ -55,7 +55,7 @@ SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include "Xresource.h"
 #include <stdio.h>
 
diff --git a/nx-X11/lib/X11/FSWrap.c b/nx-X11/lib/X11/FSWrap.c
index d40f3b035..77dd3b59c 100644
--- a/nx-X11/lib/X11/FSWrap.c
+++ b/nx-X11/lib/X11/FSWrap.c
@@ -64,7 +64,7 @@ from The Open Group.
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include <ctype.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 
 
 #define	XMAXLIST	256
diff --git a/nx-X11/lib/X11/FetchName.c b/nx-X11/lib/X11/FetchName.c
index 3d41472f3..216c7453d 100644
--- a/nx-X11/lib/X11/FetchName.c
+++ b/nx-X11/lib/X11/FetchName.c
@@ -28,9 +28,9 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xos.h>
 #include <stdio.h>
 
 
diff --git a/nx-X11/lib/X11/Font.c b/nx-X11/lib/X11/Font.c
index 92a6a8f4a..8c8d1e443 100644
--- a/nx-X11/lib/X11/Font.c
+++ b/nx-X11/lib/X11/Font.c
@@ -47,7 +47,7 @@ authorization from the X Consortium and the XFree86 Project.
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <X11/extensions/xf86bigfstr.h>
+#include <nx-X11/extensions/xf86bigfstr.h>
 #endif
 
 #include "Xlcint.h"
diff --git a/nx-X11/lib/X11/GetDflt.c b/nx-X11/lib/X11/GetDflt.c
index 8a8563379..a881f1c28 100644
--- a/nx-X11/lib/X11/GetDflt.c
+++ b/nx-X11/lib/X11/GetDflt.c
@@ -52,8 +52,8 @@ SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xos.h>
-#include <X11/Xresource.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xresource.h>
 
 #ifndef X_NOT_POSIX
 #ifdef _POSIX_SOURCE
@@ -80,12 +80,12 @@ SOFTWARE.
 #endif
 
 #ifdef XTHREADS
-#include <X11/Xthreads.h>
+#include <nx-X11/Xthreads.h>
 #endif
 #ifndef WIN32
 #define X_INCLUDE_PWD_H
 #define XOS_USE_XLIB_LOCKING
-#include <X11/Xos_r.h>
+#include <nx-X11/Xos_r.h>
 #endif
 #include <stdio.h>
 #include <ctype.h>
diff --git a/nx-X11/lib/X11/GetHints.c b/nx-X11/lib/X11/GetHints.c
index 4faccb624..2c4d49d61 100644
--- a/nx-X11/lib/X11/GetHints.c
+++ b/nx-X11/lib/X11/GetHints.c
@@ -51,11 +51,11 @@ SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xos.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xutil.h>
 #include "Xatomtype.h"
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 #include <stdio.h>
 
 Status XGetSizeHints (dpy, w, hints, property)
diff --git a/nx-X11/lib/X11/GetImage.c b/nx-X11/lib/X11/GetImage.c
index ffe9d226f..634910d79 100644
--- a/nx-X11/lib/X11/GetImage.c
+++ b/nx-X11/lib/X11/GetImage.c
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xutil.h>		/* for XDestroyImage */
+#include <nx-X11/Xutil.h>		/* for XDestroyImage */
 #include "ImUtil.h"
 
 #define ROUNDUP(nbytes, pad) (((((nbytes) - 1) + (pad)) / (pad)) * (pad))
diff --git a/nx-X11/lib/X11/GetNrmHint.c b/nx-X11/lib/X11/GetNrmHint.c
index 9dcb7c403..c770df43d 100644
--- a/nx-X11/lib/X11/GetNrmHint.c
+++ b/nx-X11/lib/X11/GetNrmHint.c
@@ -55,10 +55,10 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xatom.h>
 #include "Xatomtype.h"
-#include <X11/Xutil.h>
+#include <nx-X11/Xutil.h>
 #include <stdio.h>
 
 Status XGetWMSizeHints (dpy, w, hints, supplied, property)
diff --git a/nx-X11/lib/X11/GetRGBCMap.c b/nx-X11/lib/X11/GetRGBCMap.c
index 6657c539a..4df3ccced 100644
--- a/nx-X11/lib/X11/GetRGBCMap.c
+++ b/nx-X11/lib/X11/GetRGBCMap.c
@@ -31,10 +31,10 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
 #include "Xatomtype.h"
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 
 Status XGetRGBColormaps (dpy, w, stdcmap, count, property)
     Display *dpy;
diff --git a/nx-X11/lib/X11/GetStCmap.c b/nx-X11/lib/X11/GetStCmap.c
index 5c8c37e78..ae085aa87 100644
--- a/nx-X11/lib/X11/GetStCmap.c
+++ b/nx-X11/lib/X11/GetStCmap.c
@@ -50,10 +50,10 @@ SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
 #include "Xatomtype.h"
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 
 /*
  * 				    WARNING
diff --git a/nx-X11/lib/X11/GetTxtProp.c b/nx-X11/lib/X11/GetTxtProp.c
index 0d4474253..dbff8abc8 100644
--- a/nx-X11/lib/X11/GetTxtProp.c
+++ b/nx-X11/lib/X11/GetTxtProp.c
@@ -52,10 +52,10 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/Xos.h>
 #include <stdio.h>
 
 Status XGetTextProperty (display, window, tp, property)
diff --git a/nx-X11/lib/X11/GetWMCMapW.c b/nx-X11/lib/X11/GetWMCMapW.c
index 6d5c73c85..496efd208 100644
--- a/nx-X11/lib/X11/GetWMCMapW.c
+++ b/nx-X11/lib/X11/GetWMCMapW.c
@@ -51,7 +51,7 @@ SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 #include <stdio.h>
 
 Status XGetWMColormapWindows (dpy, w, colormapWindows, countReturn)
diff --git a/nx-X11/lib/X11/GetWMProto.c b/nx-X11/lib/X11/GetWMProto.c
index 9b244ce6a..8584a4214 100644
--- a/nx-X11/lib/X11/GetWMProto.c
+++ b/nx-X11/lib/X11/GetWMProto.c
@@ -51,7 +51,7 @@ SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 #include <stdio.h>
 
 Status XGetWMProtocols (dpy, w, protocols, countReturn)
diff --git a/nx-X11/lib/X11/HVC.c b/nx-X11/lib/X11/HVC.c
index 79241fb7a..84fac58b9 100644
--- a/nx-X11/lib/X11/HVC.c
+++ b/nx-X11/lib/X11/HVC.c
@@ -55,7 +55,7 @@
 #endif
 #include "Xlibint.h"
 #include "Xcmsint.h"
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include <math.h>
 #include "Cv.h"
 
diff --git a/nx-X11/lib/X11/Iconify.c b/nx-X11/lib/X11/Iconify.c
index 62e57b84e..e68508666 100644
--- a/nx-X11/lib/X11/Iconify.c
+++ b/nx-X11/lib/X11/Iconify.c
@@ -54,10 +54,10 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xutil.h>
 #include <stdio.h>
 
 /*
diff --git a/nx-X11/lib/X11/ImUtil.c b/nx-X11/lib/X11/ImUtil.c
index 85f4183f4..2be839928 100644
--- a/nx-X11/lib/X11/ImUtil.c
+++ b/nx-X11/lib/X11/ImUtil.c
@@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
 #include <stdio.h>
 #include "ImUtil.h"
 
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 212216f46..81a1cfd3d 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -85,7 +85,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status
 #define LibName NX_X11
 #define SoRev SOXLIBREV
 #define HugeLibrary YES
-#define IncSubdir X11
+#define IncSubdir nx-X11
 
 #if BuildLoadableXlibI18n
 SUBDIRS = xlibi18n
diff --git a/nx-X11/lib/X11/InitExt.c b/nx-X11/lib/X11/InitExt.c
index 67c865787..5aab682c7 100644
--- a/nx-X11/lib/X11/InitExt.c
+++ b/nx-X11/lib/X11/InitExt.c
@@ -31,8 +31,8 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xos.h>
 #include <stdio.h>
 
 /*
diff --git a/nx-X11/lib/X11/KeyBind.c b/nx-X11/lib/X11/KeyBind.c
index fab9eeacd..d99cfdf2f 100644
--- a/nx-X11/lib/X11/KeyBind.c
+++ b/nx-X11/lib/X11/KeyBind.c
@@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
 #define XK_MISCELLANY
 #define XK_LATIN1
 #define XK_LATIN2
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
 #define XK_CAUCASUS
 #define XK_VIETNAMESE
 #define XK_XKB_KEYS
-#include <X11/keysymdef.h>
+#include <nx-X11/keysymdef.h>
 #include <stdio.h>
 
 #ifdef USE_OWN_COMPOSE
diff --git a/nx-X11/lib/X11/KeysymStr.c b/nx-X11/lib/X11/KeysymStr.c
index 59aa3f32c..b43e2735a 100644
--- a/nx-X11/lib/X11/KeysymStr.c
+++ b/nx-X11/lib/X11/KeysymStr.c
@@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xresource.h>
-#include <X11/keysymdef.h>
+#include <nx-X11/Xresource.h>
+#include <nx-X11/keysymdef.h>
 
 #include <stdio.h> /* sprintf */
 
diff --git a/nx-X11/lib/X11/LRGB.c b/nx-X11/lib/X11/LRGB.c
index e4bc0b500..392c59579 100644
--- a/nx-X11/lib/X11/LRGB.c
+++ b/nx-X11/lib/X11/LRGB.c
@@ -41,8 +41,8 @@
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xos.h>
-#include <X11/Xatom.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xatom.h>
 #include "Xlibint.h"
 #include "Xcmsint.h"
 #include "Cv.h"
diff --git a/nx-X11/lib/X11/Lab.c b/nx-X11/lib/X11/Lab.c
index 596c137f8..19b3e3a1d 100644
--- a/nx-X11/lib/X11/Lab.c
+++ b/nx-X11/lib/X11/Lab.c
@@ -42,7 +42,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include <stdio.h> /* sscanf */
 #include "Xlibint.h"
 #include "Xcmsint.h"
diff --git a/nx-X11/lib/X11/Luv.c b/nx-X11/lib/X11/Luv.c
index ec94c9e56..206ae1017 100644
--- a/nx-X11/lib/X11/Luv.c
+++ b/nx-X11/lib/X11/Luv.c
@@ -43,7 +43,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include "Xlibint.h"
 #include "Xcmsint.h"
 #include "Cv.h"
diff --git a/nx-X11/lib/X11/OpenDis.c b/nx-X11/lib/X11/OpenDis.c
index e9d019723..67f7ccbd1 100644
--- a/nx-X11/lib/X11/OpenDis.c
+++ b/nx-X11/lib/X11/OpenDis.c
@@ -50,10 +50,10 @@ in this Software without prior written authorization from The Open Group.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xtrans/Xtrans.h>
-#include <X11/Xatom.h>
-#include <X11/Xresource.h>
-#include <X11/extensions/bigreqstr.h>
+#include <nx-X11/Xtrans/Xtrans.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xresource.h>
+#include <nx-X11/extensions/bigreqstr.h>
 #include <stdio.h>
 #include "Xintconn.h"
 
diff --git a/nx-X11/lib/X11/ParseCmd.c b/nx-X11/lib/X11/ParseCmd.c
index ddcbf7846..fe20f6eff 100644
--- a/nx-X11/lib/X11/ParseCmd.c
+++ b/nx-X11/lib/X11/ParseCmd.c
@@ -61,7 +61,7 @@ SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xresource.h>
+#include <nx-X11/Xresource.h>
 #include <stdio.h>
 
 
diff --git a/nx-X11/lib/X11/PolyReg.c b/nx-X11/lib/X11/PolyReg.c
index 4b17ec5c5..6e1f7ead8 100644
--- a/nx-X11/lib/X11/PolyReg.c
+++ b/nx-X11/lib/X11/PolyReg.c
@@ -55,7 +55,7 @@ SOFTWARE.
 #endif
 #include "Xlibint.h"
 #include "Xutil.h"
-#include <X11/Xregion.h>
+#include <nx-X11/Xregion.h>
 #include "poly.h"
 
 /*
diff --git a/nx-X11/lib/X11/Quarks.c b/nx-X11/lib/X11/Quarks.c
index d47bce314..a49562aac 100644
--- a/nx-X11/lib/X11/Quarks.c
+++ b/nx-X11/lib/X11/Quarks.c
@@ -55,7 +55,7 @@ from The Open Group.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xresource.h>
+#include <nx-X11/Xresource.h>
 #include "Xresinternal.h"
 
 /* Not cost effective, at least for vanilla MIT clients */
diff --git a/nx-X11/lib/X11/RdBitF.c b/nx-X11/lib/X11/RdBitF.c
index 198e0e4a5..97afcc493 100644
--- a/nx-X11/lib/X11/RdBitF.c
+++ b/nx-X11/lib/X11/RdBitF.c
@@ -47,7 +47,7 @@ from The Open Group.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include "Xutil.h"
 #include <stdio.h>
 #include <ctype.h>
diff --git a/nx-X11/lib/X11/Region.c b/nx-X11/lib/X11/Region.c
index cdd223b25..bef46def0 100644
--- a/nx-X11/lib/X11/Region.c
+++ b/nx-X11/lib/X11/Region.c
@@ -77,7 +77,7 @@ SOFTWARE.
 #endif
 #include "Xlibint.h"
 #include "Xutil.h"
-#include <X11/Xregion.h>
+#include <nx-X11/Xregion.h>
 #include "poly.h"
 
 #ifdef DEBUG
diff --git a/nx-X11/lib/X11/ScrResStr.c b/nx-X11/lib/X11/ScrResStr.c
index 89f771784..7feb3b388 100644
--- a/nx-X11/lib/X11/ScrResStr.c
+++ b/nx-X11/lib/X11/ScrResStr.c
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 
 char *XScreenResourceString(screen)
 	Screen *screen;
diff --git a/nx-X11/lib/X11/SetHints.c b/nx-X11/lib/X11/SetHints.c
index 5ee34435d..27b1bedbc 100644
--- a/nx-X11/lib/X11/SetHints.c
+++ b/nx-X11/lib/X11/SetHints.c
@@ -51,11 +51,11 @@ SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
 #include "Xatomtype.h"
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xos.h>
 
 #define safestrlen(s) ((s) ? strlen(s) : 0)
 
diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c
index bb4f850e3..875718dca 100644
--- a/nx-X11/lib/X11/SetLocale.c
+++ b/nx-X11/lib/X11/SetLocale.c
@@ -63,8 +63,8 @@ from The Open Group.
 #endif
 #include "Xlibint.h"
 #include "Xlcint.h"
-#include <X11/Xlocale.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xlocale.h>
+#include <nx-X11/Xos.h>
 #include "XlcPubI.h"
 
 #define MAXLOCALE	64	/* buffer size of locale name */
diff --git a/nx-X11/lib/X11/SetNrmHint.c b/nx-X11/lib/X11/SetNrmHint.c
index 64b0ef7f3..e8e6daf31 100644
--- a/nx-X11/lib/X11/SetNrmHint.c
+++ b/nx-X11/lib/X11/SetNrmHint.c
@@ -54,11 +54,11 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
 #include "Xatomtype.h"
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xos.h>
 
 void XSetWMSizeHints (dpy, w, hints, prop)
     Display *dpy;
diff --git a/nx-X11/lib/X11/SetRGBCMap.c b/nx-X11/lib/X11/SetRGBCMap.c
index 4be840b75..03aa9392c 100644
--- a/nx-X11/lib/X11/SetRGBCMap.c
+++ b/nx-X11/lib/X11/SetRGBCMap.c
@@ -31,10 +31,10 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
 #include "Xatomtype.h"
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 
 void XSetRGBColormaps (dpy, w, cmaps, count, property)
     Display *dpy;
diff --git a/nx-X11/lib/X11/SetStCmap.c b/nx-X11/lib/X11/SetStCmap.c
index b5a93e36e..521b9480d 100644
--- a/nx-X11/lib/X11/SetStCmap.c
+++ b/nx-X11/lib/X11/SetStCmap.c
@@ -50,10 +50,10 @@ SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
 #include "Xatomtype.h"
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 
 /*
  * 				    WARNING
diff --git a/nx-X11/lib/X11/SetTxtProp.c b/nx-X11/lib/X11/SetTxtProp.c
index a82d9b3e3..ae8b81e29 100644
--- a/nx-X11/lib/X11/SetTxtProp.c
+++ b/nx-X11/lib/X11/SetTxtProp.c
@@ -52,10 +52,10 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/Xos.h>
 #include <stdio.h>
 
 void XSetTextProperty (dpy, w, tp, property)
diff --git a/nx-X11/lib/X11/SetWMCMapW.c b/nx-X11/lib/X11/SetWMCMapW.c
index dd88061da..6774d7326 100644
--- a/nx-X11/lib/X11/SetWMCMapW.c
+++ b/nx-X11/lib/X11/SetWMCMapW.c
@@ -51,7 +51,7 @@ SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 
 /* 
  * XSetWMProtocols sets the property 
diff --git a/nx-X11/lib/X11/SetWMProto.c b/nx-X11/lib/X11/SetWMProto.c
index 8640e5060..bc7dcf63c 100644
--- a/nx-X11/lib/X11/SetWMProto.c
+++ b/nx-X11/lib/X11/SetWMProto.c
@@ -51,7 +51,7 @@ SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 
 /* 
  * XSetWMProtocols sets the property 
diff --git a/nx-X11/lib/X11/StBytes.c b/nx-X11/lib/X11/StBytes.c
index b23902581..676652678 100644
--- a/nx-X11/lib/X11/StBytes.c
+++ b/nx-X11/lib/X11/StBytes.c
@@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xatom.h>
 
 /* insulate predefined atom numbers from cut routines */
 static Atom n_to_atom[8] = { 
diff --git a/nx-X11/lib/X11/StName.c b/nx-X11/lib/X11/StName.c
index ba01ffb0c..d3053346c 100644
--- a/nx-X11/lib/X11/StName.c
+++ b/nx-X11/lib/X11/StName.c
@@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xatom.h>
 
 int
 XStoreName (
diff --git a/nx-X11/lib/X11/StrKeysym.c b/nx-X11/lib/X11/StrKeysym.c
index 74ccecbcd..fc1e7a34d 100644
--- a/nx-X11/lib/X11/StrKeysym.c
+++ b/nx-X11/lib/X11/StrKeysym.c
@@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xresource.h>
-#include <X11/keysymdef.h>
+#include <nx-X11/Xresource.h>
+#include <nx-X11/keysymdef.h>
 #include "Xresinternal.h"
 
 #define NEEDKTABLE
diff --git a/nx-X11/lib/X11/StrToText.c b/nx-X11/lib/X11/StrToText.c
index ba894e16f..5fd9c6ec6 100644
--- a/nx-X11/lib/X11/StrToText.c
+++ b/nx-X11/lib/X11/StrToText.c
@@ -28,9 +28,9 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xutil.h>
 
 /*
  * XStringListToTextProperty - fill in TextProperty structure with 
diff --git a/nx-X11/lib/X11/TextToStr.c b/nx-X11/lib/X11/TextToStr.c
index 0bea8096d..f4c00adcf 100644
--- a/nx-X11/lib/X11/TextToStr.c
+++ b/nx-X11/lib/X11/TextToStr.c
@@ -30,9 +30,9 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xutil.h>
 
 
 /*
diff --git a/nx-X11/lib/X11/WMProps.c b/nx-X11/lib/X11/WMProps.c
index 62c6a8d12..7a390a9d7 100644
--- a/nx-X11/lib/X11/WMProps.c
+++ b/nx-X11/lib/X11/WMProps.c
@@ -55,11 +55,11 @@ SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#include <X11/Xos.h>
-#include <X11/Xlocale.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xlocale.h>
 
 
 /* 
diff --git a/nx-X11/lib/X11/Withdraw.c b/nx-X11/lib/X11/Withdraw.c
index 1b771c286..2037b8e46 100644
--- a/nx-X11/lib/X11/Withdraw.c
+++ b/nx-X11/lib/X11/Withdraw.c
@@ -54,10 +54,10 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xutil.h>
 #include <stdio.h>
 
 /*
diff --git a/nx-X11/lib/X11/WrBitF.c b/nx-X11/lib/X11/WrBitF.c
index d8c9f18fa..d48295f0b 100644
--- a/nx-X11/lib/X11/WrBitF.c
+++ b/nx-X11/lib/X11/WrBitF.c
@@ -32,7 +32,7 @@ from The Open Group.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include "Xutil.h"
 #include <stdio.h>
 
diff --git a/nx-X11/lib/X11/XDefaultOMIF.c b/nx-X11/lib/X11/XDefaultOMIF.c
index 13f0d9cff..b4e63091b 100644
--- a/nx-X11/lib/X11/XDefaultOMIF.c
+++ b/nx-X11/lib/X11/XDefaultOMIF.c
@@ -49,8 +49,8 @@ Sun Microsystems, Inc. or its licensors is granted.
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "XlcPublic.h"
-#include <X11/Xos.h>
-#include <X11/Xatom.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xatom.h>
 #include <stdio.h>
 
 #define MAXFONTS		100
diff --git a/nx-X11/lib/X11/XKB.c b/nx-X11/lib/X11/XKB.c
index ecc5ddf0a..413a51eb6 100644
--- a/nx-X11/lib/X11/XKB.c
+++ b/nx-X11/lib/X11/XKB.c
@@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 XkbInternAtomFunc	_XkbInternAtomFunc= XInternAtom;
diff --git a/nx-X11/lib/X11/XKBAlloc.c b/nx-X11/lib/X11/XKBAlloc.c
index 9430ac0ed..131985444 100644
--- a/nx-X11/lib/X11/XKBAlloc.c
+++ b/nx-X11/lib/X11/XKBAlloc.c
@@ -39,21 +39,21 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_EVENTS
 #include "Xlibint.h"
 #include "XKBlibint.h"
-#include <X11/extensions/XKBgeom.h>
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 #else 
 
 #include <stdio.h>
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define	NEED_EVENTS
 #define	NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBgeom.h>
 
 #endif /* XKB_IN_SERVER */
 
diff --git a/nx-X11/lib/X11/XKBBell.c b/nx-X11/lib/X11/XKBBell.c
index 6ea30855e..51869097e 100644
--- a/nx-X11/lib/X11/XKBBell.c
+++ b/nx-X11/lib/X11/XKBBell.c
@@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 
diff --git a/nx-X11/lib/X11/XKBBind.c b/nx-X11/lib/X11/XKBBind.c
index e190d0052..6c1864d41 100644
--- a/nx-X11/lib/X11/XKBBind.c
+++ b/nx-X11/lib/X11/XKBBind.c
@@ -35,13 +35,13 @@ from The Open Group.
 #include <config.h>
 #endif
 #include "XKBlib.h"
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/keysym.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/keysym.h>
 #include <stdio.h>
 #include <ctype.h>
 
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 #ifdef USE_OWN_COMPOSE
diff --git a/nx-X11/lib/X11/XKBCompat.c b/nx-X11/lib/X11/XKBCompat.c
index 5886e4d26..b16e6b083 100644
--- a/nx-X11/lib/X11/XKBCompat.c
+++ b/nx-X11/lib/X11/XKBCompat.c
@@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_EVENTS
 #define	NEED_MAP_READERS
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 Status
diff --git a/nx-X11/lib/X11/XKBCtrls.c b/nx-X11/lib/X11/XKBCtrls.c
index 0ea131aa0..f3a09a124 100644
--- a/nx-X11/lib/X11/XKBCtrls.c
+++ b/nx-X11/lib/X11/XKBCtrls.c
@@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 
diff --git a/nx-X11/lib/X11/XKBCvt.c b/nx-X11/lib/X11/XKBCvt.c
index 1bdf81cd4..2d58ca990 100644
--- a/nx-X11/lib/X11/XKBCvt.c
+++ b/nx-X11/lib/X11/XKBCvt.c
@@ -35,23 +35,23 @@ from The Open Group.
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <X11/X.h>
-#include <X11/Xlib.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xlib.h>
 #define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "XlcPubI.h"
 #include "Ximint.h"
-#include <X11/Xutil.h>
-#include <X11/Xmd.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/Xmd.h>
 #define XK_LATIN1
 #define XK_PUBLISHING
-#include <X11/keysym.h>
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
-#include <X11/Xlocale.h>
+#include <nx-X11/Xlocale.h>
 #include <ctype.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 
 #ifdef __sgi_not_xconsortium
 #define	XKB_EXTEND_LOOKUP_STRING
diff --git a/nx-X11/lib/X11/XKBExtDev.c b/nx-X11/lib/X11/XKBExtDev.c
index 34558e476..0510b7f55 100644
--- a/nx-X11/lib/X11/XKBExtDev.c
+++ b/nx-X11/lib/X11/XKBExtDev.c
@@ -34,9 +34,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_EVENTS
 #define	NEED_MAP_READERS
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XI.h>
 
 /***====================================================================***/
 
diff --git a/nx-X11/lib/X11/XKBGAlloc.c b/nx-X11/lib/X11/XKBGAlloc.c
index fddb770b6..eb74cbfd0 100644
--- a/nx-X11/lib/X11/XKBGAlloc.c
+++ b/nx-X11/lib/X11/XKBGAlloc.c
@@ -40,18 +40,18 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include "Xlibint.h"
 #include "XKBlibint.h"
-#include <X11/extensions/XKBgeom.h>
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBproto.h>
 
 #else 
 
 #include <stdio.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBgeom.h>
 
 #endif /* XKB_IN_SERVER */
 
diff --git a/nx-X11/lib/X11/XKBGeom.c b/nx-X11/lib/X11/XKBGeom.c
index 061175489..d225342a7 100644
--- a/nx-X11/lib/X11/XKBGeom.c
+++ b/nx-X11/lib/X11/XKBGeom.c
@@ -37,8 +37,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_REPLIES
 #define NEED_MAP_READERS
 #include "Xlibint.h"
-#include <X11/extensions/XKBgeom.h>
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 #ifndef MINSHORT
diff --git a/nx-X11/lib/X11/XKBGetByName.c b/nx-X11/lib/X11/XKBGetByName.c
index 2c6ff0849..87f405e50 100644
--- a/nx-X11/lib/X11/XKBGetByName.c
+++ b/nx-X11/lib/X11/XKBGetByName.c
@@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 /***====================================================================***/
diff --git a/nx-X11/lib/X11/XKBGetMap.c b/nx-X11/lib/X11/XKBGetMap.c
index 2b9fb97f4..5f37f9571 100644
--- a/nx-X11/lib/X11/XKBGetMap.c
+++ b/nx-X11/lib/X11/XKBGetMap.c
@@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 static Status
diff --git a/nx-X11/lib/X11/XKBList.c b/nx-X11/lib/X11/XKBList.c
index 2f4a53490..ef265fdde 100644
--- a/nx-X11/lib/X11/XKBList.c
+++ b/nx-X11/lib/X11/XKBList.c
@@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 /***====================================================================***/
diff --git a/nx-X11/lib/X11/XKBMAlloc.c b/nx-X11/lib/X11/XKBMAlloc.c
index d57d9a58d..31255091f 100644
--- a/nx-X11/lib/X11/XKBMAlloc.c
+++ b/nx-X11/lib/X11/XKBMAlloc.c
@@ -38,22 +38,22 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/extensions/XKBproto.h>
+#include <nx-X11/keysym.h>
 #include "XKBlibint.h"
 
 #else 
 
 #include <stdio.h>
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define	NEED_EVENTS
 #define	NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <X11/keysym.h>
+#include <nx-X11/keysym.h>
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 
 #endif /* XKB_IN_SERVER */
 
diff --git a/nx-X11/lib/X11/XKBMisc.c b/nx-X11/lib/X11/XKBMisc.c
index 09f361c19..04ac0c7ea 100644
--- a/nx-X11/lib/X11/XKBMisc.c
+++ b/nx-X11/lib/X11/XKBMisc.c
@@ -38,22 +38,22 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/extensions/XKBproto.h>
+#include <nx-X11/keysym.h>
 #include "XKBlibint.h"
 
 #else 
 
 #include <stdio.h>
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define	NEED_EVENTS
 #define	NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <X11/keysym.h>
+#include <nx-X11/keysym.h>
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 
 #endif /* XKB_IN_SERVER */
 
diff --git a/nx-X11/lib/X11/XKBNames.c b/nx-X11/lib/X11/XKBNames.c
index 8483187c3..0bcd42b3d 100644
--- a/nx-X11/lib/X11/XKBNames.c
+++ b/nx-X11/lib/X11/XKBNames.c
@@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 
diff --git a/nx-X11/lib/X11/XKBRdBuf.c b/nx-X11/lib/X11/XKBRdBuf.c
index d0b7045d6..109618dd2 100644
--- a/nx-X11/lib/X11/XKBRdBuf.c
+++ b/nx-X11/lib/X11/XKBRdBuf.c
@@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_EVENTS
 #include "Xlibint.h"
 #include "XKBlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 
 /***====================================================================***/
 
diff --git a/nx-X11/lib/X11/XKBSetGeom.c b/nx-X11/lib/X11/XKBSetGeom.c
index e27297c11..f13be8097 100644
--- a/nx-X11/lib/X11/XKBSetGeom.c
+++ b/nx-X11/lib/X11/XKBSetGeom.c
@@ -38,8 +38,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_REPLIES
 #include "Xlibint.h"
 #include "XKBlibint.h"
-#include <X11/extensions/XKBgeom.h>
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBproto.h>
 
 #ifndef MINSHORT
 #define	MINSHORT	-32768
diff --git a/nx-X11/lib/X11/XKBSetMap.c b/nx-X11/lib/X11/XKBSetMap.c
index 4a3b15c70..784a241c2 100644
--- a/nx-X11/lib/X11/XKBSetMap.c
+++ b/nx-X11/lib/X11/XKBSetMap.c
@@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 static int
diff --git a/nx-X11/lib/X11/XKBUse.c b/nx-X11/lib/X11/XKBUse.c
index ad18bb6fc..95fba49ac 100644
--- a/nx-X11/lib/X11/XKBUse.c
+++ b/nx-X11/lib/X11/XKBUse.c
@@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 static Bool	_XkbIgnoreExtension = False;
diff --git a/nx-X11/lib/X11/XKBleds.c b/nx-X11/lib/X11/XKBleds.c
index 89ab2e9ec..d026d84be 100644
--- a/nx-X11/lib/X11/XKBleds.c
+++ b/nx-X11/lib/X11/XKBleds.c
@@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
 Status
diff --git a/nx-X11/lib/X11/XKBlib.h b/nx-X11/lib/X11/XKBlib.h
index 6a5dc8a7c..a1ad7ccea 100644
--- a/nx-X11/lib/X11/XKBlib.h
+++ b/nx-X11/lib/X11/XKBlib.h
@@ -29,8 +29,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef _XKBLIB_H_
 #define _XKBLIB_H_
 
-#include <X11/Xlib.h>
-#include <X11/extensions/XKBstr.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/extensions/XKBstr.h>
 
 typedef struct _XkbAnyEvent {
 	int 		type;		/* XkbAnyEvent */
diff --git a/nx-X11/lib/X11/XKBlibint.h b/nx-X11/lib/X11/XKBlibint.h
index 0244e2ef3..9c6352769 100644
--- a/nx-X11/lib/X11/XKBlibint.h
+++ b/nx-X11/lib/X11/XKBlibint.h
@@ -29,8 +29,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef _XKBLIBINT_H_
 #define	_XKBLIBINT_H_
 
-#include <X11/Xutil.h>
-#include <X11/XKBlib.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/XKBlib.h>
 
 #define	XkbMapPending		(1<<0)
 #define	XkbXlibNewKeyboard	(1<<1)
diff --git a/nx-X11/lib/X11/XYZ.c b/nx-X11/lib/X11/XYZ.c
index f5f17f356..5408c4fbc 100644
--- a/nx-X11/lib/X11/XYZ.c
+++ b/nx-X11/lib/X11/XYZ.c
@@ -38,7 +38,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include "Xlibint.h"
 #include "Xcmsint.h"
 #include "Cv.h"
diff --git a/nx-X11/lib/X11/Xcms.h b/nx-X11/lib/X11/Xcms.h
index 779bc52ff..8ce81556d 100644
--- a/nx-X11/lib/X11/Xcms.h
+++ b/nx-X11/lib/X11/Xcms.h
@@ -31,7 +31,7 @@
 #ifndef _XCMS_H_
 #define _XCMS_H_
 
-#include <X11/Xlib.h>
+#include <nx-X11/Xlib.h>
 
     /*
      * XCMS Status Values
diff --git a/nx-X11/lib/X11/Xcmsint.h b/nx-X11/lib/X11/Xcmsint.h
index 1bf02ba2f..6bb44bbcf 100644
--- a/nx-X11/lib/X11/Xcmsint.h
+++ b/nx-X11/lib/X11/Xcmsint.h
@@ -34,7 +34,7 @@
 #ifndef _XCMSINT_H_
 #define _XCMSINT_H_
 
-#include <X11/Xcms.h>
+#include <nx-X11/Xcms.h>
 
 /*
  *	DEFINES
diff --git a/nx-X11/lib/X11/XimThai.h b/nx-X11/lib/X11/XimThai.h
index 5b2666ebf..8d08eca6b 100644
--- a/nx-X11/lib/X11/XimThai.h
+++ b/nx-X11/lib/X11/XimThai.h
@@ -64,7 +64,7 @@ SOFTWARE.
 #ifndef _XIMTHAI_H_
 #define _XIMTHAI_H_
 
-#include <X11/Xlib.h>
+#include <nx-X11/Xlib.h>
 
 /* Classification of characters in TIS620 according to WTT */
 
diff --git a/nx-X11/lib/X11/Ximint.h b/nx-X11/lib/X11/Ximint.h
index e9bdda247..afd821c68 100644
--- a/nx-X11/lib/X11/Ximint.h
+++ b/nx-X11/lib/X11/Ximint.h
@@ -36,7 +36,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #define _XIMINT_H
 
 #include <stdio.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xutil.h>
 
 #define Public /**/
 #define Private static
diff --git a/nx-X11/lib/X11/Xintatom.h b/nx-X11/lib/X11/Xintatom.h
index f1e13568b..756d3445b 100644
--- a/nx-X11/lib/X11/Xintatom.h
+++ b/nx-X11/lib/X11/Xintatom.h
@@ -3,7 +3,7 @@
 #ifndef _XINTATOM_H_
 #define _XINTATOM_H_ 1
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 /* IntAtom.c */
 
diff --git a/nx-X11/lib/X11/Xintconn.h b/nx-X11/lib/X11/Xintconn.h
index edea98302..ea272833a 100644
--- a/nx-X11/lib/X11/Xintconn.h
+++ b/nx-X11/lib/X11/Xintconn.h
@@ -3,7 +3,7 @@
 #ifndef _XINTCONN_H_
 #define _XINTCONN_H_ 1
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/lib/X11/Xlcint.h b/nx-X11/lib/X11/Xlcint.h
index fcc3a65f2..5a52cd36c 100644
--- a/nx-X11/lib/X11/Xlcint.h
+++ b/nx-X11/lib/X11/Xlcint.h
@@ -74,8 +74,8 @@ from The Open Group.
 
 #ifndef _XP_PRINT_SERVER_
 
-#include <X11/Xresource.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xresource.h>
+#include <nx-X11/Xutil.h>
 #include <stdarg.h>
 
 typedef Bool (*XFilterEventProc)(
diff --git a/nx-X11/lib/X11/Xlib.h b/nx-X11/lib/X11/Xlib.h
index 8ce7fb577..d4cecc7b5 100644
--- a/nx-X11/lib/X11/Xlib.h
+++ b/nx-X11/lib/X11/Xlib.h
@@ -57,11 +57,11 @@ in this Software without prior written authorization from The Open Group.
 #include <stdint.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 
 /* applications should not depend on these two headers being included! */
-#include <X11/Xfuncproto.h>
-#include <X11/Xosdefs.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/Xosdefs.h>
 
 #ifndef X_WCHAR
 #ifdef X_NOT_STDC_ENV
diff --git a/nx-X11/lib/X11/XlibAsync.c b/nx-X11/lib/X11/XlibAsync.c
index 81403ebc9..832371782 100644
--- a/nx-X11/lib/X11/XlibAsync.c
+++ b/nx-X11/lib/X11/XlibAsync.c
@@ -48,8 +48,8 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xos.h>
 
 /*ARGSUSED*/
 Bool
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c
index 0514470dd..0aa890bbb 100644
--- a/nx-X11/lib/X11/XlibInt.c
+++ b/nx-X11/lib/X11/XlibInt.c
@@ -60,9 +60,9 @@ from The Open Group.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/Xpoll.h>
-#include <X11/Xtrans/Xtrans.h>
-#include <X11/extensions/xcmiscstr.h>
+#include <nx-X11/Xpoll.h>
+#include <nx-X11/Xtrans/Xtrans.h>
+#include <nx-X11/extensions/xcmiscstr.h>
 #include <stdio.h>
 #ifdef WIN32
 #include <direct.h>
diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h
index bcd42b52b..854b64b22 100644
--- a/nx-X11/lib/X11/Xlibint.h
+++ b/nx-X11/lib/X11/Xlibint.h
@@ -58,9 +58,9 @@ from The Open Group.
  *	Warning, there be dragons here....
  */
 
-#include <X11/Xlib.h>
-#include <X11/Xproto.h>		/* to declare xEvent */
-#include <X11/XlibConf.h>	/* for configured options like XTHREADS */
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xproto.h>		/* to declare xEvent */
+#include <nx-X11/XlibConf.h>	/* for configured options like XTHREADS */
 
 #ifdef NX_TRANS_SOCKET
 
@@ -233,14 +233,14 @@ typedef struct _XSQEvent
 
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #ifdef __sgi
 #define _SGI_MP_SOURCE  /* turn this on to get MP safe errno */
 #endif
 #include <errno.h>
 #define _XBCOPYFUNC _Xbcopy
-#include <X11/Xfuncs.h>
-#include <X11/Xosdefs.h>
+#include <nx-X11/Xfuncs.h>
+#include <nx-X11/Xosdefs.h>
 
 /* Utek leaves kernel macros around in include files (bleah) */
 #ifdef dirty
@@ -250,7 +250,7 @@ typedef struct _XSQEvent
 #include <stdlib.h>
 #include <string.h>
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 _XFUNCPROTOBEGIN
 
diff --git a/nx-X11/lib/X11/Xlocale.h b/nx-X11/lib/X11/Xlocale.h
index 61d2f7a84..4370d969e 100644
--- a/nx-X11/lib/X11/Xlocale.h
+++ b/nx-X11/lib/X11/Xlocale.h
@@ -31,8 +31,8 @@ from The Open Group.
 #ifndef _XLOCALE_H_
 #define _XLOCALE_H_
 
-#include <X11/Xfuncproto.h>
-#include <X11/Xosdefs.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/Xosdefs.h>
 
 #ifndef X_LOCALE
 #include <locale.h>
diff --git a/nx-X11/lib/X11/Xresource.h b/nx-X11/lib/X11/Xresource.h
index ce1213748..e46a5f467 100644
--- a/nx-X11/lib/X11/Xresource.h
+++ b/nx-X11/lib/X11/Xresource.h
@@ -52,7 +52,7 @@ SOFTWARE.
 #define _XRESOURCE_H_
 
 #ifndef _XP_PRINT_SERVER_
-#include <X11/Xlib.h>
+#include <nx-X11/Xlib.h>
 #endif
 
 /****************************************************************
diff --git a/nx-X11/lib/X11/Xrm.c b/nx-X11/lib/X11/Xrm.c
index a932a5ce2..f27f9d2e8 100644
--- a/nx-X11/lib/X11/Xrm.c
+++ b/nx-X11/lib/X11/Xrm.c
@@ -57,13 +57,13 @@ from The Open Group.
 #include	<stdio.h>
 #include	<ctype.h>
 #include	"Xlibint.h"
-#include	<X11/Xresource.h>
+#include	<nx-X11/Xresource.h>
 #include	"Xlcint.h"
 #ifdef XTHREADS
 #include	"locking.h"
 #endif
 #include 	"XrmI.h"
-#include	<X11/Xos.h>
+#include	<nx-X11/Xos.h>
 #include "Xresinternal.h"
 #include "Xresource.h"
 
diff --git a/nx-X11/lib/X11/Xutil.h b/nx-X11/lib/X11/Xutil.h
index 82dab7d56..8c877e697 100644
--- a/nx-X11/lib/X11/Xutil.h
+++ b/nx-X11/lib/X11/Xutil.h
@@ -52,7 +52,7 @@ SOFTWARE.
 #define _XUTIL_H_
 
 /* You must include <X11/Xlib.h> before including this file */
-#include <X11/Xlib.h>
+#include <nx-X11/Xlib.h>
 
 /* 
  * Bitmask returned by XParseGeometry().  Each bit tells if the corresponding
diff --git a/nx-X11/lib/X11/cmsColNm.c b/nx-X11/lib/X11/cmsColNm.c
index d8c24cdff..63f166efe 100644
--- a/nx-X11/lib/X11/cmsColNm.c
+++ b/nx-X11/lib/X11/cmsColNm.c
@@ -39,12 +39,12 @@
 #endif
 #include "Xlibint.h"
 #include "Xcmsint.h"
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <ctype.h>
 #define XK_LATIN1
-#include <X11/keysymdef.h>
+#include <nx-X11/keysymdef.h>
 #include "Cv.h"
 
 /* forwards/locals */
diff --git a/nx-X11/lib/X11/cmsProp.c b/nx-X11/lib/X11/cmsProp.c
index 81ea58ce9..e9158479e 100644
--- a/nx-X11/lib/X11/cmsProp.c
+++ b/nx-X11/lib/X11/cmsProp.c
@@ -36,7 +36,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 #include "Xlibint.h"
 #include "Xcmsint.h"
 #include "Cv.h"
diff --git a/nx-X11/lib/X11/evtomask.c b/nx-X11/lib/X11/evtomask.c
index fbbb998d3..c852c4608 100644
--- a/nx-X11/lib/X11/evtomask.c
+++ b/nx-X11/lib/X11/evtomask.c
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
 
 /*
  * This array can be used given an event type to determine the mask bits
diff --git a/nx-X11/lib/X11/globals.c b/nx-X11/lib/X11/globals.c
index 11965cb5f..cf270dc22 100644
--- a/nx-X11/lib/X11/globals.c
+++ b/nx-X11/lib/X11/globals.c
@@ -38,7 +38,7 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
+#include <nx-X11/Xlibint.h>
 
 
 /*
diff --git a/nx-X11/lib/X11/imDefFlt.c b/nx-X11/lib/X11/imDefFlt.c
index ccf3ba348..b5b107221 100644
--- a/nx-X11/lib/X11/imDefFlt.c
+++ b/nx-X11/lib/X11/imDefFlt.c
@@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 #define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xutil.h"
diff --git a/nx-X11/lib/X11/imDefIm.c b/nx-X11/lib/X11/imDefIm.c
index 7581548e7..e963f3560 100644
--- a/nx-X11/lib/X11/imDefIm.c
+++ b/nx-X11/lib/X11/imDefIm.c
@@ -36,7 +36,7 @@ OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 #define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
diff --git a/nx-X11/lib/X11/imDefLkup.c b/nx-X11/lib/X11/imDefLkup.c
index aa1aaaf06..5bdcb77c3 100644
--- a/nx-X11/lib/X11/imDefLkup.c
+++ b/nx-X11/lib/X11/imDefLkup.c
@@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 #define  NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
diff --git a/nx-X11/lib/X11/imDispch.c b/nx-X11/lib/X11/imDispch.c
index c0c4bc726..1e3287529 100644
--- a/nx-X11/lib/X11/imDispch.c
+++ b/nx-X11/lib/X11/imDispch.c
@@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlib.h>
+#include <nx-X11/Xlib.h>
 #include "Xlibint.h"
 #include "Xutil.h"
 #include "Xlcint.h"
diff --git a/nx-X11/lib/X11/imEvToWire.c b/nx-X11/lib/X11/imEvToWire.c
index f407296df..211252a50 100644
--- a/nx-X11/lib/X11/imEvToWire.c
+++ b/nx-X11/lib/X11/imEvToWire.c
@@ -27,8 +27,8 @@ SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xlib.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xlib.h>
 #undef NEED_EVENTS
 #include "Ximint.h"
 
diff --git a/nx-X11/lib/X11/imExten.c b/nx-X11/lib/X11/imExten.c
index 782d1c356..6cb663f66 100644
--- a/nx-X11/lib/X11/imExten.c
+++ b/nx-X11/lib/X11/imExten.c
@@ -31,7 +31,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 #define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
diff --git a/nx-X11/lib/X11/imInt.c b/nx-X11/lib/X11/imInt.c
index 5a047e4aa..9658eef58 100644
--- a/nx-X11/lib/X11/imInt.c
+++ b/nx-X11/lib/X11/imInt.c
@@ -31,9 +31,9 @@ PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xmd.h>
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "Ximint.h"
diff --git a/nx-X11/lib/X11/imLcFlt.c b/nx-X11/lib/X11/imLcFlt.c
index c3c64bf46..7ff642fae 100644
--- a/nx-X11/lib/X11/imLcFlt.c
+++ b/nx-X11/lib/X11/imLcFlt.c
@@ -35,7 +35,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include "Xlibint.h"
-#include <X11/keysym.h>
+#include <nx-X11/keysym.h>
 #include "Xlcint.h"
 #include "Ximint.h"
 
diff --git a/nx-X11/lib/X11/imLcIc.c b/nx-X11/lib/X11/imLcIc.c
index 760e24c5f..475bbbef8 100644
--- a/nx-X11/lib/X11/imLcIc.c
+++ b/nx-X11/lib/X11/imLcIc.c
@@ -32,8 +32,8 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xmd.h>
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "Ximint.h"
diff --git a/nx-X11/lib/X11/imLcIm.c b/nx-X11/lib/X11/imLcIm.c
index 675b48224..0a9027e6f 100644
--- a/nx-X11/lib/X11/imLcIm.c
+++ b/nx-X11/lib/X11/imLcIm.c
@@ -39,11 +39,11 @@ THIS SOFTWARE.
 #endif
 #include <stdio.h>
 /*
-#include <X11/Xlib.h>
+#include <nx-X11/Xlib.h>
 */
-#include <X11/Xmd.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xos.h>
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "XlcPublic.h"
diff --git a/nx-X11/lib/X11/imLcLkup.c b/nx-X11/lib/X11/imLcLkup.c
index 59025a529..b1db9f8f7 100644
--- a/nx-X11/lib/X11/imLcLkup.c
+++ b/nx-X11/lib/X11/imLcLkup.c
@@ -35,11 +35,11 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/Xutil.h>
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "Ximint.h"
diff --git a/nx-X11/lib/X11/imLcPrs.c b/nx-X11/lib/X11/imLcPrs.c
index 9736e135c..616d45186 100644
--- a/nx-X11/lib/X11/imLcPrs.c
+++ b/nx-X11/lib/X11/imLcPrs.c
@@ -35,9 +35,9 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xos.h>
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "Ximint.h"
diff --git a/nx-X11/lib/X11/imLcSIc.c b/nx-X11/lib/X11/imLcSIc.c
index a32211ce2..e36c52269 100644
--- a/nx-X11/lib/X11/imLcSIc.c
+++ b/nx-X11/lib/X11/imLcSIc.c
@@ -31,9 +31,9 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xutil.h>
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "Ximint.h"
diff --git a/nx-X11/lib/X11/imRm.c b/nx-X11/lib/X11/imRm.c
index 7dbc385cb..1da1b2967 100644
--- a/nx-X11/lib/X11/imRm.c
+++ b/nx-X11/lib/X11/imRm.c
@@ -36,7 +36,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xlib.h>
+#include <nx-X11/Xlib.h>
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "Ximint.h"
diff --git a/nx-X11/lib/X11/imThaiFlt.c b/nx-X11/lib/X11/imThaiFlt.c
index 18df0e1ff..41ab992b0 100644
--- a/nx-X11/lib/X11/imThaiFlt.c
+++ b/nx-X11/lib/X11/imThaiFlt.c
@@ -68,10 +68,10 @@ SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include <X11/keysym.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/Xutil.h>
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "Ximint.h"
diff --git a/nx-X11/lib/X11/imThaiIc.c b/nx-X11/lib/X11/imThaiIc.c
index 67d7cc268..97a72ac81 100644
--- a/nx-X11/lib/X11/imThaiIc.c
+++ b/nx-X11/lib/X11/imThaiIc.c
@@ -38,8 +38,8 @@ THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xmd.h>
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "Ximint.h"
diff --git a/nx-X11/lib/X11/imThaiIm.c b/nx-X11/lib/X11/imThaiIm.c
index e24715022..85e9df6d3 100644
--- a/nx-X11/lib/X11/imThaiIm.c
+++ b/nx-X11/lib/X11/imThaiIm.c
@@ -38,10 +38,10 @@ THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xmd.h>
-#include <X11/Xatom.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xos.h>
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "XlcPublic.h"
diff --git a/nx-X11/lib/X11/imTrX.c b/nx-X11/lib/X11/imTrX.c
index e2de05f28..7d00bb3f7 100644
--- a/nx-X11/lib/X11/imTrX.c
+++ b/nx-X11/lib/X11/imTrX.c
@@ -34,7 +34,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <string.h>
-#include <X11/Xatom.h>
+#include <nx-X11/Xatom.h>
 #define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
diff --git a/nx-X11/lib/X11/imTrans.c b/nx-X11/lib/X11/imTrans.c
index a239219b7..e9715927b 100644
--- a/nx-X11/lib/X11/imTrans.c
+++ b/nx-X11/lib/X11/imTrans.c
@@ -34,18 +34,18 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xatom.h>
-#include <X11/Xmd.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xmd.h>
 #define NEED_EVENTS
 #include "Xlibint.h"
-#include <X11/Xtrans/Xtrans.h>
+#include <nx-X11/Xtrans/Xtrans.h>
 #include "Xlcint.h"
 #include "Ximint.h"
 #include "XimTrans.h"
 #include "XimTrInt.h"
 
 #ifdef WIN32
-#include <X11/Xwindows.h>
+#include <nx-X11/Xwindows.h>
 #endif
 
 
diff --git a/nx-X11/lib/X11/lcCT.c b/nx-X11/lib/X11/lcCT.c
index 63608a3cd..41c7cf418 100644
--- a/nx-X11/lib/X11/lcCT.c
+++ b/nx-X11/lib/X11/lcCT.c
@@ -43,7 +43,7 @@
 #endif
 #include "Xlibint.h"
 #include "XlcPubI.h"
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include <stdio.h>
 
 
diff --git a/nx-X11/lib/X11/lcDB.c b/nx-X11/lib/X11/lcDB.c
index ffa8f49ae..7a14d3d4f 100644
--- a/nx-X11/lib/X11/lcDB.c
+++ b/nx-X11/lib/X11/lcDB.c
@@ -37,8 +37,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlib.h>
-#include <X11/Xresource.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xresource.h>
 #include "Xlibint.h"
 #include "XlcPubI.h"
 
diff --git a/nx-X11/lib/X11/lcFile.c b/nx-X11/lib/X11/lcFile.c
index 691daeb9e..2e0a49db4 100644
--- a/nx-X11/lib/X11/lcFile.c
+++ b/nx-X11/lib/X11/lcFile.c
@@ -33,7 +33,7 @@
 #include <ctype.h>
 #include "Xlibint.h"
 #include "XlcPubI.h"
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #if 0
 #include <unistd.h>  /* in theory delivers getresuid/gid prototypes,
 		      * in practice only the Linux syscall wrapper is there. */
diff --git a/nx-X11/lib/X11/lcPrTxt.c b/nx-X11/lib/X11/lcPrTxt.c
index 5a781280e..1a55d1cab 100644
--- a/nx-X11/lib/X11/lcPrTxt.c
+++ b/nx-X11/lib/X11/lcPrTxt.c
@@ -30,8 +30,8 @@
 #endif
 #include "Xlibint.h"
 #include "XlcPubI.h"
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/Xatom.h>
 
 static XPointer *
 alloc_list(
diff --git a/nx-X11/lib/X11/lcTxtPr.c b/nx-X11/lib/X11/lcTxtPr.c
index 1f9765f6e..e214ac4e9 100644
--- a/nx-X11/lib/X11/lcTxtPr.c
+++ b/nx-X11/lib/X11/lcTxtPr.c
@@ -30,8 +30,8 @@
 #endif
 #include "Xlibint.h"
 #include "XlcPubI.h"
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/Xatom.h>
 #include <stdio.h>
 
 static int
diff --git a/nx-X11/lib/X11/lcUtil.c b/nx-X11/lib/X11/lcUtil.c
index ab1db0083..3e49fd08f 100644
--- a/nx-X11/lib/X11/lcUtil.c
+++ b/nx-X11/lib/X11/lcUtil.c
@@ -29,7 +29,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlib.h>
+#include <nx-X11/Xlib.h>
 #include "XlcPublic.h"
 
 /* Don't use <ctype.h> here because it is locale dependent. */
diff --git a/nx-X11/lib/X11/lcWrap.c b/nx-X11/lib/X11/lcWrap.c
index ea2623191..b694425fe 100644
--- a/nx-X11/lib/X11/lcWrap.c
+++ b/nx-X11/lib/X11/lcWrap.c
@@ -61,12 +61,12 @@ from The Open Group.
 #include <stdlib.h>
 #include "Xlibint.h"
 #include "Xlcint.h"
-#include <X11/Xlocale.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xlocale.h>
+#include <nx-X11/Xos.h>
 #ifdef WIN32
 #undef close
 #endif
-#include <X11/Xutil.h>
+#include <nx-X11/Xutil.h>
 #include "XlcPubI.h"
 
 #ifdef XTHREADS
diff --git a/nx-X11/lib/X11/locking.h b/nx-X11/lib/X11/locking.h
index 96c99b972..4b847ded6 100644
--- a/nx-X11/lib/X11/locking.h
+++ b/nx-X11/lib/X11/locking.h
@@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group.
 
 #define xmalloc(s) Xmalloc(s)
 #define xfree(s) Xfree(s)
-#include <X11/Xthreads.h>
+#include <nx-X11/Xthreads.h>
 
 struct _XCVList {
     xcondition_t cv;
diff --git a/nx-X11/lib/X11/mbWMProps.c b/nx-X11/lib/X11/mbWMProps.c
index a5f7732e4..8b16bc990 100644
--- a/nx-X11/lib/X11/mbWMProps.c
+++ b/nx-X11/lib/X11/mbWMProps.c
@@ -31,10 +31,10 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/Xlocale.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xlocale.h>
 
 void
 XmbSetWMProperties (
diff --git a/nx-X11/lib/X11/omDefault.c b/nx-X11/lib/X11/omDefault.c
index 57dd975ad..eaa75ff84 100644
--- a/nx-X11/lib/X11/omDefault.c
+++ b/nx-X11/lib/X11/omDefault.c
@@ -35,8 +35,8 @@
 #endif
 #include "Xlibint.h"
 #include "XomGeneric.h"
-#include <X11/Xos.h>
-#include <X11/Xatom.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xatom.h>
 #include <stdio.h>
 
 #define DefineLocalBuf		char local_buf[BUFSIZ]
diff --git a/nx-X11/lib/X11/omGeneric.c b/nx-X11/lib/X11/omGeneric.c
index e6c23f4e2..8f4942873 100644
--- a/nx-X11/lib/X11/omGeneric.c
+++ b/nx-X11/lib/X11/omGeneric.c
@@ -55,8 +55,8 @@
 #include "Xlibint.h"
 #include "XomGeneric.h"
 #include "XlcGeneric.h"
-#include <X11/Xos.h>
-#include <X11/Xatom.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xatom.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/nx-X11/lib/X11/os2Stubs.c b/nx-X11/lib/X11/os2Stubs.c
index 9d109025c..804d2e14e 100644
--- a/nx-X11/lib/X11/os2Stubs.c
+++ b/nx-X11/lib/X11/os2Stubs.c
@@ -37,7 +37,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xpoll.h>
+#include <nx-X11/Xpoll.h>
 #include <stdio.h>
 #include <sys/errno.h>
 #define INCL_DOSSEMAPHORES
diff --git a/nx-X11/lib/X11/utf8WMProps.c b/nx-X11/lib/X11/utf8WMProps.c
index e3a329ac8..69366b6cb 100644
--- a/nx-X11/lib/X11/utf8WMProps.c
+++ b/nx-X11/lib/X11/utf8WMProps.c
@@ -53,10 +53,10 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/Xlocale.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/Xlocale.h>
 
 void
 Xutf8SetWMProperties (
diff --git a/nx-X11/lib/X11/util/makekeys.c b/nx-X11/lib/X11/util/makekeys.c
index 0b0ad9e2c..d2a7b4aef 100644
--- a/nx-X11/lib/X11/util/makekeys.c
+++ b/nx-X11/lib/X11/util/makekeys.c
@@ -31,9 +31,9 @@ from The Open Group.
 
 /* Constructs hash tables for XStringToKeysym and XKeysymToString. */
 
-#include <X11/X.h>
-#include <X11/Xos.h>
-#include <X11/keysymdef.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/keysymdef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #if defined(macII) && !defined(__STDC__)  /* stdlib.h fails to define these */
diff --git a/nx-X11/lib/X11/uvY.c b/nx-X11/lib/X11/uvY.c
index d7c3e6ab2..c07fcfc39 100644
--- a/nx-X11/lib/X11/uvY.c
+++ b/nx-X11/lib/X11/uvY.c
@@ -40,7 +40,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include "Xlibint.h"
 #include "Xcmsint.h"
 #include "Cv.h"
diff --git a/nx-X11/lib/X11/xyY.c b/nx-X11/lib/X11/xyY.c
index 63e80bc59..ba0b06137 100644
--- a/nx-X11/lib/X11/xyY.c
+++ b/nx-X11/lib/X11/xyY.c
@@ -40,7 +40,7 @@
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include "Xlibint.h"
 #include "Xcmsint.h"
 #include "Cv.h"
diff --git a/nx-X11/lib/Xau/AuDispose.c b/nx-X11/lib/Xau/AuDispose.c
index 58ffd61e7..dc2080f40 100644
--- a/nx-X11/lib/Xau/AuDispose.c
+++ b/nx-X11/lib/Xau/AuDispose.c
@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xauth.h>
+#include <nx-X11/Xauth.h>
 #include <stdlib.h>
 
 void
diff --git a/nx-X11/lib/Xau/AuFileName.c b/nx-X11/lib/Xau/AuFileName.c
index a51fc3bff..6ab0138b8 100644
--- a/nx-X11/lib/Xau/AuFileName.c
+++ b/nx-X11/lib/Xau/AuFileName.c
@@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xauth.h>
+#include <nx-X11/Xos.h>
 #include <stdlib.h>
 
 char *
diff --git a/nx-X11/lib/Xau/AuGetAddr.c b/nx-X11/lib/Xau/AuGetAddr.c
index ab13cb630..d68ceadc2 100644
--- a/nx-X11/lib/Xau/AuGetAddr.c
+++ b/nx-X11/lib/Xau/AuGetAddr.c
@@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xauth.h>
+#include <nx-X11/Xos.h>
 
 static int
 binaryEqual (_Xconst char *a, _Xconst char *b, int len)
diff --git a/nx-X11/lib/Xau/AuGetBest.c b/nx-X11/lib/Xau/AuGetBest.c
index 5ff1c7cd3..eb27f24c1 100644
--- a/nx-X11/lib/Xau/AuGetBest.c
+++ b/nx-X11/lib/Xau/AuGetBest.c
@@ -30,15 +30,15 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xauth.h>
+#include <nx-X11/Xos.h>
 #ifdef XTHREADS
-#include <X11/Xthreads.h>
+#include <nx-X11/Xthreads.h>
 #endif
 #ifdef hpux
 #define X_INCLUDE_NETDB_H
 #define XOS_USE_NO_LOCKING
-#include <X11/Xos_r.h>
+#include <nx-X11/Xos_r.h>
 #endif
 
 static int
diff --git a/nx-X11/lib/Xau/AuLock.c b/nx-X11/lib/Xau/AuLock.c
index 001235607..1813dc368 100644
--- a/nx-X11/lib/Xau/AuLock.c
+++ b/nx-X11/lib/Xau/AuLock.c
@@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xauth.h>
+#include <nx-X11/Xos.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <time.h>
@@ -42,7 +42,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef WIN32
 extern unsigned	sleep ();
 #else
-#include <X11/Xwindows.h>
+#include <nx-X11/Xwindows.h>
 #define link rename
 #endif
 #endif
diff --git a/nx-X11/lib/Xau/AuRead.c b/nx-X11/lib/Xau/AuRead.c
index 60a0d747f..2e2509633 100644
--- a/nx-X11/lib/Xau/AuRead.c
+++ b/nx-X11/lib/Xau/AuRead.c
@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xauth.h>
+#include <nx-X11/Xauth.h>
 #include <stdlib.h>
 #include <errno.h>
 
diff --git a/nx-X11/lib/Xau/AuUnlock.c b/nx-X11/lib/Xau/AuUnlock.c
index 460effe86..e40042104 100644
--- a/nx-X11/lib/Xau/AuUnlock.c
+++ b/nx-X11/lib/Xau/AuUnlock.c
@@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xauth.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xauth.h>
+#include <nx-X11/Xos.h>
 
 int
 XauUnlockAuth (
diff --git a/nx-X11/lib/Xau/AuWrite.c b/nx-X11/lib/Xau/AuWrite.c
index f25abc9e6..5a9b44eb2 100644
--- a/nx-X11/lib/Xau/AuWrite.c
+++ b/nx-X11/lib/Xau/AuWrite.c
@@ -30,7 +30,7 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xauth.h>
+#include <nx-X11/Xauth.h>
 
 static int
 write_short (unsigned short s, FILE *file)
diff --git a/nx-X11/lib/Xau/Autest.c b/nx-X11/lib/Xau/Autest.c
index 298464908..2352cf170 100644
--- a/nx-X11/lib/Xau/Autest.c
+++ b/nx-X11/lib/Xau/Autest.c
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xauth.h>
+#include <nx-X11/Xauth.h>
 
 main (argc, argv)
 char	**argv;
diff --git a/nx-X11/lib/Xau/Imakefile b/nx-X11/lib/Xau/Imakefile
index 331d29c09..df80d28d4 100644
--- a/nx-X11/lib/Xau/Imakefile
+++ b/nx-X11/lib/Xau/Imakefile
@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.5 1999/04/17 09:08:11 dawes Exp $
 #define DoProfileLib ProfileLibXau
 #define LibName NX_Xau
 #define SoRev SOXAUTHREV
-#define IncSubdir X11
+#define IncSubdir nx-X11
 
 #include <Threads.tmpl>
 
diff --git a/nx-X11/lib/Xau/k5encode.c b/nx-X11/lib/Xau/k5encode.c
index a3c6c09b1..c71222e1c 100644
--- a/nx-X11/lib/Xau/k5encode.c
+++ b/nx-X11/lib/Xau/k5encode.c
@@ -45,10 +45,10 @@ in this Software without prior written authorization from The Open Group.
 #undef BITS32
 #undef xfree
 
-#include <X11/X.h>
-#include <X11/Xos.h>
-#include <X11/Xmd.h>
-#include <X11/Xfuncs.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xfuncs.h>
 
 /*
  * XauKrb5Encode
diff --git a/nx-X11/lib/Xcomposite/Imakefile b/nx-X11/lib/Xcomposite/Imakefile
index a8e4077fa..24820c146 100644
--- a/nx-X11/lib/Xcomposite/Imakefile
+++ b/nx-X11/lib/Xcomposite/Imakefile
@@ -16,7 +16,7 @@ SOXCOMPOSITEREV=1.0.0
 
 #define LibName NX_Xcomposite
 #define SoRev SOXCOMPOSITEREV
-#define IncSubdir X11
+#define IncSubdir nx-X11
 #define IncSubSubdir extensions
 
 #include <Threads.tmpl>
diff --git a/nx-X11/lib/Xcomposite/Xcomposite.h b/nx-X11/lib/Xcomposite/Xcomposite.h
index 3604141bb..c28cc6857 100644
--- a/nx-X11/lib/Xcomposite/Xcomposite.h
+++ b/nx-X11/lib/Xcomposite/Xcomposite.h
@@ -25,9 +25,9 @@
 #ifndef _XCOMPOSITE_H_
 #define _XCOMPOSITE_H_
 
-#include <X11/extensions/composite.h>
-#include <X11/extensions/Xfixes.h>
-#include <X11/Xfuncproto.h>
+#include <nx-X11/extensions/composite.h>
+#include <nx-X11/extensions/Xfixes.h>
+#include <nx-X11/Xfuncproto.h>
 
 /*
  * This revision number also appears in configure.ac, they have
diff --git a/nx-X11/lib/Xcomposite/xcompositeint.h b/nx-X11/lib/Xcomposite/xcompositeint.h
index af5f57500..7b12e8d55 100644
--- a/nx-X11/lib/Xcomposite/xcompositeint.h
+++ b/nx-X11/lib/Xcomposite/xcompositeint.h
@@ -28,11 +28,11 @@
 #define NEED_EVENTS
 #define NEED_REPLIES
 #include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/compositeproto.h>
-#include <X11/extensions/Xcomposite.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/extensions/compositeproto.h>
+#include <nx-X11/extensions/Xcomposite.h>
 
 typedef struct _XCompositeExtDisplayInfo {
     struct _XCompositeExtDisplayInfo  *next;    /* keep a linked list */
diff --git a/nx-X11/lib/Xext/DPMS.c b/nx-X11/lib/Xext/DPMS.c
index 35b21b4ad..a2c0dc3c5 100644
--- a/nx-X11/lib/Xext/DPMS.c
+++ b/nx-X11/lib/Xext/DPMS.c
@@ -36,11 +36,11 @@ Equipment Corporation.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/extensions/dpms.h>
-#include <X11/extensions/dpmsstr.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/extensions/dpms.h>
+#include <nx-X11/extensions/dpmsstr.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
 #include <stdio.h>
 
 static XExtensionInfo _dpms_info_data;
diff --git a/nx-X11/lib/Xext/MITMisc.c b/nx-X11/lib/Xext/MITMisc.c
index c0fa87209..8ba35dce1 100644
--- a/nx-X11/lib/Xext/MITMisc.c
+++ b/nx-X11/lib/Xext/MITMisc.c
@@ -32,11 +32,11 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/extensions/MITMisc.h>
-#include <X11/extensions/mitmiscstr.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/extensions/MITMisc.h>
+#include <nx-X11/extensions/mitmiscstr.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
 
 static XExtensionInfo _mit_info_data;
 static XExtensionInfo *mit_info = &_mit_info_data;
diff --git a/nx-X11/lib/Xext/XAppgroup.c b/nx-X11/lib/Xext/XAppgroup.c
index 2ca3e4d21..abbf1c1b9 100644
--- a/nx-X11/lib/Xext/XAppgroup.c
+++ b/nx-X11/lib/Xext/XAppgroup.c
@@ -30,15 +30,15 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xwindows.h>
+#include <nx-X11/Xwindows.h>
 #endif
 
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <X11/extensions/Xagstr.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/extensions/Xagstr.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
 
 #include <stdarg.h>
 
diff --git a/nx-X11/lib/Xext/XEVI.c b/nx-X11/lib/Xext/XEVI.c
index a64b9c1ba..e5a811bdf 100644
--- a/nx-X11/lib/Xext/XEVI.c
+++ b/nx-X11/lib/Xext/XEVI.c
@@ -27,12 +27,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/extensions/XEVI.h>
-#include <X11/extensions/XEVIstr.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/extensions/XEVI.h>
+#include <nx-X11/extensions/XEVIstr.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
+#include <nx-X11/Xutil.h>
 static XExtensionInfo *xevi_info;/* needs to move to globals.c */
 static /* const */ char *xevi_extension_name = EVINAME;
 #define XeviCheckExtension(dpy,i,val) \
diff --git a/nx-X11/lib/Xext/XLbx.c b/nx-X11/lib/Xext/XLbx.c
index 8c0cfad0b..450bd5bc5 100644
--- a/nx-X11/lib/Xext/XLbx.c
+++ b/nx-X11/lib/Xext/XLbx.c
@@ -30,11 +30,11 @@
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xlibint.h>
-#include <X11/extensions/XLbx.h>
-#include <X11/extensions/lbxstr.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/extensions/XLbx.h>
+#include <nx-X11/extensions/lbxstr.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
 
 static XExtensionInfo _lbx_info_data;
 static XExtensionInfo *lbx_info = &_lbx_info_data;
diff --git a/nx-X11/lib/Xext/XMultibuf.c b/nx-X11/lib/Xext/XMultibuf.c
index 3e0049e92..570676def 100644
--- a/nx-X11/lib/Xext/XMultibuf.c
+++ b/nx-X11/lib/Xext/XMultibuf.c
@@ -32,11 +32,11 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
+#include <nx-X11/Xlibint.h>
 #include <stdio.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-#include <X11/extensions/multibufst.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
+#include <nx-X11/extensions/multibufst.h>
 
 static XExtensionInfo _multibuf_info_data;
 static XExtensionInfo *multibuf_info = &_multibuf_info_data;
diff --git a/nx-X11/lib/Xext/XSecurity.c b/nx-X11/lib/Xext/XSecurity.c
index 161ade3b7..a9899916f 100644
--- a/nx-X11/lib/Xext/XSecurity.c
+++ b/nx-X11/lib/Xext/XSecurity.c
@@ -29,11 +29,11 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
+#include <nx-X11/Xlibint.h>
 #include <stdio.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-#include <X11/extensions/securstr.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
+#include <nx-X11/extensions/securstr.h>
 
 static XExtensionInfo _Security_info_data;
 static XExtensionInfo *Security_info = &_Security_info_data;
diff --git a/nx-X11/lib/Xext/XShape.c b/nx-X11/lib/Xext/XShape.c
index 29a7f83f9..79b4b78f6 100644
--- a/nx-X11/lib/Xext/XShape.c
+++ b/nx-X11/lib/Xext/XShape.c
@@ -31,12 +31,12 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/Xregion.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-#include <X11/extensions/shapestr.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/Xregion.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
+#include <nx-X11/extensions/shapestr.h>
 
 static XExtensionInfo _shape_info_data;
 static XExtensionInfo *shape_info = &_shape_info_data;
diff --git a/nx-X11/lib/Xext/XShm.c b/nx-X11/lib/Xext/XShm.c
index f4e29a42b..ec3720732 100644
--- a/nx-X11/lib/Xext/XShm.c
+++ b/nx-X11/lib/Xext/XShm.c
@@ -36,12 +36,12 @@ in this Software without prior written authorization from The Open Group.
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xlibint.h>
-#include <X11/ImUtil.h>
-#include <X11/extensions/XShm.h>
-#include <X11/extensions/shmstr.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/ImUtil.h>
+#include <nx-X11/extensions/XShm.h>
+#include <nx-X11/extensions/shmstr.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
 
 static XExtensionInfo _shm_info_data;
 static XExtensionInfo *shm_info = &_shm_info_data;
diff --git a/nx-X11/lib/Xext/XSync.c b/nx-X11/lib/Xext/XSync.c
index 61f8600ce..39eb97cdd 100644
--- a/nx-X11/lib/Xext/XSync.c
+++ b/nx-X11/lib/Xext/XSync.c
@@ -58,10 +58,10 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-#include <X11/extensions/syncstr.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
+#include <nx-X11/extensions/syncstr.h>
 
 static XExtensionInfo _sync_info_data;
 static XExtensionInfo *sync_info = &_sync_info_data;
diff --git a/nx-X11/lib/Xext/XTestExt1.c b/nx-X11/lib/Xext/XTestExt1.c
index ee4a0bde0..00da036bd 100644
--- a/nx-X11/lib/Xext/XTestExt1.c
+++ b/nx-X11/lib/Xext/XTestExt1.c
@@ -64,9 +64,9 @@ University of California.
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xproto.h>
-#include <X11/Xlibint.h>
-#include <X11/extensions/xtestext1.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/extensions/xtestext1.h>
 
 /******************************************************************************
  * variables
diff --git a/nx-X11/lib/Xext/Xcup.c b/nx-X11/lib/Xext/Xcup.c
index 6315d32a4..8bf2bb29e 100644
--- a/nx-X11/lib/Xext/Xcup.c
+++ b/nx-X11/lib/Xext/Xcup.c
@@ -30,15 +30,15 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xwindows.h>
+#include <nx-X11/Xwindows.h>
 #endif
 
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <X11/extensions/Xcupstr.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/extensions/Xcupstr.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
 
 static XExtensionInfo _xcup_info_data;
 static XExtensionInfo *xcup_info = &_xcup_info_data;
diff --git a/nx-X11/lib/Xext/Xdbe.c b/nx-X11/lib/Xext/Xdbe.c
index 954c8f01d..05df171f6 100644
--- a/nx-X11/lib/Xext/Xdbe.c
+++ b/nx-X11/lib/Xext/Xdbe.c
@@ -38,11 +38,11 @@
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xlibint.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
 #define NEED_DBE_PROTOCOL
-#include <X11/extensions/Xdbe.h>
+#include <nx-X11/extensions/Xdbe.h>
 
 static XExtensionInfo _dbe_info_data;
 static XExtensionInfo *dbe_info = &_dbe_info_data;
diff --git a/nx-X11/lib/Xext/extutil.c b/nx-X11/lib/Xext/extutil.c
index d96b17f3f..bd79dbdb2 100644
--- a/nx-X11/lib/Xext/extutil.c
+++ b/nx-X11/lib/Xext/extutil.c
@@ -51,9 +51,9 @@ in this Software without prior written authorization from The Open Group.
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <X11/Xlibint.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
 
 
 /*
diff --git a/nx-X11/lib/Xext/globals.c b/nx-X11/lib/Xext/globals.c
index 0cd5d2690..53a18690d 100644
--- a/nx-X11/lib/Xext/globals.c
+++ b/nx-X11/lib/Xext/globals.c
@@ -34,8 +34,8 @@ from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlib.h>
-#include <X11/extensions/Xext.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/extensions/Xext.h>
 #include <stddef.h>			/* for definition of NULL */
 
 /*
diff --git a/nx-X11/lib/Xfixes/Imakefile b/nx-X11/lib/Xfixes/Imakefile
index ca1fe046b..cc3e1631d 100644
--- a/nx-X11/lib/Xfixes/Imakefile
+++ b/nx-X11/lib/Xfixes/Imakefile
@@ -16,7 +16,7 @@ SOXFIXESREV=3.0.0
 
 #define LibName NX_Xfixes
 #define SoRev SOXFIXESREV
-#define IncSubdir X11
+#define IncSubdir nx-X11
 #define IncSubSubdir extensions
 
 #include <Threads.tmpl>
diff --git a/nx-X11/lib/Xfixes/Xfixes.h b/nx-X11/lib/Xfixes/Xfixes.h
index 28ca28f1a..4cba47ca4 100644
--- a/nx-X11/lib/Xfixes/Xfixes.h
+++ b/nx-X11/lib/Xfixes/Xfixes.h
@@ -25,9 +25,9 @@
 #ifndef _XFIXES_H_
 #define _XFIXES_H_
 
-#include <X11/extensions/xfixeswire.h>
+#include <nx-X11/extensions/xfixeswire.h>
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 /*
  * This revision number also appears in configure.ac, they have
diff --git a/nx-X11/lib/Xfixes/Xfixes.man b/nx-X11/lib/Xfixes/Xfixes.man
index f081cc54e..563db15b5 100644
--- a/nx-X11/lib/Xfixes/Xfixes.man
+++ b/nx-X11/lib/Xfixes/Xfixes.man
@@ -31,7 +31,7 @@
 .SH NAME
 XFixes \- Augmented versions of core protocol requests
 .SH SYNTAX
-\&#include <X11/extensions/Xfixes.h>
+\&#include <nx-X11/extensions/Xfixes.h>
 .nf    
 .sp
 Bool XFixesQueryExtension \^(\^Display *\fIdpy\fP, 
diff --git a/nx-X11/lib/Xfixes/Xfixesint.h b/nx-X11/lib/Xfixes/Xfixesint.h
index e227571be..353dcae77 100644
--- a/nx-X11/lib/Xfixes/Xfixesint.h
+++ b/nx-X11/lib/Xfixes/Xfixesint.h
@@ -28,11 +28,11 @@
 #define NEED_EVENTS
 #define NEED_REPLIES
 #include <stdio.h>
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
 #include "Xfixes.h"
-#include <X11/extensions/xfixesproto.h>
+#include <nx-X11/extensions/xfixesproto.h>
 
 extern char XFixesExtensionName[];
 
diff --git a/nx-X11/lib/Xinerama/Xinerama.c b/nx-X11/lib/Xinerama/Xinerama.c
index fd717dd22..0256336be 100644
--- a/nx-X11/lib/Xinerama/Xinerama.c
+++ b/nx-X11/lib/Xinerama/Xinerama.c
@@ -27,13 +27,13 @@ Equipment Corporation.
 
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-#include <X11/extensions/panoramiXext.h>
-#include <X11/extensions/panoramiXproto.h>
-#include <X11/extensions/Xinerama.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
+#include <nx-X11/extensions/panoramiXext.h>
+#include <nx-X11/extensions/panoramiXproto.h>
+#include <nx-X11/extensions/Xinerama.h>
 #include <stdio.h>
 
 static XExtensionInfo _panoramiX_ext_info_data;
diff --git a/nx-X11/lib/Xrender/Imakefile b/nx-X11/lib/Xrender/Imakefile
index 35d826b22..c5a0f89fc 100644
--- a/nx-X11/lib/Xrender/Imakefile
+++ b/nx-X11/lib/Xrender/Imakefile
@@ -71,7 +71,7 @@ clean::
 #define SoRev SOXRENDERREV
 
 #ifdef XBuildIncDir
-#define IncSubdir X11
+#define IncSubdir nx-X11
 #define IncSubSubdir extensions
 RENDERINCDIR   = $(BUILDINCDIR)
 #else
diff --git a/nx-X11/lib/Xrender/Picture.c b/nx-X11/lib/Xrender/Picture.c
index 0b18f5c57..260eda05e 100644
--- a/nx-X11/lib/Xrender/Picture.c
+++ b/nx-X11/lib/Xrender/Picture.c
@@ -26,7 +26,7 @@
 #include <config.h>
 #endif
 #include "Xrenderint.h"
-#include <X11/Xregion.h>
+#include <nx-X11/Xregion.h>
 
 static void
 _XRenderProcessPictureAttributes (Display		    *dpy,
diff --git a/nx-X11/lib/Xrender/Xrender.h b/nx-X11/lib/Xrender/Xrender.h
index 4d125cd81..a38f4cc3d 100644
--- a/nx-X11/lib/Xrender/Xrender.h
+++ b/nx-X11/lib/Xrender/Xrender.h
@@ -27,12 +27,12 @@
 
 #define NX_CLEANUP
 
-#include <X11/extensions/render.h>
+#include <nx-X11/extensions/render.h>
 
-#include <X11/Xlib.h>
-#include <X11/Xfuncproto.h>
-#include <X11/Xosdefs.h>
-#include <X11/Xutil.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/Xosdefs.h>
+#include <nx-X11/Xutil.h>
 
 #ifdef NX_CLEANUP
 #include "renderproto.h"
diff --git a/nx-X11/lib/Xrender/Xrenderint.h b/nx-X11/lib/Xrender/Xrenderint.h
index a90fe65d8..9744b0da4 100644
--- a/nx-X11/lib/Xrender/Xrenderint.h
+++ b/nx-X11/lib/Xrender/Xrenderint.h
@@ -28,9 +28,9 @@
 #include "config.h"
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/renderproto.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/Xutil.h>
+#include <nx-X11/extensions/renderproto.h>
 #include "Xrender.h"
 
 typedef struct {
diff --git a/nx-X11/lib/Xtst/XRecord.c b/nx-X11/lib/Xtst/XRecord.c
index 05cbda889..8e1823ef9 100644
--- a/nx-X11/lib/Xtst/XRecord.c
+++ b/nx-X11/lib/Xtst/XRecord.c
@@ -56,10 +56,10 @@ from The Open Group.
 #include <assert.h>
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-#include <X11/extensions/recordstr.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
+#include <nx-X11/extensions/recordstr.h>
 
 static XExtensionInfo _xrecord_info_data;
 static XExtensionInfo *xrecord_info = &_xrecord_info_data;
diff --git a/nx-X11/lib/Xtst/XTest.c b/nx-X11/lib/Xtst/XTest.c
index 2c3ae2b41..6b814aab4 100644
--- a/nx-X11/lib/Xtst/XTest.c
+++ b/nx-X11/lib/Xtst/XTest.c
@@ -33,13 +33,13 @@ from The Open Group.
 /* $XFree86: xc/lib/Xtst/XTest.c,v 1.5 2001/12/14 19:56:40 dawes Exp $ */
 
 #define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <X11/extensions/XTest.h>
-#include <X11/extensions/xteststr.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-#include <X11/extensions/XInput.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/Xlibint.h>
+#include <nx-X11/extensions/XTest.h>
+#include <nx-X11/extensions/xteststr.h>
+#include <nx-X11/extensions/Xext.h>
+#include <nx-X11/extensions/extutil.h>
+#include <nx-X11/extensions/XInput.h>
+#include <nx-X11/extensions/XIproto.h>
 
 static XExtensionInfo _xtest_info_data;
 static XExtensionInfo *xtest_info = &_xtest_info_data;
diff --git a/nx-X11/lib/oldX/Imakefile b/nx-X11/lib/oldX/Imakefile
index 663d11019..e2ee75eb0 100644
--- a/nx-X11/lib/oldX/Imakefile
+++ b/nx-X11/lib/oldX/Imakefile
@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/oldX/Imakefile,v 1.2 1998/12/20 11:57:19 dawes Exp $
 #define DoProfileLib ProfileOldX
 #define LibName NX_oldX
 #define SoRev SOOLDXREV
-#define IncSubdir X11
+#define IncSubdir nx-X11
 
 #ifdef SharedOldXReqs
 REQUIREDLIBS = SharedOldXReqs
diff --git a/nx-X11/lib/xkbfile/Imakefile b/nx-X11/lib/xkbfile/Imakefile
index d7693819e..6a675dc9a 100644
--- a/nx-X11/lib/xkbfile/Imakefile
+++ b/nx-X11/lib/xkbfile/Imakefile
@@ -13,7 +13,7 @@ XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.5 2003/10/15 21:23:38 herrb Exp $
 #define HasSharedData	NO
 #define LibName		NX_xkbfile
 #define SoRev		SOXKBFILEREV
-#define IncSubdir	X11
+#define IncSubdir	nx-X11
 #define	IncSubSubdir	extensions
 
 #ifdef SharedxkbfileReqs
diff --git a/nx-X11/lib/xkbfile/XKMformat.h b/nx-X11/lib/xkbfile/XKMformat.h
index 154da5694..ced5ea21d 100644
--- a/nx-X11/lib/xkbfile/XKMformat.h
+++ b/nx-X11/lib/xkbfile/XKMformat.h
@@ -29,9 +29,9 @@
 #ifndef _XKMFORMAT_H_
 #define	_XKMFORMAT_H_ 1
 
-#include <X11/extensions/XKB.h>
-#include <X11/extensions/XKBproto.h>
-#include <X11/extensions/XKM.h>
+#include <nx-X11/extensions/XKB.h>
+#include <nx-X11/extensions/XKBproto.h>
+#include <nx-X11/extensions/XKM.h>
 
 typedef	struct _xkmFileInfo {
 	CARD8		type;
diff --git a/nx-X11/lib/xkbfile/cout.c b/nx-X11/lib/xkbfile/cout.c
index 161bd0f89..96b3ba411 100644
--- a/nx-X11/lib/xkbfile/cout.c
+++ b/nx-X11/lib/xkbfile/cout.c
@@ -32,10 +32,10 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/XKBlib.h>
+#include <nx-X11/extensions/XKBgeom.h>
 
 #include "XKMformat.h"
 #include "XKBfileInt.h"
diff --git a/nx-X11/lib/xkbfile/maprules.c b/nx-X11/lib/xkbfile/maprules.c
index 53decdcad..75baf07ea 100644
--- a/nx-X11/lib/xkbfile/maprules.c
+++ b/nx-X11/lib/xkbfile/maprules.c
@@ -38,18 +38,18 @@
 
 #define X_INCLUDE_STRING_H
 #define XOS_USE_NO_LOCKING
-#include <X11/Xos_r.h>
+#include <nx-X11/Xos_r.h>
 
 #ifndef XKB_IN_SERVER
 
-#include <X11/Xproto.h>
-#include <X11/Xlib.h>
-#include <X11/Xos.h>
-#include <X11/Xfuncs.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xfuncs.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/XKBlib.h>
+#include <nx-X11/extensions/XKBgeom.h>
 #include "XKMformat.h"
 #include "XKBfileInt.h"
 #include "XKBrules.h"
@@ -57,18 +57,18 @@
 #else
 
 #define NEED_EVENTS
-#include <X11/Xproto.h>
-#include <X11/X.h>
-#include <X11/Xos.h>
-#include <X11/Xfuncs.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xfuncs.h>
+#include <nx-X11/Xatom.h>
+#include <nx-X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <X11/extensions/XKBstr.h>
+#include <nx-X11/extensions/XKBstr.h>
 #define XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 
 #endif
 
diff --git a/nx-X11/lib/xkbfile/srvmisc.c b/nx-X11/lib/xkbfile/srvmisc.c
index 3e4c73c98..d228389d9 100644
--- a/nx-X11/lib/xkbfile/srvmisc.c
+++ b/nx-X11/lib/xkbfile/srvmisc.c
@@ -32,9 +32,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/XKBlib.h>
+#include <nx-X11/extensions/XKBgeom.h>
 
 #include "XKMformat.h"
 #include "XKBfileInt.h"
diff --git a/nx-X11/lib/xkbfile/xkbatom.c b/nx-X11/lib/xkbfile/xkbatom.c
index 1a5dea0f8..d023d5410 100644
--- a/nx-X11/lib/xkbfile/xkbatom.c
+++ b/nx-X11/lib/xkbfile/xkbatom.c
@@ -79,9 +79,9 @@ SOFTWARE.
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/XKBlib.h>
 
 #include "XKMformat.h"
 #include "XKBfileInt.h"
diff --git a/nx-X11/lib/xkbfile/xkbbells.c b/nx-X11/lib/xkbfile/xkbbells.c
index 30b918fb4..8bf0885fe 100644
--- a/nx-X11/lib/xkbfile/xkbbells.c
+++ b/nx-X11/lib/xkbfile/xkbbells.c
@@ -29,8 +29,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/XKBlib.h>
 #include "XKBbells.h"
 
 static char *_xkbStdBellNames[XkbBI_NumBells] = {
diff --git a/nx-X11/lib/xkbfile/xkbconfig.c b/nx-X11/lib/xkbfile/xkbconfig.c
index 7930979eb..8c31213a5 100644
--- a/nx-X11/lib/xkbfile/xkbconfig.c
+++ b/nx-X11/lib/xkbfile/xkbconfig.c
@@ -36,32 +36,32 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xfuncs.h>
 
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xfuncs.h>
 
 #ifndef XKB_IN_SERVER
 
-#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#include <X11/XKBlib.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/XKBlib.h>
 #include "XKBfileInt.h"
 
 #else
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define	NEED_EVENTS
-#include <X11/keysym.h>
-#include <X11/Xproto.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 #endif
 
-#include <X11/extensions/XKBconfig.h>
+#include <nx-X11/extensions/XKBconfig.h>
 
 /***====================================================================***/
 
diff --git a/nx-X11/lib/xkbfile/xkbdraw.c b/nx-X11/lib/xkbfile/xkbdraw.c
index c955f0321..865b2952e 100644
--- a/nx-X11/lib/xkbfile/xkbdraw.c
+++ b/nx-X11/lib/xkbfile/xkbdraw.c
@@ -33,12 +33,12 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include <X11/Xos.h>
-#include <X11/Xfuncs.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xfuncs.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/XKBlib.h>
+#include <nx-X11/extensions/XKBgeom.h>
 #include "XKMformat.h"
 #include "XKBfileInt.h"
 
diff --git a/nx-X11/lib/xkbfile/xkbmisc.c b/nx-X11/lib/xkbfile/xkbmisc.c
index cca31f778..52fca3d10 100644
--- a/nx-X11/lib/xkbfile/xkbmisc.c
+++ b/nx-X11/lib/xkbfile/xkbmisc.c
@@ -36,31 +36,31 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include <X11/Xos.h>
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xfuncs.h>
 
 #ifndef XKB_IN_SERVER
 
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/XKBlib.h>
+#include <nx-X11/extensions/XKBgeom.h>
 #include "XKMformat.h"
 #include "XKBfileInt.h"
 
 #else
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define	NEED_EVENTS
-#include <X11/keysym.h>
-#include <X11/Xproto.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <X11/extensions/XKBstr.h>
+#include <nx-X11/extensions/XKBstr.h>
 #define XKBSRV_NEED_FILE_FUNCS	1
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBgeom.h>
 #include "xkb.h"
 
 #endif
diff --git a/nx-X11/lib/xkbfile/xkbout.c b/nx-X11/lib/xkbfile/xkbout.c
index b69fdfbb4..8baf34b78 100644
--- a/nx-X11/lib/xkbfile/xkbout.c
+++ b/nx-X11/lib/xkbfile/xkbout.c
@@ -35,32 +35,32 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xfuncs.h>
 
 #ifndef XKB_IN_SERVER
 
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/XKBlib.h>
+#include <nx-X11/extensions/XKBgeom.h>
 
 #include "XKMformat.h"
 #include "XKBfileInt.h"
 
 #else
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define	NEED_EVENTS
-#include <X11/keysym.h>
-#include <X11/Xproto.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <X11/extensions/XKBstr.h>
+#include <nx-X11/extensions/XKBstr.h>
 #define XKBSRV_NEED_FILE_FUNCS	1
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 
-#include <X11/extensions/XKBgeom.h>
-#include <X11/extensions/XKBfile.h>
+#include <nx-X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBfile.h>
 
 #endif
 
diff --git a/nx-X11/lib/xkbfile/xkbtext.c b/nx-X11/lib/xkbfile/xkbtext.c
index 28592d242..41f2a8ff3 100644
--- a/nx-X11/lib/xkbfile/xkbtext.c
+++ b/nx-X11/lib/xkbfile/xkbtext.c
@@ -36,29 +36,29 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 
 #ifndef XKB_IN_SERVER
 
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/XKBlib.h>
+#include <nx-X11/extensions/XKBgeom.h>
 
 #include "XKMformat.h"
 #include "XKBfileInt.h"
 
 #else
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define	NEED_EVENTS
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <X11/extensions/XKBstr.h>
+#include <nx-X11/extensions/XKBstr.h>
 #define XKBSRV_NEED_FILE_FUNCS	1
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBgeom.h>
 
 #endif
 
diff --git a/nx-X11/lib/xkbfile/xkmout.c b/nx-X11/lib/xkbfile/xkmout.c
index 403e48810..7de4081af 100644
--- a/nx-X11/lib/xkbfile/xkmout.c
+++ b/nx-X11/lib/xkbfile/xkmout.c
@@ -32,10 +32,10 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <X11/Xfuncs.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/Xfuncs.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/XKBlib.h>
+#include <nx-X11/extensions/XKBgeom.h>
 
 #include "XKMformat.h"
 #include "XKBfileInt.h"
diff --git a/nx-X11/lib/xkbfile/xkmread.c b/nx-X11/lib/xkbfile/xkmread.c
index f22941f67..92ef05b86 100644
--- a/nx-X11/lib/xkbfile/xkmread.c
+++ b/nx-X11/lib/xkbfile/xkmread.c
@@ -34,33 +34,33 @@
 
 #include <stdio.h>
 
-#include <X11/Xos.h>
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xfuncs.h>
 
 #ifndef XKB_IN_SERVER
 
 #include <stdlib.h>
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/keysym.h>
 
-#include <X11/XKBlib.h>
+#include <nx-X11/XKBlib.h>
 
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBgeom.h>
 #include "XKMformat.h"
 #include "XKBfileInt.h"
 
 #else
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define	NEED_EVENTS
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <X11/extensions/XKBstr.h>
+#include <nx-X11/extensions/XKBstr.h>
 #define	 XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBgeom.h>
 
 Atom
 XkbInternAtom(Display *dpy,char *str,Bool only_if_exists)
diff --git a/nx-X11/lib/xtrans/Imakefile b/nx-X11/lib/xtrans/Imakefile
index e29a38591..2cc880c39 100644
--- a/nx-X11/lib/xtrans/Imakefile
+++ b/nx-X11/lib/xtrans/Imakefile
@@ -1,6 +1,6 @@
 XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:44 cpqbld Exp $
 
-#define IncSubdir X11
+#define IncSubdir nx-X11
 
 all::
 
diff --git a/nx-X11/programs/Xserver/GL/glx/glxserver.h b/nx-X11/programs/Xserver/GL/glx/glxserver.h
index 193ebcb6f..4238de537 100644
--- a/nx-X11/programs/Xserver/GL/glx/glxserver.h
+++ b/nx-X11/programs/Xserver/GL/glx/glxserver.h
@@ -41,9 +41,9 @@
 **
 */
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xmd.h>
 #include <misc.h>
 #include <dixstruct.h>
 #include <pixmapstr.h>
diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
index 6441a4b4f..1889bdabd 100644
--- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
+++ b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
@@ -39,7 +39,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <gcstruct.h>
 #include "pixmapstr.h"
 #include "xf86glx_util.h"
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 #include "GL/xf86glx.h"
 
 #ifdef ROUNDUP
diff --git a/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c b/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c
index 3b9955eba..a3e1d08c6 100644
--- a/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c
+++ b/nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c
@@ -8,7 +8,7 @@
 
 #include "xf86Module.h"
 
-#include <X11/extensions/xtrapdi.h>
+#include <nx-X11/extensions/xtrapdi.h>
 
 extern void DEC_XTRAPInit(INITARGS);
 
diff --git a/nx-X11/programs/Xserver/XTrap/xtrapddmi.c b/nx-X11/programs/Xserver/XTrap/xtrapddmi.c
index 2dba356b7..1b4be39cd 100644
--- a/nx-X11/programs/Xserver/XTrap/xtrapddmi.c
+++ b/nx-X11/programs/Xserver/XTrap/xtrapddmi.c
@@ -44,7 +44,7 @@ SOFTWARE.
 
 #ifndef EXTMODULE
 #include <errno.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #ifdef PC
 # include "fcntl.h"
 # include "io.h"
@@ -56,7 +56,7 @@ SOFTWARE.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/X.h>        /* From library include environment */
+#include <nx-X11/X.h>        /* From library include environment */
 #include "input.h"    /* From server include env. (must be before Xlib.h!) */
 #ifdef PC
 # include "scrintst.h"          /* Screen struct */
@@ -66,9 +66,9 @@ SOFTWARE.
 # include "scrnintstr.h"        /* Screen struct */
 #endif
 
-#include <X11/extensions/xtrapdi.h>
-#include <X11/extensions/xtrapddmi.h>
-#include <X11/extensions/xtrapproto.h>
+#include <nx-X11/extensions/xtrapdi.h>
+#include <nx-X11/extensions/xtrapddmi.h>
+#include <nx-X11/extensions/xtrapproto.h>
 
 extern int XETrapErrorBase;
 extern xXTrapGetAvailReply XETrap_avail;
diff --git a/nx-X11/programs/Xserver/XTrap/xtrapdi.c b/nx-X11/programs/Xserver/XTrap/xtrapdi.c
index bdddb6310..987d54e4f 100644
--- a/nx-X11/programs/Xserver/XTrap/xtrapdi.c
+++ b/nx-X11/programs/Xserver/XTrap/xtrapdi.c
@@ -58,12 +58,12 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef EXTMODULE
 #include <stdio.h>
 #include <errno.h>
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #else
 #include "xf86_ansic.h"
 #endif
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "input.h"              /* Server DevicePtr definitions */
 #include "misc.h"               /* Server swapping macros */
 #include "dixstruct.h"          /* Server ClientRec definitions */
@@ -77,9 +77,9 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 #include "pixmapstr.h"          /* DrawableRec */
 #include "windowstr.h"          /* Drawable Lookup structures */
-#include <X11/extensions/xtrapdi.h>
-#include <X11/extensions/xtrapddmi.h>
-#include <X11/extensions/xtrapproto.h>
+#include <nx-X11/extensions/xtrapdi.h>
+#include <nx-X11/extensions/xtrapddmi.h>
+#include <nx-X11/extensions/xtrapproto.h>
 #include "colormapst.h"
 #ifdef PANORAMIX
 #include "panoramiX.h"
diff --git a/nx-X11/programs/Xserver/XTrap/xtrapdiswp.c b/nx-X11/programs/Xserver/XTrap/xtrapdiswp.c
index c43f6e332..ba8249c35 100644
--- a/nx-X11/programs/Xserver/XTrap/xtrapdiswp.c
+++ b/nx-X11/programs/Xserver/XTrap/xtrapdiswp.c
@@ -49,12 +49,12 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/Xproto.h>
-#include <X11/Xprotostr.h>
-#include <X11/extensions/xtrapdi.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xprotostr.h>
+#include <nx-X11/extensions/xtrapdi.h>
 #include "input.h"          /* Server DevicePtr definitions */
 #include "misc.h"
 #include "dixstruct.h"
@@ -64,8 +64,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 # include "extnsionst.h"        /* Server ExtensionEntry definitions */
 #endif
 # include "swapreq.h"        /* Server SwapColorItem definition */
-#include <X11/extensions/xtrapddmi.h>
-#include <X11/extensions/xtrapproto.h>
+#include <nx-X11/extensions/xtrapddmi.h>
+#include <nx-X11/extensions/xtrapproto.h>
 
 /* In-coming XTrap requests needing to be swapped to native format */
 
diff --git a/nx-X11/programs/Xserver/XTrap/xtrapditbl.c b/nx-X11/programs/Xserver/XTrap/xtrapditbl.c
index a9ceddb3d..10a070e9e 100644
--- a/nx-X11/programs/Xserver/XTrap/xtrapditbl.c
+++ b/nx-X11/programs/Xserver/XTrap/xtrapditbl.c
@@ -39,12 +39,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/Xproto.h>
-#include <X11/Xprotostr.h>
-#include <X11/extensions/xtrapdi.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xprotostr.h>
+#include <nx-X11/extensions/xtrapdi.h>
 #include "input.h"          /* Server DevicePtr definitions */
 #include "misc.h"
 #include "dixstruct.h"
@@ -53,8 +53,8 @@ SOFTWARE.
 #else
 # include "extnsionst.h"        /* Server ExtensionEntry definitions */
 #endif
-#include <X11/extensions/xtrapddmi.h>
-#include <X11/extensions/xtrapproto.h>
+#include <nx-X11/extensions/xtrapddmi.h>
+#include <nx-X11/extensions/xtrapproto.h>
 
 globaldef void_function XETSwProcVector[256L] =
 {
diff --git a/nx-X11/programs/Xserver/Xext/EVI.c b/nx-X11/programs/Xserver/Xext/EVI.c
index 93ed19fa6..1eca62693 100644
--- a/nx-X11/programs/Xserver/Xext/EVI.c
+++ b/nx-X11/programs/Xserver/Xext/EVI.c
@@ -27,13 +27,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "dix.h"
 #define _XEVI_SERVER_
-#include <X11/extensions/XEVIstr.h>
+#include <nx-X11/extensions/XEVIstr.h>
 #include "EVIstruct.h"
 #include "modinit.h"
 #include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/Xext/appgroup.c b/nx-X11/programs/Xserver/Xext/appgroup.c
index e23ceca59..1dd4f1ae5 100644
--- a/nx-X11/programs/Xserver/Xext/appgroup.c
+++ b/nx-X11/programs/Xserver/Xext/appgroup.c
@@ -32,8 +32,8 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -42,14 +42,14 @@ from The Open Group.
 #include "colormapst.h"
 #include "servermd.h"
 #define _XAG_SERVER_
-#include <X11/extensions/Xagstr.h>
-#include <X11/extensions/Xagsrv.h>
+#include <nx-X11/extensions/Xagstr.h>
+#include <nx-X11/extensions/Xagsrv.h>
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
-#include <X11/Xfuncproto.h>
+#include <nx-X11/extensions/security.h>
+#include <nx-X11/Xfuncproto.h>
 
 #define XSERV_t
-#include <X11/Xtrans/Xtrans.h>
+#include <nx-X11/Xtrans/Xtrans.h>
 #include "../os/osdep.h"
 
 #include <stdio.h>
diff --git a/nx-X11/programs/Xserver/Xext/bigreq.c b/nx-X11/programs/Xserver/Xext/bigreq.c
index 3d6d49ca7..eba552cfe 100644
--- a/nx-X11/programs/Xserver/Xext/bigreq.c
+++ b/nx-X11/programs/Xserver/Xext/bigreq.c
@@ -33,13 +33,13 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include <X11/extensions/bigreqstr.h>
+#include <nx-X11/extensions/bigreqstr.h>
 #include "opaque.h"
 #include "modinit.h"
 
diff --git a/nx-X11/programs/Xserver/Xext/cup.c b/nx-X11/programs/Xserver/Xext/cup.c
index 198aa801f..9b6d25c21 100644
--- a/nx-X11/programs/Xserver/Xext/cup.c
+++ b/nx-X11/programs/Xserver/Xext/cup.c
@@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -42,8 +42,8 @@ in this Software without prior written authorization from The Open Group.
 #include "servermd.h"
 #include "swapreq.h"
 #define _XCUP_SERVER_
-#include <X11/extensions/Xcupstr.h>
-#include <X11/Xfuncproto.h>
+#include <nx-X11/extensions/Xcupstr.h>
+#include <nx-X11/Xfuncproto.h>
 
 #ifndef EXTMODULE
 #include "../os/osdep.h"
diff --git a/nx-X11/programs/Xserver/Xext/dgaproc.h b/nx-X11/programs/Xserver/Xext/dgaproc.h
index eb9791098..4d3f224e6 100644
--- a/nx-X11/programs/Xserver/Xext/dgaproc.h
+++ b/nx-X11/programs/Xserver/Xext/dgaproc.h
@@ -3,7 +3,7 @@
 #ifndef __DGAPROC_H
 #define __DGAPROC_H
 
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "pixmap.h"
 
 #define DGA_CONCURRENT_ACCESS	0x00000001
diff --git a/nx-X11/programs/Xserver/Xext/dpms.c b/nx-X11/programs/Xserver/Xext/dpms.c
index 3e79602d1..fc40193e4 100644
--- a/nx-X11/programs/Xserver/Xext/dpms.c
+++ b/nx-X11/programs/Xserver/Xext/dpms.c
@@ -39,16 +39,16 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "opaque.h"
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
-#include <X11/extensions/dpmsstr.h>
+#include <nx-X11/extensions/dpms.h>
+#include <nx-X11/extensions/dpmsstr.h>
 #include "dpmsproc.h"
 #include "modinit.h"
 
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.c b/nx-X11/programs/Xserver/Xext/extmod/modinit.c
index f79204281..162f76ad8 100644
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.c
+++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.c
@@ -33,7 +33,7 @@
 #include "xf86Module.h"
 #include "xf86Opt.h"
 
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 
 #include "modinit.h"
 #include "globals.h"
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
index 2bafdb2b0..40e1828bb 100644
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h
+++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
@@ -12,26 +12,26 @@
 #ifdef SHAPE
 extern void ShapeExtensionInit(INITARGS);
 #define _SHAPE_SERVER_  /* don't want Xlib structures */
-#include <X11/extensions/shapestr.h>
+#include <nx-X11/extensions/shapestr.h>
 #endif
 
 #ifdef MULTIBUFFER
 extern void MultibufferExtensionInit(INITARGS);
 #define _MULTIBUF_SERVER_	/* don't want Xlib structures */
-#include <X11/extensions/multibufst.h>
+#include <nx-X11/extensions/multibufst.h>
 #endif
 
 #ifdef MITMISC
 extern void MITMiscExtensionInit(INITARGS);
 #define _MITMISC_SERVER_
-#include <X11/extensions/mitmiscstr.h>
+#include <nx-X11/extensions/mitmiscstr.h>
 #endif
 
 #ifdef XTEST
 extern void XTestExtensionInit(INITARGS);
 #define _XTEST_SERVER_
-#include <X11/extensions/XTest.h>
-#include <X11/extensions/xteststr.h>
+#include <nx-X11/extensions/XTest.h>
+#include <nx-X11/extensions/xteststr.h>
 #endif
 
 #if 1
@@ -40,49 +40,49 @@ extern void XTestExtension1Init(INITARGS);
 
 #ifdef BIGREQS
 extern void BigReqExtensionInit(INITARGS);
-#include <X11/extensions/bigreqstr.h>
+#include <nx-X11/extensions/bigreqstr.h>
 #endif
 
 #ifdef XSYNC
 extern void SyncExtensionInit(INITARGS);
 #define _SYNC_SERVER
-#include <X11/extensions/sync.h>
-#include <X11/extensions/syncstr.h>
+#include <nx-X11/extensions/sync.h>
+#include <nx-X11/extensions/syncstr.h>
 #endif
 
 #ifdef SCREENSAVER
 extern void ScreenSaverExtensionInit (INITARGS);
-#include <X11/extensions/saver.h>
+#include <nx-X11/extensions/saver.h>
 #endif
 
 #ifdef XCMISC
 extern void XCMiscExtensionInit(INITARGS);
-#include <X11/extensions/xcmiscstr.h>
+#include <nx-X11/extensions/xcmiscstr.h>
 #endif
 
 #ifdef XF86VIDMODE
 extern void	XFree86VidModeExtensionInit(INITARGS);
 #define _XF86VIDMODE_SERVER_
-#include <X11/extensions/xf86vmstr.h>
+#include <nx-X11/extensions/xf86vmstr.h>
 #endif
 
 #ifdef XF86MISC
 extern void XFree86MiscExtensionInit(INITARGS);
 #define _XF86MISC_SERVER_
 #define _XF86MISC_SAVER_COMPAT_
-#include <X11/extensions/xf86mscstr.h>
+#include <nx-X11/extensions/xf86mscstr.h>
 #endif
 
 #ifdef XFreeXDGA
 extern void XFree86DGAExtensionInit(INITARGS);
 extern void XFree86DGARegister(INITARGS);
 #define _XF86DGA_SERVER_
-#include <X11/extensions/xf86dgastr.h>
+#include <nx-X11/extensions/xf86dgastr.h>
 #endif
 
 #ifdef DPMSExtension
 extern void DPMSExtensionInit(INITARGS);
-#include <X11/extensions/dpmsstr.h>
+#include <nx-X11/extensions/dpmsstr.h>
 #endif
 
 #ifdef FONTCACHE
@@ -95,31 +95,31 @@ extern void FontCacheExtensionInit(INITARGS);
 #ifdef TOGCUP
 extern void XcupExtensionInit(INITARGS);
 #define _XCUP_SERVER_
-#include <X11/extensions/Xcupstr.h>
+#include <nx-X11/extensions/Xcupstr.h>
 #endif
 
 #ifdef EVI
 extern void EVIExtensionInit(INITARGS);
 #define _XEVI_SERVER_
-#include <X11/extensions/XEVIstr.h>
+#include <nx-X11/extensions/XEVIstr.h>
 #endif
 
 #ifdef XV
 extern void XvExtensionInit(INITARGS);
 extern void XvMCExtensionInit(INITARGS);
 extern void XvRegister(INITARGS);
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/XvMC.h>
+#include <nx-X11/extensions/Xv.h>
+#include <nx-X11/extensions/XvMC.h>
 #endif
 
 #ifdef RES
 extern void ResExtensionInit(INITARGS);
-#include <X11/extensions/XResproto.h>
+#include <nx-X11/extensions/XResproto.h>
 #endif
 
 #ifdef SHM
 extern void ShmExtensionInit(INITARGS);
-#include <X11/extensions/shmstr.h>
+#include <nx-X11/extensions/shmstr.h>
 extern void ShmSetPixmapFormat(
     ScreenPtr pScreen,
     int format);
diff --git a/nx-X11/programs/Xserver/Xext/fontcache.c b/nx-X11/programs/Xserver/Xext/fontcache.c
index 9ab23a122..0956f9be9 100644
--- a/nx-X11/programs/Xserver/Xext/fontcache.c
+++ b/nx-X11/programs/Xserver/Xext/fontcache.c
@@ -37,8 +37,8 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -48,7 +48,7 @@
 #define _FONTCACHE_SERVER_
 #include "fontcacheP.h"
 #include "fontcachstr.h"
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 #include "swaprep.h"
 #include "modinit.h"
diff --git a/nx-X11/programs/Xserver/Xext/mbuf.c b/nx-X11/programs/Xserver/Xext/mbuf.c
index 37024da19..e6dec8f6f 100644
--- a/nx-X11/programs/Xserver/Xext/mbuf.c
+++ b/nx-X11/programs/Xserver/Xext/mbuf.c
@@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "window.h"
 #include "os.h"
 #include "windowstr.h"
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
 #include "opaque.h"
 #include "sleepuntil.h"
 #define _MULTIBUF_SERVER_	/* don't want Xlib structures */
-#include <X11/extensions/multibufst.h>
+#include <nx-X11/extensions/multibufst.h>
 
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
diff --git a/nx-X11/programs/Xserver/Xext/mbufbf.c b/nx-X11/programs/Xserver/Xext/mbufbf.c
index 84e7ee839..318fa6756 100644
--- a/nx-X11/programs/Xserver/Xext/mbufbf.c
+++ b/nx-X11/programs/Xserver/Xext/mbufbf.c
@@ -34,8 +34,8 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #include <stdio.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -53,7 +53,7 @@ in this Software without prior written authorization from The Open Group.
 
 #define _MULTIBUF_SERVER_	/* don't want Xlib structures */
 #define _MULTIBUF_BUFFER_
-#include <X11/extensions/multibufst.h>
+#include <nx-X11/extensions/multibufst.h>
 
 /* 
 Support for doublebuffer hardare
diff --git a/nx-X11/programs/Xserver/Xext/mbufpx.c b/nx-X11/programs/Xserver/Xext/mbufpx.c
index 0973fc324..0e9ae1628 100644
--- a/nx-X11/programs/Xserver/Xext/mbufpx.c
+++ b/nx-X11/programs/Xserver/Xext/mbufpx.c
@@ -33,8 +33,8 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #include <stdio.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -51,7 +51,7 @@ in this Software without prior written authorization from The Open Group.
 
 #define _MULTIBUF_SERVER_	/* don't want Xlib structures */
 #define _MULTIBUF_PIXMAP_
-#include <X11/extensions/multibufst.h>
+#include <nx-X11/extensions/multibufst.h>
 
 
 static Bool NoopDDA_True() { return TRUE; }
diff --git a/nx-X11/programs/Xserver/Xext/mitmisc.c b/nx-X11/programs/Xserver/Xext/mitmisc.c
index f7b0ee55c..5c5183e69 100644
--- a/nx-X11/programs/Xserver/Xext/mitmisc.c
+++ b/nx-X11/programs/Xserver/Xext/mitmisc.c
@@ -34,14 +34,14 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #define _MITMISC_SERVER_
-#include <X11/extensions/mitmiscstr.h>
+#include <nx-X11/extensions/mitmiscstr.h>
 #include "modinit.h"
 
 extern Bool permitOldBugs;
diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.c b/nx-X11/programs/Xserver/Xext/panoramiX.c
index 2dc011e70..000c4bf04 100644
--- a/nx-X11/programs/Xserver/Xext/panoramiX.c
+++ b/nx-X11/programs/Xserver/Xext/panoramiX.c
@@ -35,9 +35,9 @@ Equipment Corporation.
 
 #define NEED_REPLIES
 #include <stdio.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/Xarch.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xarch.h>
 #include "misc.h"
 #include "cursor.h"
 #include "cursorstr.h"
@@ -50,7 +50,7 @@ Equipment Corporation.
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "panoramiX.h"
-#include <X11/extensions/panoramiXproto.h>
+#include <nx-X11/extensions/panoramiXproto.h>
 #include "panoramiXsrv.h"
 #include "globals.h"
 #include "servermd.h"
diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.h b/nx-X11/programs/Xserver/Xext/panoramiX.h
index 4178b985f..3f70b6473 100644
--- a/nx-X11/programs/Xserver/Xext/panoramiX.h
+++ b/nx-X11/programs/Xserver/Xext/panoramiX.h
@@ -43,7 +43,7 @@ Equipment Corporation.
 #ifndef _PANORAMIX_H_
 #define _PANORAMIX_H_
 
-#include <X11/extensions/panoramiXext.h>
+#include <nx-X11/extensions/panoramiXext.h>
 /*#include "gcstruct.h"*/
 
 
diff --git a/nx-X11/programs/Xserver/Xext/panoramiXSwap.c b/nx-X11/programs/Xserver/Xext/panoramiXSwap.c
index e0548df7b..955b81ed1 100644
--- a/nx-X11/programs/Xserver/Xext/panoramiXSwap.c
+++ b/nx-X11/programs/Xserver/Xext/panoramiXSwap.c
@@ -30,8 +30,8 @@ Equipment Corporation.
 #endif
 
 #include <stdio.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "cursor.h"
 #include "cursorstr.h"
@@ -45,10 +45,10 @@ Equipment Corporation.
 #include "pixmapstr.h"
 #if 0
 #include <sys/workstation.h>
-#include <X11/Xserver/ws.h> 
+#include <nx-X11/Xserver/ws.h> 
 #endif
 #include "panoramiX.h"
-#include <X11/extensions/panoramiXproto.h>
+#include <nx-X11/extensions/panoramiXproto.h>
 #include "panoramiXsrv.h"
 #include "globals.h"
 #include "panoramiXh.h"
diff --git a/nx-X11/programs/Xserver/Xext/panoramiXprocs.c b/nx-X11/programs/Xserver/Xext/panoramiXprocs.c
index 79a5a3290..2f2b2c63e 100644
--- a/nx-X11/programs/Xserver/Xext/panoramiXprocs.c
+++ b/nx-X11/programs/Xserver/Xext/panoramiXprocs.c
@@ -33,10 +33,10 @@ Equipment Corporation.
 #endif
 
 #include <stdio.h>
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "windowstr.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"
diff --git a/nx-X11/programs/Xserver/Xext/sampleEVI.c b/nx-X11/programs/Xserver/Xext/sampleEVI.c
index 500a585c9..598992742 100644
--- a/nx-X11/programs/Xserver/Xext/sampleEVI.c
+++ b/nx-X11/programs/Xserver/Xext/sampleEVI.c
@@ -27,13 +27,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "dix.h"
 #define _XEVI_SERVER_
-#include <X11/extensions/XEVIstr.h>
+#include <nx-X11/extensions/XEVIstr.h>
 #include "EVIstruct.h"
 #include "scrnintstr.h"
 
diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c
index 4a7fc054c..ec91d080a 100644
--- a/nx-X11/programs/Xserver/Xext/saver.c
+++ b/nx-X11/programs/Xserver/Xext/saver.c
@@ -36,8 +36,8 @@ in this Software without prior written authorization from the X Consortium.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -47,7 +47,7 @@ in this Software without prior written authorization from the X Consortium.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-#include <X11/extensions/saverproto.h>
+#include <nx-X11/extensions/saverproto.h>
 #include "gcstruct.h"
 #include "cursorstr.h"
 #include "colormapst.h"
diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c
index 4bc49f408..bcc8574cb 100644
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -57,19 +57,19 @@ in this Software without prior written authorization from The Open Group.
 #include "colormapst.h"
 #include "propertyst.h"
 #define _SECURITY_SERVER
-#include <X11/extensions/securstr.h>
+#include <nx-X11/extensions/securstr.h>
 #include <assert.h>
 #include <stdarg.h>
 #ifdef LBX
 #define _XLBX_SERVER_
-#include <X11/extensions/XLbx.h>
+#include <nx-X11/extensions/XLbx.h>
 extern unsigned char LbxReqCode;
 #endif
 #ifdef XAPPGROUP
-#include <X11/extensions/Xagsrv.h>
+#include <nx-X11/extensions/Xagsrv.h>
 #endif
 #include <stdio.h>  /* for file reading operations */
-#include <X11/Xatom.h>  /* for XA_STRING */
+#include <nx-X11/Xatom.h>  /* for XA_STRING */
 
 #ifdef NXAGENT_SERVER
 
@@ -91,7 +91,7 @@ extern unsigned char LbxReqCode;
 #endif
 
 #if defined(WIN32) || defined(__CYGWIN__)
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #undef index
 #endif
 
diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index 02182398a..78d3be319 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -33,8 +33,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
 #include "resource.h"
 #include "opaque.h"
 #define _SHAPE_SERVER_	/* don't want Xlib structures */
-#include <X11/extensions/shapestr.h>
+#include <nx-X11/extensions/shapestr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #ifdef EXTMODULE
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index d500e551c..6378a55a4 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -47,8 +47,8 @@ in this Software without prior written authorization from The Open Group.
 #include <sys/stat.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -60,8 +60,8 @@ in this Software without prior written authorization from The Open Group.
 #include "extnsionst.h"
 #include "servermd.h"
 #define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
-#include <X11/Xfuncproto.h>
+#include <nx-X11/extensions/shmstr.h>
+#include <nx-X11/Xfuncproto.h>
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
 #endif
diff --git a/nx-X11/programs/Xserver/Xext/sleepuntil.c b/nx-X11/programs/Xserver/Xext/sleepuntil.c
index da93806f5..62f946cf8 100644
--- a/nx-X11/programs/Xserver/Xext/sleepuntil.c
+++ b/nx-X11/programs/Xserver/Xext/sleepuntil.c
@@ -34,8 +34,8 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #include "sleepuntil.h"
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
 #include "misc.h"
 #include "windowstr.h"
 #include "dixstruct.h"
diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c
index 006cefa86..c122e2860 100644
--- a/nx-X11/programs/Xserver/Xext/sync.c
+++ b/nx-X11/programs/Xserver/Xext/sync.c
@@ -58,9 +58,9 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xmd.h>
 #include "misc.h"
 #include "os.h"
 #include "extnsionst.h"
@@ -68,8 +68,8 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "resource.h"
 #include "opaque.h"
 #define _SYNC_SERVER
-#include <X11/extensions/sync.h>
-#include <X11/extensions/syncstr.h>
+#include <nx-X11/extensions/sync.h>
+#include <nx-X11/extensions/syncstr.h>
 
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
diff --git a/nx-X11/programs/Xserver/Xext/xcmisc.c b/nx-X11/programs/Xserver/Xext/xcmisc.c
index 0a9a09069..1d7ad0e09 100644
--- a/nx-X11/programs/Xserver/Xext/xcmisc.c
+++ b/nx-X11/programs/Xserver/Xext/xcmisc.c
@@ -34,14 +34,14 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"
-#include <X11/extensions/xcmiscstr.h>
+#include <nx-X11/extensions/xcmiscstr.h>
 #include "modinit.h"
 
 #if HAVE_STDINT_H
diff --git a/nx-X11/programs/Xserver/Xext/xevie.c b/nx-X11/programs/Xserver/Xext/xevie.c
index 354be121f..eb38d9223 100644
--- a/nx-X11/programs/Xserver/Xext/xevie.c
+++ b/nx-X11/programs/Xserver/Xext/xevie.c
@@ -38,8 +38,8 @@ of the copyright holder.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -47,13 +47,13 @@ of the copyright holder.
 #include "scrnintstr.h"
 #include "servermd.h"
 #define  _XEVIE_SERVER_
-#include <X11/extensions/Xeviestr.h>
-#include <X11/Xfuncproto.h>
+#include <nx-X11/extensions/Xeviestr.h>
+#include <nx-X11/Xfuncproto.h>
 #include "input.h"
 #include "inputstr.h"
 #include "windowstr.h"
 #include "cursorstr.h"
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 
 #include "../os/osdep.h"
 
diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c
index 36af17622..c0cc7f938 100644
--- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c
+++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c
@@ -64,8 +64,8 @@
 #include <errno.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -74,7 +74,7 @@
 #include "extnsionst.h"
 
 #define _XF86BIGFONT_SERVER_
-#include <X11/extensions/xf86bigfstr.h>
+#include <nx-X11/extensions/xf86bigfstr.h>
 
 static void XF86BigfontResetProc(
     ExtensionEntry *	/* extEntry */
diff --git a/nx-X11/programs/Xserver/Xext/xf86dga.c b/nx-X11/programs/Xserver/Xext/xf86dga.c
index 9979bfb30..074118c18 100644
--- a/nx-X11/programs/Xserver/Xext/xf86dga.c
+++ b/nx-X11/programs/Xserver/Xext/xf86dga.c
@@ -13,8 +13,8 @@ Copyright (c) 1995, 1996, 1999  XFree86 Inc
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -23,8 +23,8 @@ Copyright (c) 1995, 1996, 1999  XFree86 Inc
 #include "scrnintstr.h"
 #include "servermd.h"
 #define _XF86DGA_SERVER_
-#include <X11/extensions/xf86dga.h>
-#include <X11/extensions/xf86dgastr.h>
+#include <nx-X11/extensions/xf86dga.h>
+#include <nx-X11/extensions/xf86dgastr.h>
 #include "swaprep.h"
 #include "dgaproc.h"
 
diff --git a/nx-X11/programs/Xserver/Xext/xf86dga2.c b/nx-X11/programs/Xserver/Xext/xf86dga2.c
index 490554d9a..c2b64b048 100644
--- a/nx-X11/programs/Xserver/Xext/xf86dga2.c
+++ b/nx-X11/programs/Xserver/Xext/xf86dga2.c
@@ -12,8 +12,8 @@
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "dixevents.h"
@@ -24,8 +24,8 @@
 #include "scrnintstr.h"
 #include "servermd.h"
 #define _XF86DGA_SERVER_
-#include <X11/extensions/xf86dga.h>
-#include <X11/extensions/xf86dgastr.h>
+#include <nx-X11/extensions/xf86dga.h>
+#include <nx-X11/extensions/xf86dgastr.h>
 #include "swaprep.h"
 #include "dgaproc.h"
 #include "xf86dgaext.h"
diff --git a/nx-X11/programs/Xserver/Xext/xf86misc.c b/nx-X11/programs/Xserver/Xext/xf86misc.c
index 6de794e1f..ccf983fae 100644
--- a/nx-X11/programs/Xserver/Xext/xf86misc.c
+++ b/nx-X11/programs/Xserver/Xext/xf86misc.c
@@ -12,8 +12,8 @@
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -22,16 +22,16 @@
 #include "servermd.h"
 #define _XF86MISC_SERVER_
 #undef _XF86MISC_SAVER_COMPAT_
-#include <X11/extensions/xf86mscstr.h>
+#include <nx-X11/extensions/xf86mscstr.h>
 #include "swaprep.h"
 #include "xf86.h"
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 #include "xf86miscproc.h"
 
 #if 0
-#include <X11/Xtrans/Xtrans.h>
+#include <nx-X11/Xtrans/Xtrans.h>
 #include "../os/osdep.h"
-#include <X11/Xauth.h>
+#include <nx-X11/Xauth.h>
 #ifndef USL
 #ifndef Lynx
 #include <sys/socket.h>
diff --git a/nx-X11/programs/Xserver/Xext/xf86vmode.c b/nx-X11/programs/Xserver/Xext/xf86vmode.c
index 979f55c00..0595343c9 100644
--- a/nx-X11/programs/Xserver/Xext/xf86vmode.c
+++ b/nx-X11/programs/Xserver/Xext/xf86vmode.c
@@ -39,15 +39,15 @@ from Kaleb S. KEITHLEY
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "scrnintstr.h"
 #include "servermd.h"
 #define _XF86VIDMODE_SERVER_
-#include <X11/extensions/xf86vmstr.h>
+#include <nx-X11/extensions/xf86vmstr.h>
 #include "swaprep.h"
 #include "xf86.h"
 #include "vidmodeproc.h"
diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c
index dc4018dd7..7b3555452 100644
--- a/nx-X11/programs/Xserver/Xext/xres.c
+++ b/nx-X11/programs/Xserver/Xext/xres.c
@@ -10,14 +10,14 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"
-#include <X11/extensions/XResproto.h>
+#include <nx-X11/extensions/XResproto.h>
 #include "pixmapstr.h"
 #include "modinit.h"
 
diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c
index 994b0c502..d9adc03c0 100644
--- a/nx-X11/programs/Xserver/Xext/xtest.c
+++ b/nx-X11/programs/Xserver/Xext/xtest.c
@@ -33,9 +33,9 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_EVENTS
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -46,11 +46,11 @@ from The Open Group.
 #include "dixevents.h"
 #include "sleepuntil.h"
 #define _XTEST_SERVER_
-#include <X11/extensions/XTest.h>
-#include <X11/extensions/xteststr.h>
+#include <nx-X11/extensions/XTest.h>
+#include <nx-X11/extensions/xteststr.h>
 #ifdef XINPUT
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #define EXTENSION_EVENT_BASE	64
 #include "extinit.h"		/* LookupDeviceIntRec */
 #endif /* XINPUT */
diff --git a/nx-X11/programs/Xserver/Xext/xtest1dd.c b/nx-X11/programs/Xserver/Xext/xtest1dd.c
index c78cceed0..c945fd6bd 100644
--- a/nx-X11/programs/Xserver/Xext/xtest1dd.c
+++ b/nx-X11/programs/Xserver/Xext/xtest1dd.c
@@ -66,14 +66,14 @@ University of California.
 #endif
 
 #include <stdio.h>
-#include <X11/Xos.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xproto.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #define  XTestSERVER_SIDE
-#include <X11/extensions/xtestext1.h>	
+#include <nx-X11/extensions/xtestext1.h>	
 
 #include "xtest1dd.h"
 
diff --git a/nx-X11/programs/Xserver/Xext/xtest1di.c b/nx-X11/programs/Xserver/Xext/xtest1di.c
index 985193a89..e7c3522ba 100644
--- a/nx-X11/programs/Xserver/Xext/xtest1di.c
+++ b/nx-X11/programs/Xserver/Xext/xtest1di.c
@@ -67,8 +67,8 @@ University of California.
 #endif
 
 #include <stdio.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "gcstruct.h"   
@@ -76,7 +76,7 @@ University of California.
 #include "dixstruct.h"
 #include "opaque.h"
 #define  XTestSERVER_SIDE
-#include <X11/extensions/xtestext1.h>
+#include <nx-X11/extensions/xtestext1.h>
 #include "modinit.h"
 
 #include "xtest1dd.h"
diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c
index b361c0ff3..8037e6c45 100644
--- a/nx-X11/programs/Xserver/Xext/xvdisp.c
+++ b/nx-X11/programs/Xserver/Xext/xvdisp.c
@@ -52,8 +52,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
@@ -63,12 +63,12 @@ SOFTWARE.
 #include "resource.h"
 #include "opaque.h"
 
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
+#include <nx-X11/extensions/Xv.h>
+#include <nx-X11/extensions/Xvproto.h>
 #include "xvdix.h"
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include <nx-X11/extensions/shmstr.h>
 #endif
 
 #ifdef EXTMODULE
diff --git a/nx-X11/programs/Xserver/Xext/xvdix.h b/nx-X11/programs/Xserver/Xext/xvdix.h
index 99d918406..6e6e07302 100644
--- a/nx-X11/programs/Xserver/Xext/xvdix.h
+++ b/nx-X11/programs/Xserver/Xext/xvdix.h
@@ -54,7 +54,7 @@ SOFTWARE.
 */
 
 #include "scrnintstr.h"
-#include <X11/extensions/Xvproto.h>
+#include <nx-X11/extensions/Xvproto.h>
 
 extern int  XvScreenIndex;
 extern unsigned long XvExtensionGeneration;
diff --git a/nx-X11/programs/Xserver/Xext/xvmain.c b/nx-X11/programs/Xserver/Xext/xvmain.c
index bbbb34dcf..571bb9c46 100644
--- a/nx-X11/programs/Xserver/Xext/xvmain.c
+++ b/nx-X11/programs/Xserver/Xext/xvmain.c
@@ -79,8 +79,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "scrnintstr.h"
@@ -95,8 +95,8 @@ SOFTWARE.
 
 #define GLOBAL
 
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
+#include <nx-X11/extensions/Xv.h>
+#include <nx-X11/extensions/Xvproto.h>
 #include "xvdix.h"
 
 #ifdef EXTMODULE
diff --git a/nx-X11/programs/Xserver/Xext/xvmc.c b/nx-X11/programs/Xserver/Xext/xvmc.c
index 30de35a2b..b1441fa1d 100644
--- a/nx-X11/programs/Xserver/Xext/xvmc.c
+++ b/nx-X11/programs/Xserver/Xext/xvmc.c
@@ -6,8 +6,8 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -15,11 +15,11 @@
 #include "scrnintstr.h"
 #include "extnsionst.h"
 #include "servermd.h"
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 #include "xvdix.h"
-#include <X11/extensions/XvMC.h>
-#include <X11/extensions/Xvproto.h>
-#include <X11/extensions/XvMCproto.h>
+#include <nx-X11/extensions/XvMC.h>
+#include <nx-X11/extensions/Xvproto.h>
+#include <nx-X11/extensions/XvMCproto.h>
 #include "xvmcext.h"
 
 #ifdef HAS_XVMCSHM
diff --git a/nx-X11/programs/Xserver/Xext/xvmcext.h b/nx-X11/programs/Xserver/Xext/xvmcext.h
index 7cb8af24d..b92a53225 100644
--- a/nx-X11/programs/Xserver/Xext/xvmcext.h
+++ b/nx-X11/programs/Xserver/Xext/xvmcext.h
@@ -2,7 +2,7 @@
 
 #ifndef _XVMC_H
 #define _XVMC_H
-#include <X11/extensions/Xv.h>
+#include <nx-X11/extensions/Xv.h>
 #include "xvdix.h"
 
 typedef struct {
diff --git a/nx-X11/programs/Xserver/Xext/xvmod.c b/nx-X11/programs/Xserver/Xext/xvmod.c
index 7899f3a75..258023f65 100644
--- a/nx-X11/programs/Xserver/Xext/xvmod.c
+++ b/nx-X11/programs/Xserver/Xext/xvmod.c
@@ -4,12 +4,12 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "misc.h"
 #include "scrnintstr.h"
 #include "gc.h"
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
+#include <nx-X11/extensions/Xv.h>
+#include <nx-X11/extensions/Xvproto.h>
 #include "xvdix.h"
 #include "xvmodproc.h"
 
diff --git a/nx-X11/programs/Xserver/Xi/allowev.c b/nx-X11/programs/Xserver/Xi/allowev.c
index c1df7eb73..8073649f1 100644
--- a/nx-X11/programs/Xserver/Xi/allowev.c
+++ b/nx-X11/programs/Xserver/Xi/allowev.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
diff --git a/nx-X11/programs/Xserver/Xi/chgdctl.c b/nx-X11/programs/Xserver/Xi/chgdctl.c
index 144a51ed4..c4fa46ba7 100644
--- a/nx-X11/programs/Xserver/Xi/chgdctl.c
+++ b/nx-X11/programs/Xserver/Xi/chgdctl.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>			/* control constants */
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>			/* control constants */
 #include "XIstubs.h"
 
 #include "extnsionst.h"
diff --git a/nx-X11/programs/Xserver/Xi/chgfctl.c b/nx-X11/programs/Xserver/Xi/chgfctl.c
index 3ffac39b3..d78b32a17 100644
--- a/nx-X11/programs/Xserver/Xi/chgfctl.c
+++ b/nx-X11/programs/Xserver/Xi/chgfctl.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>			/* control constants */
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>			/* control constants */
 
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
diff --git a/nx-X11/programs/Xserver/Xi/chgkbd.c b/nx-X11/programs/Xserver/Xi/chgkbd.c
index a8a6024d8..136d257c6 100644
--- a/nx-X11/programs/Xserver/Xi/chgkbd.c
+++ b/nx-X11/programs/Xserver/Xi/chgkbd.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "globals.h"
 #include "extnsionst.h"
diff --git a/nx-X11/programs/Xserver/Xi/chgkmap.c b/nx-X11/programs/Xserver/Xi/chgkmap.c
index 3df376d9a..88afd9df7 100644
--- a/nx-X11/programs/Xserver/Xi/chgkmap.c
+++ b/nx-X11/programs/Xserver/Xi/chgkmap.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exevents.h"
diff --git a/nx-X11/programs/Xserver/Xi/chgprop.c b/nx-X11/programs/Xserver/Xi/chgprop.c
index 6e345d554..47db87293 100644
--- a/nx-X11/programs/Xserver/Xi/chgprop.c
+++ b/nx-X11/programs/Xserver/Xi/chgprop.c
@@ -59,12 +59,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 
diff --git a/nx-X11/programs/Xserver/Xi/chgptr.c b/nx-X11/programs/Xserver/Xi/chgptr.c
index bf2abd6b6..925d43c07 100644
--- a/nx-X11/programs/Xserver/Xi/chgptr.c
+++ b/nx-X11/programs/Xserver/Xi/chgptr.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "windowstr.h"			/* window structure  */
 #include "scrnintstr.h"			/* screen structure  */
diff --git a/nx-X11/programs/Xserver/Xi/closedev.c b/nx-X11/programs/Xserver/Xi/closedev.c
index 8a57aeeee..ae46f50c6 100644
--- a/nx-X11/programs/Xserver/Xi/closedev.c
+++ b/nx-X11/programs/Xserver/Xi/closedev.c
@@ -59,13 +59,13 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
 #include "scrnintstr.h"			/* screen structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
diff --git a/nx-X11/programs/Xserver/Xi/devbell.c b/nx-X11/programs/Xserver/Xi/devbell.c
index 190e32086..12c444137 100644
--- a/nx-X11/programs/Xserver/Xi/devbell.c
+++ b/nx-X11/programs/Xserver/Xi/devbell.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/Xi/exevents.c b/nx-X11/programs/Xserver/Xi/exevents.c
index f0c9aea3d..ce5fe9ec9 100644
--- a/nx-X11/programs/Xserver/Xi/exevents.c
+++ b/nx-X11/programs/Xserver/Xi/exevents.c
@@ -59,10 +59,10 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "inputstr.h"
 #include "windowstr.h"
 #include "miscstruct.h"
diff --git a/nx-X11/programs/Xserver/Xi/extinit.c b/nx-X11/programs/Xserver/Xi/extinit.c
index 0b27b5cf7..750fa46cb 100644
--- a/nx-X11/programs/Xserver/Xi/extinit.c
+++ b/nx-X11/programs/Xserver/Xi/extinit.c
@@ -61,13 +61,13 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "inputstr.h"
 #include "gcstruct.h"   		/* pointer for extnsionst.h*/
 #include "extnsionst.h"			/* extension entry   */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 
 #include "dixevents.h"
 #include "exevents.h"
diff --git a/nx-X11/programs/Xserver/Xi/getbmap.c b/nx-X11/programs/Xserver/Xi/getbmap.c
index a944d4cc8..ac2b69749 100644
--- a/nx-X11/programs/Xserver/Xi/getbmap.c
+++ b/nx-X11/programs/Xserver/Xi/getbmap.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/Xi/getdctl.c b/nx-X11/programs/Xserver/Xi/getdctl.c
index 527273ac4..d8c310d92 100644
--- a/nx-X11/programs/Xserver/Xi/getdctl.c
+++ b/nx-X11/programs/Xserver/Xi/getdctl.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/Xi/getfctl.c b/nx-X11/programs/Xserver/Xi/getfctl.c
index 5652ad303..c6cb8457c 100644
--- a/nx-X11/programs/Xserver/Xi/getfctl.c
+++ b/nx-X11/programs/Xserver/Xi/getfctl.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/Xi/getfocus.c b/nx-X11/programs/Xserver/Xi/getfocus.c
index 3c1597cc9..61a98f1bf 100644
--- a/nx-X11/programs/Xserver/Xi/getfocus.c
+++ b/nx-X11/programs/Xserver/Xi/getfocus.c
@@ -59,12 +59,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "windowstr.h"			/* focus struct      */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/Xi/getkmap.c b/nx-X11/programs/Xserver/Xi/getkmap.c
index 4e67d9c71..fe8fd9b22 100644
--- a/nx-X11/programs/Xserver/Xi/getkmap.c
+++ b/nx-X11/programs/Xserver/Xi/getkmap.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/Xi/getmmap.c b/nx-X11/programs/Xserver/Xi/getmmap.c
index 6b2e38d0b..203799103 100644
--- a/nx-X11/programs/Xserver/Xi/getmmap.c
+++ b/nx-X11/programs/Xserver/Xi/getmmap.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>			/* Request macro     */
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>			/* Request macro     */
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/Xi/getprop.c b/nx-X11/programs/Xserver/Xi/getprop.c
index 2b4de1f3e..ac37617ec 100644
--- a/nx-X11/programs/Xserver/Xi/getprop.c
+++ b/nx-X11/programs/Xserver/Xi/getprop.c
@@ -59,12 +59,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structs    */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/Xi/getselev.c b/nx-X11/programs/Xserver/Xi/getselev.c
index c2ec2b9d5..7cd97b5ef 100644
--- a/nx-X11/programs/Xserver/Xi/getselev.c
+++ b/nx-X11/programs/Xserver/Xi/getselev.c
@@ -59,10 +59,10 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window struct     */
 #include "extnsionst.h"
diff --git a/nx-X11/programs/Xserver/Xi/getvers.c b/nx-X11/programs/Xserver/Xi/getvers.c
index 3a335dd31..7743e797f 100644
--- a/nx-X11/programs/Xserver/Xi/getvers.c
+++ b/nx-X11/programs/Xserver/Xi/getvers.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/Xi/grabdev.c b/nx-X11/programs/Xserver/Xi/grabdev.c
index 21e920a35..865263688 100644
--- a/nx-X11/programs/Xserver/Xi/grabdev.c
+++ b/nx-X11/programs/Xserver/Xi/grabdev.c
@@ -60,12 +60,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/Xi/grabdevb.c b/nx-X11/programs/Xserver/Xi/grabdevb.c
index ad43c29a0..9a20345be 100644
--- a/nx-X11/programs/Xserver/Xi/grabdevb.c
+++ b/nx-X11/programs/Xserver/Xi/grabdevb.c
@@ -59,12 +59,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.c b/nx-X11/programs/Xserver/Xi/grabdevk.c
index 952c5d89a..73b8690b9 100644
--- a/nx-X11/programs/Xserver/Xi/grabdevk.c
+++ b/nx-X11/programs/Xserver/Xi/grabdevk.c
@@ -59,12 +59,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
diff --git a/nx-X11/programs/Xserver/Xi/gtmotion.c b/nx-X11/programs/Xserver/Xi/gtmotion.c
index 02b1fee32..ec26ae407 100644
--- a/nx-X11/programs/Xserver/Xi/gtmotion.c
+++ b/nx-X11/programs/Xserver/Xi/gtmotion.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exevents.h"
diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c
index 6228352f5..e99584d0e 100644
--- a/nx-X11/programs/Xserver/Xi/listdev.c
+++ b/nx-X11/programs/Xserver/Xi/listdev.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
diff --git a/nx-X11/programs/Xserver/Xi/opendev.c b/nx-X11/programs/Xserver/Xi/opendev.c
index 520c6832a..054dae159 100644
--- a/nx-X11/programs/Xserver/Xi/opendev.c
+++ b/nx-X11/programs/Xserver/Xi/opendev.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "windowstr.h"			/* window structure  */
 #include "extnsionst.h"
diff --git a/nx-X11/programs/Xserver/Xi/queryst.c b/nx-X11/programs/Xserver/Xi/queryst.c
index 34b140c8e..af2b4301d 100644
--- a/nx-X11/programs/Xserver/Xi/queryst.c
+++ b/nx-X11/programs/Xserver/Xi/queryst.c
@@ -40,12 +40,12 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exevents.h"
diff --git a/nx-X11/programs/Xserver/Xi/selectev.c b/nx-X11/programs/Xserver/Xi/selectev.c
index a9b731864..de29fcf59 100644
--- a/nx-X11/programs/Xserver/Xi/selectev.c
+++ b/nx-X11/programs/Xserver/Xi/selectev.c
@@ -60,12 +60,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exevents.h"
diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c
index 0b2a701bb..9decfadab 100644
--- a/nx-X11/programs/Xserver/Xi/sendexev.c
+++ b/nx-X11/programs/Xserver/Xi/sendexev.c
@@ -60,12 +60,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* Window      	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exevents.h"
diff --git a/nx-X11/programs/Xserver/Xi/setbmap.c b/nx-X11/programs/Xserver/Xi/setbmap.c
index 37db5110d..74b8e3c05 100644
--- a/nx-X11/programs/Xserver/Xi/setbmap.c
+++ b/nx-X11/programs/Xserver/Xi/setbmap.c
@@ -62,11 +62,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
diff --git a/nx-X11/programs/Xserver/Xi/setdval.c b/nx-X11/programs/Xserver/Xi/setdval.c
index 9b5b1e20d..04f55d4fc 100644
--- a/nx-X11/programs/Xserver/Xi/setdval.c
+++ b/nx-X11/programs/Xserver/Xi/setdval.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
diff --git a/nx-X11/programs/Xserver/Xi/setfocus.c b/nx-X11/programs/Xserver/Xi/setfocus.c
index a1dd09d71..b9a495612 100644
--- a/nx-X11/programs/Xserver/Xi/setfocus.c
+++ b/nx-X11/programs/Xserver/Xi/setfocus.c
@@ -59,12 +59,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "windowstr.h"			/* focus struct      */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 
 #include "dixevents.h"
 
diff --git a/nx-X11/programs/Xserver/Xi/setmmap.c b/nx-X11/programs/Xserver/Xi/setmmap.c
index 3fa2c7e7e..9fd8e7244 100644
--- a/nx-X11/programs/Xserver/Xi/setmmap.c
+++ b/nx-X11/programs/Xserver/Xi/setmmap.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
diff --git a/nx-X11/programs/Xserver/Xi/setmode.c b/nx-X11/programs/Xserver/Xi/setmode.c
index f95ef5514..17c46515d 100644
--- a/nx-X11/programs/Xserver/Xi/setmode.c
+++ b/nx-X11/programs/Xserver/Xi/setmode.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
diff --git a/nx-X11/programs/Xserver/Xi/stubs.c b/nx-X11/programs/Xserver/Xi/stubs.c
index 2d9aad08b..33c55d3b7 100644
--- a/nx-X11/programs/Xserver/Xi/stubs.c
+++ b/nx-X11/programs/Xserver/Xi/stubs.c
@@ -62,11 +62,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "inputstr.h"
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "XIstubs.h"
 
 /***********************************************************************
diff --git a/nx-X11/programs/Xserver/Xi/ungrdev.c b/nx-X11/programs/Xserver/Xi/ungrdev.c
index 8de4cd225..b318fa044 100644
--- a/nx-X11/programs/Xserver/Xi/ungrdev.c
+++ b/nx-X11/programs/Xserver/Xi/ungrdev.c
@@ -59,11 +59,11 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/Xi/ungrdevb.c b/nx-X11/programs/Xserver/Xi/ungrdevb.c
index 8927a5c6e..a76f9692c 100644
--- a/nx-X11/programs/Xserver/Xi/ungrdevb.c
+++ b/nx-X11/programs/Xserver/Xi/ungrdevb.c
@@ -59,12 +59,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/Xi/ungrdevk.c b/nx-X11/programs/Xserver/Xi/ungrdevk.c
index 38cfa1b71..928b602f1 100644
--- a/nx-X11/programs/Xserver/Xi/ungrdevk.c
+++ b/nx-X11/programs/Xserver/Xi/ungrdevk.c
@@ -59,12 +59,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>				/* for inputstr.h    */
-#include <X11/Xproto.h>			/* Request macro     */
+#include <nx-X11/X.h>				/* for inputstr.h    */
+#include <nx-X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"
diff --git a/nx-X11/programs/Xserver/composite/compint.h b/nx-X11/programs/Xserver/composite/compint.h
index 9a6a22f48..262d95108 100644
--- a/nx-X11/programs/Xserver/composite/compint.h
+++ b/nx-X11/programs/Xserver/composite/compint.h
@@ -50,7 +50,7 @@
 #include "damage.h"
 #include "damageextint.h"
 #include "xfixes.h"
-#include <X11/extensions/compositeproto.h>
+#include <nx-X11/extensions/compositeproto.h>
 #include <assert.h>
 
 /*
diff --git a/nx-X11/programs/Xserver/damageext/damageextint.h b/nx-X11/programs/Xserver/damageext/damageextint.h
index ab00effe3..d2f9d71ac 100644
--- a/nx-X11/programs/Xserver/damageext/damageextint.h
+++ b/nx-X11/programs/Xserver/damageext/damageextint.h
@@ -30,8 +30,8 @@
 #define _DAMAGEEXTINT_H_
 
 #define NEED_EVENTS
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c
index ad5294a4c..064987dec 100644
--- a/nx-X11/programs/Xserver/dbe/dbe.c
+++ b/nx-X11/programs/Xserver/dbe/dbe.c
@@ -41,8 +41,8 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "scrnintstr.h"
 #include "extnsionst.h"
 #include "gcstruct.h"
diff --git a/nx-X11/programs/Xserver/dbe/dbestruct.h b/nx-X11/programs/Xserver/dbe/dbestruct.h
index 69135a837..43c4c525b 100644
--- a/nx-X11/programs/Xserver/dbe/dbestruct.h
+++ b/nx-X11/programs/Xserver/dbe/dbestruct.h
@@ -39,7 +39,7 @@
 /* INCLUDES */
 
 #define NEED_DBE_PROTOCOL
-#include <X11/extensions/Xdbeproto.h>
+#include <nx-X11/extensions/Xdbeproto.h>
 #include "windowstr.h"
 
 
diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c
index 042f95953..b8383e11a 100644
--- a/nx-X11/programs/Xserver/dbe/midbe.c
+++ b/nx-X11/programs/Xserver/dbe/midbe.c
@@ -41,8 +41,8 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
diff --git a/nx-X11/programs/Xserver/dix/atom.c b/nx-X11/programs/Xserver/dix/atom.c
index 207174280..583f2dafc 100644
--- a/nx-X11/programs/Xserver/dix/atom.c
+++ b/nx-X11/programs/Xserver/dix/atom.c
@@ -52,8 +52,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xatom.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xatom.h>
 #include "misc.h"
 #include "resource.h"
 #include "dix.h"
diff --git a/nx-X11/programs/Xserver/dix/colormap.c b/nx-X11/programs/Xserver/dix/colormap.c
index 32d9bae89..11a353f84 100644
--- a/nx-X11/programs/Xserver/dix/colormap.c
+++ b/nx-X11/programs/Xserver/dix/colormap.c
@@ -53,9 +53,9 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_EVENTS
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dix.h"
 #include "colormapst.h"
diff --git a/nx-X11/programs/Xserver/dix/cursor.c b/nx-X11/programs/Xserver/dix/cursor.c
index 187dd62c5..1e1dba36b 100644
--- a/nx-X11/programs/Xserver/dix/cursor.c
+++ b/nx-X11/programs/Xserver/dix/cursor.c
@@ -53,8 +53,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "dixstruct.h"
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c
index 917a3849a..91a92644c 100644
--- a/nx-X11/programs/Xserver/dix/devices.c
+++ b/nx-X11/programs/Xserver/dix/devices.c
@@ -54,12 +54,12 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "misc.h"
 #include "resource.h"
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -68,11 +68,11 @@ SOFTWARE.
 #include "site.h"
 #define	XKB_IN_SERVER
 #ifdef XKB
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 #ifdef LBX
 #include "lbxserve.h"
diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c
index 71c22ae0e..b6010e627 100644
--- a/nx-X11/programs/Xserver/dix/dispatch.c
+++ b/nx-X11/programs/Xserver/dix/dispatch.c
@@ -109,15 +109,15 @@ int ProcInitialConnection();
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 #ifdef XAPPGROUP
-#include <X11/extensions/Xagsrv.h>
+#include <nx-X11/extensions/Xagsrv.h>
 #endif
 #ifdef XKB
 #define XKB_IN_SERVER
 #include "inputstr.h"
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 #endif
 #ifdef LBX
 #include "lbxserve.h"
diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c
index fac918963..6e515300d 100644
--- a/nx-X11/programs/Xserver/dix/dixfonts.c
+++ b/nx-X11/programs/Xserver/dix/dixfonts.c
@@ -56,9 +56,9 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xproto.h>
 #include "scrnintstr.h"
 #include "resource.h"
 #include "dixstruct.h"
@@ -139,7 +139,7 @@ _NXGetFontPathError:
 
 #ifdef XF86BIGFONT
 #define _XF86BIGFONT_SERVER_
-#include <X11/extensions/xf86bigfont.h>
+#include <nx-X11/extensions/xf86bigfont.h>
 #endif
 
 #define QUERYCHARINFO(pci, pr)  *(pr) = (pci)->metrics
diff --git a/nx-X11/programs/Xserver/dix/dixutils.c b/nx-X11/programs/Xserver/dix/dixutils.c
index f3b3373d0..8bcfce619 100644
--- a/nx-X11/programs/Xserver/dix/dixutils.c
+++ b/nx-X11/programs/Xserver/dix/dixutils.c
@@ -88,18 +88,18 @@ Author:  Adobe Systems Incorporated
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
 #include "misc.h"
 #include "windowstr.h"
 #include "dixstruct.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"
 #define  XK_LATIN1
-#include <X11/keysymdef.h>
+#include <nx-X11/keysymdef.h>
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 
 /*
diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c
index ab995a772..1166bf84b 100644
--- a/nx-X11/programs/Xserver/dix/events.c
+++ b/nx-X11/programs/Xserver/dix/events.c
@@ -115,12 +115,12 @@ of the copyright holder.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "misc.h"
 #include "resource.h"
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -134,13 +134,13 @@ of the copyright holder.
 #include "globals.h"
 
 #ifdef XKB
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
 #endif
 
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 
 #ifdef XEVIE
@@ -157,7 +157,7 @@ int    xeviegrabState = 0;
 xEvent *xeviexE;
 #endif
 
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extnsionst.h"
 
diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c
index 19333c151..dd6de9c63 100644
--- a/nx-X11/programs/Xserver/dix/extension.c
+++ b/nx-X11/programs/Xserver/dix/extension.c
@@ -51,10 +51,10 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -63,7 +63,7 @@ SOFTWARE.
 #include "dispatch.h"
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 #ifdef LBX
 #include "lbxserve.h"
diff --git a/nx-X11/programs/Xserver/dix/gc.c b/nx-X11/programs/Xserver/dix/gc.c
index 834919946..2c17de3d6 100644
--- a/nx-X11/programs/Xserver/dix/gc.c
+++ b/nx-X11/programs/Xserver/dix/gc.c
@@ -52,9 +52,9 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "resource.h"
 #include "gcstruct.h"
diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c
index 15eedf602..e4f43fd01 100644
--- a/nx-X11/programs/Xserver/dix/globals.c
+++ b/nx-X11/programs/Xserver/dix/globals.c
@@ -53,8 +53,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
 #include "misc.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/dix/grabs.c b/nx-X11/programs/Xserver/dix/grabs.c
index e133c0dfc..839e930b1 100644
--- a/nx-X11/programs/Xserver/dix/grabs.c
+++ b/nx-X11/programs/Xserver/dix/grabs.c
@@ -52,10 +52,10 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "misc.h"
 #define NEED_EVENTS
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "cursorstr.h"
diff --git a/nx-X11/programs/Xserver/dix/initatoms.c b/nx-X11/programs/Xserver/dix/initatoms.c
index a5972afd6..5f6244a76 100644
--- a/nx-X11/programs/Xserver/dix/initatoms.c
+++ b/nx-X11/programs/Xserver/dix/initatoms.c
@@ -7,8 +7,8 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xatom.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xatom.h>
 #include "misc.h"
 #include "dix.h"
 void MakePredeclaredAtoms()
diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c
index 954c260c2..6a5b0021d 100644
--- a/nx-X11/programs/Xserver/dix/main.c
+++ b/nx-X11/programs/Xserver/dix/main.c
@@ -84,9 +84,9 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xos.h>   /* for unistd.h  */
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xos.h>   /* for unistd.h  */
+#include <nx-X11/Xproto.h>
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"
@@ -113,7 +113,7 @@ Equipment Corporation.
 
 #ifdef DPMSExtension
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <nx-X11/extensions/dpms.h>
 #include "dpmsproc.h"
 #endif
 
diff --git a/nx-X11/programs/Xserver/dix/pixmap.c b/nx-X11/programs/Xserver/dix/pixmap.c
index 7888cf90a..463e31598 100644
--- a/nx-X11/programs/Xserver/dix/pixmap.c
+++ b/nx-X11/programs/Xserver/dix/pixmap.c
@@ -32,7 +32,7 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"
diff --git a/nx-X11/programs/Xserver/dix/privates.c b/nx-X11/programs/Xserver/dix/privates.c
index 36bbc65d1..d08883d1d 100644
--- a/nx-X11/programs/Xserver/dix/privates.c
+++ b/nx-X11/programs/Xserver/dix/privates.c
@@ -33,7 +33,7 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"
diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c
index f462a3ebd..51cbc1a0d 100644
--- a/nx-X11/programs/Xserver/dix/property.c
+++ b/nx-X11/programs/Xserver/dix/property.c
@@ -51,10 +51,10 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "windowstr.h"
 #include "propertyst.h"
 #include "dixstruct.h"
@@ -62,7 +62,7 @@ SOFTWARE.
 #include "swaprep.h"
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 #ifdef LBX
 #include "lbxserve.h"
diff --git a/nx-X11/programs/Xserver/dix/resource.c b/nx-X11/programs/Xserver/dix/resource.c
index e0fc2b997..ed8a255f5 100644
--- a/nx-X11/programs/Xserver/dix/resource.c
+++ b/nx-X11/programs/Xserver/dix/resource.c
@@ -106,7 +106,7 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "misc.h"
 #include "os.h"
 #include "resource.h"
diff --git a/nx-X11/programs/Xserver/dix/swaprep.c b/nx-X11/programs/Xserver/dix/swaprep.c
index 9776cd437..b8f245408 100644
--- a/nx-X11/programs/Xserver/dix/swaprep.c
+++ b/nx-X11/programs/Xserver/dix/swaprep.c
@@ -52,10 +52,10 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include <X11/fonts/fontstruct.h>
diff --git a/nx-X11/programs/Xserver/dix/swapreq.c b/nx-X11/programs/Xserver/dix/swapreq.c
index 7d57d551f..35a7e7527 100644
--- a/nx-X11/programs/Xserver/dix/swapreq.c
+++ b/nx-X11/programs/Xserver/dix/swapreq.c
@@ -52,10 +52,10 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_EVENTS
-#include <X11/Xproto.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xprotostr.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"	/* for SendEvent */
diff --git a/nx-X11/programs/Xserver/dix/tables.c b/nx-X11/programs/Xserver/dix/tables.c
index 5196f0e85..eb4f4c8d2 100644
--- a/nx-X11/programs/Xserver/dix/tables.c
+++ b/nx-X11/programs/Xserver/dix/tables.c
@@ -51,10 +51,10 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "windowstr.h"
 #include "extnsionst.h"
 #include "dixstruct.h"
diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c
index 340ca50cc..5854f2e95 100644
--- a/nx-X11/programs/Xserver/dix/window.c
+++ b/nx-X11/programs/Xserver/dix/window.c
@@ -105,11 +105,11 @@ Equipment Corporation.
 #include "globals.h"
 
 #ifdef XAPPGROUP
-#include <X11/extensions/Xagsrv.h>
+#include <nx-X11/extensions/Xagsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 
 /******
diff --git a/nx-X11/programs/Xserver/fb/fb.h b/nx-X11/programs/Xserver/fb/fb.h
index 202638d32..b64f3a227 100644
--- a/nx-X11/programs/Xserver/fb/fb.h
+++ b/nx-X11/programs/Xserver/fb/fb.h
@@ -27,7 +27,7 @@
 #ifndef _FB_H_
 #define _FB_H_
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "scrnintstr.h"
 #include "pixmap.h"
 #include "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/fb/fbcmap.c b/nx-X11/programs/Xserver/fb/fbcmap.c
index 762c51c9d..a7c8ca638 100644
--- a/nx-X11/programs/Xserver/fb/fbcmap.c
+++ b/nx-X11/programs/Xserver/fb/fbcmap.c
@@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "scrnintstr.h"
 #include "colormapst.h"
 #include "resource.h"
diff --git a/nx-X11/programs/Xserver/fb/fbpseudocolor.c b/nx-X11/programs/Xserver/fb/fbpseudocolor.c
index 83d556a0e..469f3ea08 100644
--- a/nx-X11/programs/Xserver/fb/fbpseudocolor.c
+++ b/nx-X11/programs/Xserver/fb/fbpseudocolor.c
@@ -2,8 +2,8 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "scrnintstr.h"
 #include "colormapst.h"
 #include "glyphstr.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/nx-X11/programs/Xserver/hw/nxagent/Agent.h
index dbed1e0d8..ec312bad2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Agent.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Agent.h
@@ -103,8 +103,8 @@ typedef XID KeySym64;
 
 #define NX_TRANS_SOCKET
 #define GC XlibGC
-#include "Xlib.h"
-#include "X11/extensions/shape.h"
+#include <nx-X11/Xlib.h>
+#include <nx-X11/extensions/shape.h>
 #undef GC
 
 #ifdef _XSERVER64_tmp
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 557798e7f..21bcc60e5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -33,7 +33,7 @@
 
 #include "gcstruct.h"
 #include "xfixeswire.h"
-#include <X11/extensions/Xfixes.h>
+#include <nx-X11/extensions/Xfixes.h>
 
 /*
  * Use asyncronous get property replies.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c
index 0fb9491a4..63c3b73c1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c
@@ -25,7 +25,7 @@
 #include "scrnintstr.h"
 #include "Agent.h"
 
-#include <X11/Xlib.h>
+#include <nx-X11/Xlib.h>
 
 #include "opaque.h"
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 862ce57d0..abc6a9380 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -38,8 +38,8 @@ is" without express or implied warranty.
 #include <time.h>
 #include <errno.h>
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index c33564092..d965d574c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -66,7 +66,7 @@
 #define Window     XlibWindow
 #define Atom   XlibAtom
 #define Time XlibXID
-#include <X11/extensions/Xfixes.h>
+#include <nx-X11/extensions/Xfixes.h>
 #undef Window
 #undef Atom
 #undef Time
@@ -90,10 +90,10 @@
 #undef  KeySym
 #undef  XID
 
-#include <X11/cursorfont.h>
+#include <nx-X11/cursorfont.h>
 
 #include "Shadow.h"
-#include <X11/extensions/Xrandr.h>
+#include "X11/include/Xrandr_nxagent.h"
 
 #include "NXlib.h"
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.h b/nx-X11/programs/Xserver/hw/nxagent/Events.h
index c74fa151f..02b2b8cbe 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.h
@@ -18,7 +18,7 @@
 #ifndef __Events_H__
 #define __Events_H__
 
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 
 #define ProcessedExpose (LASTEvent + 1)
 #define ProcessedNotify (LASTEvent + 2)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Holder.c b/nx-X11/programs/Xserver/hw/nxagent/Holder.c
index 4aca1ecdb..64ffb24a4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Holder.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Holder.c
@@ -33,7 +33,7 @@
 #include "../../include/gc.h"
 #include "../../include/window.h"
 
-#include <X11/xpm.h>
+#include "X11/include/xpm_nxagent.h"
 
 #include "Agent.h"
 #include "Pixmaps.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Icons.h b/nx-X11/programs/Xserver/hw/nxagent/Icons.h
index 98e879662..b307f42e6 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Icons.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Icons.h
@@ -19,7 +19,7 @@
 #define __Icons_H__
 
 #define Pixel XpmPixel
-#include <X11/xpm.h>
+#include "X11/include/xpm_nxagent.h"
 #undef Pixel
 
 #define NXAGENT_ICON_NAME  "nxagent.xpm"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 835aebeb6..9ead48de1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -64,13 +64,13 @@ is" without express or implied warranty.
 #include "property.h"
 #include "Init.h"
 
-#include <X11/extensions/XKB.h>
+#include <nx-X11/extensions/XKB.h>
 
 #define XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XKBconfig.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBconfig.h>
 
-#include "X11/extensions/XKBrules.h"
+#include <nx-X11/extensions/XKBrules.h>
 
 #include "Xatom.h"
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h b/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h
index d11561e18..a274b8a39 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h
@@ -33,12 +33,12 @@
 
 #else
 
-#include <X11/extensions/composite.h>
-#include <X11/extensions/Xfixes.h>
+#include <nx-X11/extensions/composite.h>
+#include <nx-X11/extensions/Xfixes.h>
 
 #endif
 
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 /*
  * This revision number also appears in configure.ac, they have
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h b/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h
index 8667ded16..b4433d6c1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h
@@ -27,7 +27,7 @@
 
 #ifndef NXAGENT_SERVER
 
-#include <X11/extensions/xfixeswire.h>
+#include <nx-X11/extensions/xfixeswire.h>
 
 #endif
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index af76ed4c2..704bfcc0d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -109,12 +109,13 @@ int ProcInitialConnection();
 #define True 1
 #endif
 
+#include <X11/fonts/fontstruct.h>
+
 #define GC XlibGC
-#include <X11/Xlib.h>
+#include <nx-X11/Xlib.h>
 #undef GC
 
 #include "windowstr.h"
-#include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 #include "gcstruct.h"
 #include "selection.h"
@@ -135,15 +136,15 @@ int ProcInitialConnection();
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 #ifdef XAPPGROUP
-#include <X11/extensions/Xagsrv.h>
+#include <nx-X11/extensions/Xagsrv.h>
 #endif
 #ifdef XKB
 #define XKB_IN_SERVER
 #include "inputstr.h"
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 #endif
 
 #include "Atoms.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
index 4f41ee228..2f3a75147 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
@@ -73,16 +73,16 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xproto.h>
+#include <X11/fonts/fontstruct.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xproto.h>
 #include "scrnintstr.h"
 #include "resource.h"
 #include "dixstruct.h"
 #include "cursorstr.h"
 #include "misc.h"
 #include "opaque.h"
-#include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 #include "closestr.h"
 
@@ -172,7 +172,7 @@ _NXGetFontPathError:
 
 #ifdef XF86BIGFONT
 #define _XF86BIGFONT_SERVER_
-#include <X11/extensions/xf86bigfont.h>
+#include <nx-X11/extensions/xf86bigfont.h>
 #endif
 
 #define QUERYCHARINFO(pci, pr)  *(pr) = (pci)->metrics
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
index 5940fe7d1..11ff62947 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
@@ -132,13 +132,13 @@ of the copyright holder.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "Xlib.h"
 #include "misc.h"
 #include "resource.h"
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -152,13 +152,13 @@ of the copyright holder.
 #include "globals.h"
 
 #ifdef XKB
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
 #endif
 
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 
 #ifdef XEVIE
@@ -175,7 +175,7 @@ int    xeviegrabState = 0;
 xEvent *xeviexE;
 #endif
 
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extnsionst.h"
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c
index f964e2fd8..962367bf2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c
@@ -68,10 +68,10 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -80,7 +80,7 @@ SOFTWARE.
 #include "../../dix/dispatch.h"
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 #ifdef LBX
 #include "lbxserve.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h b/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h
index e7bb2d841..5d7fcf640 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h
@@ -50,7 +50,7 @@
 #ifndef _GLYPHSTR_H_
 #define _GLYPHSTR_H_
 
-#include <X11/extensions/renderproto.h>
+#include <nx-X11/extensions/renderproto.h>
 #include "../../render/picture.h"
 #include "screenint.h"
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
index e1c6b6d8c..aa3c606f8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c
@@ -97,10 +97,10 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_EVENTS
-#include <X11/Xproto.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xprotostr.h>
 
 #include "misc.h"
 #include "regionstr.h"
@@ -112,7 +112,7 @@ Equipment Corporation.
 
 #include "dixstruct.h"
 #include "mi.h"
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 
 #include "globals.h"
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c
index 8132e9dd0..a720cafbf 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c
@@ -67,7 +67,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "regionstr.h"
 #include "region.h"
 #include "mi.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
index a2d4a8e52..d6c5aa4dd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
@@ -68,10 +68,10 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "windowstr.h"
 #include "propertyst.h"
 #include "dixstruct.h"
@@ -79,7 +79,7 @@ SOFTWARE.
 #include "swaprep.h"
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 #ifdef LBX
 #include "lbxserve.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
index 260355c6e..dc1d2387e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c
@@ -47,8 +47,8 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -59,9 +59,9 @@
 #include "colormapst.h"
 #include "extnsionst.h"
 #include "servermd.h"
-#include <X11/extensions/render.h>
-#include <X11/extensions/renderproto.h>
-#include <X11/Xfuncproto.h>
+#include <nx-X11/extensions/render.h>
+#include <nx-X11/extensions/renderproto.h>
+#include <nx-X11/Xfuncproto.h>
 #include "cursorstr.h"
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c
index 833a33fd3..39a1992de 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c
@@ -123,7 +123,7 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "misc.h"
 #include "os.h"
 #include "resource.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
index 3b40b82f7..95905fde7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
@@ -64,8 +64,8 @@ in this Software without prior written authorization from The Open Group.
 #include <sys/stat.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -77,8 +77,8 @@ in this Software without prior written authorization from The Open Group.
 #include "extnsionst.h"
 #include "servermd.h"
 #define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
-#include <X11/Xfuncproto.h>
+#include <nx-X11/extensions/shmstr.h>
+#include <nx-X11/Xfuncproto.h>
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
 #endif
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
index 4017099e9..4552ad563 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
@@ -123,11 +123,11 @@ Equipment Corporation.
 #include "globals.h"
 
 #ifdef XAPPGROUP
-#include <X11/extensions/Xagsrv.h>
+#include <nx-X11/extensions/Xagsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 
 #include "Screen.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c
index cfce34463..1724374a0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c
@@ -71,8 +71,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
@@ -82,12 +82,12 @@ SOFTWARE.
 #include "resource.h"
 #include "opaque.h"
 
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
+#include <nx-X11/extensions/Xv.h>
+#include <nx-X11/extensions/Xvproto.h>
 #include "xvdix.h"
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include <nx-X11/extensions/shmstr.h>
 #endif
 
 #include "Trap.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 095aa7b08..491a92c2f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -77,13 +77,13 @@ is" without express or implied warranty.
 #include "Shadow.h"
 #include "Utils.h"
 
-#include <X11/extensions/Xrandr.h>
+#include "X11/include/Xrandr_nxagent.h"
 
 #define GC     XlibGC
 #define Font   XlibFont
 #define KeySym XlibKeySym
 #define XID    XlibXID
-#include <X11/Xlibint.h>
+#include <nx-X11/Xlibint.h>
 #undef  GC
 #undef  Font
 #undef  KeySym
diff --git a/nx-X11/programs/Xserver/hw/nxagent/TestExt.c b/nx-X11/programs/Xserver/hw/nxagent/TestExt.c
index 6bce2eaeb..30fe1968e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/TestExt.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/TestExt.c
@@ -29,9 +29,9 @@ is" without express or implied warranty.
 
 */
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/Xlib.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xlib.h>
 #undef Bool
 #include "screenint.h"
 #include "input.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
new file mode 100644
index 000000000..acfc5834e
--- /dev/null
+++ b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright © 2000 Compaq Computer Corporation, Inc.
+ * Copyright © 2002 Hewlett-Packard Company, Inc.
+ * Copyright © 2006 Intel Corporation
+ * Copyright © 2008 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Author:  Jim Gettys, HP Labs, Hewlett-Packard, Inc.
+ *	    Keith Packard, Intel Corporation
+ */
+
+/*
+ * This file is a reduced version of the header file of
+ * <X11/extensions/Xrandr.h>
+ *
+ * This copy of code has been introduced to allow a clear namespace
+ * separation between <X11/...> and <nx-X11/...> header files.
+ *
+ * This version of the Xrandr library header file only contains symbols
+ * required by nxagent and strictly avoids indirectly including
+ * from an X11 library that is also shipped in nx-X11/lib/.
+ *
+ * When using <X11/extensions/Xrandr.h> instead for inclusion in
+ * nxagent, it will attempt pulling in the <X11/extensions/Xrender.h>
+ * header which in turn will include <X11/Xlib.h>. However, the headers of
+ * the same name from <nx-X11/...> should be used instead.
+ *
+ * FIXME: Once the nxagent Xserver starts using libXrender from X.Org, this
+ * hack can be removed.
+ *
+ * 2015/06/26, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+ */
+
+#ifndef _XRANDR_H_
+#define _XRANDR_H_
+
+#include <X11/extensions/randr.h>
+#include <X11/Xfuncproto.h>
+
+_XFUNCPROTOBEGIN
+
+typedef XID RRProvider;
+typedef XID RRMode;
+
+/*
+ *  Events.
+ */
+
+typedef struct {
+    int type;                   /* event base */
+    unsigned long serial;       /* # of last request processed by server */
+    Bool send_event;            /* true if this came from a SendEvent request */
+    Display *display;           /* Display the event was read from */
+    Window window;              /* window which selected for this event */
+    Window root;                /* Root window for changed screen */
+    Time timestamp;             /* when the screen change occurred */
+    Time config_timestamp;      /* when the last configuration change */
+    SizeID size_index;
+    SubpixelOrder subpixel_order;
+    Rotation rotation;
+    int width;
+    int height;
+    int mwidth;
+    int mheight;
+} XRRScreenChangeNotifyEvent;
+
+typedef unsigned long XRRModeFlags;
+
+typedef struct _XRRModeInfo {
+    RRMode		id;
+    unsigned int	width;
+    unsigned int	height;
+    unsigned long	dotClock;
+    unsigned int	hSyncStart;
+    unsigned int	hSyncEnd;
+    unsigned int	hTotal;
+    unsigned int	hSkew;
+    unsigned int	vSyncStart;
+    unsigned int	vSyncEnd;
+    unsigned int	vTotal;
+    char		*name;
+    unsigned int	nameLength;
+    XRRModeFlags	modeFlags;
+} XRRModeInfo;
+
+_XFUNCPROTOEND
+
+#endif /* _XRANDR_H_ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h
new file mode 100644
index 000000000..b02e5a913
--- /dev/null
+++ b/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h
@@ -0,0 +1,259 @@
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+/*****************************************************************************\
+* xpm.h:                                                                      *
+*                                                                             *
+*  XPM library                                                                *
+*  Include file                                                               *
+*                                                                             *
+*  Developed by Arnaud Le Hors                                                *
+\*****************************************************************************/
+
+/*
+ * This file is a reduced version of the header file of
+ * <X11/xpm.h>
+ *
+ * This copy of code has been introduced to allow a clear namespace
+ * separation between <X11/...> and <nx-X11/...> header files.
+ *
+ * This version of the Xpm library header file only contains symbols
+ * required by nxagent and strictly avoids indirectly including
+ * from an X11 library that is also shipped in nx-X11/lib/.
+ *
+ * When using <X11/xpm.h> instead for inclusion in nxagent, it will
+ * attempt pulling in the <X11/extensions/Xlib.h> header file.
+ * However, the headers of the same name from <nx-X11/...> should be
+ * used instead.
+ *
+ * FIXME: Once the nxagent Xserver starts using libX11 from X.Org, this
+ * hack can be removed.
+ *
+ * 2015/06/26, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+ */
+
+#ifndef XPM_h
+#define XPM_h
+
+/*
+ * first some identification numbers:
+ * the version and revision numbers are determined with the following rule:
+ * SO Major number = LIB minor version number.
+ * SO Minor number = LIB sub-minor version number.
+ * e.g: Xpm version 3.2f
+ *      we forget the 3 which is the format number, 2 gives 2, and f gives 6.
+ *      thus we have XpmVersion = 2 and XpmRevision = 6
+ *      which gives  SOXPMLIBREV = 2.6
+ *
+ * Then the XpmIncludeVersion number is built from these numbers.
+ */
+#define XpmFormat 3
+#define XpmVersion 4
+#define XpmRevision 11
+#define XpmIncludeVersion ((XpmFormat * 100 + XpmVersion) * 100 + XpmRevision)
+
+#ifndef XPM_NUMBERS
+
+/* let's define Pixel if it is not done yet */
+#if ! defined(_XtIntrinsic_h) && ! defined(PIXEL_ALREADY_TYPEDEFED)
+typedef unsigned long Pixel;	/* Index into colormap */
+# define PIXEL_ALREADY_TYPEDEFED
+#endif
+
+/* include headers from <nx-X11/...> instead of <X11/...> */
+#include <nx-X11/Xlib.h>
+#include <nx-X11/Xutil.h>
+
+/* Return ErrorStatus codes:
+ * null     if full success
+ * positive if partial success
+ * negative if failure
+ */
+
+#define XpmColorError    1
+#define XpmSuccess       0
+#define XpmOpenFailed   -1
+#define XpmFileInvalid  -2
+#define XpmNoMemory     -3
+#define XpmColorFailed  -4
+
+typedef struct {
+    char *name;			/* Symbolic color name */
+    char *value;		/* Color value */
+    Pixel pixel;		/* Color pixel */
+}      XpmColorSymbol;
+
+typedef struct {
+    char *name;			/* name of the extension */
+    unsigned int nlines;	/* number of lines in this extension */
+    char **lines;		/* pointer to the extension array of strings */
+}      XpmExtension;
+
+typedef struct {
+    char *string;		/* characters string */
+    char *symbolic;		/* symbolic name */
+    char *m_color;		/* monochrom default */
+    char *g4_color;		/* 4 level grayscale default */
+    char *g_color;		/* other level grayscale default */
+    char *c_color;		/* color default */
+}      XpmColor;
+
+typedef struct {
+    unsigned int width;		/* image width */
+    unsigned int height;	/* image height */
+    unsigned int cpp;		/* number of characters per pixel */
+    unsigned int ncolors;	/* number of colors */
+    XpmColor *colorTable;	/* list of related colors */
+    unsigned int *data;		/* image data */
+}      XpmImage;
+
+typedef struct {
+    unsigned long valuemask;	/* Specifies which attributes are defined */
+    char *hints_cmt;		/* Comment of the hints section */
+    char *colors_cmt;		/* Comment of the colors section */
+    char *pixels_cmt;		/* Comment of the pixels section */
+    unsigned int x_hotspot;	/* Returns the x hotspot's coordinate */
+    unsigned int y_hotspot;	/* Returns the y hotspot's coordinate */
+    unsigned int nextensions;	/* number of extensions */
+    XpmExtension *extensions;	/* pointer to array of extensions */
+}      XpmInfo;
+
+typedef int (*XpmAllocColorFunc)(
+    Display*			/* display */,
+    Colormap			/* colormap */,
+    char*			/* colorname */,
+    XColor*			/* xcolor */,
+    void*			/* closure */
+);
+
+typedef int (*XpmFreeColorsFunc)(
+    Display*			/* display */,
+    Colormap			/* colormap */,
+    Pixel*			/* pixels */,
+    int				/* npixels */,
+    void*			/* closure */
+);
+
+
+/* required struct for hw/nxagent/Holder.c */
+typedef struct {
+    unsigned long valuemask;		/* Specifies which attributes are
+					   defined */
+
+    Visual *visual;			/* Specifies the visual to use */
+    Colormap colormap;			/* Specifies the colormap to use */
+    unsigned int depth;			/* Specifies the depth */
+    unsigned int width;			/* Returns the width of the created
+					   pixmap */
+    unsigned int height;		/* Returns the height of the created
+					   pixmap */
+    unsigned int x_hotspot;		/* Returns the x hotspot's
+					   coordinate */
+    unsigned int y_hotspot;		/* Returns the y hotspot's
+					   coordinate */
+    unsigned int cpp;			/* Specifies the number of char per
+					   pixel */
+    Pixel *pixels;			/* List of used color pixels */
+    unsigned int npixels;		/* Number of used pixels */
+    XpmColorSymbol *colorsymbols;	/* List of color symbols to override */
+    unsigned int numsymbols;		/* Number of symbols */
+    char *rgb_fname;			/* RGB text file name */
+    unsigned int nextensions;		/* Number of extensions */
+    XpmExtension *extensions;		/* List of extensions */
+
+    unsigned int ncolors;               /* Number of colors */
+    XpmColor *colorTable;               /* List of colors */
+/* 3.2 backward compatibility code */
+    char *hints_cmt;                    /* Comment of the hints section */
+    char *colors_cmt;                   /* Comment of the colors section */
+    char *pixels_cmt;                   /* Comment of the pixels section */
+/* end 3.2 bc */
+    unsigned int mask_pixel;            /* Color table index of transparent
+                                           color */
+
+    /* Color Allocation Directives */
+    Bool exactColors;			/* Only use exact colors for visual */
+    unsigned int closeness;		/* Allowable RGB deviation */
+    unsigned int red_closeness;		/* Allowable red deviation */
+    unsigned int green_closeness;	/* Allowable green deviation */
+    unsigned int blue_closeness;	/* Allowable blue deviation */
+    int color_key;			/* Use colors from this color set */
+
+    Pixel *alloc_pixels;		/* Returns the list of alloc'ed color
+					   pixels */
+    int nalloc_pixels;			/* Returns the number of alloc'ed
+					   color pixels */
+
+    Bool alloc_close_colors;    	/* Specify whether close colors should
+					   be allocated using XAllocColor
+					   or not */
+    int bitmap_format;			/* Specify the format of 1bit depth
+					   images: ZPixmap or XYBitmap */
+
+    /* Color functions */
+    XpmAllocColorFunc alloc_color;	/* Application color allocator */
+    XpmFreeColorsFunc free_colors;	/* Application color de-allocator */
+    void *color_closure;		/* Application private data to pass to
+					   alloc_color and free_colors */
+
+}      XpmAttributes;
+
+/* XpmAttributes value masks bits */
+
+/* required masks bits for hw/nxagent/Holder.c */
+#define XpmDepth	   (1L<<2)
+#define XpmSize		   (1L<<3)	/* width & height */
+
+/* macros for forward declarations of functions with prototypes */
+#define FUNC(f, t, p) extern t f p
+#define LFUNC(f, t, p) static t f p
+
+
+/*
+ * functions declarations (for building nxagent against system wide libXpm4,
+ * but also against libNX_X11 (as opposed to system-wide libX11).
+ */
+
+_XFUNCPROTOBEGIN
+
+/* Keep for hw/nxagent/Holder.c */
+FUNC(XpmCreatePixmapFromData, int, (Display *display,
+				    Drawable d,
+				    char **data,
+				    Pixmap *pixmap_return,
+				    Pixmap *shapemask_return,
+				    XpmAttributes *attributes));
+/* Keep for hw/nxagent/Display.c */
+FUNC(XpmReadFileToPixmap, int, (Display *display,
+                                Drawable d,
+                                const char *filename,
+                                Pixmap *pixmap_return,
+                                Pixmap *shapemask_return,
+                                XpmAttributes *attributes));
+
+_XFUNCPROTOEND
+
+#endif /* XPM_NUMBERS */
+#endif
diff --git a/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h b/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
index c51e0ee14..ca68c1b63 100644
--- a/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
+++ b/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
@@ -45,7 +45,7 @@
 #ifndef	XF86_LIBC_H
 #define XF86_LIBC_H 1
 
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xfuncs.h>
 #include <stddef.h>
 
 /*
diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile
index d68ef940c..4c9b169a4 100644
--- a/nx-X11/programs/Xserver/include/Imakefile
+++ b/nx-X11/programs/Xserver/include/Imakefile
@@ -63,5 +63,5 @@ InstallDriverSDKNonExecFile(validate.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(window.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(windowstr.h,$(DRIVERSDKINCLUDEDIR))
 
-BuildIncludes($(HEADERS),X11,..)
-InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS))
+BuildIncludes($(HEADERS),nx-X11,..)
+InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS))
diff --git a/nx-X11/programs/Xserver/include/closestr.h b/nx-X11/programs/Xserver/include/closestr.h
index c06010113..31b5693f5 100644
--- a/nx-X11/programs/Xserver/include/closestr.h
+++ b/nx-X11/programs/Xserver/include/closestr.h
@@ -33,7 +33,7 @@ from The Open Group.
 #define CLOSESTR_H
 
 #define	NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "closure.h"
 #include "dix.h"
 #include "misc.h"
diff --git a/nx-X11/programs/Xserver/include/colormap.h b/nx-X11/programs/Xserver/include/colormap.h
index d519bb782..67f44193d 100644
--- a/nx-X11/programs/Xserver/include/colormap.h
+++ b/nx-X11/programs/Xserver/include/colormap.h
@@ -50,7 +50,7 @@ SOFTWARE.
 #ifndef CMAP_H
 #define CMAP_H 1
 
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "screenint.h"
 #include "window.h"
 
diff --git a/nx-X11/programs/Xserver/include/dixfontstr.h b/nx-X11/programs/Xserver/include/dixfontstr.h
index 948bf1adb..09a162451 100644
--- a/nx-X11/programs/Xserver/include/dixfontstr.h
+++ b/nx-X11/programs/Xserver/include/dixfontstr.h
@@ -30,7 +30,7 @@ SOFTWARE.
 #include <X11/fonts/fontstruct.h>
 #include "closure.h"
 #define NEED_REPLIES
-#include <X11/Xproto.h> /* for xQueryFontReply */
+#include <nx-X11/Xproto.h> /* for xQueryFontReply */
 
 #define FONTCHARSET(font)	  (font)
 #define FONTMAXBOUNDS(font,field) (font)->info.maxbounds.field
diff --git a/nx-X11/programs/Xserver/include/dixstruct.h b/nx-X11/programs/Xserver/include/dixstruct.h
index 53c78d2de..e4b5e9fe8 100644
--- a/nx-X11/programs/Xserver/include/dixstruct.h
+++ b/nx-X11/programs/Xserver/include/dixstruct.h
@@ -31,7 +31,7 @@ SOFTWARE.
 #include "cursor.h"
 #include "gc.h"
 #include "pixmap.h"
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 
 /*
  * 	direct-mapped hash table, used by resource manager to store
diff --git a/nx-X11/programs/Xserver/include/gc.h b/nx-X11/programs/Xserver/include/gc.h
index 1c0c90d3e..1969e5cd7 100644
--- a/nx-X11/programs/Xserver/include/gc.h
+++ b/nx-X11/programs/Xserver/include/gc.h
@@ -50,15 +50,15 @@ SOFTWARE.
 #ifndef GC_H
 #define GC_H 
 
-#include <X11/X.h>	/* for GContext, Mask */
+#include <nx-X11/X.h>	/* for GContext, Mask */
 
 #ifndef _XTYPEDEF_POINTER
 /* Don't let Xdefs.h define 'pointer' */
 #define _XTYPEDEF_POINTER       1
 #endif /* _XTYPEDEF_POINTER */
-#include <X11/Xdefs.h>	/* for Bool */
+#include <nx-X11/Xdefs.h>	/* for Bool */
 
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "screenint.h"	/* for ScreenPtr */
 #include "pixmap.h"	/* for DrawablePtr */
 
diff --git a/nx-X11/programs/Xserver/include/gcstruct.h b/nx-X11/programs/Xserver/include/gcstruct.h
index 16779f692..71d3ace47 100644
--- a/nx-X11/programs/Xserver/include/gcstruct.h
+++ b/nx-X11/programs/Xserver/include/gcstruct.h
@@ -58,7 +58,7 @@ SOFTWARE.
 #include "region.h"
 #include "pixmap.h"
 #include "screenint.h"
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xprotostr.h>
 
 /*
  * functions which modify the state of the GC
diff --git a/nx-X11/programs/Xserver/include/input.h b/nx-X11/programs/Xserver/include/input.h
index 88cc98050..a7c8d0dfe 100644
--- a/nx-X11/programs/Xserver/include/input.h
+++ b/nx-X11/programs/Xserver/include/input.h
@@ -52,8 +52,8 @@ SOFTWARE.
 
 #include "misc.h"
 #include "screenint.h"
-#include <X11/Xmd.h>
-#include <X11/Xproto.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xproto.h>
 #include "window.h"     /* for WindowPtr */
 
 #define DEVICE_INIT	0
diff --git a/nx-X11/programs/Xserver/include/misc.h b/nx-X11/programs/Xserver/include/misc.h
index 1576f1433..cb3051c94 100644
--- a/nx-X11/programs/Xserver/include/misc.h
+++ b/nx-X11/programs/Xserver/include/misc.h
@@ -77,16 +77,16 @@ OF THIS SOFTWARE.
 extern unsigned long globalSerialNumber;
 extern unsigned long serverGeneration;
 
-#include <X11/Xosdefs.h>
-#include <X11/Xfuncproto.h>
-#include <X11/Xmd.h>
-#include <X11/X.h>
+#include <nx-X11/Xosdefs.h>
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/X.h>
 
 #ifndef _XTYPEDEF_POINTER
 /* Don't let Xdefs.h define 'pointer' */
 #define _XTYPEDEF_POINTER       1
 #endif /* _XTYPEDEF_POINTER */
-#include <X11/Xdefs.h>
+#include <nx-X11/Xdefs.h>
 
 #ifndef IN_MODULE
 #ifndef NULL
@@ -121,7 +121,7 @@ typedef struct _xReq *xReqPtr;
 
 #include "os.h" 	/* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */
 #ifndef IN_MODULE
-#include <X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */
+#include <nx-X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */
 #endif
 
 #define NullBox ((BoxPtr)0)
diff --git a/nx-X11/programs/Xserver/include/miscstruct.h b/nx-X11/programs/Xserver/include/miscstruct.h
index 87874aae4..7df9240c9 100644
--- a/nx-X11/programs/Xserver/include/miscstruct.h
+++ b/nx-X11/programs/Xserver/include/miscstruct.h
@@ -51,7 +51,7 @@ SOFTWARE.
 #define MISCSTRUCT_H 1
 
 #include "misc.h"
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xprotostr.h>
 #include "gc.h"
 
 typedef xPoint DDXPointRec;
diff --git a/nx-X11/programs/Xserver/include/opaque.h b/nx-X11/programs/Xserver/include/opaque.h
index ca29afdc0..749b6f5b9 100644
--- a/nx-X11/programs/Xserver/include/opaque.h
+++ b/nx-X11/programs/Xserver/include/opaque.h
@@ -31,7 +31,7 @@ from The Open Group.
 #ifndef OPAQUE_H
 #define OPAQUE_H
 
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 
 #include "globals.h"
 
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h
index 551b35097..e150e1e0b 100644
--- a/nx-X11/programs/Xserver/include/os.h
+++ b/nx-X11/programs/Xserver/include/os.h
@@ -54,7 +54,7 @@ SOFTWARE.
 #include "misc.h"
 #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size))
 #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((void *)(_ptr))
-#include <X11/Xalloca.h>
+#include <nx-X11/Xalloca.h>
 #ifndef IN_MODULE
 #include <stdarg.h>
 #else
diff --git a/nx-X11/programs/Xserver/include/scrnintstr.h b/nx-X11/programs/Xserver/include/scrnintstr.h
index 297227493..0539ca516 100644
--- a/nx-X11/programs/Xserver/include/scrnintstr.h
+++ b/nx-X11/programs/Xserver/include/scrnintstr.h
@@ -56,7 +56,7 @@ SOFTWARE.
 #include "colormap.h"
 #include "cursor.h"
 #include "validate.h"
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "dix.h"
 
 typedef struct _PixmapFormat {
diff --git a/nx-X11/programs/Xserver/include/window.h b/nx-X11/programs/Xserver/include/window.h
index cbfed645f..571115365 100644
--- a/nx-X11/programs/Xserver/include/window.h
+++ b/nx-X11/programs/Xserver/include/window.h
@@ -53,7 +53,7 @@ SOFTWARE.
 #include "misc.h"
 #include "region.h"
 #include "screenint.h"
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 
 #define TOTALLY_OBSCURED 0
 #define UNOBSCURED 1
diff --git a/nx-X11/programs/Xserver/include/windowstr.h b/nx-X11/programs/Xserver/include/windowstr.h
index dab6fcf71..5c181bc51 100644
--- a/nx-X11/programs/Xserver/include/windowstr.h
+++ b/nx-X11/programs/Xserver/include/windowstr.h
@@ -58,7 +58,7 @@ SOFTWARE.
 #include "resource.h"	/* for ROOT_WINDOW_ID_BASE */
 #include "dix.h"
 #include "miscstruct.h"
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xprotostr.h>
 #include "opaque.h"
 
 #define GuaranteeNothing	0
diff --git a/nx-X11/programs/Xserver/mfb/maskbits.h b/nx-X11/programs/Xserver/mfb/maskbits.h
index 7e2b74a18..94a7e8955 100644
--- a/nx-X11/programs/Xserver/mfb/maskbits.h
+++ b/nx-X11/programs/Xserver/mfb/maskbits.h
@@ -28,8 +28,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
 #include "servermd.h"
 
 
diff --git a/nx-X11/programs/Xserver/mi/mi.h b/nx-X11/programs/Xserver/mi/mi.h
index 0f3f5778f..6eea34b6c 100644
--- a/nx-X11/programs/Xserver/mi/mi.h
+++ b/nx-X11/programs/Xserver/mi/mi.h
@@ -49,7 +49,7 @@ SOFTWARE.
 
 #ifndef MI_H
 #define MI_H
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "region.h"
 #include "validate.h"
 #include "window.h"
diff --git a/nx-X11/programs/Xserver/mi/miarc.c b/nx-X11/programs/Xserver/mi/miarc.c
index f06c4b51d..8db188a6e 100644
--- a/nx-X11/programs/Xserver/mi/miarc.c
+++ b/nx-X11/programs/Xserver/mi/miarc.c
@@ -62,8 +62,8 @@ SOFTWARE.
 #include <math.h>
 #undef _XOPEN_SOURCE
 #endif
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "misc.h"
 #include "gcstruct.h"
 #include "scrnintstr.h"
@@ -72,7 +72,7 @@ SOFTWARE.
 #include "mifpoly.h"
 #include "mi.h"
 #include "mifillarc.h"
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 static double miDsin(double a);
 static double miDcos(double a);
diff --git a/nx-X11/programs/Xserver/mi/mibitblt.c b/nx-X11/programs/Xserver/mi/mibitblt.c
index 0caad083f..60318a046 100644
--- a/nx-X11/programs/Xserver/mi/mibitblt.c
+++ b/nx-X11/programs/Xserver/mi/mibitblt.c
@@ -52,8 +52,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 
 #include "misc.h"
 #include "gcstruct.h"
@@ -62,7 +62,7 @@ SOFTWARE.
 #include "scrnintstr.h"
 #include "mi.h"
 #include "regionstr.h"
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 #include "servermd.h"
 
 #ifndef HAS_FFS
diff --git a/nx-X11/programs/Xserver/mi/mibstore.c b/nx-X11/programs/Xserver/mi/mibstore.c
index f18648f66..875ec87f3 100644
--- a/nx-X11/programs/Xserver/mi/mibstore.c
+++ b/nx-X11/programs/Xserver/mi/mibstore.c
@@ -49,9 +49,9 @@ implied warranty.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "regionstr.h"
 #include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/mi/miclipn.c b/nx-X11/programs/Xserver/mi/miclipn.c
index 14ff0d69a..913b0e47a 100644
--- a/nx-X11/programs/Xserver/mi/miclipn.c
+++ b/nx-X11/programs/Xserver/mi/miclipn.c
@@ -32,7 +32,7 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "mi.h"
diff --git a/nx-X11/programs/Xserver/mi/micmap.c b/nx-X11/programs/Xserver/mi/micmap.c
index 98f3e521d..15d3f7f46 100644
--- a/nx-X11/programs/Xserver/mi/micmap.c
+++ b/nx-X11/programs/Xserver/mi/micmap.c
@@ -40,8 +40,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "scrnintstr.h"
 #include "colormapst.h"
 #include "resource.h"
diff --git a/nx-X11/programs/Xserver/mi/miexpose.c b/nx-X11/programs/Xserver/mi/miexpose.c
index f3dae5768..782ddad49 100644
--- a/nx-X11/programs/Xserver/mi/miexpose.c
+++ b/nx-X11/programs/Xserver/mi/miexpose.c
@@ -80,10 +80,10 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_EVENTS
-#include <X11/Xproto.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xprotostr.h>
 
 #include "misc.h"
 #include "regionstr.h"
@@ -95,7 +95,7 @@ Equipment Corporation.
 
 #include "dixstruct.h"
 #include "mi.h"
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 
 #include "globals.h"
 
diff --git a/nx-X11/programs/Xserver/mi/mifillarc.c b/nx-X11/programs/Xserver/mi/mifillarc.c
index 0dcf25d05..533bfe996 100644
--- a/nx-X11/programs/Xserver/mi/mifillarc.c
+++ b/nx-X11/programs/Xserver/mi/mifillarc.c
@@ -34,8 +34,8 @@ Author:  Bob Scheifler, MIT X Consortium
 #endif
 
 #include <math.h>
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mifillrct.c b/nx-X11/programs/Xserver/mi/mifillrct.c
index 9f68db720..8a8f2b4f3 100644
--- a/nx-X11/programs/Xserver/mi/mifillrct.c
+++ b/nx-X11/programs/Xserver/mi/mifillrct.c
@@ -51,8 +51,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmap.h"
diff --git a/nx-X11/programs/Xserver/mi/mifpolycon.c b/nx-X11/programs/Xserver/mi/mifpolycon.c
index 40b83586f..95b81bbb6 100644
--- a/nx-X11/programs/Xserver/mi/mifpolycon.c
+++ b/nx-X11/programs/Xserver/mi/mifpolycon.c
@@ -51,7 +51,7 @@ SOFTWARE.
 #endif
 
 #include <math.h>
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index b70a6a67e..f4ff4c243 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -191,35 +191,35 @@ typedef void (*InitExtension)(INITARGS);
 
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include <nx-X11/extensions/shmstr.h>
 #endif
 #ifdef XTEST
 #define _XTEST_SERVER_
-#include <X11/extensions/XTest.h>
+#include <nx-X11/extensions/XTest.h>
 #endif
 #ifdef XKB
-#include <X11/extensions/XKB.h>
+#include <nx-X11/extensions/XKB.h>
 #endif
 #ifdef LBX
 #define _XLBX_SERVER_
-#include <X11/extensions/lbxstr.h>
+#include <nx-X11/extensions/lbxstr.h>
 #endif
 #ifdef XAPPGROUP
 #define _XAG_SERVER_
-#include <X11/extensions/Xagstr.h>
+#include <nx-X11/extensions/Xagstr.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/securstr.h>
+#include <nx-X11/extensions/securstr.h>
 #endif
 #ifdef PANORAMIX
-#include <X11/extensions/panoramiXproto.h>
+#include <nx-X11/extensions/panoramiXproto.h>
 #endif
 #ifdef XF86BIGFONT
-#include <X11/extensions/xf86bigfstr.h>
+#include <nx-X11/extensions/xf86bigfstr.h>
 #endif
 #ifdef RES
-#include <X11/extensions/XResproto.h>
+#include <nx-X11/extensions/XResproto.h>
 #endif
 
 /* FIXME: this whole block of externs should be from the appropriate headers */
diff --git a/nx-X11/programs/Xserver/mi/mioverlay.c b/nx-X11/programs/Xserver/mi/mioverlay.c
index 732e47af0..f67704e11 100644
--- a/nx-X11/programs/Xserver/mi/mioverlay.c
+++ b/nx-X11/programs/Xserver/mi/mioverlay.c
@@ -4,7 +4,7 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "scrnintstr.h"
 #include "validate.h"
 #include "windowstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mipoly.c b/nx-X11/programs/Xserver/mi/mipoly.c
index 403d3da56..11214a732 100644
--- a/nx-X11/programs/Xserver/mi/mipoly.c
+++ b/nx-X11/programs/Xserver/mi/mipoly.c
@@ -60,7 +60,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "windowstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mipolygen.c b/nx-X11/programs/Xserver/mi/mipolygen.c
index c3d9ef397..98fe21d50 100644
--- a/nx-X11/programs/Xserver/mi/mipolygen.c
+++ b/nx-X11/programs/Xserver/mi/mipolygen.c
@@ -50,7 +50,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "gcstruct.h"
 #include "miscanfill.h"
 #include "mipoly.h"
diff --git a/nx-X11/programs/Xserver/mi/mipolypnt.c b/nx-X11/programs/Xserver/mi/mipolypnt.c
index 5d615c28d..dcbdf85d0 100644
--- a/nx-X11/programs/Xserver/mi/mipolypnt.c
+++ b/nx-X11/programs/Xserver/mi/mipolypnt.c
@@ -50,8 +50,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "pixmapstr.h"
 #include "gcstruct.h"
 #include "windowstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mipolyrect.c b/nx-X11/programs/Xserver/mi/mipolyrect.c
index 98e467f9f..9b21bb032 100644
--- a/nx-X11/programs/Xserver/mi/mipolyrect.c
+++ b/nx-X11/programs/Xserver/mi/mipolyrect.c
@@ -50,8 +50,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmap.h"
diff --git a/nx-X11/programs/Xserver/mi/mipolyseg.c b/nx-X11/programs/Xserver/mi/mipolyseg.c
index dcf3d815a..bd3c93ed6 100644
--- a/nx-X11/programs/Xserver/mi/mipolyseg.c
+++ b/nx-X11/programs/Xserver/mi/mipolyseg.c
@@ -50,8 +50,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmap.h"
diff --git a/nx-X11/programs/Xserver/mi/mipushpxl.c b/nx-X11/programs/Xserver/mi/mipushpxl.c
index 5fce1cae7..44834db50 100644
--- a/nx-X11/programs/Xserver/mi/mipushpxl.c
+++ b/nx-X11/programs/Xserver/mi/mipushpxl.c
@@ -50,7 +50,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "gcstruct.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/mi/miregion.c b/nx-X11/programs/Xserver/mi/miregion.c
index 5ec4ec55a..1df0dcc46 100644
--- a/nx-X11/programs/Xserver/mi/miregion.c
+++ b/nx-X11/programs/Xserver/mi/miregion.c
@@ -82,7 +82,7 @@ Equipment Corporation.
 #endif
 
 #include "regionstr.h"
-#include <X11/Xprotostr.h>
+#include <nx-X11/Xprotostr.h>
 #include "gc.h"
 #include "mi.h"
 #include "mispans.h"
diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c
index 78e2af5a4..4950eaa93 100644
--- a/nx-X11/programs/Xserver/mi/miscrinit.c
+++ b/nx-X11/programs/Xserver/mi/miscrinit.c
@@ -32,7 +32,7 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "servermd.h"
 #include "misc.h"
 #include "mi.h"
@@ -42,7 +42,7 @@ from The Open Group.
 #include "miline.h"
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include <X11/extensions/XShm.h>
+#include <nx-X11/extensions/XShm.h>
 #endif
 
 /* We use this structure to propogate some information from miScreenInit to
diff --git a/nx-X11/programs/Xserver/mi/miwideline.c b/nx-X11/programs/Xserver/mi/miwideline.c
index 44cf18f2e..fa9ef4591 100644
--- a/nx-X11/programs/Xserver/mi/miwideline.c
+++ b/nx-X11/programs/Xserver/mi/miwideline.c
@@ -47,7 +47,7 @@ from The Open Group.
 #include <math.h>
 #undef _XOPEN_SOURCE
 #endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "windowstr.h"
 #include "gcstruct.h"
 #include "regionstr.h"
diff --git a/nx-X11/programs/Xserver/mi/miwindow.c b/nx-X11/programs/Xserver/mi/miwindow.c
index 179c6e31e..44b7ada60 100644
--- a/nx-X11/programs/Xserver/mi/miwindow.c
+++ b/nx-X11/programs/Xserver/mi/miwindow.c
@@ -50,7 +50,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "regionstr.h"
 #include "region.h"
 #include "mi.h"
diff --git a/nx-X11/programs/Xserver/mi/mizerarc.c b/nx-X11/programs/Xserver/mi/mizerarc.c
index 62402f41b..4b4d724a6 100644
--- a/nx-X11/programs/Xserver/mi/mizerarc.c
+++ b/nx-X11/programs/Xserver/mi/mizerarc.c
@@ -40,8 +40,8 @@ Author:  Bob Scheifler, MIT X Consortium
 #endif
 
 #include <math.h>
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mizerclip.c b/nx-X11/programs/Xserver/mi/mizerclip.c
index e648b21d4..6acfc7fe0 100644
--- a/nx-X11/programs/Xserver/mi/mizerclip.c
+++ b/nx-X11/programs/Xserver/mi/mizerclip.c
@@ -49,7 +49,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 
 #include "misc.h"
 #include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/mi/mizerline.c b/nx-X11/programs/Xserver/mi/mizerline.c
index 8e62a8c94..5a61ff5d6 100644
--- a/nx-X11/programs/Xserver/mi/mizerline.c
+++ b/nx-X11/programs/Xserver/mi/mizerline.c
@@ -50,7 +50,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 
 #include "misc.h"
 #include "scrnintstr.h"
diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c
index d97d44ab6..0a18c28c8 100644
--- a/nx-X11/programs/Xserver/os/WaitFor.c
+++ b/nx-X11/programs/Xserver/os/WaitFor.c
@@ -78,19 +78,19 @@ SOFTWARE.
 #endif
 
 #ifdef WIN32
-#include <X11/Xwinsock.h>
+#include <nx-X11/Xwinsock.h>
 #endif
-#include <X11/Xos.h>			/* for strings, fcntl, time */
+#include <nx-X11/Xos.h>			/* for strings, fcntl, time */
 #include <errno.h>
 #include <stdio.h>
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "misc.h"
 
 #ifdef __UNIXOS2__
 #define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t)
 #endif
 #include "osdep.h"
-#include <X11/Xpoll.h>
+#include <nx-X11/Xpoll.h>
 #include "dixstruct.h"
 #include "opaque.h"
 #ifdef DPMSExtension
@@ -138,7 +138,7 @@ mffs(fd_mask mask)
 
 #ifdef DPMSExtension
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <nx-X11/extensions/dpms.h>
 #endif
 
 #ifdef XTESTEXT1
diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c
index 07b460f40..05dfaf38a 100644
--- a/nx-X11/programs/Xserver/os/access.c
+++ b/nx-X11/programs/Xserver/os/access.c
@@ -62,15 +62,15 @@ SOFTWARE.
 #endif
 
 #ifdef WIN32
-#include <X11/Xwinsock.h>
+#include <nx-X11/Xwinsock.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <X11/Xtrans/Xtrans.h>
-#include <X11/Xauth.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/Xtrans/Xtrans.h>
+#include <nx-X11/Xauth.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "site.h"
 #include <errno.h>
@@ -197,14 +197,14 @@ SOFTWARE.
 #endif
 
 #define X_INCLUDE_NETDB_H
-#include <X11/Xos_r.h>
+#include <nx-X11/Xos_r.h>
 
 #include "dixstruct.h"
 #include "osdep.h"
 
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 
 #ifndef PATH_MAX
diff --git a/nx-X11/programs/Xserver/os/auth.c b/nx-X11/programs/Xserver/os/auth.c
index dfb6f8899..c14c1e874 100644
--- a/nx-X11/programs/Xserver/os/auth.c
+++ b/nx-X11/programs/Xserver/os/auth.c
@@ -57,8 +57,8 @@ from The Open Group.
 #ifdef K5AUTH
 # include   <krb5/krb5.h>
 #endif
-# include   <X11/X.h>
-# include   <X11/Xauth.h>
+# include   <nx-X11/X.h>
+# include   <nx-X11/Xauth.h>
 # include   "misc.h"
 # include   "osdep.h"
 # include   "dixstruct.h"
@@ -66,10 +66,10 @@ from The Open Group.
 # include   <sys/stat.h>
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-# include   <X11/extensions/security.h>
+# include   <nx-X11/extensions/security.h>
 #endif
 #ifdef WIN32
-#include    <X11/Xw32defs.h>
+#include    <nx-X11/Xw32defs.h>
 #endif
 
 struct protocol {
diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c
index 0f846d084..ef71cd540 100644
--- a/nx-X11/programs/Xserver/os/connection.c
+++ b/nx-X11/programs/Xserver/os/connection.c
@@ -68,14 +68,14 @@ SOFTWARE.
 #endif
 
 #ifdef WIN32
-#include <X11/Xwinsock.h>
+#include <nx-X11/Xwinsock.h>
 #endif
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #define XSERV_t
 #define TRANS_SERVER
 #define TRANS_REOPEN
-#include <X11/Xtrans/Xtrans.h>
+#include <nx-X11/Xtrans/Xtrans.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
@@ -144,15 +144,15 @@ extern __const__ int _nfiles;
 #endif /* WIN32 */
 #include "misc.h"
 #include "osdep.h"
-#include <X11/Xpoll.h>
+#include <nx-X11/Xpoll.h>
 #include "opaque.h"
 #include "dixstruct.h"
 #ifdef XAPPGROUP
-#include <X11/extensions/Xagsrv.h>
+#include <nx-X11/extensions/Xagsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 #ifdef LBX
 #include "colormapst.h"
diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c
index b92e7c4ae..ccfc01dfe 100644
--- a/nx-X11/programs/Xserver/os/io.c
+++ b/nx-X11/programs/Xserver/os/io.c
@@ -63,11 +63,11 @@ SOFTWARE.
 #define DEBUG_COMMUNICATION
 #endif
 #ifdef WIN32
-#include <X11/Xwinsock.h>
+#include <nx-X11/Xwinsock.h>
 #endif
 #include <stdio.h>
-#include <X11/Xtrans/Xtrans.h>
-#include <X11/Xmd.h>
+#include <nx-X11/Xtrans/Xtrans.h>
+#include <nx-X11/Xmd.h>
 #include <errno.h>
 #if !defined(__UNIXOS2__) && !defined(WIN32)
 #ifndef Lynx
@@ -76,12 +76,12 @@ SOFTWARE.
 #include <uio.h>
 #endif
 #endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "os.h"
 #include "osdep.h"
-#include <X11/Xpoll.h>
+#include <nx-X11/Xpoll.h>
 #include "opaque.h"
 #include "dixstruct.h"
 #include "misc.h"
@@ -125,7 +125,7 @@ OsCommPtr AvailableInput = (OsCommPtr)NULL;
 			      lswaps((req)->length) : (req)->length)
 
 #ifdef BIGREQS
-#include <X11/extensions/bigreqstr.h>
+#include <nx-X11/extensions/bigreqstr.h>
 
 #define get_big_req_len(req,cli) ((cli)->swapped ? \
 				  lswapl(((xBigReq *)(req))->length) : \
diff --git a/nx-X11/programs/Xserver/os/k5auth.c b/nx-X11/programs/Xserver/os/k5auth.c
index 3c50de032..f2ed5369d 100644
--- a/nx-X11/programs/Xserver/os/k5auth.c
+++ b/nx-X11/programs/Xserver/os/k5auth.c
@@ -54,11 +54,11 @@ from The Open Group.
 #undef BITS32
 #undef xfree
 #include <krb5/los-proto.h>
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "os.h"
 #include "osdep.h"
-#include <X11/Xproto.h>
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/Xfuncs.h>
 #include "dixstruct.h"
 #include <com_err.h>
 #include "Xauth.h"
diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c
index 9af39800f..2444cd333 100644
--- a/nx-X11/programs/Xserver/os/log.c
+++ b/nx-X11/programs/Xserver/os/log.c
@@ -99,7 +99,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include <stdio.h>
 #include <time.h>
 #include <sys/stat.h>
diff --git a/nx-X11/programs/Xserver/os/mitauth.c b/nx-X11/programs/Xserver/os/mitauth.c
index 2f42fd41f..abf7976af 100644
--- a/nx-X11/programs/Xserver/os/mitauth.c
+++ b/nx-X11/programs/Xserver/os/mitauth.c
@@ -37,7 +37,7 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "os.h"
 #include "osdep.h"
 #include "dixstruct.h"
diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h
index e8c2d5959..e0c5de3a8 100644
--- a/nx-X11/programs/Xserver/os/osdep.h
+++ b/nx-X11/programs/Xserver/os/osdep.h
@@ -103,7 +103,7 @@ SOFTWARE.
 #endif
 #endif
 
-#include <X11/Xpoll.h>
+#include <nx-X11/Xpoll.h>
 
 /*
  * MAXSOCKS is used only for initialising MaxClients when no other method
diff --git a/nx-X11/programs/Xserver/os/osinit.c b/nx-X11/programs/Xserver/os/osinit.c
index ea99ace21..ca707d4b2 100644
--- a/nx-X11/programs/Xserver/os/osinit.c
+++ b/nx-X11/programs/Xserver/os/osinit.c
@@ -52,10 +52,10 @@ SOFTWARE.
 #endif
 
 #include <stdio.h>
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "os.h"
 #include "osdep.h"
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 
 #ifdef SMART_SCHEDULE
 #include "dixstruct.h"
diff --git a/nx-X11/programs/Xserver/os/rpcauth.c b/nx-X11/programs/Xserver/os/rpcauth.c
index 896291e59..94c26651b 100644
--- a/nx-X11/programs/Xserver/os/rpcauth.c
+++ b/nx-X11/programs/Xserver/os/rpcauth.c
@@ -40,7 +40,7 @@ from The Open Group.
 
 #ifdef SECURE_RPC
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "Xauth.h"
 #include "misc.h"
 #include "os.h"
diff --git a/nx-X11/programs/Xserver/os/secauth.c b/nx-X11/programs/Xserver/os/secauth.c
index 1000b4e79..eadb17b40 100644
--- a/nx-X11/programs/Xserver/os/secauth.c
+++ b/nx-X11/programs/Xserver/os/secauth.c
@@ -30,7 +30,7 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "os.h"
 #include "osdep.h"
 #include "dixstruct.h"
@@ -38,7 +38,7 @@ from The Open Group.
 
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 
 static char InvalidPolicyReason[] = "invalid policy specification";
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index b09190c4e..3ab08897a 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -79,13 +79,13 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 
 #if defined(WIN32) && !defined(__CYGWIN__)
-#include <X11/Xwinsock.h>
+#include <nx-X11/Xwinsock.h>
 #endif
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include <stdio.h>
 #include "misc.h"
-#include <X11/X.h>
-#include <X11/Xtrans/Xtrans.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xtrans/Xtrans.h>
 #include "input.h"
 #include "dixfont.h"
 #include "osdep.h"
@@ -136,11 +136,11 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 
 #ifdef XKB
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include <X11/extensions/security.h>
+#include <nx-X11/extensions/security.h>
 #endif
 
 #ifdef RENDER
@@ -258,7 +258,7 @@ Bool noXvExtension = FALSE;
 #endif
 
 #define X_INCLUDE_NETDB_H
-#include <X11/Xos_r.h>
+#include <nx-X11/Xos_r.h>
 
 #include <errno.h>
 
diff --git a/nx-X11/programs/Xserver/os/xalloc.c b/nx-X11/programs/Xserver/os/xalloc.c
index a2487d4bc..4d2d3f1ee 100644
--- a/nx-X11/programs/Xserver/os/xalloc.c
+++ b/nx-X11/programs/Xserver/os/xalloc.c
@@ -39,9 +39,9 @@ Pascal Haible.
 
 #include <stdlib.h>	/* for malloc() etc. */
 
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include "misc.h"
-#include <X11/X.h>
+#include <nx-X11/X.h>
 
 #ifdef XALLOC_LOG
 #include <stdio.h>
diff --git a/nx-X11/programs/Xserver/os/xdmauth.c b/nx-X11/programs/Xserver/os/xdmauth.c
index e02ca349c..92fbde478 100644
--- a/nx-X11/programs/Xserver/os/xdmauth.c
+++ b/nx-X11/programs/Xserver/os/xdmauth.c
@@ -40,8 +40,8 @@ from The Open Group.
 #endif
 
 #include <stdio.h>
-#include <X11/X.h>
-#include <X11/Xtrans/Xtrans.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xtrans/Xtrans.h>
 #include "os.h"
 #include "osdep.h"
 #include "dixstruct.h"
@@ -51,7 +51,7 @@ from The Open Group.
 static Bool authFromXDMCP;
 
 #ifdef XDMCP
-#include <X11/Xmd.h>
+#include <nx-X11/Xmd.h>
 #undef REQUEST
 #include <X11/Xdmcp.h>
 
diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c
index 675e9c456..4181e52ce 100644
--- a/nx-X11/programs/Xserver/os/xdmcp.c
+++ b/nx-X11/programs/Xserver/os/xdmcp.c
@@ -21,10 +21,10 @@
 #endif
 
 #ifdef WIN32
-#include <X11/Xwinsock.h>
+#include <nx-X11/Xwinsock.h>
 #endif
 
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 
 #if !defined(WIN32)
 #ifndef Lynx
@@ -39,10 +39,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
 #include "misc.h"
-#include <X11/Xpoll.h>
+#include <nx-X11/Xpoll.h>
 #include "osdep.h"
 #include "input.h"
 #include "dixstruct.h"
@@ -76,7 +76,7 @@
 #include <X11/Xdmcp.h>
 
 #define X_INCLUDE_NETDB_H
-#include <X11/Xos_r.h>
+#include <nx-X11/Xos_r.h>
 
 #ifdef NX_TRANS_SOCKET
 
diff --git a/nx-X11/programs/Xserver/os/xprintf.c b/nx-X11/programs/Xserver/os/xprintf.c
index 54bbeefe2..4423208ff 100644
--- a/nx-X11/programs/Xserver/os/xprintf.c
+++ b/nx-X11/programs/Xserver/os/xprintf.c
@@ -30,7 +30,7 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/Xos.h>
+#include <nx-X11/Xos.h>
 #include "os.h"
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/nx-X11/programs/Xserver/randr/randrproto.h b/nx-X11/programs/Xserver/randr/randrproto.h
index 7d5c139e9..bded957fa 100644
--- a/nx-X11/programs/Xserver/randr/randrproto.h
+++ b/nx-X11/programs/Xserver/randr/randrproto.h
@@ -30,7 +30,7 @@
 #ifndef _XRANDRP_H_
 #define _XRANDRP_H_
 
-/*#include <X11/extensions/randr.h>*/
+/*#include <nx-X11/extensions/randr.h>*/
 #include "randr.h"
 
 #define Window CARD32
diff --git a/nx-X11/programs/Xserver/randr/randrstr.h b/nx-X11/programs/Xserver/randr/randrstr.h
index 3c3db2c13..bab784b8f 100644
--- a/nx-X11/programs/Xserver/randr/randrstr.h
+++ b/nx-X11/programs/Xserver/randr/randrstr.h
@@ -32,8 +32,8 @@
 #ifndef _RANDRSTR_H_
 #define _RANDRSTR_H_
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -44,17 +44,17 @@
 #include "extnsionst.h"
 #include "servermd.h"
 #ifndef NXAGENT_SERVER
-#include <X11/extensions/randr.h>
-#include <X11/extensions/randrproto.h>
+#include <nx-X11/extensions/randr.h>
+#include <nx-X11/extensions/randrproto.h>
 #else
 #include "randr.h"
 #include "randrproto.h"
 #endif
 #ifdef RENDER
-#include <X11/extensions/render.h> 	/* we share subpixel order information */
+#include <nx-X11/extensions/render.h> 	/* we share subpixel order information */
 #include "picturestr.h"
 #endif
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 
 /* required for ABI compatibility for now */
 #define RANDR_10_INTERFACE 1
diff --git a/nx-X11/programs/Xserver/randr/rrxinerama.c b/nx-X11/programs/Xserver/randr/rrxinerama.c
index 5441f8abc..2bc17cf21 100644
--- a/nx-X11/programs/Xserver/randr/rrxinerama.c
+++ b/nx-X11/programs/Xserver/randr/rrxinerama.c
@@ -88,7 +88,7 @@
 #include "randrstr.h"
 #include "swaprep.h"
 #ifndef NXAGENT_SERVER
-#include <X11/extensions/panoramiXproto.h>
+#include <nx-X11/extensions/panoramiXproto.h>
 #else
 #include "panoramiXproto.h"
 #endif
diff --git a/nx-X11/programs/Xserver/record/record.c b/nx-X11/programs/Xserver/record/record.c
index aa1cd7543..2c5b867b4 100644
--- a/nx-X11/programs/Xserver/record/record.c
+++ b/nx-X11/programs/Xserver/record/record.c
@@ -43,7 +43,7 @@ and Jim Haggerty of Metheus.
 #include "dixstruct.h"
 #include "extnsionst.h"
 #define _XRECORD_SERVER_
-#include <X11/extensions/recordstr.h>
+#include <nx-X11/extensions/recordstr.h>
 #include "set.h"
 
 #ifndef XFree86LOADER
diff --git a/nx-X11/programs/Xserver/render/animcur.c b/nx-X11/programs/Xserver/render/animcur.c
index 15293af64..27e5ab949 100644
--- a/nx-X11/programs/Xserver/render/animcur.c
+++ b/nx-X11/programs/Xserver/render/animcur.c
@@ -36,8 +36,8 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xmd.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xmd.h>
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "dixstruct.h"
diff --git a/nx-X11/programs/Xserver/render/glyphstr.h b/nx-X11/programs/Xserver/render/glyphstr.h
index e9bbd19b0..f27a73fbb 100644
--- a/nx-X11/programs/Xserver/render/glyphstr.h
+++ b/nx-X11/programs/Xserver/render/glyphstr.h
@@ -26,7 +26,7 @@
 #ifndef _GLYPHSTR_H_
 #define _GLYPHSTR_H_
 
-#include <X11/extensions/renderproto.h>
+#include <nx-X11/extensions/renderproto.h>
 #include "picture.h"
 #include "screenint.h"
 
diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c
index 8d644b35e..2dedbc9c4 100644
--- a/nx-X11/programs/Xserver/render/render.c
+++ b/nx-X11/programs/Xserver/render/render.c
@@ -30,8 +30,8 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -42,11 +42,11 @@
 #include "colormapst.h"
 #include "extnsionst.h"
 #include "servermd.h"
-#include <X11/extensions/render.h>
-#include <X11/extensions/renderproto.h>
+#include <nx-X11/extensions/render.h>
+#include <nx-X11/extensions/renderproto.h>
 #include "picturestr.h"
 #include "glyphstr.h"
-#include <X11/Xfuncproto.h>
+#include <nx-X11/Xfuncproto.h>
 #include "cursorstr.h"
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
diff --git a/nx-X11/programs/Xserver/xfixes/xfixesint.h b/nx-X11/programs/Xserver/xfixes/xfixesint.h
index 4892654be..a883acaec 100755
--- a/nx-X11/programs/Xserver/xfixes/xfixesint.h
+++ b/nx-X11/programs/Xserver/xfixes/xfixesint.h
@@ -30,13 +30,13 @@
 #define _XFIXESINT_H_
 
 #define NEED_EVENTS
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include <X11/extensions/xfixesproto.h>
+#include <nx-X11/extensions/xfixesproto.h>
 #include "windowstr.h"
 #include "selection.h"
 #include "xfixes.h"
diff --git a/nx-X11/programs/Xserver/xkb/ddxBeep.c b/nx-X11/programs/Xserver/xkb/ddxBeep.c
index 22d62a502..e99e4c2dd 100644
--- a/nx-X11/programs/Xserver/xkb/ddxBeep.c
+++ b/nx-X11/programs/Xserver/xkb/ddxBeep.c
@@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
 
 #if (defined(__osf__) && defined(__alpha))
 #include <sys/sysinfo.h>
diff --git a/nx-X11/programs/Xserver/xkb/ddxConfig.c b/nx-X11/programs/Xserver/xkb/ddxConfig.c
index b023531dc..8ffd344ca 100644
--- a/nx-X11/programs/Xserver/xkb/ddxConfig.c
+++ b/nx-X11/programs/Xserver/xkb/ddxConfig.c
@@ -32,16 +32,16 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "os.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XKBconfig.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBconfig.h>
 
 Bool
 XkbDDXApplyConfig(XPointer cfg_in,XkbSrvInfoPtr info)
diff --git a/nx-X11/programs/Xserver/xkb/ddxCtrls.c b/nx-X11/programs/Xserver/xkb/ddxCtrls.c
index 2e4e106ce..9fee8aa30 100644
--- a/nx-X11/programs/Xserver/xkb/ddxCtrls.c
+++ b/nx-X11/programs/Xserver/xkb/ddxCtrls.c
@@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
 
 void
 XkbDDXKeybdCtrlProc(DeviceIntPtr dev,KeybdCtrl *ctrl)
diff --git a/nx-X11/programs/Xserver/xkb/ddxDevBtn.c b/nx-X11/programs/Xserver/xkb/ddxDevBtn.c
index d0e37f263..04094e787 100644
--- a/nx-X11/programs/Xserver/xkb/ddxDevBtn.c
+++ b/nx-X11/programs/Xserver/xkb/ddxDevBtn.c
@@ -32,15 +32,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 
 extern	int	DeviceValuator;
 
diff --git a/nx-X11/programs/Xserver/xkb/ddxFakeBtn.c b/nx-X11/programs/Xserver/xkb/ddxFakeBtn.c
index 73c8a2415..b77d040ff 100644
--- a/nx-X11/programs/Xserver/xkb/ddxFakeBtn.c
+++ b/nx-X11/programs/Xserver/xkb/ddxFakeBtn.c
@@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
 
 void
 XkbDDXFakePointerButton(int event,int button)
diff --git a/nx-X11/programs/Xserver/xkb/ddxFakeMtn.c b/nx-X11/programs/Xserver/xkb/ddxFakeMtn.c
index ffd6f5d79..33fa49ae7 100644
--- a/nx-X11/programs/Xserver/xkb/ddxFakeMtn.c
+++ b/nx-X11/programs/Xserver/xkb/ddxFakeMtn.c
@@ -33,14 +33,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
 
 #ifdef PANORAMIX
 #include "panoramiX.h"
diff --git a/nx-X11/programs/Xserver/xkb/ddxInit.c b/nx-X11/programs/Xserver/xkb/ddxInit.c
index 8b76b7cb1..00ffea14e 100644
--- a/nx-X11/programs/Xserver/xkb/ddxInit.c
+++ b/nx-X11/programs/Xserver/xkb/ddxInit.c
@@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
 
 int
 XkbDDXInitDevice(DeviceIntPtr dev)
diff --git a/nx-X11/programs/Xserver/xkb/ddxKeyClick.c b/nx-X11/programs/Xserver/xkb/ddxKeyClick.c
index c940e5321..e56377ca5 100644
--- a/nx-X11/programs/Xserver/xkb/ddxKeyClick.c
+++ b/nx-X11/programs/Xserver/xkb/ddxKeyClick.c
@@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
 
 void
 XkbDDXKeyClick(DeviceIntPtr pXDev,int keycode,int synthetic)
diff --git a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c
index b78dc420d..44fad85ca 100644
--- a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c
+++ b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c
@@ -36,14 +36,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
 
 #ifdef XF86DDXACTIONS
 #include "xf86.h"
diff --git a/nx-X11/programs/Xserver/xkb/ddxLEDs.c b/nx-X11/programs/Xserver/xkb/ddxLEDs.c
index fb5f72bf8..92ab12ee8 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLEDs.c
+++ b/nx-X11/programs/Xserver/xkb/ddxLEDs.c
@@ -32,14 +32,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
 
 void
 XkbDDXUpdateIndicators(DeviceIntPtr dev,CARD32 new)
diff --git a/nx-X11/programs/Xserver/xkb/ddxList.c b/nx-X11/programs/Xserver/xkb/ddxList.c
index 9c961e934..3dfb85644 100644
--- a/nx-X11/programs/Xserver/xkb/ddxList.c
+++ b/nx-X11/programs/Xserver/xkb/ddxList.c
@@ -33,17 +33,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include <ctype.h>
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xos.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
-#include <X11/extensions/XKM.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/extensions/XKM.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
 
 #ifndef PATH_MAX
 #ifdef MAXPATHLEN
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c
index 7caf9b1cb..16343fc9c 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c
+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c
@@ -44,17 +44,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <unistd.h>
 
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xos.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
-#include <X11/extensions/XKM.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/extensions/XKM.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
 #include "xkb.h"
 
 #if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__)
@@ -94,7 +94,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef WIN32
 
-#include <X11/Xwindows.h>
+#include <nx-X11/Xwindows.h>
 const char* 
 Win32TempDir()
 {
diff --git a/nx-X11/programs/Xserver/xkb/ddxPrivate.c b/nx-X11/programs/Xserver/xkb/ddxPrivate.c
index 5c0bca4cd..c71216d70 100644
--- a/nx-X11/programs/Xserver/xkb/ddxPrivate.c
+++ b/nx-X11/programs/Xserver/xkb/ddxPrivate.c
@@ -10,10 +10,10 @@
 
 #include <stdio.h>
 #define NEED_EVENTS 1
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include "windowstr.h"
 #define XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 
 #ifdef XF86DDXACTIONS
 #include "xf86.h"
diff --git a/nx-X11/programs/Xserver/xkb/ddxVT.c b/nx-X11/programs/Xserver/xkb/ddxVT.c
index 1b7853fa0..1806ed257 100644
--- a/nx-X11/programs/Xserver/xkb/ddxVT.c
+++ b/nx-X11/programs/Xserver/xkb/ddxVT.c
@@ -36,14 +36,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
 
 #ifdef XF86DDXACTIONS
 #include "xf86.h"
diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c
index 441d88a5c..4a1561db3 100644
--- a/nx-X11/programs/Xserver/xkb/xkb.c
+++ b/nx-X11/programs/Xserver/xkb/xkb.c
@@ -31,18 +31,18 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 
 #include <stdio.h>
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define	NEED_EVENTS
 #define	NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 #include "extnsionst.h"
 #include "xkb.h"
 
-#include <X11/extensions/XI.h>
+#include <nx-X11/extensions/XI.h>
 
 	int	XkbEventBase;
 	int	XkbErrorBase;
@@ -3916,7 +3916,7 @@ ProcXkbSetNames(ClientPtr client)
 
 /***====================================================================***/
 
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBgeom.h>
 
 #define	XkbSizeCountedString(s)  ((s)?((((2+strlen(s))+3)/4)*4):4)
 
diff --git a/nx-X11/programs/Xserver/xkb/xkbAccessX.c b/nx-X11/programs/Xserver/xkb/xkbAccessX.c
index 75e46dc32..ac5713d05 100644
--- a/nx-X11/programs/Xserver/xkb/xkbAccessX.c
+++ b/nx-X11/programs/Xserver/xkb/xkbAccessX.c
@@ -36,11 +36,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <limits.h>
 #endif
 #define NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "inputstr.h"
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 #if !defined(WIN32) && !defined(Lynx)
 #include <sys/time.h>
 #endif
diff --git a/nx-X11/programs/Xserver/xkb/xkbActions.c b/nx-X11/programs/Xserver/xkb/xkbActions.c
index b7f3e13a5..eb1c80448 100644
--- a/nx-X11/programs/Xserver/xkb/xkbActions.c
+++ b/nx-X11/programs/Xserver/xkb/xkbActions.c
@@ -34,12 +34,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include <math.h>
 #define NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 #include "xkb.h"
 #include <ctype.h>
 
diff --git a/nx-X11/programs/Xserver/xkb/xkbEvents.c b/nx-X11/programs/Xserver/xkb/xkbEvents.c
index ca201c6f0..6c0aa0761 100644
--- a/nx-X11/programs/Xserver/xkb/xkbEvents.c
+++ b/nx-X11/programs/Xserver/xkb/xkbEvents.c
@@ -32,13 +32,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #define NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
-#include <X11/extensions/XI.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/extensions/XI.h>
 #include "inputstr.h"
 #include "windowstr.h"
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 #include "xkb.h"
 
 /***====================================================================***/
diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c
index ef7e6a4f7..9afe0dacc 100644
--- a/nx-X11/programs/Xserver/xkb/xkbInit.c
+++ b/nx-X11/programs/Xserver/xkb/xkbInit.c
@@ -41,19 +41,19 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <unistd.h>
 #include <math.h>
 #define NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
-#include <X11/Xatom.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
+#include <nx-X11/Xatom.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "opaque.h"
 #include "property.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XKBgeom.h>
-#include <X11/extensions/XKMformat.h>
-#include <X11/extensions/XKBfile.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKMformat.h>
+#include <nx-X11/extensions/XKBfile.h>
 #include "xkb.h"
 
 #define	CREATE_ATOM(s)	MakeAtom(s,sizeof(s)-1,1)
diff --git a/nx-X11/programs/Xserver/xkb/xkbLEDs.c b/nx-X11/programs/Xserver/xkb/xkbLEDs.c
index e04c05f14..20203ef2c 100644
--- a/nx-X11/programs/Xserver/xkb/xkbLEDs.c
+++ b/nx-X11/programs/Xserver/xkb/xkbLEDs.c
@@ -34,13 +34,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <ctype.h>
 #include <math.h>
 #define NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XKBsrv.h>
 #include "xkb.h"
 
 /***====================================================================***/
diff --git a/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c b/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c
index 713995d16..330fd2800 100644
--- a/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c
+++ b/nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c
@@ -33,12 +33,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include <math.h>
 #define NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 #include <ctype.h>
 
 
diff --git a/nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c b/nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c
index 82f476790..ac601c525 100644
--- a/nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c
+++ b/nx-X11/programs/Xserver/xkb/xkbPrOtherEv.c
@@ -33,15 +33,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include <math.h>
 #define NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/keysym.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
+#include <nx-X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBsrv.h>
 
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <nx-X11/extensions/XI.h>
+#include <nx-X11/extensions/XIproto.h>
 
 extern	void	ProcessOtherEvent(
     xEvent *		/* xE */,
diff --git a/nx-X11/programs/Xserver/xkb/xkbSwap.c b/nx-X11/programs/Xserver/xkb/xkbSwap.c
index be1cd94fc..c16209153 100644
--- a/nx-X11/programs/Xserver/xkb/xkbSwap.c
+++ b/nx-X11/programs/Xserver/xkb/xkbSwap.c
@@ -31,14 +31,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 
 #include "stdio.h"
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #define	NEED_EVENTS
 #define	NEED_REPLIES
-#include <X11/Xproto.h>
+#include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XKBstr.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBstr.h>
 #include "extnsionst.h"
 #include "xkb.h"
 
diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c
index f3c3ff8ca..465644f16 100644
--- a/nx-X11/programs/Xserver/xkb/xkbUtils.c
+++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c
@@ -34,16 +34,16 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <ctype.h>
 #include <math.h>
 #define NEED_EVENTS 1
-#include <X11/X.h>
-#include <X11/Xproto.h>
+#include <nx-X11/X.h>
+#include <nx-X11/Xproto.h>
 #define	XK_CYRILLIC
-#include <X11/keysym.h>
+#include <nx-X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
 
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <X11/extensions/XKBsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBgeom.h>
 #include "xkb.h"
 
 #ifdef MODE_SWITCH
diff --git a/nx-X11/programs/nxauth/gethost.c b/nx-X11/programs/nxauth/gethost.c
index cab2aea9f..fa889f29b 100644
--- a/nx-X11/programs/nxauth/gethost.c
+++ b/nx-X11/programs/nxauth/gethost.c
@@ -36,10 +36,10 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #ifdef WIN32
-#include <X11/Xwinsock.h>
+#include <nx-X11/Xwinsock.h>
 #define EPROTOTYPE WSAEPROTOTYPE
 #endif
-#include <X11/X.h>
+#include <nx-X11/X.h>
 #include <signal.h>
 #include <setjmp.h>
 #include <ctype.h>
diff --git a/nx-X11/programs/nxauth/parsedpy.c b/nx-X11/programs/nxauth/parsedpy.c
index 8ce46815c..d0f022574 100644
--- a/nx-X11/programs/nxauth/parsedpy.c
+++ b/nx-X11/programs/nxauth/parsedpy.c
@@ -49,12 +49,12 @@ in this Software without prior written authorization from The Open Group.
 
 #include <stdio.h>			/* for NULL */
 #include <ctype.h>			/* for isascii() and isdigit() */
-#include <X11/Xos.h>			/* for strchr() and string routines */
-#include <X11/Xlib.h>			/* for Family contants */
+#include <nx-X11/Xos.h>			/* for strchr() and string routines */
+#include <nx-X11/Xlib.h>			/* for Family contants */
 #ifdef hpux
 #include <sys/utsname.h>		/* for struct utsname */
 #endif
-#include <X11/Xauth.h>			/* for FamilyLocal */
+#include <nx-X11/Xauth.h>			/* for FamilyLocal */
 
 #if defined(UNIXCONN) || defined(LOCALCONN)
 #define UNIX_CONNECTION "unix"
diff --git a/nx-X11/programs/nxauth/process.c b/nx-X11/programs/nxauth/process.c
index 76259d76a..86aba2b2a 100644
--- a/nx-X11/programs/nxauth/process.c
+++ b/nx-X11/programs/nxauth/process.c
@@ -55,10 +55,10 @@ from The Open Group.
 #include <sys/stat.h>
 
 #include <signal.h>
-/*#include <X11/X.h>*/			/* for Family constants */
+/*#include <nx-X11/X.h>*/			/* for Family constants */
 /*
-#include <X11/Xlib.h>
-#include <X11/extensions/security.h>
+#include <nx-X11/Xlib.h>
+#include <nx-X11/extensions/security.h>
 */
 
 /*FIXME*/
diff --git a/nx-X11/programs/nxauth/xauth.h b/nx-X11/programs/nxauth/xauth.h
index 33a6c4e3b..4f8490070 100644
--- a/nx-X11/programs/nxauth/xauth.h
+++ b/nx-X11/programs/nxauth/xauth.h
@@ -29,9 +29,9 @@ in this Software without prior written authorization from The Open Group.
 /* $XFree86: xc/programs/xauth/xauth.h,v 1.6 2001/12/14 20:01:15 dawes Exp $ */
 
 #include <stdio.h>
-#include <X11/Xos.h>
-#include <X11/Xauth.h>
-#include <X11/Xfuncs.h>
+#include <nx-X11/Xos.h>
+#include <nx-X11/Xauth.h>
+#include <nx-X11/Xfuncs.h>
 
 #ifndef True
 typedef int Bool;
author	Mike Gabriel <mike.gabriel@das-netzwerkteam.de>	2015-12-28 13:17:21 +0100
committer	Mike Gabriel <mike.gabriel@das-netzwerkteam.de>	2015-12-28 13:17:21 +0100
commit	ca0f639a4ef9ad605f0e62577c84f2be73807ff3 (patch)
tree	1f13c31901460fd31786b6d50b6c9841d25be99e /nx-X11
parent	f58006d932d907dc13d76084e9171de59ee27f16 (diff)
parent	433d8186588698ce6a435fbff5e9d40a37b78be9 (diff)
download	nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.tar.gz nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.tar.bz2 nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.zip