diff --git a/src/alpscomm.c b/src/alpscomm.c
index b85d0b9..fef3992 100644
--- a/src/alpscomm.c
+++ b/src/alpscomm.c
@@ -27,10 +27,7 @@
  *      Neil Brown (neilb@cse.unsw.edu.au)
  *      Peter Osterlund (petero2@telia.com)
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include "synproto.h"
diff --git a/src/eventcomm.c b/src/eventcomm.c
index cfbfb74..fc90b08 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -24,10 +24,7 @@
  * Authors:
  *      Peter Osterlund (petero2@telia.com)
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include <xserver-properties.h>
diff --git a/src/properties.c b/src/properties.c
index ecc50e1..1bb5c2e 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -22,10 +22,7 @@
  *
  * Authors: Peter Hutterer
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include "xf86Module.h"
diff --git a/src/ps2comm.c b/src/ps2comm.c
index 3a1955b..8501cf1 100644
--- a/src/ps2comm.c
+++ b/src/ps2comm.c
@@ -31,10 +31,7 @@
  *      Linuxcare Inc. David Kennedy (dkennedy@linuxcare.com)
  *      Fred Hucht (fred@thp.Uni-Duisburg.de)
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include "synproto.h"
diff --git a/src/psmcomm.c b/src/psmcomm.c
index 0bf9877..3f7f9d1 100644
--- a/src/psmcomm.c
+++ b/src/psmcomm.c
@@ -33,10 +33,7 @@
  *      Fred Hucht (fred@thp.Uni-Duisburg.de)
  *      Arne Schwabe <schwabe@uni-paderborn.de>
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include <unistd.h>
diff --git a/src/synaptics.c b/src/synaptics.c
index 97150af..001f7a1 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -54,10 +54,7 @@
  *
  * Trademarks are the property of their respective owners.
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include <unistd.h>
diff --git a/src/synproto.h b/src/synproto.h
index 6ba6740..6cb75fc 100644
--- a/src/synproto.h
+++ b/src/synproto.h
@@ -27,9 +27,7 @@
 #ifndef _SYNPROTO_H_
 #define _SYNPROTO_H_
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 
diff --git a/tools/synclient.c b/tools/synclient.c
index f0e8167..1b9f53b 100644
--- a/tools/synclient.c
+++ b/tools/synclient.c
@@ -23,10 +23,7 @@
  * Authors:
  *      Peter Osterlund (petero2@telia.com)
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index df07b3b..86f8597 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -23,10 +23,7 @@
  * Authors:
  *      Peter Osterlund (petero2@telia.com)
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>