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.

18 files changed, 35 insertions, 35 deletions

diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index cc9a2707f..75aa396fb 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -14,8 +14,8 @@ is" without express or implied warranty.
 */
 /* $XFree86$ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c
index bcebc10cd..61f4c44c0 100644
--- a/hw/xnest/Color.c
+++ b/hw/xnest/Color.c
@@ -14,8 +14,8 @@ is" without express or implied warranty.
 */
 /* $XFree86$ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "window.h"
 #include "windowstr.h"
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index aaab62c23..cea8b60d0 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -14,8 +14,8 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 69a3c208f..a580c4ce2 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -14,9 +14,9 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index a0256c313..259466adc 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -14,9 +14,9 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.6 2003/07/16 01:38:51 dawes Exp $ */
 
-#include "X.h"
-#include "Xatom.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xatom.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "regionstr.h"
 #include "font.h"
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index 7141e9cb9..f9f8ab9a1 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -14,8 +14,8 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.6 2001/10/28 03:34:11 tsi Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index 4ccc0b916..b3cccc2d5 100644
--- a/hw/xnest/GCOps.c
+++ b/hw/xnest/GCOps.c
@@ -14,8 +14,8 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.5 2003/07/16 01:38:51 dawes Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "regionstr.h"
 #include "fontstruct.h"
 #include "gcstruct.h"
diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c
index 1ffc54764..421234316 100644
--- a/hw/xnest/GetTime.c
+++ b/hw/xnest/GetTime.c
@@ -31,7 +31,7 @@ from the X Consortium.
 /* $XFree86$ */
 
 
-#include "Xos.h"
+#include <X11/Xos.h>
 #include "os.h"
 #include <time.h>
 
diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c
index 5344e4e50..362e9a4b6 100644
--- a/hw/xnest/Handlers.c
+++ b/hw/xnest/Handlers.c
@@ -14,8 +14,8 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 0133ded35..3fac15e63 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -14,8 +14,8 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.24 2003/01/15 02:34:14 torrey Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index d63faca52..f786819a5 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -1,5 +1,5 @@
 /* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.2 2004/04/23 19:54:21 eich Exp $ */
 /*
 
 Copyright 1993 by Davor Matic
@@ -16,8 +16,8 @@ is" without express or implied warranty.
 /* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.9 2003/09/13 21:33:09 dawes Exp $ */
 
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "keysym.h"
 #include "screenint.h"
 #include "inputstr.h"
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
index 5a92dc271..569382203 100644
--- a/hw/xnest/Pixmap.c
+++ b/hw/xnest/Pixmap.c
@@ -14,8 +14,8 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.7 2003/07/16 01:38:51 dawes Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "regionstr.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"
diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c
index 853a48955..abd258d6c 100644
--- a/hw/xnest/Pointer.c
+++ b/hw/xnest/Pointer.c
@@ -14,8 +14,8 @@ is" without express or implied warranty.
 */
 /* $XFree86$ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "screenint.h"
 #include "inputstr.h"
 #include "input.h"
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 3dec48b5f..1ce79cc52 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -14,8 +14,8 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.12 2003/11/14 22:25:59 dawes Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "dix.h"
 #include "mi.h"
diff --git a/hw/xnest/TestExt.c b/hw/xnest/TestExt.c
index d7006207a..be9299c31 100644
--- a/hw/xnest/TestExt.c
+++ b/hw/xnest/TestExt.c
@@ -25,7 +25,7 @@ is" without express or implied warranty.
 #include "servermd.h"
 #include "mipointer.h"
 #define XTestSERVER_SIDE
-#include "xtestext1.h"
+#include <X11/extensions/xtestext1.h>
 #include "xtest1dd.h"
 
 extern CARD32 lastEventTime;
diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c
index f88e587b9..93e9fb38a 100644
--- a/hw/xnest/Visual.c
+++ b/hw/xnest/Visual.c
@@ -14,8 +14,8 @@ is" without express or implied warranty.
 */
 /* $XFree86$ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "dix.h"
 #include "mi.h"
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index a8d65fb7c..6d2fccc31 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -14,8 +14,8 @@ is" without express or implied warranty.
 */
 /* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.7 2001/10/28 03:34:11 tsi Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "gcstruct.h"
 #include "window.h"
 #include "windowstr.h"
diff --git a/hw/xnest/os2Stub.c b/hw/xnest/os2Stub.c
index 2e3b7b399..0868b4480 100644
--- a/hw/xnest/os2Stub.c
+++ b/hw/xnest/os2Stub.c
@@ -33,7 +33,7 @@
 /* things so it cannot be used as a general select.                             */
 
 #define I_NEED_OS2_H
-#include "Xpoll.h"
+#include <X11/Xpoll.h>
 #include <stdio.h>
 #include <sys/select.h>
 #include <sys/errno.h>