[PATCH input-keyboard 01/13] config: remove AH_TOP autoheader statement

[Gaetan Nadon]

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.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac      |    2 --
 src/at_scancode.c |    1 +
 src/bsd_KbdMap.c  |    1 +
 src/bsd_kbd.c     |    1 +
 src/hurd_kbd.c    |    1 +
 src/kbd.c         |    3 ++-
 src/lnx_KbdMap.c  |    1 +
 src/lnx_kbd.c     |    1 +
 src/sco_KbdMap.c  |    1 +
 src/sco_kbd.c     |    1 +
 src/sun_kbd.c     |    1 +
 src/sun_kbdMap.c  |    1 +
 12 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4b7ea01..a45664f 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"])
-
 case $host_os in
   linux*)
     IS_LINUX="yes"
diff --git a/src/at_scancode.c b/src/at_scancode.c
index b945914..245945c 100644
--- a/src/at_scancode.c
+++ b/src/at_scancode.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #endif
 
+#include <xorg-server.h>
 #include "xf86.h"
 #include "xf86Xinput.h"
 #include "xf86OSKbd.h"
diff --git a/src/bsd_KbdMap.c b/src/bsd_KbdMap.c
index 778b574..ef43ffa 100644
--- a/src/bsd_KbdMap.c
+++ b/src/bsd_KbdMap.c
@@ -12,6 +12,7 @@
 #include "config.h"
 #endif
 
+#include <xorg-server.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "input.h"
diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c
index 02d992d..bc80692 100644
--- a/src/bsd_kbd.c
+++ b/src/bsd_kbd.c
@@ -14,6 +14,7 @@
 #include "config.h"
 #endif
 
+#include <xorg-server.h>
 #include <X11/X.h>
 #include <termios.h>
 
diff --git a/src/hurd_kbd.c b/src/hurd_kbd.c
index ef339b5..fc084a0 100644
--- a/src/hurd_kbd.c
+++ b/src/hurd_kbd.c
@@ -27,6 +27,7 @@
 #include <config.h>
 #endif
 
+#include <xorg-server.h>
 #include <X11/X.h>
 
 #include "compiler.h"
diff --git a/src/kbd.c b/src/kbd.c
index 556d594..5060c53 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -18,7 +18,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-  
+#include <xorg-server.h>
+
 #define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/src/lnx_KbdMap.c b/src/lnx_KbdMap.c
index d5bec1c..72d3ab2 100644
--- a/src/lnx_KbdMap.c
+++ b/src/lnx_KbdMap.c
@@ -10,6 +10,7 @@
 #include "config.h"
 #endif
 
+#include <xorg-server.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "input.h"
diff --git a/src/lnx_kbd.c b/src/lnx_kbd.c
index 9144464..670e990 100644
--- a/src/lnx_kbd.c
+++ b/src/lnx_kbd.c
@@ -18,6 +18,7 @@
 #include "config.h"
 #endif
 
+#include <xorg-server.h>
 #include <X11/X.h>
 
 #include "compiler.h"
diff --git a/src/sco_KbdMap.c b/src/sco_KbdMap.c
index 6efe96b..925b01e 100644
--- a/src/sco_KbdMap.c
+++ b/src/sco_KbdMap.c
@@ -31,6 +31,7 @@
 #include "config.h"
 #endif
 
+#include <xorg-server.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "input.h"
diff --git a/src/sco_kbd.c b/src/sco_kbd.c
index dcdc93b..7fe9975 100644
--- a/src/sco_kbd.c
+++ b/src/sco_kbd.c
@@ -40,6 +40,7 @@
 #include "config.h"
 #endif
 
+#include <xorg-server.h>
 #include <X11/X.h>
 
 #include "compiler.h"
diff --git a/src/sun_kbd.c b/src/sun_kbd.c
index 31d4099..00a4c9d 100644
--- a/src/sun_kbd.c
+++ b/src/sun_kbd.c
@@ -49,6 +49,7 @@
 #include "config.h"
 #endif
 
+#include <xorg-server.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/src/sun_kbdMap.c b/src/sun_kbdMap.c
index 50d7585..d739e1c 100644
--- a/src/sun_kbdMap.c
+++ b/src/sun_kbdMap.c
@@ -25,6 +25,7 @@
 #include "config.h"
 #endif
 
+#include <xorg-server.h>
 #include <X11/Xfuncproto.h>
 #include <X11/Sunkeysym.h>
 #include "atKeynames.h"
-- 
1.6.0.4