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

XTrap/xtrapdi.c

@@ -65,7 +65,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "input.h"              /* Server DevicePtr definitions */
-#include <X11/misc.h>               /* Server swapping macros */
+#include "misc.h"               /* Server swapping macros */
 #include "dixstruct.h"          /* Server ClientRec definitions */
 #include "resource.h"           /* Used with the MakeAtom call */
 #ifdef PC

XTrap/xtrapdiswp.c

@@ -56,7 +56,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/Xprotostr.h>
 #include <X11/extensions/xtrapdi.h>
 #include "input.h"          /* Server DevicePtr definitions */
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #ifdef PC
 # include "extnsist.h"

XTrap/xtrapditbl.c

@@ -46,7 +46,7 @@ SOFTWARE.
 #include <X11/Xprotostr.h>
 #include <X11/extensions/xtrapdi.h>
 #include "input.h"          /* Server DevicePtr definitions */
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #ifdef PC
 # include "extnsist.h"

Xext/appgroup.c

@@ -34,7 +34,7 @@ from The Open Group.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "scrnintstr.h"

Xext/bigreq.c

@@ -35,8 +35,8 @@ from The Open Group.
 
 #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"
 #include "extnsionst.h"
 #include <X11/extensions/bigreqstr.h>

Xext/cup.c

@@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "colormapst.h"

Xext/dpms.c

@@ -41,8 +41,8 @@ Equipment Corporation.
 
 #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"
 #include "extnsionst.h"
 #include "opaque.h"

Xext/fontcache.c

@@ -39,7 +39,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"

Xext/mbuf.c

@@ -35,7 +35,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "window.h"
-#include <X11/os.h>
+#include "os.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

Xext/mbufbf.c

@@ -36,8 +36,8 @@ in this Software without prior written authorization from The Open Group.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

Xext/mbufpx.c

@@ -35,8 +35,8 @@ in this Software without prior written authorization from The Open Group.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

Xext/mitmisc.c

@@ -36,8 +36,8 @@ in this Software without prior written authorization from The Open Group.
 
 #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"
 #include "extnsionst.h"
 #define _MITMISC_SERVER_

Xext/panoramiX.c

@@ -34,7 +34,7 @@ Equipment Corporation.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xarch.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "cursor.h"
 #include "cursorstr.h"
 #include "extnsionst.h"

Xext/panoramiXSwap.c

@@ -32,7 +32,7 @@ Equipment Corporation.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "cursor.h"
 #include "cursorstr.h"
 #include "extnsionst.h"

Xext/panoramiXprocs.c

@@ -45,7 +45,7 @@ Equipment Corporation.
 #include "opaque.h"
 #include "inputstr.h"
 #include "migc.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "panoramiX.h"
 #include "panoramiXsrv.h"

Xext/saver.c

@@ -38,8 +38,8 @@ in this Software without prior written authorization from the X Consortium.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

Xext/shape.c

@@ -35,8 +35,8 @@ in this Software without prior written authorization from The Open Group.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

Xext/shm.c

@@ -49,8 +49,8 @@ in this Software without prior written authorization from The Open Group.
 #define NEED_EVENTS
 #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"
 #include "resource.h"
 #include "scrnintstr.h"

Xext/sleepuntil.c

@@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include "sleepuntil.h"
 #include <X11/X.h>
 #include <X11/Xmd.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "windowstr.h"
 #include "dixstruct.h"
 #include "pixmapstr.h"

Xext/sync.c

@@ -61,8 +61,8 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xmd.h>
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "extnsionst.h"
 #include "dixstruct.h"
 #include "resource.h"

Xext/xcmisc.c

@@ -36,8 +36,8 @@ from The Open Group.
 
 #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"
 #include "extnsionst.h"
 #include "swaprep.h"

Xext/xevie.c

@@ -40,7 +40,7 @@ of the copyright holder.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "colormapst.h"

Xext/xf86bigfont.c

@@ -66,8 +66,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"
 #include "gcstruct.h"
 #include "dixfontstr.h"

Xext/xprint.c

@@ -76,7 +76,7 @@ copyright holders.
 #define NEED_EVENTS
 #include <X11/Xproto.h>
 #undef NEED_EVENTS
-#include <X11/misc.h>
+#include "misc.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

Xext/xres.c

@@ -12,8 +12,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"
 #include "extnsionst.h"
 #include "swaprep.h"

Xext/xtest.c

@@ -36,8 +36,8 @@ from The Open Group.
 #include <X11/X.h>
 #define NEED_EVENTS
 #include <X11/Xproto.h>
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "windowstr.h"

Xext/xtest1dd.c

@@ -70,7 +70,7 @@ University of California.
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #define  XTestSERVER_SIDE
 #include <X11/extensions/xtestext1.h>	

Xext/xtest1di.c

@@ -69,8 +69,8 @@ University of California.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "gcstruct.h"   
 #include "extnsionst.h"
 #include "dixstruct.h"

Xext/xvdisp.c

@@ -54,7 +54,7 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "pixmapstr.h"

