Change all misc.h and os.h references to <X11/foo.h>.

XTrap/xtrapdi.c

@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.2 2004/04/23 18:44:40 eich Exp $ */
 /* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
@@ -61,7 +61,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 "misc.h"               /* Server swapping macros */
+#include <X11/misc.h>               /* Server swapping macros */
 #include "dixstruct.h"          /* Server ClientRec definitions */
 #include "resource.h"           /* Used with the MakeAtom call */
 #ifdef PC

XTrap/xtrapdiswp.c

@@ -52,7 +52,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 "misc.h"
+#include <X11/misc.h>
 #include "dixstruct.h"
 #ifdef PC
 # include "extnsist.h"

XTrap/xtrapditbl.c

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

Xext/appgroup.c

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

Xext/bigreq.c

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

Xext/cup.c

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

Xext/dpms.c

@@ -37,8 +37,8 @@ Equipment Corporation.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "opaque.h"

Xext/fontcache.c

@@ -35,7 +35,7 @@
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "scrnintstr.h"

Xext/mbuf.c

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

Xext/mbufbf.c

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

Xext/mbufpx.c

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

Xext/mitmisc.c

@@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group.
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #define _MITMISC_SERVER_

Xext/panoramiX.c

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

Xext/panoramiX.h

@@ -1,5 +1,5 @@
 /* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */
-/* $XdotOrg: xc/programs/Xserver/Xext/panoramiX.h,v 1.2 2004/04/23 18:44:41 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/panoramiX.h,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
 /*****************************************************************
 
 Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.

Xext/panoramiXSwap.c

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

Xext/panoramiXprocs.c

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

Xext/saver.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.6 2005/03/23 21:09:48 herrb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.7 2005/04/20 12:25:12 daniels Exp $ */
 /*
  * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
  *
@@ -34,8 +34,8 @@ in this Software without prior written authorization from the X Consortium.
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

Xext/security.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/security.c,v 1.2 2004/04/23 18:44:41 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/security.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
 /* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 /*
 

Xext/shape.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.4 2004/07/29 23:43:39 kem Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.6 2005/06/10 04:01:14 ajax Exp $ */
 /* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */
 /************************************************************
 
@@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group.
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

Xext/shm.c

@@ -45,8 +45,8 @@ in this Software without prior written authorization from The Open Group.
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "dixstruct.h"
 #include "resource.h"
 #include "scrnintstr.h"

Xext/sleepuntil.c

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

Xext/sync.c

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

Xext/xcmisc.c

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

Xext/xevie.c

@@ -30,13 +30,13 @@ or other dealings in this Software without prior written authorization
 of the copyright holder.
 
 ************************************************************/
-/* $XdotOrg: $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xevie.c,v 1.6 2005/05/22 01:12:49 alanc Exp $ */
 
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "colormapst.h"

Xext/xf86bigfont.c

@@ -62,8 +62,8 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "dixstruct.h"
 #include "gcstruct.h"
 #include "dixfontstr.h"

Xext/xprint.c

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

Xext/xres.c

@@ -2,14 +2,14 @@
    Copyright (c) 2002  XFree86 Inc
 */
 /* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */
-/* $XdotOrg: xc/programs/Xserver/Xext/xres.c,v 1.3 2004/12/15 20:51:25 herrb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xres.c,v 1.4 2005/04/20 12:25:12 daniels Exp $ */
 
 #define NEED_EVENTS
 #define NEED_REPLIES
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"

Xext/xtest.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
 /* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
 /*
 
@@ -32,8 +32,8 @@ from The Open Group.
 #include <X11/X.h>
 #define NEED_EVENTS
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "windowstr.h"

Xext/xtest1dd.c

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

Xext/xtest1di.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/xtest1di.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xtest1di.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
 /* $Xorg: xtest1di.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
 /*
  *	File:  xtest1di.c
@@ -65,8 +65,8 @@ University of California.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "gcstruct.h"   
 #include "extnsionst.h"
 #include "dixstruct.h"

Xext/xvdisp.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
 /***********************************************************
 Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
 and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@@ -50,7 +50,7 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "pixmapstr.h"

Xext/xvmain.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */
 /***********************************************************
 Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
 and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@@ -77,8 +77,8 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "pixmapstr.h"

Xext/xvmc.c

@@ -4,8 +4,8 @@
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "dixstruct.h"
 #include "resource.h"
 #include "scrnintstr.h"

Xprint/Init.c

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

Xprint/Util.c

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

Xprint/mediaSizes.c

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

Xprint/pcl/Pcl.h

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

Xprint/ps/Ps.h

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

Xprint/ps/psout.c

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

Xprint/ps/psout_ft.c

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

Xprint/ps/psout_ftpstype1.c

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

Xprint/ps/psout_ftpstype3.c

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

Xprint/raster/Raster.c

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

Xprint/raster/Raster.h

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

Xprint/raster/RasterAttVal.c

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

afb/afbbres.c

@@ -50,7 +50,7 @@ SOFTWARE.
 /* $XConsortium: afbbres.c,v 1.22 94/04/17 20:28:17 dpw Exp $ */
 
 #include <X11/X.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "afb.h"
 #include "maskbits.h"
 #include "miline.h"

