diff --git a/kcms/componentchooser/CMakeLists.txt b/kcms/componentchooser/CMakeLists.txt
--- a/kcms/componentchooser/CMakeLists.txt
+++ b/kcms/componentchooser/CMakeLists.txt
@@ -30,7 +30,13 @@
 
 
 target_link_libraries(kcm_componentchooser
+                      KF5::I18n
+                      KF5::Completion
+                      KF5::ConfigWidgets
+                      KF5::Service
+                      KF5::KIOWidgets
                       KF5::KDELibs4Support
+                      Qt5::DBus
                       Qt5::X11Extras
                       )
 
diff --git a/kcms/componentchooser/browserconfig_ui.ui b/kcms/componentchooser/browserconfig_ui.ui
--- a/kcms/componentchooser/browserconfig_ui.ui
+++ b/kcms/componentchooser/browserconfig_ui.ui
@@ -140,7 +140,7 @@
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
-   <header location="global">KDE/KLineEdit</header>
+   <header location="global">KLineEdit</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/kcms/componentchooser/componentchooserterminal.cpp b/kcms/componentchooser/componentchooserterminal.cpp
--- a/kcms/componentchooser/componentchooserterminal.cpp
+++ b/kcms/componentchooser/componentchooserterminal.cpp
@@ -20,7 +20,6 @@
 #include <QDBusMessage>
 #include <QCheckBox>
 
-#include <kapplication.h>
 #include <kmessagebox.h>
 #include <kopenwithdialog.h>
 #include <kconfig.h>
diff --git a/kcms/componentchooser/componentconfig_ui.ui b/kcms/componentchooser/componentconfig_ui.ui
--- a/kcms/componentchooser/componentconfig_ui.ui
+++ b/kcms/componentchooser/componentconfig_ui.ui
@@ -41,7 +41,7 @@
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
-   <header location="global">KDE/KComboBox</header>
+   <header location="global">KComboBox</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/kcms/componentchooser/emailclientconfig_ui.ui b/kcms/componentchooser/emailclientconfig_ui.ui
--- a/kcms/componentchooser/emailclientconfig_ui.ui
+++ b/kcms/componentchooser/emailclientconfig_ui.ui
@@ -127,7 +127,7 @@
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
-   <header location="global">KDE/KLineEdit</header>
+   <header location="global">KLineEdit</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/kcms/cursortheme/CMakeLists.txt b/kcms/cursortheme/CMakeLists.txt
--- a/kcms/cursortheme/CMakeLists.txt
+++ b/kcms/cursortheme/CMakeLists.txt
@@ -31,6 +31,8 @@
     KF5::Archive
     KF5::KCMUtils
     KF5::I18n
+    KF5::GuiAddons
+    KF5::WindowSystem
     KF5::KIOCore
     KF5::KIOWidgets
     KF5::KDELibs4Support
diff --git a/kcms/cursortheme/kcmcursortheme.cpp b/kcms/cursortheme/kcmcursortheme.cpp
--- a/kcms/cursortheme/kcmcursortheme.cpp
+++ b/kcms/cursortheme/kcmcursortheme.cpp
@@ -37,7 +37,6 @@
 #include <KIO/DeleteJob>
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
-#include <kio/netaccess.h>
 #include <KTar>
 #include <KGlobalSettings>
 
diff --git a/kcms/emoticons/CMakeLists.txt b/kcms/emoticons/CMakeLists.txt
--- a/kcms/emoticons/CMakeLists.txt
+++ b/kcms/emoticons/CMakeLists.txt
@@ -7,6 +7,7 @@
 add_library(kcm_emoticons MODULE ${kcmemoticons_SRCS})
 target_link_libraries(kcm_emoticons
                       KF5::NewStuff
+                      KF5::Completion
                       KF5::KDELibs4Support
                       KF5::Emoticons)
 
diff --git a/kcms/lookandfeel/CMakeLists.txt b/kcms/lookandfeel/CMakeLists.txt
--- a/kcms/lookandfeel/CMakeLists.txt
+++ b/kcms/lookandfeel/CMakeLists.txt
@@ -20,6 +20,7 @@
 target_link_libraries(kcm_lookandfeel
   KF5::KIOWidgets
   KF5::CoreAddons
+  KF5::GuiAddons
   KF5::KCMUtils
   KF5::I18n
   KF5::Plasma
diff --git a/kcms/style/kcmstyle.cpp b/kcms/style/kcmstyle.cpp
--- a/kcms/style/kcmstyle.cpp
+++ b/kcms/style/kcmstyle.cpp
@@ -85,7 +85,6 @@
 
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
-#include <kdemacros.h>
 
 K_PLUGIN_FACTORY(KCMStyleFactory, registerPlugin<KCMStyle>();)
 K_EXPORT_PLUGIN(KCMStyleFactory("kcmstyle"))