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.

22 files changed, 63 insertions, 63 deletions

diff --git a/dix/atom.c b/dix/atom.c
index 5a62ff083..c71b3bbc3 100644
--- a/dix/atom.c
+++ b/dix/atom.c
@@ -48,8 +48,8 @@ SOFTWARE.
 
 /* $Xorg: atom.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
 
-#include "X.h"
-#include "Xatom.h"
+#include <X11/X.h>
+#include <X11/Xatom.h>
 #include "misc.h"
 #include "resource.h"
 #include "dix.h"
diff --git a/dix/colormap.c b/dix/colormap.c
index dc5dd405e..732267172 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.5 2004/08/13 08:16:14 keithp Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.6 2005/03/07 23:02:58 gisburn Exp $ */
 /* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.11 2003/11/03 05:10:59 tsi Exp $ */
 /***********************************************************
 
@@ -49,9 +49,9 @@ SOFTWARE.
 
 /* $Xorg: colormap.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dix.h"
 #include "colormapst.h"
diff --git a/dix/cursor.c b/dix/cursor.c
index b269c4e8d..11b4629cf 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -49,8 +49,8 @@ SOFTWARE.
 
 /* $Xorg: cursor.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "dixstruct.h"
diff --git a/dix/devices.c b/dix/devices.c
index bfcd9133f..3bc098158 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -49,12 +49,12 @@ SOFTWARE.
 
 /* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "resource.h"
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -63,11 +63,11 @@ SOFTWARE.
 #include "site.h"
 #define	XKB_IN_SERVER
 #ifdef XKB
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "security.h"
+#include <X11/extensions/security.h>
 #endif
 #ifdef LBX
 #include "lbxserve.h"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 2f24e6126..6a93dacbb 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.6 2004/09/15 09:05:22 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.7 2005/03/07 23:02:58 gisburn Exp $ */
 /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
 /************************************************************
 
@@ -105,15 +105,15 @@ int ProcInitialConnection();
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "security.h"
+#include <X11/extensions/security.h>
 #endif
 #ifdef XAPPGROUP
-#include "Xagsrv.h"
+#include <X11/extensions/Xagsrv.h>
 #endif
 #ifdef XKB
 #define XKB_IN_SERVER
 #include "inputstr.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #endif
 #ifdef LBX
 #include "lbxserve.h"
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 006d5141c..107b27cac 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.2 2004/04/23 19:04:44 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.3 2005/03/07 23:02:58 gisburn 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.
@@ -52,9 +52,9 @@ Equipment Corporation.
 /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
 
 #define NEED_REPLIES
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "resource.h"
 #include "dixstruct.h"
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 155636e91..26b7151a6 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -84,8 +84,8 @@ Author:  Adobe Systems Incorporated
 
 /* $Xorg: dixutils.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "misc.h"
 #include "windowstr.h"
 #include "dixstruct.h"
@@ -95,7 +95,7 @@ Author:  Adobe Systems Incorporated
 #include "keysymdef.h"
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "security.h"
+#include <X11/extensions/security.h>
 #endif
 
 /*
diff --git a/dix/events.c b/dix/events.c
index 473a6c70c..d80b249bb 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.6 2004/08/09 02:08:35 kem Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.7 2005/03/07 23:02:58 gisburn Exp $ */
 /* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */
 /************************************************************
 
@@ -78,12 +78,12 @@ Equipment Corporation.
 
 /* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "resource.h"
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -97,13 +97,13 @@ Equipment Corporation.
 #include "globals.h"
 
 #ifdef XKB
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
 #endif
 
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "security.h"
+#include <X11/extensions/security.h>
 #endif
 
 #ifdef XEVIE
@@ -120,7 +120,7 @@ int    xeviegrabState = 0;
 xEvent *xeviexE;
 #endif
 
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extnsionst.h"
 
diff --git a/dix/extension.c b/dix/extension.c
index ee8bcaa23..bbd179a8b 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -47,10 +47,10 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: extension.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
@@ -59,7 +59,7 @@ SOFTWARE.
 #include "dispatch.h"
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "security.h"
+#include <X11/extensions/security.h>
 #endif
 #ifdef LBX
 #include "lbxserve.h"
diff --git a/dix/gc.c b/dix/gc.c
index 19be76531..426cae5ee 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -48,9 +48,9 @@ SOFTWARE.
 
 /* $Xorg: gc.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "resource.h"
 #include "gcstruct.h"
diff --git a/dix/globals.c b/dix/globals.c
index 23fbd1039..c7190f6c0 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.2 2004/04/23 19:04:44 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.3 2004/09/22 17:20:55 alanc Exp $ */
 /* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */
 /************************************************************
 
@@ -49,8 +49,8 @@ SOFTWARE.
 
 /* $Xorg: globals.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "misc.h"
 #include "windowstr.h"
 #include "scrnintstr.h"
diff --git a/dix/grabs.c b/dix/grabs.c
index 34482e561..5a767a641 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -48,10 +48,10 @@ SOFTWARE.
 */
 /* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "cursorstr.h"
diff --git a/dix/initatoms.c b/dix/initatoms.c
index 7aadd909a..8253a7274 100644
--- a/dix/initatoms.c
+++ b/dix/initatoms.c
@@ -3,8 +3,8 @@
  * Do not change!  Changing this file implies a protocol change!
  */
 