Xext/xvmain.c

@@ -81,8 +81,8 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "pixmapstr.h"

Xext/xvmc.c

@@ -8,8 +8,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"
 #include "resource.h"
 #include "scrnintstr.h"

Xprint/Init.c

@@ -77,7 +77,7 @@ copyright holders.
 #include "screenint.h"
 #include "input.h"
 #include "cursor.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "windowstr.h"
 #include "inputstr.h"
 
@@ -94,7 +94,7 @@ typedef char *XPointer;
 #include "DiPrint.h"
 #include "attributes.h"
 
-#include <X11/os.h>
+#include "os.h"
 #include "spooler.h"
 
 static void GenericScreenInit(

Xprint/Util.c

@@ -45,7 +45,7 @@ copyright holders.
 #include <stdio.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 
 #include <X11/extensions/Print.h>

Xprint/mediaSizes.c

@@ -62,7 +62,7 @@ copyright holders.
 #include <X11/X.h>
 #include "dixstruct.h"
 #include "screenint.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
 #include <X11/fonts/fontstruct.h>
 

Xprint/pcl/Pcl.h

@@ -77,7 +77,7 @@ typedef char *XPointer;
 #define Status int
 #define True 1
 #define False 0
-#include <X11/misc.h>
+#include "misc.h"
 #include <X11/Xfuncproto.h>
 #include <X11/Xresource.h>
 #include "attributes.h"

Xprint/ps/Ps.h

@@ -112,7 +112,7 @@ typedef char *XPointer;
 #define False 0
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include <X11/Xfuncproto.h>
 #include <X11/Xresource.h>
 #include "attributes.h"

Xprint/ps/psout.c

@@ -80,7 +80,7 @@ in this Software without prior written authorization from The Open Group.
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <X11/os.h>
+#include "os.h"
 #define USE_PSOUT_PRIVATE 1
 #include "psout.h"
 #ifdef XP_USE_FREETYPE

Xprint/ps/psout_ft.c

@@ -27,7 +27,7 @@ THE SOFTWARE.
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <X11/os.h>
+#include "os.h"
 #define USE_PSOUT_PRIVATE 1
 #include "psout.h"
 

Xprint/ps/psout_ftpstype1.c

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include <errno.h>
 #include <sys/wait.h>
 
-#include <X11/os.h>
+#include "os.h"
 #define USE_PSOUT_PRIVATE 1
 #include "psout.h"
 

Xprint/ps/psout_ftpstype3.c

@@ -27,7 +27,7 @@ THE SOFTWARE.
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <X11/os.h>
+#include "os.h"
 #define USE_PSOUT_PRIVATE 1
 #include "psout.h"
 

Xprint/raster/Raster.c

@@ -66,7 +66,7 @@ copyright holders.
 #include <X11/Xproto.h>
 #undef NEED_EVENTS
 #include <X11/Xatom.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "scrnintstr.h"
 #include "screenint.h"

Xprint/raster/Raster.h

@@ -61,7 +61,7 @@ typedef char *XPointer;
 #define Status int
 #define True 1
 #define False 0
-#include <X11/misc.h>
+#include "misc.h"
 #include <X11/Xfuncproto.h>
 #include <X11/Xresource.h>
 #include "attributes.h"

Xprint/raster/RasterAttVal.c

@@ -38,7 +38,7 @@ copyright holders.
 
 #include <stdio.h>
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "scrnintstr.h"
 #include "screenint.h"

afb/afbbres.c

@@ -54,7 +54,7 @@ SOFTWARE.
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "afb.h"
 #include "maskbits.h"
 #include "miline.h"

afb/afbbresd.c

@@ -53,7 +53,7 @@ SOFTWARE.
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "afb.h"
 #include "maskbits.h"
 #include "miline.h"

afb/afbgetsp.c

@@ -56,7 +56,7 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "region.h"
 #include "gc.h"
 #include "windowstr.h"

afb/afbmisc.c

@@ -53,7 +53,7 @@ SOFTWARE.
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "cursor.h"
 #include "scrnintstr.h"
 

afb/afbsetsp.c

@@ -56,7 +56,7 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "windowstr.h"

cfb/cfbbres.c

@@ -51,7 +51,7 @@ SOFTWARE.
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "cfb.h"
 #include "cfbmskbits.h"
 #include "servermd.h"

cfb/cfbbresd.c

@@ -51,7 +51,7 @@ SOFTWARE.
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "cfb.h"
 #include "cfbmskbits.h"
 #include "miline.h"

cfb/cfbgetsp.c

@@ -55,7 +55,7 @@ SOFTWARE.
 #include <X11/Xmd.h>
 #include "servermd.h"
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "region.h"
 #include "gc.h"
 #include "windowstr.h"

cfb/cfbsetsp.c

@@ -55,7 +55,7 @@ SOFTWARE.
 #include <X11/Xmd.h>
 #include "servermd.h"
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "windowstr.h"

composite/compint.h

@@ -29,9 +29,9 @@
 #ifndef _COMPINT_H_
 #define _COMPINT_H_
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
-#include <X11/os.h>
+#include "os.h"
 #include "regionstr.h"
 #include "validate.h"
 #include "windowstr.h"

damageext/damageextint.h

@@ -32,8 +32,8 @@
 #define NEED_EVENTS
 #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"
 #include "extnsionst.h"
 #include <X11/extensions/damageproto.h>

dbe/midbe.c

@@ -43,8 +43,8 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

dix/atom.c

@@ -54,7 +54,7 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xatom.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "resource.h"
 #include "dix.h"
 

dix/colormap.c

@@ -56,10 +56,10 @@ SOFTWARE.
 #include <X11/X.h>
 #define NEED_EVENTS
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dix.h"
 #include "colormapst.h"
-#include <X11/os.h>
+#include "os.h"
 #include "scrnintstr.h"
 #include "resource.h"
 #include "windowstr.h"

dix/devices.c

@@ -55,7 +55,7 @@ SOFTWARE.
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "resource.h"
 #define NEED_EVENTS
 #define NEED_REPLIES

dix/dixfonts.c

@@ -63,7 +63,7 @@ Equipment Corporation.
 #include "resource.h"
 #include "dixstruct.h"
 #include "cursorstr.h"
-#include <X11/misc.h>
+#include "misc.h"
 #include "opaque.h"
 #include "dixfontstr.h"
 #include "closestr.h"

dix/dixutils.c

@@ -90,7 +90,7 @@ Author:  Adobe Systems Incorporated
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "windowstr.h"
 #include "dixstruct.h"
 #include "pixmapstr.h"

dix/events.c

@@ -116,7 +116,7 @@ of the copyright holder.
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "resource.h"
 #define NEED_EVENTS
 #define NEED_REPLIES

dix/extension.c

@@ -55,7 +55,7 @@ SOFTWARE.
 #define NEED_EVENTS
 #define NEED_REPLIES
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "gcstruct.h"

dix/gc.c

@@ -55,7 +55,7 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "resource.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"

dix/globals.c

@@ -55,14 +55,14 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "input.h"
 #include "dixfont.h"
 #include "site.h"
 #include "dixstruct.h"
-#include <X11/os.h>
+#include "os.h"
 
 ScreenInfo screenInfo;
 KeybdCtrl defaultKeyboardControl = {

dix/glyphcurs.c

@@ -51,7 +51,7 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 #include "scrnintstr.h"

dix/grabs.c

@@ -53,7 +53,7 @@ SOFTWARE.
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
+#include "misc.h"
 #define NEED_EVENTS
 #include <X11/Xproto.h>
 #include "windowstr.h"

dix/initatoms.c

@@ -9,7 +9,7 @@
 
 #include <X11/X.h>
 #include <X11/Xatom.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dix.h"
 void MakePredeclaredAtoms()
 {

dix/main.c

@@ -88,8 +88,8 @@ Equipment Corporation.
 #include <X11/Xos.h>   /* for unistd.h  */
 #include <X11/Xproto.h>
 #include "scrnintstr.h"
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "windowstr.h"
 #include "resource.h"
 #include "dixstruct.h"

dix/pixmap.c

@@ -34,8 +34,8 @@ from The Open Group.
 
 #include <X11/X.h>
 #include "scrnintstr.h"
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "windowstr.h"
 #include "resource.h"
 #include "dixstruct.h"

dix/privates.c

@@ -35,8 +35,8 @@ from The Open Group.
 
 #include <X11/X.h>
 #include "scrnintstr.h"
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "windowstr.h"
 #include "resource.h"
 #include "dixstruct.h"

dix/resource.c

@@ -107,8 +107,8 @@ Equipment Corporation.
 #endif
 
 #include <X11/X.h>
-#include <X11/misc.h>
-#include <X11/os.h>
+#include "misc.h"
+#include "os.h"
 #include "resource.h"
 #include "dixstruct.h" 
 #include "opaque.h"

dix/swaprep.c

@@ -56,7 +56,7 @@ SOFTWARE.
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include <X11/Xproto.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include <X11/fonts/fontstruct.h>
 #include "scrnintstr.h"

dix/swapreq.c

@@ -56,7 +56,7 @@ SOFTWARE.
 #define NEED_EVENTS
 #include <X11/Xproto.h>
 #include <X11/Xprotostr.h>
-#include <X11/misc.h>
+#include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"	/* for SendEvent */
 #include "swapreq.h"

dix/window.c

@@ -84,9 +84,9 @@ Equipment Corporation.
 #include <dix-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include "scrnintstr.h"
-#include <X11/os.h>
+#include "os.h"
 #include "regionstr.h"
 #include "validate.h"
 #include "windowstr.h"

dix/xpstubs.c

@@ -31,7 +31,7 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/misc.h>
+#include "misc.h"
 #include <X11/fonts/font.h>
 #ifdef XPRINT
 #include "DiPrint.h"

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"

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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

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"
 

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"

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"

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"
 

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"

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)

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"

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"

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"
 

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"

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"

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>

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"