diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4426b52e92..8353d488fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,6 +192,10 @@ if(KWIN_BUILD_OPENGLES)
   include_directories(${OPENGLES_INCLUDE_DIR})
 endif()
 
+if (XKB_FOUND)
+  include_directories(${XKB_INCLUDE_DIR})
+endif()
+
 # for things that are also used by kwin libraries
 configure_file(libkwineffects/kwinconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkwineffects/kwinconfig.h )
 # for kwin internal things
diff --git a/cmake/modules/FindXKB.cmake b/cmake/modules/FindXKB.cmake
index 99fd785eda..94a1e93547 100644
--- a/cmake/modules/FindXKB.cmake
+++ b/cmake/modules/FindXKB.cmake
@@ -33,11 +33,9 @@ if(NOT WIN32)
 
     find_path(XKB_INCLUDE_DIR
         NAMES
-            xkbcommon.h
+            xkbcommon/xkbcommon.h
         HINTS
             ${PKG_XKB_INCLUDE_DIRS}
-        PATH_SUFFIXES
-            xkbcommon
     )
     find_library(XKB_LIBRARY
         NAMES