-#include "X.h"
-#include "Xatom.h"
+#include <X11/X.h>
+#include <X11/Xatom.h>
 #include "misc.h"
 #include "dix.h"
 void MakePredeclaredAtoms()
diff --git a/dix/main.c b/dix/main.c
index 504602ead..481a199e2 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.5 2005/03/07 23:02:58 gisburn Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.6 2005/03/23 19:58:45 gisburn Exp $ */
 /* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */
 /***********************************************************
 
@@ -80,9 +80,9 @@ Equipment Corporation.
 /* $TOG: main.c /main/86 1998/02/09 14:20:03 kaleb $ */
 
 #define NEED_EVENTS
-#include "X.h"
-#include "Xos.h"   /* for unistd.h  */
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xos.h>   /* for unistd.h  */
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"
@@ -110,7 +110,7 @@ Equipment Corporation.
 
 #ifdef DPMSExtension
 #define DPMS_SERVER
-#include "dpms.h"
+#include <X11/extensions/dpms.h>
 #include "dpmsproc.h"
 #endif
 
diff --git a/dix/pixmap.c b/dix/pixmap.c
index bccc6b5cd..18e7b9394 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -28,7 +28,7 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.4 2001/01/17 22:36:44 dawes Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"
diff --git a/dix/privates.c b/dix/privates.c
index ffc046a0b..1353e29aa 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -28,7 +28,7 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.7 2001/01/17 22:36:44 dawes Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"
diff --git a/dix/property.c b/dix/property.c
index 9bdc7f7e9..dec5a91d8 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -47,10 +47,10 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: property.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "propertyst.h"
 #include "dixstruct.h"
@@ -58,7 +58,7 @@ SOFTWARE.
 #include "swaprep.h"
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "security.h"
+#include <X11/extensions/security.h>
 #endif
 #ifdef LBX
 #include "lbxserve.h"
diff --git a/dix/resource.c b/dix/resource.c
index 96dcec2cf..f0035f48a 100644
--- a/dix/resource.c
+++ b/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.3 2004/04/25 22:42:09 gisburn Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/resource.c,v 1.4 2005/03/07 23:02:58 gisburn Exp $ */
 /* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */
 
 /*	Routines to manage various kinds of resources:
@@ -102,7 +102,7 @@ Equipment Corporation.
 /* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.13 2003/09/24 02:43:13 dawes Exp $ */
 
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "os.h"
 #include "resource.h"
diff --git a/dix/swaprep.c b/dix/swaprep.c
index 08e6d3c37..1c6da139f 100644
--- a/dix/swaprep.c
+++ b/dix/swaprep.c
@@ -48,10 +48,10 @@ SOFTWARE.
 
 /* $Xorg: swaprep.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "fontstruct.h"
diff --git a/dix/swapreq.c b/dix/swapreq.c
index 5baadf792..8f9036da1 100644
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@@ -48,10 +48,10 @@ SOFTWARE.
 
 /* $Xorg: swapreq.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #define NEED_EVENTS
-#include "Xproto.h"
-#include "Xprotostr.h"
+#include <X11/Xproto.h>
+#include <X11/Xprotostr.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"	/* for SendEvent */
diff --git a/dix/tables.c b/dix/tables.c
index 6037b1220..092abd61f 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -47,10 +47,10 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: tables.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "extnsionst.h"
 #include "dixstruct.h"
diff --git a/dix/window.c b/dix/window.c
index f77f612f4..27d3d05ec 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.6 2004/07/31 08:24:13 anholt Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.7 2005/03/07 23:02:59 gisburn Exp $ */
 /* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
 /*
 
@@ -101,11 +101,11 @@ Equipment Corporation.
 #include "globals.h"
 
 #ifdef XAPPGROUP
-#include "Xagsrv.h"
+#include <X11/extensions/Xagsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "security.h"
+#include <X11/extensions/security.h>
 #endif
 
 /******