Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".

149 files changed, 152 insertions, 152 deletions

diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c
index ce48c75ab..fe8cd2fd8 100644
--- a/hw/darwin/darwin.c
+++ b/hw/darwin/darwin.c
@@ -34,7 +34,7 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/os.h>
+#include "os.h"
 #include "servermd.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c
index 5bf163708..7d69382af 100644
--- a/hw/darwin/iokit/xfIOKit.c
+++ b/hw/darwin/iokit/xfIOKit.c
@@ -38,7 +38,7 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/os.h>
+#include "os.h"
 #include "servermd.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c
index 1933ba05b..d79df4cee 100644
--- a/hw/darwin/quartz/applewm.c
+++ b/hw/darwin/quartz/applewm.c
@@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "globals.h"
 #include "extnsionst.h"
diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c
index 9e6676b99..d4cd27b8f 100644
--- a/hw/darwin/quartz/xpr/appledri.c
+++ b/hw/darwin/quartz/xpr/appledri.c
@@ -40,7 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "colormapst.h"
diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c
index 6846afab3..e8e49f965 100644
--- a/hw/darwin/quartz/xpr/dri.c
+++ b/hw/darwin/quartz/xpr/dri.c
@@ -47,7 +47,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "colormapst.h"
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index 57673d746..ac6416d54 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -49,8 +49,8 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "dixstruct.h"
 #define EXTENSION_PROC_ARGS void *
 #include "extnsionst.h"
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index a4779d0d9..e0cc4dd65 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Resources.h"
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index b77d53038..0e7f7491e 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -36,7 +36,7 @@
 #include <fcntl.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
-#include <X11/os.h>
+#include "os.h"
 #ifdef XFree86LOADER
 #include "loaderProcs.h"
 #endif
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index 535c7e8fa..7d135e0ec 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -37,7 +37,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "globals.h"
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/common/xf86Debug.c b/hw/xfree86/common/xf86Debug.c
index a41d0dd75..15c267232 100644
--- a/hw/xfree86/common/xf86Debug.c
+++ b/hw/xfree86/common/xf86Debug.c
@@ -38,7 +38,7 @@
 #include <sys/time.h>
 #include <unistd.h> 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/common/xf86DoProbe.c b/hw/xfree86/common/xf86DoProbe.c
index 3208e6da8..2f5b03eb1 100644
--- a/hw/xfree86/common/xf86DoProbe.c
+++ b/hw/xfree86/common/xf86DoProbe.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
-#include <X11/os.h>
+#include "os.h"
 #ifdef XFree86LOADER
 #include "loaderProcs.h"
 #include "xf86Config.h"
diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c
index c9c8128b2..9f8c15651 100644
--- a/hw/xfree86/common/xf86DoScanPci.c
+++ b/hw/xfree86/common/xf86DoScanPci.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
-#include <X11/os.h>
+#include "os.h"
 #ifdef XFree86LOADER
 #include "loaderProcs.h"
 #endif
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 90beb5688..699188421 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -64,7 +64,7 @@
 #include <X11/X.h>
 #include <X11/Xpoll.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 
 #include "compiler.h"
 
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index c6488d677..a295fb980 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -36,7 +36,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "windowstr.h"
 #include "propertyst.h"
 #include "xf86.h"
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 04f0d0150..a6c7d5c89 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -41,7 +41,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "servermd.h"
 #include "pixmapstr.h"
 #include "windowstr.h"
diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c
index 75a1d71fc..62d011f42 100644
--- a/hw/xfree86/common/xf86MiscExt.c
+++ b/hw/xfree86/common/xf86MiscExt.c
@@ -40,7 +40,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 0211e3ced..7328b1b76 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -41,7 +41,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "servermd.h"
 #include "mibank.h"
 #include "globals.h"
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 7e11e776f..44643d9b1 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -47,7 +47,7 @@
 #ifndef _XF86MODULE_H
 #define _XF86MODULE_H
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86Version.h"
 #ifndef NULL
 #define NULL ((void *)0)
diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c
index 695d97707..9bffdee70 100644
--- a/hw/xfree86/common/xf86Option.c
+++ b/hw/xfree86/common/xf86Option.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Xinput.h"
 #include "xf86Optrec.h"
diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index a020e97b2..0a927ed36 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -28,7 +28,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "mibank.h"
 #include "globals.h"
 #include "xf86.h"
diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c
index ec371f299..81e4b969e 100644
--- a/hw/xfree86/common/xf86VidMode.c
+++ b/hw/xfree86/common/xf86VidMode.c
@@ -40,7 +40,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 019d84287..200048717 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -41,7 +41,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include <X11/Xproto.h>
 #include "colormapst.h"
 #include "scrnintstr.h"
diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c
index bceca0dd8..28a65302d 100644
--- a/hw/xfree86/common/xf86fbBus.c
+++ b/hw/xfree86/common/xf86fbBus.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Resources.h"
diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c
index 3228c9bdf..31c84c49f 100644
--- a/hw/xfree86/common/xf86fbman.c
+++ b/hw/xfree86/common/xf86fbman.c
@@ -31,7 +31,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 
 #include <X11/X.h>
diff --git a/hw/xfree86/common/xf86isaBus.c b/hw/xfree86/common/xf86isaBus.c
index 97d5c3f53..2cad85de8 100644
--- a/hw/xfree86/common/xf86isaBus.c
+++ b/hw/xfree86/common/xf86isaBus.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Resources.h"
diff --git a/hw/xfree86/common/xf86noBus.c b/hw/xfree86/common/xf86noBus.c
index 70cdf1cc0..09f2f4407 100644
--- a/hw/xfree86/common/xf86noBus.c
+++ b/hw/xfree86/common/xf86noBus.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Resources.h"
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index f01c7add8..0d8016ff9 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "Pci.h"
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
index ae4688737..3d6576f52 100644
--- a/hw/xfree86/common/xf86sbusBus.c
+++ b/hw/xfree86/common/xf86sbusBus.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 186959708..9a1e2bf92 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -39,7 +39,7 @@
 #ifndef _XF86STR_H
 #define _XF86STR_H
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "input.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index 0c8b39a70..35695bd9e 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -34,7 +34,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c
index bad2233e2..a39e1bd4d 100644
--- a/hw/xfree86/common/xf86xvmc.c
+++ b/hw/xfree86/common/xf86xvmc.c
@@ -31,7 +31,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c
index 3eed90a11..d5e0fc159 100644
--- a/hw/xfree86/common/xorgHelper.c
+++ b/hw/xfree86/common/xorgHelper.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "servermd.h"
 #include "pixmapstr.h"
 #include "windowstr.h"
diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c
index a3d7068ec..c2b0f4aba 100644
--- a/hw/xfree86/ddc/ddcProperty.c
+++ b/hw/xfree86/ddc/ddcProperty.c
@@ -9,7 +9,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 /* #include "xf86_ansic.h" */
 /* #include "xf86_OSproc.h" */
diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c
index a6c05bfe2..ef4848eef 100644
--- a/hw/xfree86/ddc/edid.c
+++ b/hw/xfree86/ddc/edid.c
@@ -11,7 +11,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index 36983f452..3e41276a2 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -8,7 +8,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index e23256bcc..1cec91283 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -8,7 +8,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/ddc/print_vdif.c b/hw/xfree86/ddc/print_vdif.c
index 6c890c210..ededa21b2 100644
--- a/hw/xfree86/ddc/print_vdif.c
+++ b/hw/xfree86/ddc/print_vdif.c
@@ -5,7 +5,7 @@
 #endif
 
 #include "vdif.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86DDC.h"
 
 static void print_vdif(xf86VdifPtr l, char *s);
diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
index b323f6b22..f526cb484 100644
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/hw/xfree86/ddc/xf86DDC.c
@@ -8,7 +8,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c
index 1fdead0bc..9c55d8731 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga.c
@@ -15,7 +15,7 @@ Copyright (c) 1995, 1996, 1999  XFree86 Inc
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "colormapst.h"
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index 990d71da2..ee3600f1a 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -14,7 +14,7 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "dixevents.h"
 #include "pixmapstr.h"
diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c
index 8c0f481b1..176401b13 100644
--- a/hw/xfree86/dixmods/extmod/xf86misc.c
+++ b/hw/xfree86/dixmods/extmod/xf86misc.c
@@ -14,7 +14,7 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "scrnintstr.h"
diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index 005c96102..11e01757a 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -41,7 +41,7 @@ from Kaleb S. KEITHLEY
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "scrnintstr.h"
diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c
index 9f15129c3..777504978 100644
--- a/hw/xfree86/dixmods/extmod/xvmod.c
+++ b/hw/xfree86/dixmods/extmod/xvmod.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
 #include "gc.h"
 #include <X11/extensions/Xv.h>
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 7308b3d0e..f7af5a6ea 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -50,7 +50,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "colormapst.h"
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index 4a58b6c9e..aa603dc3f 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -48,7 +48,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "colormapst.h"
diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c
index 7677fc055..6e7d035df 100644
--- a/hw/xfree86/dummylib/fatalerror.c
+++ b/hw/xfree86/dummylib/fatalerror.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c
index 4a578ca46..d7c613122 100644
--- a/hw/xfree86/dummylib/getvalidbios.c
+++ b/hw/xfree86/dummylib/getvalidbios.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c
index fc560f10f..1a36f4912 100644
--- a/hw/xfree86/dummylib/logvwrite.c
+++ b/hw/xfree86/dummylib/logvwrite.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c
index 80804627e..43e417560 100644
--- a/hw/xfree86/dummylib/pcitestmulti.c
+++ b/hw/xfree86/dummylib/pcitestmulti.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c
index 5deb56d70..7d6e8f81b 100644
--- a/hw/xfree86/dummylib/verrorf.c
+++ b/hw/xfree86/dummylib/verrorf.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c
index 4676a93cf..48a346866 100644
--- a/hw/xfree86/dummylib/xalloc.c
+++ b/hw/xfree86/dummylib/xalloc.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c
index 05a9cca06..9d9e72154 100644
--- a/hw/xfree86/dummylib/xf86allocscripi.c
+++ b/hw/xfree86/dummylib/xf86allocscripi.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c
index 4cd9de04c..40f956594 100644
--- a/hw/xfree86/dummylib/xf86drvmsg.c
+++ b/hw/xfree86/dummylib/xf86drvmsg.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c
index 2dcc2eccb..04cbf59da 100644
--- a/hw/xfree86/dummylib/xf86drvmsgverb.c
+++ b/hw/xfree86/dummylib/xf86drvmsgverb.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c
index 9fa9e803f..6648eaf7c 100644
--- a/hw/xfree86/dummylib/xf86errorf.c
+++ b/hw/xfree86/dummylib/xf86errorf.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c
index 3a06b02d1..65399e334 100644
--- a/hw/xfree86/dummylib/xf86errorfverb.c
+++ b/hw/xfree86/dummylib/xf86errorfverb.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c
index f9454cb73..439b63ac9 100644
--- a/hw/xfree86/dummylib/xf86getpagesize.c
+++ b/hw/xfree86/dummylib/xf86getpagesize.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c
index 50d423d22..24046af67 100644
--- a/hw/xfree86/dummylib/xf86getverb.c
+++ b/hw/xfree86/dummylib/xf86getverb.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c
index 61c1fe4d6..bfbda9e18 100644
--- a/hw/xfree86/dummylib/xf86info.c
+++ b/hw/xfree86/dummylib/xf86info.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c
index 192d29dec..919625ead 100644
--- a/hw/xfree86/dummylib/xf86msg.c
+++ b/hw/xfree86/dummylib/xf86msg.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c
index 300311c89..a54c8a565 100644
--- a/hw/xfree86/dummylib/xf86msgverb.c
+++ b/hw/xfree86/dummylib/xf86msgverb.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c
index 9a24455f4..45779054a 100644
--- a/hw/xfree86/dummylib/xf86opt.c
+++ b/hw/xfree86/dummylib/xf86opt.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c
index d5a11ce65..dfd9d8a1a 100644
--- a/hw/xfree86/dummylib/xf86screens.c
+++ b/hw/xfree86/dummylib/xf86screens.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c
index 017f0b37e..f65bf1e9c 100644
--- a/hw/xfree86/dummylib/xf86servisinit.c
+++ b/hw/xfree86/dummylib/xf86servisinit.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c
index f6c5ed36e..0d31cb153 100644
--- a/hw/xfree86/dummylib/xf86verbose.c
+++ b/hw/xfree86/dummylib/xf86verbose.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c
index 321c1e2e1..d33ea97c1 100644
--- a/hw/xfree86/i2c/xf86i2c.c
+++ b/hw/xfree86/i2c/xf86i2c.c
@@ -13,7 +13,7 @@
 #endif
 
 #if 1
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/loader/aoutloader.c b/hw/xfree86/loader/aoutloader.c
index a000862ae..e03e80ef2 100644
--- a/hw/xfree86/loader/aoutloader.c
+++ b/hw/xfree86/loader/aoutloader.c
@@ -49,7 +49,7 @@
 #endif
 
 #include <X11/Xos.h>
-#include <X11/os.h>
+#include "os.h"
 #include "aout.h"
 
 #include "sym.h"
