11 files changed, 22 insertions, 22 deletions
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