5 files changed, 24 insertions, 24 deletions
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] =
 {