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.

24 files changed, 52 insertions, 52 deletions

diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c
index 6eee7e097..665f0e5a2 100644
--- a/xkb/ddxBeep.c
+++ b/xkb/ddxBeep.c
@@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
 
 #if (defined(__osf__) && defined(__alpha))
 #include <sys/sysinfo.h>
diff --git a/xkb/ddxConfig.c b/xkb/ddxConfig.c
index c4a6ec7a0..70c10e202 100644
--- a/xkb/ddxConfig.c
+++ b/xkb/ddxConfig.c
@@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "windowstr.h"
 #include "os.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #include <X11/extensions/XKBconfig.h>
 
 Bool
diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c
index 16c9f15b9..278cd1dc0 100644
--- a/xkb/ddxCtrls.c
+++ b/xkb/ddxCtrls.c
@@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
 
 void
 XkbDDXKeybdCtrlProc(DeviceIntPtr dev,KeybdCtrl *ctrl)
diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c
index 0ce401adb..f93934a77 100644
--- a/xkb/ddxDevBtn.c
+++ b/xkb/ddxDevBtn.c
@@ -34,9 +34,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 
 extern	int	DeviceValuator;
 
diff --git a/xkb/ddxFakeBtn.c b/xkb/ddxFakeBtn.c
index 033aa18ea..540b72292 100644
--- a/xkb/ddxFakeBtn.c
+++ b/xkb/ddxFakeBtn.c
@@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
 
 void
 XkbDDXFakePointerButton(int event,int button)
diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c
index 70f37d130..cfadb2d62 100644
--- a/xkb/ddxFakeMtn.c
+++ b/xkb/ddxFakeMtn.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.2 2004/04/23 19:54:30 eich Exp $ */
 /* $Xorg: ddxFakeMtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */
 /************************************************************
 Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -35,8 +35,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
 
 #ifdef PANORAMIX
 #include "panoramiX.h"
diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c
index dea4ce607..75567486d 100644
--- a/xkb/ddxInit.c
+++ b/xkb/ddxInit.c
@@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
 
 int
 XkbDDXInitDevice(DeviceIntPtr dev)
diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c
index c0b2b8018..19a2ec9e1 100644
--- a/xkb/ddxKeyClick.c
+++ b/xkb/ddxKeyClick.c
@@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
 
 void
 XkbDDXKeyClick(DeviceIntPtr pXDev,int keycode,int synthetic)
diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c
index 98744ed97..7a822fa20 100644
--- a/xkb/ddxKillSrv.c
+++ b/xkb/ddxKillSrv.c
@@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
 
 #ifdef XF86DDXACTIONS
 #include "xf86.h"
diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c
index e7c484cab..5998f7614 100644
--- a/xkb/ddxLEDs.c
+++ b/xkb/ddxLEDs.c
@@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
 
 void
 XkbDDXUpdateIndicators(DeviceIntPtr dev,CARD32 new)
diff --git a/xkb/ddxList.c b/xkb/ddxList.c
index 6a070f8a9..7e7c375ad 100644
--- a/xkb/ddxList.c
+++ b/xkb/ddxList.c
@@ -38,8 +38,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "scrnintstr.h"
 #include "windowstr.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
 
 #ifndef PATH_MAX
 #ifdef MAXPATHLEN
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 906715a2b..c2b1f18ee 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -38,8 +38,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "scrnintstr.h"
 #include "windowstr.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
 #include "xkb.h"
 
 #if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__)
diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c
index 852e2386f..3a9f8ea0b 100644
--- a/xkb/ddxPrivate.c
+++ b/xkb/ddxPrivate.c
@@ -5,7 +5,7 @@
 #include <X11/X.h>
 #include "windowstr.h"
 #define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 
 #ifdef XF86DDXACTIONS
 #include "xf86.h"
diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c
index bbd0d1ac1..aa8cba00b 100644
--- a/xkb/ddxVT.c
+++ b/xkb/ddxVT.c
@@ -34,8 +34,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include "XKBsrv.h"
-#include "XI.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XI.h>
 
 #ifdef XF86DDXACTIONS
 #include "xf86.h"
diff --git a/xkb/xkb.c b/xkb/xkb.c
index fcc156d35..ce3164c10 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -27,19 +27,19 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.22tsi Exp $ */
 
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #define	NEED_EVENTS
 #define	NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #include "extnsionst.h"
 #include "modinit.h"
 #include "xkb.h"
 
-#include "XI.h"
+#include <X11/extensions/XI.h>
 
 	int	XkbEventBase;
 	int	XkbErrorBase;
@@ -3907,7 +3907,7 @@ ProcXkbSetNames(ClientPtr client)
 
 /***====================================================================***/
 
-#include "XKBgeom.h"
+#include <X11/extensions/XKBgeom.h>
 
 #define	XkbSizeCountedString(s)  ((s)?((((2+strlen(s))+3)/4)*4):4)
 
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 5794e34ba..6e519dc5a 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
 #include "inputstr.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #if !defined(WIN32) && !defined(Lynx)
 #include <sys/time.h>
 #endif
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 0239c678a..f7fa0af28 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #include "xkb.h"
 #include <ctype.h>
 
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 7d2421a87..29ce818c1 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -31,10 +31,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
-#include "XI.h"
+#include <X11/extensions/XI.h>
 #include "inputstr.h"
 #include "windowstr.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #include "xkb.h"
 
 /***====================================================================***/
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 260446eb8..506b5458e 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -1,5 +1,5 @@
 /* $Xorg: xkbInit.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/xkb/xkbInit.c,v 1.2 2004/04/23 19:54:30 eich Exp $ */
 /************************************************************
 Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
 
@@ -42,8 +42,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "opaque.h"
 #include "property.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
-#include "XKBgeom.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBgeom.h>
 #include <X11/extensions/XKMformat.h>
 #include <X11/extensions/XKBfile.h>
 #include "xkb.h"
diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index 26e6d87d3..7cdd21ae3 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -35,8 +35,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 
-#include "XI.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XKBsrv.h>
 #include "xkb.h"
 
 /***====================================================================***/
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index 43288d3e9..175f7ff22 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #include <ctype.h>
 
 
diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c
index ec155645f..08af172b7 100644
--- a/xkb/xkbPrOtherEv.c
+++ b/xkb/xkbPrOtherEv.c
@@ -34,10 +34,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 
 extern	void	ProcessOtherEvent(
     xEvent *		/* xE */,
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index 4b6ba4ccc..520885515 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -27,14 +27,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.4 2003/09/13 16:39:01 dawes Exp $ */
 
 #include "stdio.h"
-#include "X.h"
+#include <X11/X.h>
 #define	NEED_EVENTS
 #define	NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
-#include "XKBsrv.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBstr.h>
 #include "extnsionst.h"
 #include "xkb.h"
 
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 8b439c2a5..61585ebdb 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -38,8 +38,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 
 #define	XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
-#include "extensions/XKBgeom.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBgeom.h>
 #include "xkb.h"
 
 #ifdef MODE_SWITCH