diff --git a/hw/xfree86/loader/coffloader.c b/hw/xfree86/loader/coffloader.c
index 32a229d2f..298ca5d61 100644
--- a/hw/xfree86/loader/coffloader.c
+++ b/hw/xfree86/loader/coffloader.c
@@ -44,7 +44,7 @@
 #endif
 
 #include <X11/Xos.h>
-#include <X11/os.h>
+#include "os.h"
 #include "coff.h"
 
 #include "sym.h"
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 4e57d2e15..2316c8ecf 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -63,9 +63,9 @@
 #include "dixevents.h"
 #include "dixfont.h"
 #include "dixstruct.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "globals.h"
-#include <X11/os.h>
+#include "os.h"
 #include "osdep.h"
 #include "resource.h"
 #include "servermd.h"
diff --git a/hw/xfree86/loader/dlloader.c b/hw/xfree86/loader/dlloader.c
index 719b7b314..224157d43 100644
--- a/hw/xfree86/loader/dlloader.c
+++ b/hw/xfree86/loader/dlloader.c
@@ -34,7 +34,7 @@
 #include <dlfcn.h>
 
 #include <X11/Xos.h>
-#include <X11/os.h>
+#include "os.h"
 
 #include "sym.h"
 #include "loader.h"
diff --git a/hw/xfree86/loader/elfloader.c b/hw/xfree86/loader/elfloader.c
index 0275aa037..39772cf69 100644
--- a/hw/xfree86/loader/elfloader.c
+++ b/hw/xfree86/loader/elfloader.c
@@ -51,7 +51,7 @@
 #endif
 
 #include <X11/Xos.h>
-#include <X11/os.h>
+#include "os.h"
 #include "elf.h"
 
 #include "sym.h"
diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c
index 0966466fd..1a841ac9a 100644
--- a/hw/xfree86/loader/extsym.c
+++ b/hw/xfree86/loader/extsym.c
@@ -31,7 +31,7 @@
 
 #include "resource.h"
 #include "sym.h"
-#include <X11/misc.h>
+#include "misc.h"
 #ifdef PANORAMIX
 #include "panoramiX.h"
 #endif
diff --git a/hw/xfree86/loader/hash.c b/hw/xfree86/loader/hash.c
index 9cd4e6eb8..393360f94 100644
--- a/hw/xfree86/loader/hash.c
+++ b/hw/xfree86/loader/hash.c
@@ -28,7 +28,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/os.h>
+#include "os.h"
 #include <X11/Xos.h>
 #undef abs
 #include <stdlib.h>
diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c
index 471510a30..945b9ef26 100644
--- a/hw/xfree86/loader/loader.c
+++ b/hw/xfree86/loader/loader.c
@@ -73,7 +73,7 @@
 #include "elf.h"
 #include "coff.h"
 
-#include <X11/os.h>
+#include "os.h"
 #include "sym.h"
 #include "loader.h"
 #include "loaderProcs.h"
diff --git a/hw/xfree86/loader/loadext.c b/hw/xfree86/loader/loadext.c
index fb0affeba..5a795d372 100644
--- a/hw/xfree86/loader/loadext.c
+++ b/hw/xfree86/loader/loadext.c
@@ -34,7 +34,7 @@
 #endif
 
 #include "loaderProcs.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 
 ExtensionModule *ExtensionModuleList = NULL;
diff --git a/hw/xfree86/loader/loadfont.c b/hw/xfree86/loader/loadfont.c
index f9bbbfeb4..675828412 100644
--- a/hw/xfree86/loader/loadfont.c
+++ b/hw/xfree86/loader/loadfont.c
@@ -34,7 +34,7 @@
 #endif
 
 #include "loaderProcs.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 
 FontModule *FontModuleList = NULL;
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 48220719b..f1a9ab4db 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -53,13 +53,13 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/os.h>
+#include "os.h"
 /* For stat() and related stuff */
 #define NO_OSLIB_PROTOTYPES
 #include "xf86_OSlib.h"
 #define LOADERDECLARATIONS
 #include "loaderProcs.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #ifdef XINPUT
diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c
index 29d6a2f89..3e10cd72e 100644
--- a/hw/xfree86/loader/misym.c
+++ b/hw/xfree86/loader/misym.c
@@ -56,7 +56,7 @@
 #endif
 
 #include "sym.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "mi.h"
 #include "mibank.h"
 #include "miwideline.h"
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index de7e638bb..70aec096b 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -58,7 +58,7 @@
 #include <fcntl.h>
 #include <setjmp.h>
 #include "sym.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "mi.h"
 #include "cursor.h"
 #include "mipointer.h"
diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c
index 3554edddc..c8e204307 100644
--- a/hw/xfree86/os-support/bsd/bsd_apm.c
+++ b/hw/xfree86/os-support/bsd/bsd_apm.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #define XF86_OS_PRIVS
diff --git a/hw/xfree86/os-support/bsd/bsd_axp.c b/hw/xfree86/os-support/bsd/bsd_axp.c
index 8328e5115..00b928a5e 100644
--- a/hw/xfree86/os-support/bsd/bsd_axp.c
+++ b/hw/xfree86/os-support/bsd/bsd_axp.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Axp.h"
diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c
index acd9fc111..00f457b88 100644
--- a/hw/xfree86/os-support/bsd/bsd_jstk.c
+++ b/hw/xfree86/os-support/bsd/bsd_jstk.c
@@ -37,7 +37,7 @@
 #include <fcntl.h>
 
 #ifdef XFree86LOADER
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86_libc.h"
 #endif
 #include "xf86.h"
diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
index 06544eedf..5215d54e4 100644
--- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
+++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
@@ -33,7 +33,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #define XF86_OS_PRIVS
diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h
index f0ab4307a..886c830fb 100644
--- a/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/hw/xfree86/os-support/bus/xf86Pci.h
@@ -110,7 +110,7 @@
 #define _XF86PCI_H 1
 #include <X11/Xarch.h>
 #include <X11/Xfuncproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 
 #define PCI_NOT_FOUND	0xFFFFFFFFU
 
diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
index 9a50947f5..ebc4534a8 100644
--- a/hw/xfree86/os-support/linux/lnx_apm.c
+++ b/hw/xfree86/os-support/linux/lnx_apm.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #define XF86_OS_PRIVS
diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c
index b479ca8ed..4f5aa87ae 100644
--- a/hw/xfree86/os-support/linux/lnx_axp.c
+++ b/hw/xfree86/os-support/linux/lnx_axp.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Axp.h"
diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c
index a20298ed4..97edd11a6 100644
--- a/hw/xfree86/os-support/linux/lnx_pci.c
+++ b/hw/xfree86/os-support/linux/lnx_pci.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #define XF86_OS_PRIVS
diff --git a/hw/xfree86/os-support/misc/xf86_Util.c b/hw/xfree86/os-support/misc/xf86_Util.c
index 9f251440a..afcdd5b69 100644
--- a/hw/xfree86/os-support/misc/xf86_Util.c
+++ b/hw/xfree86/os-support/misc/xf86_Util.c
@@ -42,7 +42,7 @@ int _xf86misc;
 /* For use only with gcc */
 #ifdef __GNUC__
 
-#include <X11/os.h>
+#include "os.h"
 
 char *
 debug_alloca(char *file, int line, int size)
diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c
index a77e2b94c..4bd17914c 100644
--- a/hw/xfree86/os-support/shared/libc_wrapper.c
+++ b/hw/xfree86/os-support/shared/libc_wrapper.c
@@ -50,7 +50,7 @@
 #include <stdarg.h>
 #include <fcntl.h>
 #include <X11/Xfuncproto.h>
-#include <X11/os.h>
+#include "os.h"
 #include <ctype.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/hw/xfree86/os-support/shared/pm_noop.c b/hw/xfree86/os-support/shared/pm_noop.c
index d17ce3812..6e24653ba 100644
--- a/hw/xfree86/os-support/shared/pm_noop.c
+++ b/hw/xfree86/os-support/shared/pm_noop.c
@@ -33,7 +33,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #define XF86_OS_PRIVS
diff --git a/hw/xfree86/os-support/xf86_ansic.h b/hw/xfree86/os-support/xf86_ansic.h
index ea2216b39..6d2352cd6 100644
--- a/hw/xfree86/os-support/xf86_ansic.h
+++ b/hw/xfree86/os-support/xf86_ansic.h
@@ -90,7 +90,7 @@
 #endif
 
 #ifndef FONTMODULE
-#include <X11/misc.h>
+#include "misc.h"
 #endif
 #include "xf86_libc.h"
 #ifndef SHRT_MAX
diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c
index 13b697d85..243bcfbbc 100644
--- a/hw/xfree86/rac/xf86RAC.c
+++ b/hw/xfree86/rac/xf86RAC.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/rac/xf86RAC.h b/hw/xfree86/rac/xf86RAC.h
index f500b56d7..438c6acb1 100644
--- a/hw/xfree86/rac/xf86RAC.h
+++ b/hw/xfree86/rac/xf86RAC.h
@@ -8,7 +8,7 @@
 #define __XF86RAC_H 1
 
 #include "screenint.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 
 Bool xf86RACInit(ScreenPtr pScreen, unsigned int flag);
diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c
index 527638fac..83e6e4611 100644
--- a/hw/xfree86/ramdac/xf86HWCurs.c
+++ b/hw/xfree86/ramdac/xf86HWCurs.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c
index 1daebdc5f..91455d412 100644
--- a/hw/xfree86/scanpci/xf86ScanPci.c
+++ b/hw/xfree86/scanpci/xf86ScanPci.c
@@ -56,7 +56,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Pci.h"
diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c
index 4363ad0f9..7da9617cb 100644
--- a/hw/xfree86/shadowfb/shadow.c
+++ b/hw/xfree86/shadowfb/shadow.c
@@ -14,7 +14,7 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "pixmapstr.h"
 #include "input.h"
 #include <X11/fonts/font.h>
diff --git a/hw/xfree86/utils/pcitweak/pcitweak.c b/hw/xfree86/utils/pcitweak/pcitweak.c
index f11922ece..a7c6a3263 100644
--- a/hw/xfree86/utils/pcitweak/pcitweak.c
+++ b/hw/xfree86/utils/pcitweak/pcitweak.c
@@ -33,7 +33,7 @@
  */
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/utils/scanpci/scanpci.c b/hw/xfree86/utils/scanpci/scanpci.c
index b1378ff59..4ed4a1108 100644
--- a/hw/xfree86/utils/scanpci/scanpci.c
+++ b/hw/xfree86/utils/scanpci/scanpci.c
@@ -26,7 +26,7 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.91tsi Exp $ */
 
 #include <X11/X.h>
-#include <X11/os.h>
+#include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c
index 07a41d128..8b98190cb 100644
--- a/hw/xfree86/vgahw/vgaHW.c
+++ b/hw/xfree86/vgahw/vgaHW.c
@@ -17,7 +17,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h
index 568d45093..5fb114073 100644
--- a/hw/xfree86/vgahw/vgaHW.h
+++ b/hw/xfree86/vgahw/vgaHW.h
@@ -19,7 +19,7 @@
 #define _VGAHW_H
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "input.h"
 #include "scrnintstr.h"
 #include "colormapst.h"
diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c
index 73aab81cd..de0244848 100644
--- a/hw/xfree86/xaa/xaaBitBlt.c
+++ b/hw/xfree86/xaa/xaaBitBlt.c
@@ -11,7 +11,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c
index 45e3b6e4a..8d5bbf9aa 100644
--- a/hw/xfree86/xaa/xaaCpyArea.c
+++ b/hw/xfree86/xaa/xaaCpyArea.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c
index 5d2af7584..b60ba3f83 100644
--- a/hw/xfree86/xaa/xaaCpyPlane.c
+++ b/hw/xfree86/xaa/xaaCpyPlane.c
@@ -14,7 +14,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c
index d35434a18..e50e88f91 100644
--- a/hw/xfree86/xaa/xaaCpyWin.c
+++ b/hw/xfree86/xaa/xaaCpyWin.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c
index a2ba8f590..059804c70 100644
--- a/hw/xfree86/xaa/xaaDashLine.c
+++ b/hw/xfree86/xaa/xaaDashLine.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c
index 3fca17cbb..2f8851c38 100644
--- a/hw/xfree86/xaa/xaaFallback.c
+++ b/hw/xfree86/xaa/xaaFallback.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c
index 43a351e22..4c4f0d38d 100644
--- a/hw/xfree86/xaa/xaaFillArc.c
+++ b/hw/xfree86/xaa/xaaFillArc.c
@@ -38,7 +38,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c
index 1136cbc8f..55177d319 100644
--- a/hw/xfree86/xaa/xaaFillPoly.c
+++ b/hw/xfree86/xaa/xaaFillPoly.c
@@ -35,7 +35,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c
index d459e979c..bf6328272 100644
--- a/hw/xfree86/xaa/xaaFillRect.c
+++ b/hw/xfree86/xaa/xaaFillRect.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c
index 451ade394..83df2a0e2 100644
--- a/hw/xfree86/xaa/xaaGC.c
+++ b/hw/xfree86/xaa/xaaGC.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c
index 24a916bd6..5c04e2266 100644
--- a/hw/xfree86/xaa/xaaGCmisc.c
+++ b/hw/xfree86/xaa/xaaGCmisc.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c
index 5de432fed..b87cc4eec 100644
--- a/hw/xfree86/xaa/xaaImage.c
+++ b/hw/xfree86/xaa/xaaImage.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
index ca53aaf7a..35ee34c6c 100644
--- a/hw/xfree86/xaa/xaaInit.c
+++ b/hw/xfree86/xaa/xaaInit.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
index 9016c6127..8f4043537 100644
--- a/hw/xfree86/xaa/xaaInitAccel.c
+++ b/hw/xfree86/xaa/xaaInitAccel.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c
index be1feb4fd..2314869cf 100644
--- a/hw/xfree86/xaa/xaaLine.c
+++ b/hw/xfree86/xaa/xaaLine.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c
index e8a28d5d0..7f39229f8 100644
--- a/hw/xfree86/xaa/xaaLineMisc.c
+++ b/hw/xfree86/xaa/xaaLineMisc.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c
index 0c17a4abf..0d0d8cf11 100644
--- a/hw/xfree86/xaa/xaaNonTEText.c
+++ b/hw/xfree86/xaa/xaaNonTEText.c
@@ -22,7 +22,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c
index fbe029f92..d227579a9 100644
--- a/hw/xfree86/xaa/xaaOffscreen.c
+++ b/hw/xfree86/xaa/xaaOffscreen.c
@@ -11,7 +11,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c
index 48968c41f..12d2a959b 100644
--- a/hw/xfree86/xaa/xaaOverlay.c
+++ b/hw/xfree86/xaa/xaaOverlay.c
@@ -5,7 +5,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c
index 359e4d4a6..0cfd46f50 100644
--- a/hw/xfree86/xaa/xaaOverlayDF.c
+++ b/hw/xfree86/xaa/xaaOverlayDF.c
@@ -10,7 +10,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c
index 139fb7b81..a4fadb9aa 100644
--- a/hw/xfree86/xaa/xaaPCache.c
+++ b/hw/xfree86/xaa/xaaPCache.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c
index cde39d9ea..041ee1831 100644
--- a/hw/xfree86/xaa/xaaPaintWin.c
+++ b/hw/xfree86/xaa/xaaPaintWin.c
@@ -5,7 +5,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c
index b12750421..60cfe0843 100644
--- a/hw/xfree86/xaa/xaaPict.c
+++ b/hw/xfree86/xaa/xaaPict.c
@@ -26,7 +26,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c
index f9fe04d1c..80e700153 100644
--- a/hw/xfree86/xaa/xaaROP.c
+++ b/hw/xfree86/xaa/xaaROP.c
@@ -5,7 +5,7 @@
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c
index 9bbecae8b..b176e51fd 100644
--- a/hw/xfree86/xaa/xaaRect.c
+++ b/hw/xfree86/xaa/xaaRect.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c
index a1de98c0a..315024ef3 100644
--- a/hw/xfree86/xaa/xaaSpans.c
+++ b/hw/xfree86/xaa/xaaSpans.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c
index 480462588..c0dd6da3e 100644
--- a/hw/xfree86/xaa/xaaStateChange.c
+++ b/hw/xfree86/xaa/xaaStateChange.c
@@ -4,7 +4,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c
index 3079c6db5..6f8dc6de2 100644
--- a/hw/xfree86/xaa/xaaTEText.c
+++ b/hw/xfree86/xaa/xaaTEText.c
@@ -22,7 +22,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c
index 8e0e5d828..481ff8cc3 100644
--- a/hw/xfree86/xaa/xaaWideLine.c
+++ b/hw/xfree86/xaa/xaaWideLine.c
@@ -29,7 +29,7 @@ Original mi code written by Keith Packard.
 #endif
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h
index 0e70d6354..cff5d9d3f 100644
--- a/hw/xfree86/xf4bpp/OScompiler.h
+++ b/hw/xfree86/xf4bpp/OScompiler.h
@@ -35,7 +35,7 @@
 #define MIN(a,b) (((a)<(b))?(a):(b))
 #define ABS(x) (((x)>0)?(x):-(x))
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86_ansic.h"
 #include "compiler.h"
 
diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h
index 1e613bb30..ba0aae662 100644
--- a/hw/xfree86/xf4bpp/vgaVideo.h
+++ b/hw/xfree86/xf4bpp/vgaVideo.h
@@ -28,7 +28,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>	/* GJA -- for pointer data type */
+#include "misc.h"	/* GJA -- for pointer data type */
 #ifdef lint
 #if defined(volatile)
 #undef volatile
