Fix includes right throughout the Xserver tree:

change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
    <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.

Xext/EVI.c

@@ -23,13 +23,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.10tsi Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "dix.h"
 #define _XEVI_SERVER_
-#include "XEVIstr.h"
+#include <X11/extensions/XEVIstr.h>
 #include "EVIstruct.h"
 #include "modinit.h"
 

Xext/appgroup.c

@@ -28,8 +28,8 @@ from The Open Group.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -38,14 +38,14 @@ from The Open Group.
 #include "colormapst.h"
 #include "servermd.h"
 #define _XAG_SERVER_
-#include "Xagstr.h"
+#include <X11/extensions/Xagstr.h>
-#include "Xagsrv.h"
+#include <X11/extensions/Xagsrv.h>
 #define _SECURITY_SERVER
-#include "security.h"
+#include <X11/extensions/security.h>
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 
 #define XSERV_t
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
 #include "../os/osdep.h"
 
 #include <stdio.h>

Xext/bigreq.c

@@ -29,13 +29,13 @@ from The Open Group.
 /* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.8 2003/10/28 23:08:43 tsi Exp $ */
 
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include "bigreqstr.h"
+#include <X11/extensions/bigreqstr.h>
 #include "opaque.h"
 #include "modinit.h"
 

Xext/cup.c

@@ -28,8 +28,8 @@ in this Software without prior written authorization from The Open Group.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -38,8 +38,8 @@ in this Software without prior written authorization from The Open Group.
 #include "servermd.h"
 #include "swapreq.h"
 #define _XCUP_SERVER_
-#include "Xcupstr.h"
+#include <X11/extensions/Xcupstr.h>
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 
 #ifndef EXTMODULE
 #include "../os/osdep.h"

Xext/dpms.c

@@ -35,16 +35,16 @@ Equipment Corporation.
 
 /* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "opaque.h"
 #define DPMS_SERVER
-#include "dpms.h"
+#include <X11/extensions/dpms.h>
-#include "dpmsstr.h"
+#include <X11/extensions/dpmsstr.h>
 #include "dpmsproc.h"
 #include "modinit.h"
 

Xext/fontcache.c

@@ -33,8 +33,8 @@
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -44,7 +44,7 @@
 #define _FONTCACHE_SERVER_
 #include "fontcacheP.h"
 #include "fontcachstr.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 
 #include "swaprep.h"
 #include "modinit.h"

Xext/mbuf.c

@@ -28,8 +28,8 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: mbuf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "window.h"
 #include "os.h"
 #include "windowstr.h"
@@ -42,7 +42,7 @@ in this Software without prior written authorization from The Open Group.
 #include "opaque.h"
 #include "sleepuntil.h"
 #define _MULTIBUF_SERVER_	/* don't want Xlib structures */
-#include "multibufst.h"
+#include <X11/extensions/multibufst.h>
 
 #ifdef EXTMODULE
 #include "xf86_ansic.h"

Xext/mbufbf.c

@@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group.
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
 
 #define _MULTIBUF_SERVER_	/* don't want Xlib structures */
 #define _MULTIBUF_BUFFER_
-#include "multibufst.h"
+#include <X11/extensions/multibufst.h>
 
 /* 
 Support for doublebuffer hardare

Xext/mbufpx.c

@@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group.
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
 
 #define _MULTIBUF_SERVER_	/* don't want Xlib structures */
 #define _MULTIBUF_PIXMAP_
-#include "multibufst.h"
+#include <X11/extensions/multibufst.h>
 
 
 static Bool NoopDDA_True() { return TRUE; }

Xext/mitmisc.c

@@ -30,14 +30,14 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: mitmisc.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #define _MITMISC_SERVER_
-#include "mitmiscstr.h"
+#include <X11/extensions/mitmiscstr.h>
 #include "modinit.h"
 
 extern Bool permitOldBugs;

Xext/panoramiX.c

@@ -27,9 +27,9 @@ Equipment Corporation.
 
 #define NEED_REPLIES
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
-#include "Xarch.h"
+#include <X11/Xarch.h>
 #include "misc.h"
 #include "cursor.h"
 #include "cursorstr.h"
@@ -42,7 +42,7 @@ Equipment Corporation.
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "panoramiX.h"
-#include "panoramiXproto.h"
+#include <X11/extensions/panoramiXproto.h>
 #include "panoramiXsrv.h"
 #include "globals.h"
 #include "servermd.h"

