config: remove AH_TOP autoheader statement

The generated config.h does not need to include xorg-server.h
for the content it provides.
Add #include <xorg-server.h> in .[hc] files as needed.

Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

5 files changed, 4 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index c41a81d..389318a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,8 +48,6 @@ AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_CC
 
-AH_TOP([#include "xorg-server.h"])
-
 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/hurd_mouse.c b/src/hurd_mouse.c
index 089cba3..9f87e79 100644
--- a/src/hurd_mouse.c
+++ b/src/hurd_mouse.c
@@ -26,6 +26,7 @@
 #include <xorg-config.h>
 #endif
 
+#include <xorg-server.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "inputstr.h"
diff --git a/src/lnx_mouse.c b/src/lnx_mouse.c
index c317f5d..2f74ddb 100644
--- a/src/lnx_mouse.c
+++ b/src/lnx_mouse.c
@@ -7,6 +7,7 @@
 #include "config.h"
 #endif
 
+#include <xorg-server.h>
 #include <X11/X.h>
 #include "xf86.h"
 #include "xf86Xinput.h"
diff --git a/src/mouse.c b/src/mouse.c
index 7571aeb..148a9d5 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -47,6 +47,7 @@
 #include "config.h"
 #endif
 
+#include <xorg-server.h>
 #include <math.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/pnp.c b/src/pnp.c
index 9911185..6b6a68e 100644
--- a/src/pnp.c
+++ b/src/pnp.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #endif
 
+#include <xorg-server.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>