diff --git a/kglobalaccel/CMakeLists.txt b/kglobalaccel/CMakeLists.txt
index 5e906d5d..1ba81c1a 100644
--- a/kglobalaccel/CMakeLists.txt
+++ b/kglobalaccel/CMakeLists.txt
@@ -3,11 +3,6 @@ project(kglobalaccel)
 ###############################################################################
 ### KDED Global Accel Daemon
 
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/config-kglobalaccel.h.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/config-kglobalaccel.h
-)
-
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1219)
 
 set(kglobalaccel_SRCS
diff --git a/kglobalaccel/config-kglobalaccel.h.cmake b/kglobalaccel/config-kglobalaccel.h.cmake
deleted file mode 100644
index 78a8e621..00000000
--- a/kglobalaccel/config-kglobalaccel.h.cmake
+++ /dev/null
@@ -1 +0,0 @@
-#cmakedefine HAVE_XKB
diff --git a/kglobalaccel/kglobalaccel_x11.cpp b/kglobalaccel/kglobalaccel_x11.cpp
index f2b60eca..6fec89fe 100644
--- a/kglobalaccel/kglobalaccel_x11.cpp
+++ b/kglobalaccel/kglobalaccel_x11.cpp
@@ -17,31 +17,26 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <config-kglobalaccel.h>
-
+#include "config-X11.h"
 #include "kglobalaccel_x11.h"
-
-#include <QtGui/qwindowdefs.h>
-
-#include "kaction.h"
 #include "globalshortcutsregistry.h"
-#include "kkeyserver.h"
 
-#include <kapplication.h>
-#include <kdebug.h>
-
-#include <QtCore/QRegExp>
+#include <QRegExp>
 #include <QWidget>
-#include <QtCore/qmetaobject.h>
+#include <QMetaObject>
 #include <QMenu>
-
-#include <kxerrorhandler.h>
+#include <qwindowdefs.h>
+#include <KAction>
+#include <KApplication>
+#include <KXErrorHandler>
+#include <KDebug>
+#include <kkeyserver.h>
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #ifdef HAVE_XKB
-# include <X11/XKBlib.h>
+#  include <X11/XKBlib.h>
 #endif
 #include <X11/keysym.h>
 #include <fixx11h.h>