diff --git a/CMakeLists.txt b/CMakeLists.txt
index d20ebf8..4916c9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,68 +1,68 @@
 project(khotkeys)
 set(PROJECT_VERSION "5.17.80")
 set(PROJECT_VERSION_MAJOR 5)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 set(QT_MIN_VERSION "5.12.0")
 set(KF5_MIN_VERSION "5.62.0")
 
 
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/libkhotkeysprivate
     ${CMAKE_CURRENT_BINARY_DIR}/libkhotkeysprivate
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMPackageConfigHelpers)
 include(ECMOptionalAddSubdirectory)
 include(KDEClangFormat)
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     GlobalAccel
     I18n
     KIO
     XmlGui
     KDELibs4Support
     DBusAddons
     KCMUtils
     Plasma
 )
 
-find_package(X11 REQUIRED)
+find_package(X11 REQUIRED OPTIONAL_COMPONENTS Xtst)
 find_package(LibKWorkspace CONFIG REQUIRED)
 
 if(X11_FOUND)
     find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras )
     set(HAVE_XTEST ${X11_XTest_FOUND})
     set(HAVE_X11 1)
 endif()
 
 configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
 
 
 # Set KI18n translation domain
 add_definitions(-DTRANSLATION_DOMAIN=\"khotkeys\")
 
 # Convenience library
 add_subdirectory( libkhotkeysprivate )
 # has to be before kcm_hotkeys
 add_subdirectory( app )
 # kcm module to configure hotkeys
 add_subdirectory( kcm_hotkeys )
 # kdedmodule and standalone demon for hotkeys
 add_subdirectory( data )
 add_subdirectory( test )
 add_subdirectory( doc )
 
 # add clang-format target for all our real source files
 file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
 kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/config-X11.h.cmake b/config-X11.h.cmake
index ae8978a..dd71255 100644
--- a/config-X11.h.cmake
+++ b/config-X11.h.cmake
@@ -1,44 +1,5 @@
-/* Define if you have the XRandR extension */
-#cmakedefine HAVE_XRANDR 1
-
-/* Define if you have the XDamage extension */
-#cmakedefine HAVE_XDAMAGE 1
-
-/* Define if you have the XKB extension */
-#cmakedefine HAVE_XKB 1
-
-/* Define if you have the Xinerama extension */
-#cmakedefine HAVE_XINERAMA 1
-
-/* Define if you have the XSHM (MIT SHM) extension */
-#cmakedefine HAVE_XSHM 1
-
-/* Define if you have the XComposite extension */
-#cmakedefine HAVE_XCOMPOSITE 1
-
-/* Define to 1 if you have Xcursor */
-#cmakedefine HAVE_XCURSOR 1
-
-/* Define if you have the xf86misc extension */
-#cmakedefine HAVE_XF86MISC 1
-
-/* Define if you have the XFixes extension */
-#cmakedefine HAVE_XFIXES 1
-
 /* Define if you have the XTest extension */
 #cmakedefine HAVE_XTEST 1
 
-/* Define if your system has XRender support */
-#cmakedefine HAVE_XRENDER 1
-
-/* Define if you have OpenGL */
-#cmakedefine HAVE_OPENGL 1
-
-/* Define if you have the XSync extension */
-#cmakedefine HAVE_XSYNC 1
-
-/* Define if you have XRandR 1.3 */
-#cmakedefine HAS_RANDR_1_3 1
-
 /* Define if you have X11 at all */
 #cmakedefine01 HAVE_X11