Clear header file namespace separation (<X11/...> vs. <nx-X11/...>).

 In the process of building nxagent against more and more system-wide installed
 X.org libraries, we come to the limit of including structs from this (bundled
 nx-X11) and that (system-wide X.Org) library.

 This commit introduces a clear namespace separation of headers provided by
 nx-X11 and headers provided by X.Org. This approach is only temporary as we
 want to drop all nx-X11 bundled libraries from nx-libs.

 However, for a while we need to make this separation clear and also ship
 some reduced fake X.Org headers that avoid pulling in libX* and libNX_X*
 symbols at the same time.

 This patch has been tested on Debian jessie and unstable and requires no
 overall testing on various distros and distro versions, as we finally will
 drop all libNX_X* libraries and build against X.org's client libs.

 For now, this hack eases our development / cleanup process.

62 files changed, 97 insertions, 97 deletions

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 */
 {