afb/afbbresd.c

@@ -49,7 +49,7 @@ SOFTWARE.
 /* $XConsortium: afbbresd.c,v 1.10 94/04/17 20:28:18 dpw Exp $ */
 
 #include <X11/X.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "afb.h"
 #include "maskbits.h"
 #include "miline.h"

afb/afbgetsp.c

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

afb/afbmisc.c

@@ -49,7 +49,7 @@ SOFTWARE.
 /* $XConsortium: afbmisc.c,v 5.4 94/04/17 20:28:27 dpw Exp $ */
 
 #include <X11/X.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "cursor.h"
 #include "scrnintstr.h"
 

afb/afbsetsp.c

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

cfb/cfbbres.c

@@ -47,7 +47,7 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: cfbbres.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */
 #include <X11/X.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "cfb.h"
 #include "cfbmskbits.h"
 #include "servermd.h"

cfb/cfbbresd.c

@@ -47,7 +47,7 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: cfbbresd.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */
 #include <X11/X.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "cfb.h"
 #include "cfbmskbits.h"
 #include "miline.h"

cfb/cfbgetsp.c

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

cfb/cfbpntwin.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.2 2004/04/23 19:00:12 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.3 2005/04/20 12:25:18 daniels Exp $ */
 /* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
 /***********************************************************
 

cfb/cfbsetsp.c

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

composite/compint.h

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

damageext/damageextint.h

@@ -28,8 +28,8 @@
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include <X11/extensions/damageproto.h>

dbe/dbe.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dbe/dbe.c,v 1.2 2004/04/23 19:03:43 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dbe/dbe.c,v 1.3 2005/04/20 12:25:19 daniels Exp $ */
 /* $Xorg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */
 /******************************************************************************
  * 

dbe/midbe.c

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

dix/colormap.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.6 2005/03/07 23:02:58 gisburn Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.7 2005/04/20 12:25:19 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.11 2003/11/03 05:10:59 tsi Exp $ */
 /***********************************************************
 
@@ -52,10 +52,10 @@ SOFTWARE.
 #include <X11/X.h>
 #define NEED_EVENTS
 #include <X11/Xproto.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "dix.h"
 #include "colormapst.h"
-#include "os.h"
+#include <X11/os.h>
 #include "scrnintstr.h"
 #include "resource.h"
 #include "windowstr.h"

dix/devices.c

@@ -48,10 +48,10 @@ SOFTWARE.
 
 
 /* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
-/* $XdotOrg: $ */
+/* $XdotOrg: xc/programs/Xserver/dix/devices.c,v 1.5 2005/05/22 01:12:49 alanc Exp $ */
 
 #include <X11/X.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "resource.h"
 #define NEED_EVENTS
 #define NEED_REPLIES

