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.

14 files changed, 24 insertions, 24 deletions

diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index 14b7d9858..fee28aa7d 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -43,8 +43,8 @@
  * Please see the Client-to-Server DMX Extension to the X Protocol
  * document for details about the protocol.  */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
diff --git a/hw/dmx/dmx_glxvisuals.c b/hw/dmx/dmx_glxvisuals.c
index 539c7ab27..806927612 100644
--- a/hw/dmx/dmx_glxvisuals.c
+++ b/hw/dmx/dmx_glxvisuals.c
@@ -36,8 +36,8 @@
 #include "dmx.h"
 #include <GL/glx.h>
 #include <GL/glxproto.h>
-#include "Xext.h"
-#include "extutil.h"
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
 
 #include "dmx_glxvisuals.h"
 
diff --git a/hw/dmx/dmxdpms.c b/hw/dmx/dmxdpms.c
index b29e6004a..48f7488f1 100644
--- a/hw/dmx/dmxdpms.c
+++ b/hw/dmx/dmxdpms.c
@@ -48,7 +48,7 @@
 #include "dpmsproc.h"
 #endif
 #include "windowstr.h"          /* For screenIsSaved */
-#include "X11/extensions/dpms.h"
+#include <X11/extensions/dpms.h>
 
 static unsigned long dpmsGeneration = 0;
 static Bool          dpmsSupported  = TRUE;
diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
index 00ce18425..438c4eb21 100644
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@@ -54,7 +54,7 @@
 #include "dmxpict.h"
 #endif
 
-#include "Xos.h"                /* For gettimeofday */
+#include <X11/Xos.h>                /* For gettimeofday */
 #include "dixstruct.h"
 #include "panoramiXsrv.h"
 
@@ -64,8 +64,8 @@
 #include <GL/glx.h>
 #include <GL/glxint.h>
 #include "dmx_glxvisuals.h"
-#include "Xext.h"
-#include "extutil.h"
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
 
 extern void GlxSetVisualConfigs(
     int               nconfigs,
diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c
index 92cc6979e..72aa0f87a 100644
--- a/hw/dmx/dmxlog.c
+++ b/hw/dmx/dmxlog.c
@@ -40,8 +40,8 @@
 #include "dmxlog.h"
 #include "dmxinput.h"
 #ifdef XINPUT
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 #endif
 
 static dmxLogLevel dmxCurrentLogLevel = dmxDebug;
diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c
index 69dda63fe..7e831a5fe 100644
--- a/hw/dmx/dmxpict.c
+++ b/hw/dmx/dmxpict.c
@@ -46,8 +46,8 @@
 #include "pixmapstr.h"
 #include "dixstruct.h"
 
-#include "render.h"
-#include "renderproto.h"
+#include <X11/extensions/render.h>
+#include <X11/extensions/renderproto.h>
 #include "picture.h"
 #include "picturestr.h"
 #include "mipict.h"
diff --git a/hw/dmx/dmxstat.c b/hw/dmx/dmxstat.c
index ced4c8bba..ae3f40458 100644
--- a/hw/dmx/dmxstat.c
+++ b/hw/dmx/dmxstat.c
@@ -46,7 +46,7 @@
 #include "dmx.h"
 #include "dmxstat.h"
 #include "dmxlog.h"
-#include "Xos.h"                /* For sys/time.h */
+#include <X11/Xos.h>                /* For sys/time.h */
 
 /** Used to compute a running average of value. */
 typedef struct _DMXStatAvg {
diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c
index 8fd52d298..15b25795c 100644
--- a/hw/dmx/input/dmxeq.c
+++ b/hw/dmx/input/dmxeq.c
@@ -78,7 +78,7 @@
 #include "scrnintstr.h"         /* For screenInfo */
 
 #ifdef XINPUT
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #define EXTENSION_PROC_ARGS void *
 #include "extinit.h"            /* For LookupDeviceIntRec */
 #endif
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
index 4dd52ba3c..0ac9e8025 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -70,8 +70,8 @@
 #include "windowstr.h"
 
 #ifdef XINPUT
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 #include "exevents.h"
 #define EXTENSION_PROC_ARGS void *
 #include "extinit.h"
diff --git a/hw/dmx/input/dmxxinput.c b/hw/dmx/input/dmxxinput.c
index d080ebbcf..1d53e9f0f 100644
--- a/hw/dmx/input/dmxxinput.c
+++ b/hw/dmx/input/dmxxinput.c
@@ -38,11 +38,11 @@
  */
 
 #define	 NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "inputstr.h"
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 
 #include "mipointer.h"
diff --git a/hw/dmx/input/lnx-keyboard.c b/hw/dmx/input/lnx-keyboard.c
index 0d973c91b..c162aa952 100644
--- a/hw/dmx/input/lnx-keyboard.c
+++ b/hw/dmx/input/lnx-keyboard.c
@@ -152,7 +152,7 @@
 /*****************************************************************************/
 
 #include "inputstr.h"
-#include "Xos.h"
+#include <X11/Xos.h>
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <signal.h>
diff --git a/hw/dmx/input/lnx-ms.c b/hw/dmx/input/lnx-ms.c
index bb2f56e93..c7218f6b7 100644
--- a/hw/dmx/input/lnx-ms.c
+++ b/hw/dmx/input/lnx-ms.c
@@ -70,7 +70,7 @@
  * (see the source code for complete references). */
 
 #include "inputstr.h"
-#include "Xos.h"
+#include <X11/Xos.h>
 #include <errno.h>
 #include <termios.h>
 
diff --git a/hw/dmx/input/lnx-ps2.c b/hw/dmx/input/lnx-ps2.c
index 73ac29ea9..c83b1ecb7 100644
--- a/hw/dmx/input/lnx-ps2.c
+++ b/hw/dmx/input/lnx-ps2.c
@@ -67,7 +67,7 @@
  * for complete references). */
 
 #include "inputstr.h"
-#include "Xos.h"
+#include <X11/Xos.h>
 #include <errno.h>
 #include <termios.h>
 
diff --git a/hw/dmx/input/usb-private.h b/hw/dmx/input/usb-private.h
index 6762e5552..eae9c8b7a 100644
--- a/hw/dmx/input/usb-private.h
+++ b/hw/dmx/input/usb-private.h
@@ -43,7 +43,7 @@
 
 #include "dmxinputinit.h"
 #include "inputstr.h"
-#include "Xos.h"
+#include <X11/Xos.h>
 #include <errno.h>
 #include <linux/input.h>
 #include "usb-common.h"