diff --git a/hw/xfree86/xf8_16bpp/cfbscrinit.c b/hw/xfree86/xf8_16bpp/cfbscrinit.c
index a6bc2a67e..d7e6665d9 100644
--- a/hw/xfree86/xf8_16bpp/cfbscrinit.c
+++ b/hw/xfree86/xf8_16bpp/cfbscrinit.c
@@ -12,7 +12,7 @@
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c
index 9deda1f5f..2e4dd7296 100644
--- a/hw/xfree86/xf8_32bpp/cfbscrinit.c
+++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c
@@ -7,7 +7,7 @@
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"
diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c
index 9b04eba43..2766bf871 100644
--- a/hw/xfree86/xf8_32bpp/xf86overlay.c
+++ b/hw/xfree86/xf8_32bpp/xf86overlay.c
@@ -10,7 +10,7 @@
 #include <xorg-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "xf86.h"
 #include "xf86_ansic.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/xf8_32wid/cfbscrinit.c b/hw/xfree86/xf8_32wid/cfbscrinit.c
index 438ea0882..b23161d01 100644
--- a/hw/xfree86/xf8_32wid/cfbscrinit.c
+++ b/hw/xfree86/xf8_32wid/cfbscrinit.c
@@ -15,7 +15,7 @@
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"
diff --git a/hw/xfree86/xf8_32wid/cfbwid.c b/hw/xfree86/xf8_32wid/cfbwid.c
index 4fcd4725e..432242bbc 100644
--- a/hw/xfree86/xf8_32wid/cfbwid.c
+++ b/hw/xfree86/xf8_32wid/cfbwid.c
@@ -6,7 +6,7 @@
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"
diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index 0998b1307..75aa396fb 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -18,7 +18,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
 #include "servermd.h"
 
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index 8ba943e91..cea8b60d0 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -18,7 +18,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "cursor.h"
 #include "cursorstr.h"
 #include "scrnintstr.h"
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index 51f7f943f..602a6c9b2 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -19,7 +19,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
 #include "servermd.h"
 
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 2b2d4a8ca..98b7e5046 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -19,7 +19,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "servermd.h"
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index d5ce79f85..bdc0180ae 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -17,7 +17,7 @@ is" without express or implied warranty.
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "regionstr.h"
 #include <X11/fonts/font.h>
 #include <X11/fonts/fontstruct.h>
diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c
index b7b22862c..421234316 100644
--- a/hw/xnest/GetTime.c
+++ b/hw/xnest/GetTime.c
@@ -32,7 +32,7 @@ from the X Consortium.
 
 
 #include <X11/Xos.h>
-#include <X11/os.h>
+#include "os.h"
 #include <time.h>
 
 CARD32
diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c
index 3b7ba8e04..362e9a4b6 100644
--- a/hw/xnest/Handlers.c
+++ b/hw/xnest/Handlers.c
@@ -18,7 +18,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "servermd.h"
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 3e9a4bd9b..d520a4ef5 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -18,7 +18,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "servermd.h"
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 903750346..d1260c694 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -21,7 +21,7 @@ is" without express or implied warranty.
 #include "keysym.h"
 #include "screenint.h"
 #include "inputstr.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
 #include "servermd.h"
 
diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c
index e02064d6e..7613122be 100644
--- a/hw/xnest/Pointer.c
+++ b/hw/xnest/Pointer.c
@@ -19,7 +19,7 @@ is" without express or implied warranty.
 #include "screenint.h"
 #include "inputstr.h"
 #include "input.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
 #include "servermd.h"
 #include "mipointer.h"
diff --git a/hw/xnest/TestExt.c b/hw/xnest/TestExt.c
index afe0281b1..be9299c31 100644
--- a/hw/xnest/TestExt.c
+++ b/hw/xnest/TestExt.c
@@ -20,7 +20,7 @@ is" without express or implied warranty.
 #undef Bool
 #include "screenint.h"
 #include "input.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
 #include "servermd.h"
 #include "mipointer.h"
diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h
index 0252d37a2..5230b16e0 100644
--- a/hw/xwin/winprefs.h
+++ b/hw/xwin/winprefs.h
@@ -34,7 +34,7 @@
 /* Need Bool */
 #include <X11/Xdefs.h>
 /* Need TRUE */
-#include <X11/misc.h>
+#include "misc.h"
 
 /* Need to know how long paths can be... */
 #include <limits.h>
diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c
index e149c3e41..a63c09210 100755
--- a/hw/xwin/winwindowswm.c
+++ b/hw/xwin/winwindowswm.c
@@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "colormapst.h"