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.

16 files changed, 17 insertions, 17 deletions

diff --git a/src/atichip.h b/src/atichip.h
index e605b91..9d6a8e1 100644
--- a/src/atichip.h
+++ b/src/atichip.h
@@ -27,7 +27,7 @@
 #include "atipriv.h"
 #include "atiregs.h"
 
-#include "Xmd.h"
+#include <X11/Xmd.h>
 
 /*
  * Chip-related definitions.
diff --git a/src/atimach64.c b/src/atimach64.c
index 0693c28..619d413 100644
--- a/src/atimach64.c
+++ b/src/atimach64.c
@@ -61,7 +61,7 @@
 #ifndef DPMS_SERVER
 # define DPMS_SERVER
 #endif
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
 
 /*
  * ATIMach64PreInit --
diff --git a/src/atimach64xv.c b/src/atimach64xv.c
index 7b109f6..120cb7d 100644
--- a/src/atimach64xv.c
+++ b/src/atimach64xv.c
@@ -28,7 +28,7 @@
 #include "atimach64io.h"
 #include "atimach64xv.h"
 
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "fourcc.h"
 
 #define MAKE_ATOM(string) MakeAtom(string, strlen(string), TRUE)
diff --git a/src/ativga.c b/src/ativga.c
index 62edf02..8d5c5bb 100644
--- a/src/ativga.c
+++ b/src/ativga.c
@@ -1,6 +1,6 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.c,v 1.20 2003/04/23 21:51:31 tsi Exp $ */
 /*
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+ * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -32,7 +32,7 @@
 #ifndef DPMS_SERVER
 # define DPMS_SERVER
 #endif
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
 
 #ifndef AVOID_CPIO
 
diff --git a/src/mach64_sarea.h b/src/mach64_sarea.h
index 47a4bf9..5a7f489 100644
--- a/src/mach64_sarea.h
+++ b/src/mach64_sarea.h
@@ -31,7 +31,7 @@
 #ifndef __MACH64_SAREA_H__
 #define __MACH64_SAREA_H__ 1
 
-#include "Xmd.h"
+#include <X11/Xmd.h>
 
 /* WARNING: If you change any of these defines, make sure to change the
  * defines in the kernel file (mach64_drm.h)
diff --git a/src/r128_common.h b/src/r128_common.h
index 506f97c..0bce768 100644
--- a/src/r128_common.h
+++ b/src/r128_common.h
@@ -38,7 +38,7 @@
 #ifndef _R128_COMMON_H_
 #define _R128_COMMON_H_
 
-#include "X11/Xmd.h"
+#include <X11/Xmd.h>
 
 /*
  * WARNING: If you change any of these defines, make sure to change
diff --git a/src/r128_sarea.h b/src/r128_sarea.h
index b9ad29d..6116f1d 100644
--- a/src/r128_sarea.h
+++ b/src/r128_sarea.h
@@ -38,7 +38,7 @@
 #ifndef _R128_SAREA_H_
 #define _R128_SAREA_H_
 
-#include "Xmd.h"
+#include <X11/Xmd.h>
 
 /* WARNING: If you change any of these defines, make sure to change the
  * defines in the kernel file (r128_drm.h)
diff --git a/src/r128_video.c b/src/r128_video.c
index 04d85e0..7304c9b 100644
--- a/src/r128_video.c
+++ b/src/r128_video.c
@@ -11,7 +11,7 @@
 #include "xf86.h"
 #include "dixstruct.h"
 
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "fourcc.h"
 
 #define OFF_DELAY       250  /* milliseconds */
diff --git a/src/radeon.h b/src/radeon.h
index 2098a79..a99e7cd 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -73,7 +73,7 @@
 #define NEED_REPLIES  		/* ? */
 #define EXTENSION_PROC_ARGS void *
 #include "extnsionst.h"  	/* required */
-#include "panoramiXproto.h"  	/* required */
+#include <X11/extensions/panoramiXproto.h>  	/* required */
 #define RADEON_XINERAMA_MAJOR_VERSION  1
 #define RADEON_XINERAMA_MINOR_VERSION  1
 
diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c
index 809ac0d..94102b9 100644
--- a/src/radeon_mergedfb.c
+++ b/src/radeon_mergedfb.c
@@ -37,7 +37,7 @@
 #include "xf86Resources.h"
 #include "xf86_OSproc.h"
 #include "extnsionst.h"  	/* required */
-#include "panoramiXproto.h"  	/* required */
+#include <X11/extensions/panoramiXproto.h>  	/* required */
 #include "dixstruct.h"
 #include "vbe.h"
 
diff --git a/src/radeon_mergedfb.h b/src/radeon_mergedfb.h
index e51ce5c..3ad65a6 100644
--- a/src/radeon_mergedfb.h
+++ b/src/radeon_mergedfb.h
@@ -44,7 +44,7 @@
 #define NEED_REPLIES  		/* ? */
 #define EXTENSION_PROC_ARGS void *
 #include "extnsionst.h"  	/* required */
-#include "panoramiXproto.h"  	/* required */
+#include <X11/extensions/panoramiXproto.h>  	/* required */
 #define RADEON_XINERAMA_MAJOR_VERSION  1
 #define RADEON_XINERAMA_MINOR_VERSION  1
 
diff --git a/src/radeon_mm_i2c.c b/src/radeon_mm_i2c.c
index 782181c..b9f35cb 100644
--- a/src/radeon_mm_i2c.c
+++ b/src/radeon_mm_i2c.c
@@ -2,7 +2,7 @@
 #include "radeon_reg.h"
 #include "radeon_macros.h"
 #include "radeon_probe.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "radeon_video.h"
 
 #include "xf86.h"
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index 778f94a..fbbf09f 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -46,7 +46,7 @@
 #include "xf86.h"
 #include "xf86_ansic.h"
 #define _XF86MISC_SERVER_
-#include "xf86misc.h"
+#include <X11/extensions/xf86misc.h>
 #include "xf86Resources.h"
 
 #include "radeon_chipset.h"
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index 14bbd8a..a4f20e7 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -41,7 +41,7 @@
 #include "xf86DDC.h"
 
 #define _XF86MISC_SERVER_
-#include "xf86misc.h"
+#include <X11/extensions/xf86misc.h>
 
 typedef enum
 {
diff --git a/src/radeon_video.c b/src/radeon_video.c
index f07dcf9..0c4a5c1 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -11,7 +11,7 @@
 #include "dixstruct.h"
 #include "xf86PciInfo.h"
 
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "fourcc.h"
 
 #include "theatre_detect.h"
diff --git a/src/radeon_vip.c b/src/radeon_vip.c
index 9f2ae2d..d017ad7 100644
--- a/src/radeon_vip.c
+++ b/src/radeon_vip.c
@@ -2,7 +2,7 @@
 #include "radeon_reg.h"
 #include "radeon_macros.h"
 #include "radeon_probe.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "radeon_video.h"
 
 #include "xf86.h"