diff --git a/kcms/touchpad/cmake/modules/FindX11_XCB.cmake b/kcms/touchpad/cmake/modules/FindX11_XCB.cmake
deleted file mode 100644
index c31d9b67a..000000000
--- a/kcms/touchpad/cmake/modules/FindX11_XCB.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-# - Try to find libX11-xcb
-# Once done this will define
-#
-#  X11_XCB_FOUND       - system has libX11-xcb
-#  X11_XCB_LIBRARIES   - Link these to use libX11-xcb
-#  X11_XCB_INCLUDE_DIR - the libX11-xcb include dir
-#  X11_XCB_DEFINITIONS - compiler switches required for using libX11-xcb
-
-# Copyright (c) 2012 Fredrik Höglund <fredrik@kde.org>
-# Copyright (c) 2008 Helio Chissini de Castro, <helio@kde.org>
-# Copyright (c) 2007 Matthias Kretz, <kretz@kde.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-
-IF (NOT WIN32)
-  # use pkg-config to get the directories and then use these values
-  # in the FIND_PATH() and FIND_LIBRARY() calls
-  FIND_PACKAGE(PkgConfig)
-  PKG_CHECK_MODULES(PKG_X11_XCB QUIET x11-xcb)
-
-  SET(X11_XCB_DEFINITIONS ${PKG_X11_XCB_CFLAGS})
-
-  FIND_PATH(X11_XCB_INCLUDE_DIR  NAMES X11/Xlib-xcb.h HINTS ${PKG_X11_XCB_INCLUDE_DIRS})
-  FIND_LIBRARY(X11_XCB_LIBRARIES NAMES X11-xcb        HINTS ${PKG_X11_XCB_LIBRARY_DIRS})
-
-  include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(X11_XCB DEFAULT_MSG X11_XCB_LIBRARIES X11_XCB_INCLUDE_DIR)
-
-  MARK_AS_ADVANCED(X11_XCB_INCLUDE_DIR X11_XCB_LIBRARIES)
-ENDIF (NOT WIN32)
-
diff --git a/kcms/touchpad/src/backends/x11.cmake b/kcms/touchpad/src/backends/x11.cmake
index 4a08d07e9..f49070843 100644
--- a/kcms/touchpad/src/backends/x11.cmake
+++ b/kcms/touchpad/src/backends/x11.cmake
@@ -1,48 +1,47 @@
 # // krazy:excludeall=copyright,license
 find_package(X11 REQUIRED)
 find_package(X11_XCB REQUIRED)
 find_package(XCB REQUIRED)
 find_package(PkgConfig REQUIRED)
 
 if(NOT X11_Xinput_FOUND)
     message(FATAL_ERROR "Xinput not found")
 endif()
 
 include_directories(${XCB_INCLUDE_DIR}
-                    ${X11_XCB_INCLUDE_DIR}
                     ${X11_Xinput_INCLUDE_PATH}
                     ${X11_X11_INCLUDE_PATH}
                     ${Synaptics_INCLUDE_DIRS}
                     ${XORG_INCLUDE_DIRS}
 )
 
-add_definitions(${X11_XCB_DEFINITIONS} ${XCB_DEFINITIONS})
+add_definitions(${XCB_DEFINITIONS})
 
 SET(backend_SRCS
     ${backend_SRCS}
     backends/x11/propertyinfo.cpp
     backends/x11/xlibbackend.cpp
     backends/x11/synapticstouchpad.cpp
     backends/x11/libinputtouchpad.cpp
     backends/x11/xlibtouchpad.cpp
     backends/x11/xcbatom.cpp
     backends/x11/xlibnotifications.cpp
     backends/x11/xrecordkeyboardmonitor.cpp
 )
 
 SET(backend_LIBS
     ${backend_LIBS}
     ${XCB_LIBRARIES}
     ${X11_X11_LIB}
-    ${X11_XCB_LIBRARIES}
+    X11::XCB
     ${X11_Xinput_LIB}
 )
 
 add_executable(kcm-touchpad-list-devices backends/x11/listdevices.cpp)
 target_link_libraries(kcm-touchpad-list-devices
                       ${X11_X11_LIB}
                       ${X11_Xinput_LIB}
 )
 install(TARGETS kcm-touchpad-list-devices
         DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
 )