Xorg: remove xorg-server.h from toplevel config.h.

DRI and DRM also include this file.

23 files changed, 22 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index 37fdd64..c952c79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,12 +28,6 @@ if test "x$GCC" = "xyes"; then
         CFLAGS="$CFLAGS -Wall -pedantic -std=gnu99"
 fi
 
-AH_TOP([
-#ifndef IN_DRI_DRIVER
-#include "xorg-server.h"
-#endif
-])
-
 AC_ARG_WITH(xorg-module-dir,
             AC_HELP_STRING([--with-xorg-module-dir=DIR],
                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
diff --git a/src/via_accel.c b/src/via_accel.c
index 8ceebc5..93698fe 100644
--- a/src/via_accel.c
+++ b/src/via_accel.c
@@ -22,6 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_ch7xxx.c b/src/via_ch7xxx.c
index a8cbcd9..f70c046 100644
--- a/src/via_ch7xxx.c
+++ b/src/via_ch7xxx.c
@@ -22,6 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_crt.c b/src/via_crt.c
index 0b6552a..c148e67 100644
--- a/src/via_crt.c
+++ b/src/via_crt.c
@@ -27,6 +27,7 @@
  *
  */
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_crtc.c b/src/via_crtc.c
index 9604620..af43f8d 100644
--- a/src/via_crtc.c
+++ b/src/via_crtc.c
@@ -28,6 +28,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_cursor.c b/src/via_cursor.c
index 58f77df..d7f665d 100644
--- a/src/via_cursor.c
+++ b/src/via_cursor.c
@@ -31,6 +31,7 @@
  ************************************************************************/
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_dri.c b/src/via_dri.c
index ef6480b..8efe1d0 100644
--- a/src/via_dri.c
+++ b/src/via_dri.c
@@ -23,6 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_driver.c b/src/via_driver.c
index a0a507c..35c5da2 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -32,6 +32,7 @@
  ************************************************************************/
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_edid.c b/src/via_edid.c
index f5354c2..97ccdb6 100644
--- a/src/via_edid.c
+++ b/src/via_edid.c
@@ -29,6 +29,7 @@
  */
 
 #ifdef HAVE_XORG_CONFIG_H
+#include "xorg-server.h"
 #include <xorg-config.h>
 #endif
 
diff --git a/src/via_host.c b/src/via_host.c
index 696d1e3..0da7fe1 100644
--- a/src/via_host.c
+++ b/src/via_host.c
@@ -28,6 +28,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_i2c.c b/src/via_i2c.c
index 3ee7765..630fc81 100644
--- a/src/via_i2c.c
+++ b/src/via_i2c.c
@@ -27,6 +27,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_id.c b/src/via_id.c
index eab3246..5f47d90 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -22,6 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_memory.c b/src/via_memory.c
index 94733d5..d119e5f 100644
--- a/src/via_memory.c
+++ b/src/via_memory.c
@@ -22,6 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_mode.c b/src/via_mode.c
index dc435ed..f1f453f 100644
--- a/src/via_mode.c
+++ b/src/via_mode.c
@@ -29,6 +29,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_mpeg.c b/src/via_mpeg.c
index 0cfc62a..9b2a95a 100644
--- a/src/via_mpeg.c
+++ b/src/via_mpeg.c
@@ -22,6 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_output.c b/src/via_output.c
index 8eee3d2..5ae9ce8 100644
--- a/src/via_output.c
+++ b/src/via_output.c
@@ -29,6 +29,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_panel.c b/src/via_panel.c
index 3b24a6d..8974930 100644
--- a/src/via_panel.c
+++ b/src/via_panel.c
@@ -22,6 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_regs.c b/src/via_regs.c
index bd5d910..9936495 100644
--- a/src/via_regs.c
+++ b/src/via_regs.c
@@ -22,6 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_shadow.c b/src/via_shadow.c
index 503573c..b03a2b6 100644
--- a/src/via_shadow.c
+++ b/src/via_shadow.c
@@ -23,6 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_sii16x.c b/src/via_sii16x.c
index f933088..e29f8d4 100644
--- a/src/via_sii16x.c
+++ b/src/via_sii16x.c
@@ -22,6 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_video.c b/src/via_video.c
index 1933dd8..fe59eee 100644
--- a/src/via_video.c
+++ b/src/via_video.c
@@ -29,6 +29,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_vt162x.c b/src/via_vt162x.c
index 182baf4..2e0fb36 100644
--- a/src/via_vt162x.c
+++ b/src/via_vt162x.c
@@ -25,6 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif
 
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index 3b68f86..3fb7934 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -22,6 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
+#include "xorg-server.h"
 #include "config.h"
 #endif