diff --git a/src/at_scancode.c b/src/at_scancode.c
index 597ee7c..793669f 100644
--- a/src/at_scancode.c
+++ b/src/at_scancode.c
@@ -25,9 +25,7 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include "xf86.h"
diff --git a/src/bsd_KbdMap.c b/src/bsd_KbdMap.c
index 10a40f5..8c3bf25 100644
--- a/src/bsd_KbdMap.c
+++ b/src/bsd_KbdMap.c
@@ -5,10 +5,7 @@
  * which is Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  * and from xf86KbdCODrv.c by Holger Veit
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include <X11/X.h>
diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c
index 17562b6..75866e3 100644
--- a/src/bsd_kbd.c
+++ b/src/bsd_kbd.c
@@ -7,10 +7,7 @@
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
  * Copyright 1993 by David Dawes <dawes@xfree86.org>
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include <X11/X.h>
diff --git a/src/hurd_kbd.c b/src/hurd_kbd.c
index 4452499..f2ec31f 100644
--- a/src/hurd_kbd.c
+++ b/src/hurd_kbd.c
@@ -20,10 +20,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  *
  */
-
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <xorg-server.h>
 #include <X11/X.h>
diff --git a/src/kbd.c b/src/kbd.c
index 85877af..e879e33 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -9,10 +9,7 @@
  * xf86Events.c and xf86Io.c which are
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/lnx_KbdMap.c b/src/lnx_KbdMap.c
index a066d0d..9f75b84 100644
--- a/src/lnx_KbdMap.c
+++ b/src/lnx_KbdMap.c
@@ -3,10 +3,7 @@
  *
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include <X11/X.h>
diff --git a/src/lnx_kbd.c b/src/lnx_kbd.c
index c221194..63c0171 100644
--- a/src/lnx_kbd.c
+++ b/src/lnx_kbd.c
@@ -12,9 +12,7 @@
  * This program comes with ABSOLUTELY NO WARRANTY.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include <X11/X.h>
diff --git a/src/sun_kbd.c b/src/sun_kbd.c
index f6185e6..ec49ec1 100644
--- a/src/sun_kbd.c
+++ b/src/sun_kbd.c
@@ -44,10 +44,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include "xf86.h"
diff --git a/src/sun_kbdMap.c b/src/sun_kbdMap.c
index e5bd54b..7861f6b 100644
--- a/src/sun_kbdMap.c
+++ b/src/sun_kbdMap.c
@@ -20,10 +20,7 @@
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include <X11/Xfuncproto.h>