diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
index cfe556988..e7db0e431 100644
--- a/kcms/CMakeLists.txt
+++ b/kcms/CMakeLists.txt
@@ -1,71 +1,74 @@
 remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS)
 
 find_package(Freetype)
 set_package_properties(Freetype PROPERTIES DESCRIPTION "A font rendering engine"
                        URL "https://www.freetype.org"
                        TYPE OPTIONAL
                        PURPOSE "Needed to build kfontinst, a simple font installer."
                       )
 
 
 set(libkxftconfig_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/fonts/kxftconfig.cpp )
 
 if(X11_Xkb_FOUND AND XCB_XKB_FOUND)
     add_subdirectory( keyboard )
 endif()
 
 if (EVDEV_FOUND AND XORGLIBINPUT_FOUND AND X11_Xinput_FOUND)
     add_subdirectory( mouse )
 endif()
 
 add_subdirectory( access )
 add_subdirectory( dateandtime )
 add_subdirectory( autostart )
 add_subdirectory( ksplash )
 
 add_subdirectory( launch )
 add_subdirectory( colors )
 add_subdirectory( krdb )
 add_subdirectory( style )
 add_subdirectory( desktoptheme )
 add_subdirectory( standard_actions )
 add_subdirectory( keys )
 add_subdirectory( ksmserver )
 add_subdirectory( lookandfeel )
 add_subdirectory( nightcolor )
 
 add_subdirectory( hardware )
 add_subdirectory( desktoppaths )
 
 add_subdirectory(activities)
 add_subdirectory(componentchooser)
 add_subdirectory(emoticons)
 add_subdirectory(icons)
 add_subdirectory(kded)
 add_subdirectory(formats)
 add_subdirectory(notifications)
 add_subdirectory(phonon)
 add_subdirectory(runners)
 add_subdirectory(spellchecking)
 add_subdirectory(qtquicksettings)
 
 add_subdirectory(workspaceoptions)
 if (KF5Baloo_FOUND)
    add_subdirectory(baloo)
 endif()
 add_subdirectory(solid_actions)
-add_subdirectory(cursortheme)
+
+if(X11_Xcursor_FOUND)
+    add_subdirectory(cursortheme)
+endif()
 
 if (SYNAPTICS_FOUND AND X11_Xinput_FOUND)
     add_subdirectory(touchpad)
 endif()
 
 if(FONTCONFIG_FOUND AND FREETYPE_FOUND)
     add_subdirectory( kfontinst )
 endif()
 
 if( FREETYPE_FOUND )
    if(FONTCONFIG_FOUND )
        add_subdirectory( fonts )
    endif()
 endif()
diff --git a/kcms/cursortheme/CMakeLists.txt b/kcms/cursortheme/CMakeLists.txt
index 606696ab5..35981044b 100644
--- a/kcms/cursortheme/CMakeLists.txt
+++ b/kcms/cursortheme/CMakeLists.txt
@@ -1,63 +1,60 @@
 # KI18N Translation Domain for this library
 add_definitions(-DTRANSLATION_DOMAIN=\"kcm_cursortheme\")
 
 include_directories( ${LIBUSB_INCLUDE_DIR} )
 
-if(X11_Xcursor_FOUND)
-  set( libnoinst_SRCS
-    xcursor/thememodel.cpp
-    xcursor/cursortheme.cpp
-    xcursor/xcursortheme.cpp
-    xcursor/previewwidget.cpp
-    xcursor/sortproxymodel.cpp
-    ../krdb/krdb.cpp )
-  include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/xcursor/ )
-else()
-  set( libnoinst_SRCS core/themepage.cpp )
-  include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/core/ )
-endif()
+
+set( libnoinst_SRCS
+xcursor/thememodel.cpp
+xcursor/cursortheme.cpp
+xcursor/xcursortheme.cpp
+xcursor/previewwidget.cpp
+xcursor/sortproxymodel.cpp
+../krdb/krdb.cpp )
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/xcursor/ )
+
 
 set(klauncher_xml ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml)
 qt5_add_dbus_interface(libnoinst_SRCS ${klauncher_xml} klauncher_iface)
 
 ########### next target ###############
 
 set(kcm_cursortheme_PART_SRCS kcmcursortheme.cpp ${libnoinst_SRCS})
 
 add_library(kcm_cursortheme MODULE ${kcm_cursortheme_PART_SRCS})
 
 
 target_link_libraries(kcm_cursortheme
     Qt5::DBus
     Qt5::X11Extras
     Qt5::Quick
     KF5::Archive
     KF5::KCMUtils
     KF5::I18n
     KF5::KIOCore
     KF5::KIOWidgets
     KF5::KDELibs4Support
     KF5::NewStuff
     KF5::QuickAddons
     ${X11_LIBRARIES}
     XCB::XCB
 )
 
 if (X11_Xcursor_FOUND)
    target_link_libraries(kcm_cursortheme ${X11_Xcursor_LIB})
 endif ()
 if (X11_Xfixes_FOUND)
    target_link_libraries(kcm_cursortheme ${X11_Xfixes_LIB})
 endif ()
 
 install(TARGETS kcm_cursortheme  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 kcoreaddons_desktop_to_json(kcm_cursortheme "kcm_cursortheme.desktop")
 
 ########### install files ###############
 
 install( FILES kcm_cursortheme.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 install( FILES xcursor/xcursor.knsrc DESTINATION  ${KDE_INSTALL_KNSRCDIR} )
 
 kpackage_install_package(package kcm_cursortheme kcms)