summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
Diffstat (limited to 'os')
-rw-r--r--os/WaitFor.c2
-rw-r--r--os/access.c2
-rw-r--r--os/connection.c2
-rw-r--r--os/io.c4
-rw-r--r--os/k5auth.c2
-rw-r--r--os/lbxio.c4
-rw-r--r--os/mitauth.c2
-rw-r--r--os/oscolor.c4
-rw-r--r--os/osinit.c2
-rw-r--r--os/rpcauth.c4
-rw-r--r--os/secauth.c2
-rw-r--r--os/utils.c2
-rw-r--r--os/xalloc.c2
-rw-r--r--os/xdmauth.c2
-rw-r--r--os/xdmcp.c2
-rw-r--r--os/xprintf.c2
16 files changed, 20 insertions, 20 deletions
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 899ad42f7..31e16210b 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -67,7 +67,7 @@ SOFTWARE.
#include <errno.h>
#include <stdio.h>
#include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
#ifdef __UNIXOS2__
#define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t)
diff --git a/os/access.c b/os/access.c
index 4e5f75f3f..329d1cfea 100644
--- a/os/access.c
+++ b/os/access.c
@@ -71,7 +71,7 @@ SOFTWARE.
#include <X11/Xauth.h>
#include <X11/X.h>
#include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
#include "site.h"
#include <errno.h>
#include <sys/types.h>
diff --git a/os/connection.c b/os/connection.c
index fd4024577..0a12c655d 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -142,7 +142,7 @@ extern __const__ int _nfiles;
#endif
#endif
#endif /* WIN32 */
-#include <X11/misc.h> /* for typedef of pointer */
+#include "misc.h" /* for typedef of pointer */
#include "osdep.h"
#include <X11/Xpoll.h>
#include "opaque.h"
diff --git a/os/io.c b/os/io.c
index 87166fb79..76edbaeee 100644
--- a/os/io.c
+++ b/os/io.c
@@ -79,12 +79,12 @@ SOFTWARE.
#include <X11/X.h>
#define NEED_REPLIES
#include <X11/Xproto.h>
-#include <X11/os.h>
+#include "os.h"
#include "osdep.h"
#include <X11/Xpoll.h>
#include "opaque.h"
#include "dixstruct.h"
-#include <X11/misc.h>
+#include "misc.h"
#ifdef LBX
#include "colormapst.h"
#include "propertyst.h"
diff --git a/os/k5auth.c b/os/k5auth.c
index b23a3d440..78301ad10 100644
--- a/os/k5auth.c
+++ b/os/k5auth.c
@@ -55,7 +55,7 @@ from The Open Group.
#undef xfree
#include <krb5/los-proto.h>
#include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
#include "osdep.h"
#include <X11/Xproto.h>
#include <X11/Xfuncs.h>
diff --git a/os/lbxio.c b/os/lbxio.c
index 0a128df5b..97ae958e3 100644
--- a/os/lbxio.c
+++ b/os/lbxio.c
@@ -67,12 +67,12 @@ SOFTWARE.
#endif
#include <X11/X.h>
#include <X11/Xproto.h>
-#include <X11/os.h>
+#include "os.h"
#include <X11/Xpoll.h>
#include "osdep.h"
#include "opaque.h"
#include "dixstruct.h"
-#include <X11/misc.h>
+#include "misc.h"
#include "colormapst.h"
#include "propertyst.h"
#include "lbxserve.h"
diff --git a/os/mitauth.c b/os/mitauth.c
index 9a806c02b..2f42fd41f 100644
--- a/os/mitauth.c
+++ b/os/mitauth.c
@@ -38,7 +38,7 @@ from The Open Group.
#endif
#include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
#include "osdep.h"
#include "dixstruct.h"
diff --git a/os/oscolor.c b/os/oscolor.c
index 65de9e4f5..fdbde7906 100644
--- a/os/oscolor.c
+++ b/os/oscolor.c
@@ -63,7 +63,7 @@ SOFTWARE.
#endif
#endif
#include "rgb.h"
-#include <X11/os.h>
+#include "os.h"
#include "opaque.h"
/* Note that we are assuming there is only one database for all the screens. */
@@ -152,7 +152,7 @@ OsLookupColor(int screen, char *name, unsigned int len,
*/
#include <stdio.h>
-#include <X11/os.h>
+#include "os.h"
#include "opaque.h"
#define HASHSIZE 511
diff --git a/os/osinit.c b/os/osinit.c
index b820c91be..f9e253f2d 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -53,7 +53,7 @@ SOFTWARE.
#include <stdio.h>
#include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
#include "osdep.h"
#include <X11/Xos.h>
diff --git a/os/rpcauth.c b/os/rpcauth.c
index 71f87e9a4..3c5cb5946 100644
--- a/os/rpcauth.c
+++ b/os/rpcauth.c
@@ -42,8 +42,8 @@ from The Open Group.
#include <X11/X.h>
#include "Xauth.h"
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
#include "dixstruct.h"
#include <rpc/rpc.h>
diff --git a/os/secauth.c b/os/secauth.c
index ff057992f..1000b4e79 100644
--- a/os/secauth.c
+++ b/os/secauth.c
@@ -31,7 +31,7 @@ from The Open Group.
#endif
#include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
#include "osdep.h"
#include "dixstruct.h"
#include "swaprep.h"
diff --git a/os/utils.c b/os/utils.c
index a3a0c99f6..f23e1036c 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -66,7 +66,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <X11/Xos.h>
#include <stdio.h>
-#include <X11/misc.h>
+#include "misc.h"
#include <X11/X.h>
#include <X11/Xtrans/Xtrans.h>
#include "input.h"
diff --git a/os/xalloc.c b/os/xalloc.c
index c266ca5ab..e1cdbfc5b 100644
--- a/os/xalloc.c
+++ b/os/xalloc.c
@@ -40,7 +40,7 @@ Pascal Haible.
#include <stdlib.h> /* for malloc() etc. */
#include <X11/Xos.h>
-#include <X11/misc.h>
+#include "misc.h"
#include <X11/X.h>
#ifdef XALLOC_LOG
diff --git a/os/xdmauth.c b/os/xdmauth.c
index f54c83da8..e02ca349c 100644
--- a/os/xdmauth.c
+++ b/os/xdmauth.c
@@ -42,7 +42,7 @@ from The Open Group.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xtrans/Xtrans.h>
-#include <X11/os.h>
+#include "os.h"
#include "osdep.h"
#include "dixstruct.h"
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 44994380b..3aad4eee3 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -41,7 +41,7 @@
#include <stdlib.h>
#include <X11/X.h>
#include <X11/Xmd.h>
-#include <X11/misc.h>
+#include "misc.h"
#include <X11/Xpoll.h>
#include "osdep.h"
#include "input.h"
diff --git a/os/xprintf.c b/os/xprintf.c
index bd8b1f339..07eaa1f58 100644
--- a/os/xprintf.c
+++ b/os/xprintf.c
@@ -31,7 +31,7 @@
#endif
#include <X11/Xos.h>
-#include <X11/os.h>
+#include "os.h"
#include <stdarg.h>
#include <stdio.h>