dix/dispatch.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.7 2005/03/07 23:02:58 gisburn Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.9 2005/06/10 04:01:14 ajax Exp $ */
 /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
 /************************************************************
 

dix/dixfonts.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.4 2005/04/20 12:25:19 daniels Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.5 2005/04/20 13:33:54 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.28 2003/11/08 02:02:03 dawes Exp $ */
 /************************************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -59,7 +59,7 @@ Equipment Corporation.
 #include "resource.h"
 #include "dixstruct.h"
 #include "cursorstr.h"
-#include "misc.h"
+#include <X11/misc.h>
 #include "opaque.h"
 #include "dixfontstr.h"
 #include "closestr.h"

dix/dixutils.c

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

dix/events.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.10 2005/06/10 04:01:14 ajax Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.12 2005/06/15 16:46:59 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */
 /************************************************************
 
@@ -112,7 +112,7 @@ of the copyright holder.
 /* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
 #include <X11/X.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "resource.h"
 #define NEED_EVENTS
 #define NEED_REPLIES

dix/extension.c

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

dix/gc.c

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

dix/globals.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.3 2004/09/22 17:20:55 alanc Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.4 2005/04/20 12:25:19 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */
 /************************************************************
 
@@ -51,14 +51,14 @@ SOFTWARE.
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "input.h"
 #include "dixfont.h"
 #include "site.h"
 #include "dixstruct.h"
-#include "os.h"
+#include <X11/os.h>
 
 ScreenInfo screenInfo;
 KeybdCtrl defaultKeyboardControl = {

dix/glyphcurs.c

@@ -47,7 +47,7 @@ SOFTWARE.
 
 /* $Xorg: glyphcurs.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "misc.h"
+#include <X11/misc.h>
 #include "fontstruct.h"
 #include "dixfontstr.h"
 #include "scrnintstr.h"

dix/grabs.c

@@ -49,7 +49,7 @@ SOFTWARE.
 /* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */
 
 #include <X11/X.h>
-#include "misc.h"
+#include <X11/misc.h>
 #define NEED_EVENTS
 #include <X11/Xproto.h>
 #include "windowstr.h"

dix/initatoms.c

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

dix/main.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.7 2005/04/20 12:25:19 daniels Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.11 2005/05/22 01:12:49 alanc Exp $ */
 /* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */
 /***********************************************************
 
@@ -84,8 +84,8 @@ Equipment Corporation.
 #include <X11/Xos.h>   /* for unistd.h  */
 #include <X11/Xproto.h>
 #include "scrnintstr.h"
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "windowstr.h"
 #include "resource.h"
 #include "dixstruct.h"

dix/pixmap.c

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

dix/privates.c

@@ -1,5 +1,5 @@
 /* $Xorg: privates.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
-/* $XdotOrg: $ */
+/* $XdotOrg: xc/programs/Xserver/dix/privates.c,v 1.6 2005/05/22 01:12:49 alanc Exp $ */
 /*
 
 Copyright 1993, 1998  The Open Group
@@ -31,8 +31,8 @@ from The Open Group.
 
 #include <X11/X.h>
 #include "scrnintstr.h"
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "windowstr.h"
 #include "resource.h"
 #include "dixstruct.h"

dix/resource.c

@@ -74,7 +74,7 @@ Equipment Corporation.
 ******************************************************************/
 
 /* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
-/* $XdotOrg: xc/programs/Xserver/dix/resource.c,v 1.4 2005/03/07 23:02:58 gisburn Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/resource.c,v 1.5 2005/04/20 12:25:19 daniels Exp $ */
 /* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */
 
 /*	Routines to manage various kinds of resources:
@@ -103,8 +103,8 @@ Equipment Corporation.
 
 #define NEED_EVENTS
 #include <X11/X.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "resource.h"
 #include "dixstruct.h" 
 #include "opaque.h"

dix/swaprep.c

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

dix/swapreq.c

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

dix/window.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.7 2005/03/07 23:02:59 gisburn Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.9 2005/06/10 04:01:14 ajax Exp $ */
 /* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
 /*
 
@@ -80,9 +80,9 @@ Equipment Corporation.
 
 /* $XFree86: xc/programs/Xserver/dix/window.c,v 3.36 2003/11/14 23:52:50 torrey Exp $ */
 
-#include "misc.h"
+#include <X11/misc.h>
 #include "scrnintstr.h"
-#include "os.h"
+#include <X11/os.h>
 #include "regionstr.h"
 #include "validate.h"
 #include "windowstr.h"

dix/xpstubs.c

@@ -27,7 +27,7 @@ from The Open Group.
 
 /* $Xorg: xpstubs.c,v 1.5 2001/03/08 17:52:08 pookie Exp $ */
 
-#include "misc.h"
+#include <X11/misc.h>
 #include "font.h"
 #ifdef XPRINT
 #include "DiPrint.h"

fb/fb.h

@@ -22,7 +22,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.8 2004/12/04 00:42:50 kuhn Exp $ */
+/* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.9 2005/04/20 12:25:19 daniels Exp $ */
 
 #ifndef _FB_H_
 #define _FB_H_

fb/fbcompose.c

@@ -1,5 +1,5 @@
 /*
- * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.5 2005/01/13 20:49:21 sandmann Exp $
+ * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.10 2005/07/01 10:05:42 lars Exp $
  * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.

fb/fbgc.c

@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.2 2004/04/23 19:05:14 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.3 2004/12/04 00:42:50 kuhn Exp $ */
 /* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */
 
 #include "fb.h"