Xext/panoramiX.h

@@ -1,5 +1,5 @@
 /* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/Xext/panoramiX.h,v 1.2 2004/04/23 18:44:41 eich Exp $ */
 /*****************************************************************
 
 Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@@ -39,7 +39,7 @@ Equipment Corporation.
 #ifndef _PANORAMIX_H_
 #define _PANORAMIX_H_
 
-#include "panoramiXext.h"
+#include <X11/extensions/panoramiXext.h>
 #include "gcstruct.h"
 
 

Xext/panoramiXSwap.c

@@ -26,8 +26,8 @@ Equipment Corporation.
 /* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.9 2003/07/16 01:38:29 dawes Exp $ */
 
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "cursor.h"
 #include "cursorstr.h"
@@ -44,7 +44,7 @@ Equipment Corporation.
 #include <X11/Xserver/ws.h> 
 #endif
 #include "panoramiX.h"
-#include "panoramiXproto.h"
+#include <X11/extensions/panoramiXproto.h>
 #include "panoramiXsrv.h"
 #include "globals.h"
 #include "panoramiXh.h"

Xext/panoramiXprocs.c

@@ -29,10 +29,10 @@ Equipment Corporation.
 /* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */
 
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"

Xext/sampleEVI.c

@@ -23,13 +23,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $XFree86$ */
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "dix.h"
 #define _XEVI_SERVER_
