diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index cefcac7517..9b24fcd3ab 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -1,118 +1,117 @@
 set(KDevPlatformInterfaces_LIB_SRCS
     iassistant.cpp
     context.cpp
     configpage.cpp
     iplugin.cpp
     idocument.cpp
     icore.cpp
     iuicontroller.cpp
     iplugincontroller.cpp
     iprojectcontroller.cpp
     iproject.cpp
     ilanguagecontroller.cpp
     ilanguage.cpp
     idocumentcontroller.cpp
     istatus.cpp
     iruncontroller.cpp
     isession.cpp
     isessionlock.cpp
     isourceformatter.cpp
     isourceformattercontroller.cpp
     contextmenuextension.cpp
     icompletionsettings.cpp
     iselectioncontroller.cpp
     idocumentationprovider.cpp
     idocumentationproviderprovider.cpp
     idocumentation.cpp
     idocumentationcontroller.cpp
     idebugcontroller.cpp
     ipartcontroller.cpp
     launchconfigurationpage.cpp
     launchconfigurationtype.cpp
     ilauncher.cpp
     ilaunchconfiguration.cpp
     ilaunchmode.cpp
     iprojectprovider.cpp
     ibuddydocumentfinder.cpp
     itemplateprovider.cpp
     itestsuite.cpp
     itestcontroller.cpp
     ilanguagecheck.cpp
     ilanguagecheckprovider.cpp
 )
 configure_file(ipluginversion.h.in ${CMAKE_CURRENT_BINARY_DIR}/ipluginversion.h)
 
 add_library(KDevPlatformInterfaces ${KDevPlatformInterfaces_LIB_SRCS})
 add_library(KDev::Interfaces ALIAS KDevPlatformInterfaces)
 generate_export_header(KDevPlatformInterfaces EXPORT_FILE_NAME interfacesexport.h)
 target_link_libraries(KDevPlatformInterfaces
 LINK_PUBLIC
     KF5::ConfigCore
     KF5::Parts
     KF5::TextEditor
     KF5::I18n
     KF5::Service
 LINK_PRIVATE
     KF5::IconThemes
     KF5::NotifyConfig
     KF5::KIOWidgets
-    KF5::KCMUtils
     KF5::ThreadWeaver
 )
 target_include_directories(KDevPlatformInterfaces INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/kdevplatform>")
 # TODO: this is ugly (sort-of cyclic dependecy):
 target_include_directories(KDevPlatformInterfaces PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../util") # for utilexport.h
 
 set_target_properties(KDevPlatformInterfaces PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION} EXPORT_NAME Interfaces)
 install(TARGETS KDevPlatformInterfaces EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 install(FILES
     iassistant.h
     context.h
     configpage.h
     contextmenuextension.h
     iplugin.h
     icore.h
     iuicontroller.h
     iplugincontroller.h
     iprojectcontroller.h
     iproject.h
     ilanguagecontroller.h
     ilanguage.h
     idocument.h
     idocumentcontroller.h
     isourceformatter.h
     isourceformattercontroller.h
     istatus.h
     isession.h
     isessionlock.h
     iruncontroller.h
     ilaunchconfiguration.h
     ilauncher.h
     launchconfigurationpage.h
     launchconfigurationtype.h
     icompletionsettings.h
     iselectioncontroller.h
     idocumentation.h
     idocumentationprovider.h
     idocumentationproviderprovider.h
     idocumentationcontroller.h
     idebugcontroller.h
     ipartcontroller.h
     ilaunchmode.h
     iprojectprovider.h
     ilanguagecheck.h
     ilanguagecheckprovider.h
     ibuddydocumentfinder.h
     itemplateprovider.h
     itestsuite.h
     itestcontroller.h
     ${CMAKE_CURRENT_BINARY_DIR}/interfacesexport.h
     ${CMAKE_CURRENT_BINARY_DIR}/ipluginversion.h
     DESTINATION ${INCLUDE_INSTALL_DIR}/kdevplatform/interfaces COMPONENT Devel
 )
 
 install(FILES
     kdevelopplugin.desktop
     DESTINATION ${SERVICETYPES_INSTALL_DIR}
 )
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index bbb13bf024..59e3527ae0 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -1,141 +1,140 @@
 
 add_subdirectory(settings)
 add_subdirectory(tests)
 
 set(KDevPlatformShell_LIB_SRCS
     workingsetcontroller.cpp
     workingsets/workingset.cpp
     workingsets/workingsetfilelabel.cpp
     workingsets/workingsettoolbutton.cpp
     workingsets/workingsettooltipwidget.cpp
     workingsets/workingsetwidget.cpp
     workingsets/closedworkingsetswidget.cpp
     workingsets/workingsethelpers.cpp
     assistantpopup.cpp
     mainwindow.cpp
     mainwindow_p.cpp
     plugincontroller.cpp
     shellextension.cpp
     core.cpp
     uicontroller.cpp
     projectcontroller.cpp
     project.cpp
     partcontroller.cpp
     #document.cpp
     partdocument.cpp
     textdocument.cpp
     documentcontroller.cpp
     languagecontroller.cpp
     language.cpp
     statusbar.cpp
     runcontroller.cpp
     sessioncontroller.cpp
     session.cpp
     sessionlock.cpp
     sessionchooserdialog.cpp
     savedialog.cpp
     sessiondialog.cpp
     sourceformattercontroller.cpp
     completionsettings.cpp
     openprojectpage.cpp
     openprojectdialog.cpp
     projectinfopage.cpp
     selectioncontroller.cpp
     documentationcontroller.cpp
     debugcontroller.cpp
     launchconfiguration.cpp
     launchconfigurationdialog.cpp
     loadedpluginsdialog.cpp
     testcontroller.cpp
     projectsourcepage.cpp
     debug.cpp
 
     progresswidget/progressmanager.cpp
     progresswidget/statusbarprogresswidget.cpp
     progresswidget/overlaywidget.cpp
     progresswidget/progressdialog.cpp
 
     areadisplay.cpp
 
     settings/uipreferences.cpp
 )
 
 set(KDevPlatformShell_UI
     sessiondialog.ui
     projectinfopage.ui
     launchconfigurationdialog.ui
     projectsourcepage.ui
     settings/uiconfig.ui
 )
 
 ki18n_wrap_ui(KDevPlatformShell_LIB_SRCS ${KDevPlatformShell_UI})
 kconfig_add_kcfg_files(KDevPlatformShell_LIB_SRCS settings/uiconfig.kcfgc)
 
 add_library(KDevPlatformShell ${KDevPlatformShell_LIB_SRCS})
 add_library(KDev::Shell ALIAS KDevPlatformShell)
 
 generate_export_header(KDevPlatformShell EXPORT_FILE_NAME shellexport.h)
 target_link_libraries(KDevPlatformShell
 LINK_PUBLIC
     KF5::XmlGui
 
     KDev::Sublime
     KDev::OutputView
     KDev::Debugger
     KDev::Interfaces
 LINK_PRIVATE
     Qt5::Declarative
 
     KF5::GuiAddons
     KF5::IconThemes
     KF5::KIOFileWidgets
     KF5::KIOWidgets
-    KF5::KCMUtils
     KF5::Parts
     KF5::Notifications
     KF5::NotifyConfig
     KF5::TextEditor
     KF5::ThreadWeaver
     KF5::JobWidgets
     KF5::ItemViews
     KF5::WindowSystem
 
     KDev::Project
     KDev::Vcs
     KDev::Language
     KDev::Util
     KDev::Documentation
 )
 set_target_properties(KDevPlatformShell PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION} EXPORT_NAME Shell)
 
 install(FILES
     mainwindow.h
     plugincontroller.h
     shellextension.h
     core.h
     uicontroller.h
     projectcontroller.h
     project.h
     partcontroller.h
     partdocument.h
     textdocument.h
     documentcontroller.h
     languagecontroller.h
     session.h
     sessioncontroller.h
     sessionlock.h
     sourceformattercontroller.h
     language.h
     selectioncontroller.h
     runcontroller.h
     launchconfiguration.h
     ${CMAKE_CURRENT_BINARY_DIR}/shellexport.h
     DESTINATION ${INCLUDE_INSTALL_DIR}/kdevplatform/shell COMPONENT Devel
 )
 
 install(TARGETS KDevPlatformShell EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 install( FILES debugger/kdevdebuggershellui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevdebugger )
 install( FILES kdevsessionui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevsession )
 install( FILES kdevsourceformatter.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevsourceformatter )
 install( FILES AssistantButton.qml assistantpopup.qml DESTINATION ${DATA_INSTALL_DIR}/kdevelop )