diff --git a/config-kleopatra.h.cmake b/config-kleopatra.h.cmake
index 914f8d0b7..caa9dbb5d 100644
--- a/config-kleopatra.h.cmake
+++ b/config-kleopatra.h.cmake
@@ -1,34 +1,31 @@
 /* Define to 1 if you have a recent enough libassuan */
 #cmakedefine HAVE_USABLE_ASSUAN 1
 
 /* Define to 1 if you have libassuan v2 */
 #cmakedefine HAVE_ASSUAN2 1
 
 #ifndef HAVE_ASSUAN2
 /* Define to 1 if your libassuan has the assuan_fd_t type  */
 #cmakedefine HAVE_ASSUAN_FD_T 1
 
 /* Define to 1 if your libassuan has the assuan_inquire_ext function */
 #cmakedefine HAVE_ASSUAN_INQUIRE_EXT 1
 
 /* Define to 1 if your assuan_inquire_ext puts the buffer arguments into the callback signature */
 #cmakedefine HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT 1
 
 /* Define to 1 if your libassuan has the assuan_sock_get_nonce function */
 #cmakedefine HAVE_ASSUAN_SOCK_GET_NONCE 1
 
 #endif
 /* Define to 1 if you build libkleopatraclient */
 #cmakedefine HAVE_KLEOPATRACLIENT_LIBRARY 1
 
-/* KCMUtils available */
-#cmakedefine01 HAVE_KCMUTILS
-
 /* DBus available */
 #cmakedefine01 HAVE_QDBUS
 
 /* Defined if GpgME++ supports trust signatures */
 #cmakedefine GPGMEPP_SUPPORTS_TRUST_SIGNATURES 1
 
 /* Defined if QGpgME supports trust signatures */
 #cmakedefine QGPGME_SUPPORTS_TRUST_SIGNATURES 1
diff --git a/src/conf/CMakeLists.txt b/src/conf/CMakeLists.txt
index f4ddc49d9..01c194bc8 100644
--- a/src/conf/CMakeLists.txt
+++ b/src/conf/CMakeLists.txt
@@ -1,69 +1,63 @@
 include_directories(${kleopatra_SOURCE_DIR}/src)
 
 if(BUILD_libkleopatraclient)
 
   set(_kcm_kleopatra_libkleopatraclient_extra_SRCS
     smimevalidationconfigurationwidget.cpp
     smimevalidationconfigurationpage.cpp
     cryptooperationsconfigwidget.cpp
     cryptooperationsconfigpage.cpp
   )
 
   ki18n_wrap_ui(_kcm_kleopatra_libkleopatraclient_extra_SRCS
     smimevalidationconfigurationwidget.ui
   )
 
   kconfig_add_kcfg_files(_kcm_kleopatra_libkleopatraclient_extra_SRCS
     ${kleopatra_SOURCE_DIR}/src/kcfg/smimevalidationpreferences.kcfgc
   )
 
   set(_kcm_kleopatra_libkleopatraclient_extra_LIBS kleopatraclientgui)
 
-  set(_kcm_kleopatra_libkleopatraclient_extra_install_FILES
-    kleopatra_config_smimevalidation.desktop
-    kleopatra_config_cryptooperations.desktop
-  )
-
 else()
 
   set(_kcm_kleopatra_libkleopatraclient_extra_SRCS)
   set(_kcm_kleopatra_libkleopatraclient_extra_LIBS)
-  set(_kcm_kleopatra_libkleopatraclient_extra_install_FILES)
 
 endif()
 
 set(kcm_kleopatra_PART_SRCS
   dirservconfigpage.cpp
   appearanceconfigpage.cpp
   appearanceconfigwidget.cpp
   gnupgsystemconfigurationpage.cpp
   ${kleopatra_BINARY_DIR}/src/kleopatra_debug.cpp
   ${_kcm_kleopatra_libkleopatraclient_extra_SRCS}
 )
 
 
 ki18n_wrap_ui(kcm_kleopatra_PART_SRCS
   appearanceconfigwidget.ui
   smimevalidationconfigurationwidget.ui
 )
 
 kconfig_add_kcfg_files(kcm_kleopatra_PART_SRCS
   ${kleopatra_SOURCE_DIR}/src/kcfg/tooltippreferences.kcfgc
   ${kleopatra_SOURCE_DIR}/src/kcfg/emailoperationspreferences.kcfgc
   ${kleopatra_SOURCE_DIR}/src/kcfg/fileoperationspreferences.kcfgc
   ${kleopatra_SOURCE_DIR}/src/kcfg/tagspreferences.kcfgc
   ${kleopatra_SOURCE_DIR}/src/kcfg/settings.kcfgc
 )
 
 add_library(kcm_kleopatra_static STATIC ${kcm_kleopatra_PART_SRCS})
 
 target_link_libraries(kcm_kleopatra_static
   KF5::Libkleo
   KF5::IconThemes
   KF5::I18n
   KF5::WidgetsAddons
   KF5::ConfigWidgets
   ${_kcm_kleopatra_extra_libs}
   ${_kleopatra_dbusaddons_libs}
   ${_kcm_kleopatra_libkleopatraclient_extra_LIBS}
 )
diff --git a/src/conf/kleopageconfigdialog.h b/src/conf/kleopageconfigdialog.h
index c9739f9c3..f01e833b5 100644
--- a/src/conf/kleopageconfigdialog.h
+++ b/src/conf/kleopageconfigdialog.h
@@ -1,50 +1,50 @@
 /*
     kleopageconfigdialog.h.h
 
     This file is part of Kleopatra
     SPDX-FileCopyrightText: 2016 Bundesamt für Sicherheit in der Informationstechnik
     SPDX-FileContributor: Intevation GmbH
 
     SPDX-License-Identifier: GPL-2.0-only
 */
 
 #pragma once
 
 #include <KPageDialog>
 #include <QList>
-#include <KCModule>
 
 class KPageWidgetItem;
+class KCModule;
 
 /**
  * KPageDialog based config dialog to be used when
  * KCMUtils are not available. */
 class KleoPageConfigDialog : public KPageDialog
 {
     Q_OBJECT
 public:
     explicit KleoPageConfigDialog(QWidget *parent = nullptr);
 
     void addModule(const QString &name, const QString &comment, const QString &docPath, const QString &icon, KCModule *module);
 
 Q_SIGNALS:
     void configCommitted();
 
 protected Q_SLOTS:
     void slotDefaultClicked();
     void slotUser1Clicked();
     void slotApplyClicked();
     void slotOkClicked();
     void slotHelpClicked();
     void slotCurrentPageChanged(KPageWidgetItem *current, KPageWidgetItem *previous);
     void moduleChanged(bool value);
 
 private:
     void clientChanged();
     void apply();
 
     QList<KCModule *> mModules;
     QList<KCModule *> mChangedModules;
     QMap<QString, QString> mHelpUrls;
 };