-#include "XEVIstr.h"
+#include <X11/extensions/XEVIstr.h>
 #include "EVIstruct.h"
 #include "scrnintstr.h"
 static int sampleGetVisualInfo(

Xext/saver.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.4 2004/11/01 16:05:27 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.6 2005/03/23 21:09:48 herrb Exp $ */
 /*
  * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
  *
@@ -32,8 +32,8 @@ in this Software without prior written authorization from the X Consortium.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -43,7 +43,7 @@ in this Software without prior written authorization from the X Consortium.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-#include "saverproto.h"
+#include <X11/extensions/saverproto.h>
 #include "gcstruct.h"
 #include "cursorstr.h"
 #include "colormapst.h"

Xext/security.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/security.c,v 1.2 2004/04/23 18:44:41 eich Exp $ */
 /* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 /*
 
@@ -36,19 +36,19 @@ in this Software without prior written authorization from The Open Group.
 #include "colormapst.h"
 #include "propertyst.h"
 #define _SECURITY_SERVER
-#include "securstr.h"
+#include <X11/extensions/securstr.h>
 #include <assert.h>
 #include <stdarg.h>
 #ifdef LBX
 #define _XLBX_SERVER_
-#include "XLbx.h"
+#include <X11/extensions/XLbx.h>
 extern unsigned char LbxReqCode;
 #endif
 #ifdef XAPPGROUP
-#include "Xagsrv.h"
+#include <X11/extensions/Xagsrv.h>
 #endif
 #include <stdio.h>  /* for file reading operations */
-#include "Xatom.h"  /* for XA_STRING */
+#include <X11/Xatom.h>  /* for XA_STRING */
 
 #ifndef DEFAULTPOLICYFILE
 # define DEFAULTPOLICYFILE NULL

Xext/shape.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.3 2004/07/29 18:46:37 stukreit Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.4 2004/07/29 23:43:39 kem Exp $ */
 /* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */
 /************************************************************
 
@@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: shape.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -41,7 +41,7 @@ in this Software without prior written authorization from The Open Group.
 #include "resource.h"
 #include "opaque.h"
 #define _SHAPE_SERVER_	/* don't want Xlib structures */
-#include "shapestr.h"
+#include <X11/extensions/shapestr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #ifdef EXTMODULE

Xext/shm.c

@@ -43,8 +43,8 @@ in this Software without prior written authorization from The Open Group.
 #include <sys/stat.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -56,8 +56,8 @@ in this Software without prior written authorization from The Open Group.
 #include "extnsionst.h"
 #include "servermd.h"
 #define _XSHM_SERVER_
-#include "shmstr.h"
+#include <X11/extensions/shmstr.h>
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 #ifdef EXTMODULE
 #include "xf86_ansic.h"
 #endif

Xext/sleepuntil.c

@@ -30,8 +30,8 @@ in this Software without prior written authorization from The Open Group.
 /* dixsleep.c - implement millisecond timeouts for X clients */
 
 #include "sleepuntil.h"
-#include "X.h"
+#include <X11/X.h>
-#include "Xmd.h"
+#include <X11/Xmd.h>
 #include "misc.h"
 #include "windowstr.h"
 #include "dixstruct.h"

Xext/sync.c

@@ -54,9 +54,9 @@ PERFORMANCE OF THIS SOFTWARE.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
-#include "Xmd.h"
+#include <X11/Xmd.h>
 #include "misc.h"
 #include "os.h"
 #include "extnsionst.h"
@@ -64,8 +64,8 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "resource.h"
 #include "opaque.h"
 #define _SYNC_SERVER
-#include "sync.h"
+#include <X11/extensions/sync.h>
-#include "syncstr.h"
+#include <X11/extensions/syncstr.h>
 
 #ifdef EXTMODULE
 #include "xf86_ansic.h"

Xext/xcmisc.c

@@ -30,14 +30,14 @@ from The Open Group.
 
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"
-#include "xcmiscstr.h"
+#include <X11/extensions/xcmiscstr.h>
 #include "modinit.h"
 
 #if 0

Xext/xevie.c

@@ -33,8 +33,8 @@ of the copyright holder.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -43,7 +43,7 @@ of the copyright holder.
 #include "servermd.h"
 #define  _XEVIE_SERVER_
 #include "Xeviestr.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 #include "input.h"
 
 #include "../os/osdep.h"

Xext/xf86bigfont.c

@@ -60,8 +60,8 @@
 #include <errno.h>
 #endif
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"

Xext/xprint.c

@@ -67,10 +67,10 @@ copyright holders.
 /* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */
 
 #define _XP_PRINT_SERVER_
-#include "X.h"
+#include <X11/X.h>
-#include "Xos.h"
+#include <X11/Xos.h>
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #undef NEED_EVENTS
 #include "misc.h"
 #include "windowstr.h"
@@ -78,7 +78,7 @@ copyright holders.
 #include "pixmapstr.h"
 #include "extnsionst.h"
 #include "dixstruct.h"
-#include "Xatom.h"
+#include <X11/Xatom.h>
 #include "Print.h"
 #include "Printstr.h"
 #include "../Xprint/DiPrint.h"

Xext/xres.c

@@ -2,18 +2,18 @@
    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.2 2004/04/23 18:44:42 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xres.c,v 1.3 2004/12/15 20:51:25 herrb Exp $ */
 
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"
-#include "XResproto.h"
+#include <X11/extensions/XResproto.h>
 #include "pixmapstr.h"
 #include "modinit.h"
 

Xext/xtest.c

@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */
 /* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
 /*
 
@@ -29,9 +29,9 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.10 2003/10/28 23:08:44 tsi Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -42,11 +42,11 @@ from The Open Group.
 #include "dixevents.h"
 #include "sleepuntil.h"
 #define _XTEST_SERVER_
-#include "XTest.h"
+#include <X11/extensions/XTest.h>
-#include "xteststr.h"
+#include <X11/extensions/xteststr.h>
 #ifdef XINPUT
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #define EXTENSION_EVENT_BASE	64
 #include "extinit.h"		/* LookupDeviceIntRec */
 #endif /* XINPUT */

Xext/xtest1dd.c

@@ -62,14 +62,14 @@ University of California.
 #define	NEED_REPLIES
 
 #include <stdio.h>
-#include "Xos.h"
+#include <X11/Xos.h>
-#include "X.h"
+#include <X11/X.h>
-#include "Xmd.h"
+#include <X11/Xmd.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #define  XTestSERVER_SIDE
-#include "xtestext1.h"	
+#include <X11/extensions/xtestext1.h>	
 
 #include "xtest1dd.h"
 

Xext/xtest1di.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xtest1di.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xtest1di.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */
 /* $Xorg: xtest1di.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
 /*
  *	File:  xtest1di.c
@@ -63,8 +63,8 @@ University of California.
 #define	 NEED_REPLIES
 
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "gcstruct.h"   
@@ -72,7 +72,7 @@ University of California.
 #include "dixstruct.h"
 #include "opaque.h"
 #define  XTestSERVER_SIDE
-#include "xtestext1.h"
+#include <X11/extensions/xtestext1.h>
 #include "modinit.h"
 
 #include "xtest1dd.h"

Xext/xvdisp.c

@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */
 /***********************************************************
 Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
 and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@@ -48,8 +48,8 @@ SOFTWARE.
 **
 */
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
@@ -59,12 +59,12 @@ SOFTWARE.
 #include "resource.h"
 #include "opaque.h"
 
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
-#include "Xvproto.h"
+#include <X11/extensions/Xvproto.h>
 #include "xvdix.h"
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include "shmstr.h"
+#include <X11/extensions/shmstr.h>
 #endif
 
 #ifdef EXTMODULE

Xext/xvdix.h

@@ -54,7 +54,7 @@ SOFTWARE.
 */
 
 #include "scrnintstr.h"
-#include "Xvproto.h"
+#include <X11/extensions/Xvproto.h>
 
 extern int  XvScreenIndex;
 extern unsigned long XvExtensionGeneration;

Xext/xvmain.c

@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.2 2004/04/23 18:44:42 eich Exp $ */
 /***********************************************************
 Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
 and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@@ -75,8 +75,8 @@ SOFTWARE.
 **
 */
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "scrnintstr.h"
@@ -91,8 +91,8 @@ SOFTWARE.
 
 #define GLOBAL
 
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
-#include "Xvproto.h"
+#include <X11/extensions/Xvproto.h>
 #include "xvdix.h"
 
 #ifdef EXTMODULE

Xext/xvmc.c

@@ -2,8 +2,8 @@
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -11,11 +11,11 @@
 #include "scrnintstr.h"
 #include "extnsionst.h"
 #include "servermd.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 #include "xvdix.h"
-#include "XvMC.h"
+#include <X11/extensions/XvMC.h>
-#include "Xvproto.h"
+#include <X11/extensions/Xvproto.h>
-#include "XvMCproto.h"
+#include <X11/extensions/XvMCproto.h>
 #include "xvmcext.h"
 
 #ifdef HAS_XVMCSHM

Xext/xvmcext.h

@@ -2,7 +2,7 @@
 
 #ifndef _XVMC_H
 #define _XVMC_H
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "xvdix.h"
 
 typedef struct {

Xi/allowev.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */

Xi/chgdctl.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS			/* for inputstr.h    */
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"			/* control constants */
+#include <X11/extensions/XIproto.h>			/* control constants */
 #include "XIstubs.h"
 
 #include "extnsionst.h"

Xi/chgfctl.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS			/* for inputstr.h    */
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"			/* control constants */
+#include <X11/extensions/XIproto.h>			/* control constants */
 
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */

Xi/chgkbd.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "globals.h"
 #include "extnsionst.h"

Xi/chgkmap.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS			/* for inputstr.h    */
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exevents.h"

Xi/chgprop.c

@@ -55,12 +55,12 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 

Xi/chgptr.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "windowstr.h"			/* window structure  */
 #include "scrnintstr.h"			/* screen structure  */

Xi/closedev.c

@@ -55,13 +55,13 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
 #include "scrnintstr.h"			/* screen structure  */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */

Xi/devbell.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xi/exevents.c

@@ -55,10 +55,10 @@ SOFTWARE.
  */
 
 #define	 NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "inputstr.h"
 #include "windowstr.h"
 #include "miscstruct.h"

Xi/extinit.c

@@ -57,13 +57,13 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "inputstr.h"
 #include "gcstruct.h"   		/* pointer for extnsionst.h*/
 #include "extnsionst.h"			/* extension entry   */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 
 #include "dixevents.h"
 #include "exevents.h"

Xi/getbmap.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xi/getdctl.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS			/* for inputstr.h    */
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xi/getfctl.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS			/* for inputstr.h    */
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xi/getfocus.c

@@ -55,12 +55,12 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "windowstr.h"			/* focus struct      */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xi/getkmap.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS			/* for inputstr.h    */
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xi/getmmap.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS			/* for inputstr.h    */
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"			/* Request macro     */
+#include <X11/extensions/XIproto.h>			/* Request macro     */
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xi/getprop.c

@@ -55,12 +55,12 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structs    */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xi/getselev.c

@@ -55,10 +55,10 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window struct     */
 #include "extnsionst.h"

Xi/getvers.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xi/grabdev.c

@@ -56,12 +56,12 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xi/grabdevb.c

@@ -55,12 +55,12 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */

Xi/grabdevk.c

@@ -55,12 +55,12 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */

Xi/gtmotion.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exevents.h"

Xi/listdev.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */

Xi/opendev.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "windowstr.h"			/* window structure  */
 #include "extnsionst.h"

Xi/queryst.c

@@ -36,12 +36,12 @@ from The Open Group.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exevents.h"

Xi/selectev.c

@@ -56,12 +56,12 @@ SOFTWARE.
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
 
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exevents.h"

Xi/sendexev.c

@@ -56,12 +56,12 @@ SOFTWARE.
 #define EXTENSION_EVENT_BASE  64
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* Window      	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exevents.h"

Xi/setbmap.c

@@ -58,11 +58,11 @@ SOFTWARE.
 #define IsOn(ptr, bit) \
 	(((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7)))
 
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */

Xi/setdval.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */

Xi/setfocus.c

@@ -55,12 +55,12 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "windowstr.h"			/* focus struct      */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 
 #include "dixevents.h"
 

Xi/setmmap.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS			/* for inputstr.h    */
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */

Xi/setmode.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */

Xi/stubs.c

@@ -58,11 +58,11 @@ SOFTWARE.
  */
 
 #define	 NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "inputstr.h"
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 
 /***********************************************************************

Xi/ungrdev.c

@@ -55,11 +55,11 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xi/ungrdevb.c

@@ -55,12 +55,12 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xi/ungrdevk.c

@@ -55,12 +55,12 @@ SOFTWARE.
 
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
-#include "X.h"				/* for inputstr.h    */
+#include <X11/X.h>				/* for inputstr.h    */
-#include "Xproto.h"			/* Request macro     */
+#include <X11/Xproto.h>			/* Request macro     */
 #include "inputstr.h"			/* DeviceIntPtr	     */
 #include "windowstr.h"			/* window structure  */
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"			/* LookupDeviceIntRec */
 #include "exglobals.h"

Xprint/Init.c

@@ -65,9 +65,9 @@ copyright holders.
 #include <sys/sysmacros.h>
 #endif
 
-#include "X.h"
+#include <X11/X.h>
 #define NEED_EVENTS 1
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include <servermd.h>
 
 #include "screenint.h"

Xprint/Oid.h

@@ -34,7 +34,7 @@ copyright holders.
 #ifndef _Xp_Oid_h
 #define _Xp_Oid_h
 
-#include <Xproto.h>
+#include <X11/Xproto.h>
 
 /*
  * include the auto-generated XpOid enum definition

Xprint/ValTree.c

@@ -32,7 +32,7 @@ copyright holders.
 */
 /* $XFree86$ */
 
-#include    "X.h"
+#include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "validate.h"
 #include    "windowstr.h"

Xprint/attributes.c

@@ -45,7 +45,7 @@ copyright holders.
 ** 
 ********************************************************************/
 
-#include <Xproto.h>
+#include <X11/Xproto.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/wait.h>

Xprint/ddxInit.c

@@ -31,9 +31,9 @@ dealings in this Software without prior written authorization from said
 copyright holders.
 */
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xos.h"
+#include <X11/Xos.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "servermd.h"
 #include "DiPrint.h"
@@ -283,8 +283,8 @@ ddxProcessArgument (
 
 #ifdef XINPUT
 
-#include "XI.h"
+#include <X11/extensions/XI.h>
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 
 extern  int     BadDevice;

Xprint/mediaSizes.c

@@ -55,7 +55,7 @@ copyright holders.
 #include <string.h>
 #include <locale.h>
 
-#include "X.h"
+#include <X11/X.h>
 #include "dixstruct.h"
 #include "screenint.h"
 #include "misc.h"

Xprint/pcl/PclInit.c

@@ -86,7 +86,7 @@ copyright holders.
 #include "Pcl.h"
 
 #include "cfb.h"
-#include "Xos.h"	/* for unlink() */
+#include <X11/Xos.h>	/* for unlink() */
 
 #include "attributes.h"
 #include "DiPrint.h"

Xprint/pcl/PclMisc.c

@@ -50,7 +50,7 @@ copyright holders.
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include "Xos.h"	/* for SIGCLD on pre-POSIX systems */
+#include <X11/Xos.h>	/* for SIGCLD on pre-POSIX systems */
 #include "Pcl.h"
 
 #include "cursor.h"

Xprint/pcl/PclPrint.c

@@ -54,7 +54,7 @@ copyright holders.
 #include <X11/Xprotostr.h>
 
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #undef NEED_EVENTS
 
 #include "Pcl.h"

Xprint/pcl/PclText.c

@@ -54,7 +54,7 @@ copyright holders.
 
 #include "Pcl.h"
 #include "migc.h"
-#include "Xatom.h"
+#include <X11/Xatom.h>
 
 #include "PclSFonts.h"
 

Xprint/ps/PsMisc.c

@@ -74,7 +74,7 @@ in this Software without prior written authorization from The Open Group.
 ** 
 ********************************************************************/
 
-#include "Xos.h"	/* for SIGCLD on pre-POSIX systems */
+#include <X11/Xos.h>	/* for SIGCLD on pre-POSIX systems */
 #include <stdio.h>
 #include "Ps.h"
 

Xprint/ps/PsPrint.c

@@ -84,7 +84,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xprotostr.h>
 
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #undef NEED_EVENTS
 
 #include "Ps.h"

Xprint/ps/psout_ft.c

@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include FT_FREETYPE_H
 #include FT_TYPE1_TABLES_H
 
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "font.h"
 #include "fontstruct.h"
 #include "fntfilst.h"

Xprint/ps/psout_ftpstype1.c

@@ -34,7 +34,7 @@ THE SOFTWARE.
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "font.h"
 #include "fontstruct.h"
 #include "fntfilst.h"

Xprint/ps/psout_ftpstype3.c

@@ -58,7 +58,7 @@ THE SOFTWARE.
 #include FT_INTERNAL_OBJECTS_H
 #endif /* USE_FT_INTERNALS */
 
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "font.h"
 #include "fontstruct.h"
 #include "fntfilst.h"

Xprint/raster/Raster.c

@@ -56,12 +56,12 @@ copyright holders.
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "X.h"
+#include <X11/X.h>
-#include "Xos.h"	/* for SIGCLD on pre-POSIX systems */
+#include <X11/Xos.h>	/* for SIGCLD on pre-POSIX systems */
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #undef NEED_EVENTS
-#include "Xatom.h"
+#include <X11/Xatom.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "scrnintstr.h"

Xprint/raster/Raster.h

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

Xprint/raster/RasterAttVal.c

@@ -33,7 +33,7 @@ copyright holders.
 /* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.3 2001/10/31 22:50:29 tsi Exp $ */
 
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "scrnintstr.h"

afb/afbbitblt.c

@@ -49,8 +49,8 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbbitblt.c,v 5.25 94/04/17 20:28:16 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xprotostr.h"
+#include <X11/Xprotostr.h>
 
 #include "regionstr.h"
 #include "gcstruct.h"

afb/afbblt.c

@@ -33,9 +33,9 @@ Author: Keith Packard
 */
 /* $XConsortium: afbblt.c,v 1.11 94/04/17 20:28:16 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xmd.h"
+#include <X11/Xmd.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "afb.h"
 #include "gcstruct.h"
 #include "windowstr.h"

afb/afbbres.c

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

afb/afbbresd.c

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

afb/afbbstore.c

@@ -32,7 +32,7 @@ from the X Consortium.
 */
 
 #include	"afb.h"
-#include	"X.h"
+#include	<X11/X.h>
 #include	"mibstore.h"
 #include	"regionstr.h"
 #include	"scrnintstr.h"

afb/afbclip.c

@@ -48,7 +48,7 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbclip.c,v 5.6 94/04/17 20:28:19 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "regionstr.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"

afb/afbcmap.c

@@ -29,8 +29,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "colormapst.h"
 #include "resource.h"

afb/afbfillarc.c

@@ -28,8 +28,8 @@ in this Software without prior written authorization from the X Consortium.
 
 /* $XConsortium: afbfillarc.c,v 5.14 94/04/17 20:28:20 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xprotostr.h"
+#include <X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"

afb/afbfillrct.c

@@ -49,8 +49,8 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbfillrct.c,v 5.10 94/04/17 20:28:21 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xprotostr.h"
+#include <X11/Xprotostr.h>
 #include "pixmapstr.h"
 #include "gcstruct.h"
 #include "windowstr.h"

afb/afbfillsp.c

@@ -49,8 +49,8 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbfillsp.c,v 5.13 94/04/17 20:28:21 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
-#include "Xmd.h"
+#include <X11/Xmd.h>
 #include "gcstruct.h"
 #include "window.h"
 #include "pixmapstr.h"