fb/fbglyph.c

@@ -1,5 +1,5 @@
 /*
- * $XdotOrg: xc/programs/Xserver/fb/fbglyph.c,v 1.2 2004/04/23 19:05:14 eich Exp $
+ * $XdotOrg: xc/programs/Xserver/fb/fbglyph.c,v 1.3 2004/12/04 00:42:50 kuhn Exp $
  * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12tsi Exp $
  *
  * Copyright © 1998 Keith Packard

fb/fboverlay.c

@@ -23,7 +23,7 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
-/* $XdotOrg: xc/programs/Xserver/fb/fboverlay.c,v 1.4 2004/07/30 20:30:51 ajax Exp $ */
+/* $XdotOrg: xc/programs/Xserver/fb/fboverlay.c,v 1.5 2004/12/04 00:42:50 kuhn Exp $ */
 
 #include "fb.h"
 #include "fboverlay.h"

fb/fbscreen.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/fb/fbscreen.c,v 1.3 2004/05/16 05:08:39 alanc Exp $
+/* $XdotOrg: xc/programs/Xserver/fb/fbscreen.c,v 1.4 2004/12/04 00:42:50 kuhn Exp $
  * Id: fbscreen.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
  * Copyright © 1998 Keith Packard

fb/fbwindow.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.5 2004/12/04 00:42:50 kuhn Exp $ */
+/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.6 2004/12/06 15:53:00 eich Exp $ */
 /*
  * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *

hw/darwin/darwin.c

@@ -29,12 +29,12 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.5 2004/09/22 23:38:32 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.6 2005/04/20 12:25:19 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "os.h"
+#include <X11/os.h>
 #include "servermd.h"
 #include "inputstr.h"
 #include "scrnintstr.h"

hw/darwin/iokit/xfIOKit.c

@@ -33,12 +33,12 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2004/07/30 17:37:09 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.4 2005/04/20 12:25:19 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "os.h"
+#include <X11/os.h>
 #include "servermd.h"
 #include "inputstr.h"
 #include "scrnintstr.h"

hw/darwin/quartz/XServer.h

@@ -29,7 +29,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.4 2005/04/20 12:25:19 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.16 2003/11/23 06:04:01 torrey Exp $ */
 
 #define BOOL xBOOL

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 "misc.h"
+#include <X11/misc.h>
 #include "dixstruct.h"
 #include "globals.h"
 #include "extnsionst.h"

hw/darwin/quartz/fullscreen/fullscreen.c

@@ -25,7 +25,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.2 2004/04/23 19:16:21 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2004/07/30 19:12:18 torrey Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */
 
 #include "quartzCommon.h"

hw/darwin/quartz/quartz.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.2 2004/04/23 19:15:17 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.3 2004/07/30 19:12:17 torrey Exp $ */
 /**************************************************************
  *
  * Quartz-specific support for the Darwin X Server

hw/darwin/quartz/quartz.h

@@ -30,7 +30,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.2 2004/04/23 19:15:17 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.7 2003/11/12 20:21:51 torrey Exp $ */
 
 #ifndef _QUARTZ_H

hw/darwin/quartz/quartzCommon.h

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.2 2004/04/23 19:15:17 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */
 /*
  * quartzCommon.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 "misc.h"
+#include <X11/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 "misc.h"
+#include <X11/misc.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "colormapst.h"

hw/darwin/quartz/xpr/xpr.h

@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.2 2004/04/23 19:16:52 eich Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.4 2003/11/12 20:21:52 torrey Exp $ */
 
 #ifndef XPR_H

hw/darwin/quartz/xpr/xprFrame.c

@@ -27,7 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.3 2004/10/08 00:35:05 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2005/04/20 12:25:20 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2003/11/12 20:21:52 torrey Exp $ */
 
 #include "xpr.h"

hw/darwin/quartz/xpr/xprScreen.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.4 2004/08/12 20:24:36 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.5 2004/09/18 00:38:30 torrey Exp $ */
 /*
  * Xplugin rootless implementation screen functions
  */

hw/dmx/dmx.c

@@ -45,8 +45,8 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
+#include <X11/misc.h>
+#include <X11/os.h>
 #include "dixstruct.h"
 #define EXTENSION_PROC_ARGS void *
 #include "extnsionst.h"