diff --git a/effects/blur/CMakeLists.txt b/effects/blur/CMakeLists.txt
index afe5b65f13..160229bdb8 100644
--- a/effects/blur/CMakeLists.txt
+++ b/effects/blur/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(kwin_blur_config
     KF5::Service
 )
 
-kservice_desktop_to_json(kwin_blur_config blur_config.desktop)
+kcoreaddons_desktop_to_json(kwin_blur_config blur_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/coverswitch/CMakeLists.txt b/effects/coverswitch/CMakeLists.txt
index 691faf43e5..09211a720f 100644
--- a/effects/coverswitch/CMakeLists.txt
+++ b/effects/coverswitch/CMakeLists.txt
@@ -24,7 +24,7 @@ target_link_libraries(kwin_coverswitch_config
     KF5::Service
 )
 
-kservice_desktop_to_json(kwin_coverswitch_config coverswitch_config.desktop)
+kcoreaddons_desktop_to_json(kwin_coverswitch_config coverswitch_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/cube/CMakeLists.txt b/effects/cube/CMakeLists.txt
index 2562689526..5b07dd58e0 100644
--- a/effects/cube/CMakeLists.txt
+++ b/effects/cube/CMakeLists.txt
@@ -42,7 +42,7 @@ target_link_libraries(kwin_cube_config
     KF5::Service
 )
 
-kservice_desktop_to_json(kwin_cube_config cube_config.desktop)
+kcoreaddons_desktop_to_json(kwin_cube_config cube_config.desktop)
 
 # cube slide
 set(kwin_cubeslide_config_SRCS cubeslide_config.cpp)
@@ -59,7 +59,7 @@ target_link_libraries(kwin_cubeslide_config
     KF5::Service
 )
 
-kservice_desktop_to_json(kwin_cubeslide_config cubeslide_config.desktop)
+kcoreaddons_desktop_to_json(kwin_cubeslide_config cubeslide_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/dashboard/CMakeLists.txt b/effects/dashboard/CMakeLists.txt
index d55d16c21e..81c5ee1ff8 100644
--- a/effects/dashboard/CMakeLists.txt
+++ b/effects/dashboard/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(kwin_dashboard_config
     KF5::Service
 )
 
-kservice_desktop_to_json(kwin_dashboard_config dashboard_config.desktop)
+kcoreaddons_desktop_to_json(kwin_dashboard_config dashboard_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/desktopgrid/CMakeLists.txt b/effects/desktopgrid/CMakeLists.txt
index 4764374359..505ade044a 100644
--- a/effects/desktopgrid/CMakeLists.txt
+++ b/effects/desktopgrid/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(kwin_desktopgrid_config
     KF5::XmlGui
 )
 
-kservice_desktop_to_json(kwin_desktopgrid_config desktopgrid_config.desktop)
+kcoreaddons_desktop_to_json(kwin_desktopgrid_config desktopgrid_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/diminactive/CMakeLists.txt b/effects/diminactive/CMakeLists.txt
index 221bc8fc0f..7d06ebb651 100644
--- a/effects/diminactive/CMakeLists.txt
+++ b/effects/diminactive/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(kwin_diminactive_config
     KF5::Service
 )
 
-kservice_desktop_to_json(kwin_diminactive_config diminactive_config.desktop)
+kcoreaddons_desktop_to_json(kwin_diminactive_config diminactive_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/flipswitch/CMakeLists.txt b/effects/flipswitch/CMakeLists.txt
index a0d011ea4b..62469a78f4 100644
--- a/effects/flipswitch/CMakeLists.txt
+++ b/effects/flipswitch/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(kwin_flipswitch_config
     KF5::XmlGui
 )
 
-kservice_desktop_to_json(kwin_flipswitch_config flipswitch_config.desktop)
+kcoreaddons_desktop_to_json(kwin_flipswitch_config flipswitch_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/glide/CMakeLists.txt b/effects/glide/CMakeLists.txt
index 9f8c47ffb7..fb7ff13d3b 100644
--- a/effects/glide/CMakeLists.txt
+++ b/effects/glide/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(kwin_glide_config
     KF5::Service
 )
 
-kservice_desktop_to_json(kwin_glide_config glide_config.desktop)
+kcoreaddons_desktop_to_json(kwin_glide_config glide_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/invert/CMakeLists.txt b/effects/invert/CMakeLists.txt
index 9d637fb583..224849820c 100644
--- a/effects/invert/CMakeLists.txt
+++ b/effects/invert/CMakeLists.txt
@@ -24,7 +24,7 @@ target_link_libraries(kwin_invert_config
     KF5::XmlGui
 )
 
-kservice_desktop_to_json(kwin_invert_config invert_config.desktop)
+kcoreaddons_desktop_to_json(kwin_invert_config invert_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/lookingglass/CMakeLists.txt b/effects/lookingglass/CMakeLists.txt
index 796697e494..68defde1d9 100644
--- a/effects/lookingglass/CMakeLists.txt
+++ b/effects/lookingglass/CMakeLists.txt
@@ -26,7 +26,7 @@ target_link_libraries(kwin_lookingglass_config
     KF5::XmlGui
 )
 
-kservice_desktop_to_json(kwin_lookingglass_config lookingglass_config.desktop)
+kcoreaddons_desktop_to_json(kwin_lookingglass_config lookingglass_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/magiclamp/CMakeLists.txt b/effects/magiclamp/CMakeLists.txt
index 5227f1ded8..dbed53f170 100644
--- a/effects/magiclamp/CMakeLists.txt
+++ b/effects/magiclamp/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(kwin_magiclamp_config
     KF5::Service
 )
 
-kservice_desktop_to_json(kwin_magiclamp_config magiclamp_config.desktop)
+kcoreaddons_desktop_to_json(kwin_magiclamp_config magiclamp_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/magnifier/CMakeLists.txt b/effects/magnifier/CMakeLists.txt
index 6a43377176..36bf7af0d0 100644
--- a/effects/magnifier/CMakeLists.txt
+++ b/effects/magnifier/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(kwin_magnifier_config
     KF5::XmlGui
 )
 
-kservice_desktop_to_json(kwin_magnifier_config magnifier_config.desktop)
+kcoreaddons_desktop_to_json(kwin_magnifier_config magnifier_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/mouseclick/CMakeLists.txt b/effects/mouseclick/CMakeLists.txt
index 251e8e7448..b8996d9408 100644
--- a/effects/mouseclick/CMakeLists.txt
+++ b/effects/mouseclick/CMakeLists.txt
@@ -16,7 +16,7 @@ target_link_libraries(kwin_mouseclick_config
     KF5::XmlGui
 )
 
-kservice_desktop_to_json(kwin_mouseclick_config mouseclick_config.desktop)
+kcoreaddons_desktop_to_json(kwin_mouseclick_config mouseclick_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/mousemark/CMakeLists.txt b/effects/mousemark/CMakeLists.txt
index 71e20bad62..5a72ba3749 100644
--- a/effects/mousemark/CMakeLists.txt
+++ b/effects/mousemark/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(kwin_mousemark_config
     KF5::XmlGui
 )
 
-kservice_desktop_to_json(kwin_mousemark_config mousemark_config.desktop)
+kcoreaddons_desktop_to_json(kwin_mousemark_config mousemark_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/presentwindows/CMakeLists.txt b/effects/presentwindows/CMakeLists.txt
index 10e6a0b91c..afbff12833 100644
--- a/effects/presentwindows/CMakeLists.txt
+++ b/effects/presentwindows/CMakeLists.txt
@@ -23,7 +23,7 @@ target_link_libraries(kwin_presentwindows_config
     KF5::XmlGui
 )
 
-kservice_desktop_to_json(kwin_presentwindows_config presentwindows_config.desktop)
+kcoreaddons_desktop_to_json(kwin_presentwindows_config presentwindows_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/resize/CMakeLists.txt b/effects/resize/CMakeLists.txt
index 0f6b442a98..12887d86b3 100644
--- a/effects/resize/CMakeLists.txt
+++ b/effects/resize/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(kwin_resize_config
     KF5::Service
 )
 
-kservice_desktop_to_json(kwin_resize_config resize_config.desktop)
+kcoreaddons_desktop_to_json(kwin_resize_config resize_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/showfps/CMakeLists.txt b/effects/showfps/CMakeLists.txt
index c8de55ba1c..4b336ce85d 100644
--- a/effects/showfps/CMakeLists.txt
+++ b/effects/showfps/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(kwin_showfps_config
     KF5::Service
 )
 
-kservice_desktop_to_json(kwin_showfps_config showfps_config.desktop)
+kcoreaddons_desktop_to_json(kwin_showfps_config showfps_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/thumbnailaside/CMakeLists.txt b/effects/thumbnailaside/CMakeLists.txt
index 8cd89a2fda..f3422b24b9 100644
--- a/effects/thumbnailaside/CMakeLists.txt
+++ b/effects/thumbnailaside/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(kwin_thumbnailaside_config
     KF5::XmlGui
 )
 
-kservice_desktop_to_json(kwin_thumbnailaside_config thumbnailaside_config.desktop)
+kcoreaddons_desktop_to_json(kwin_thumbnailaside_config thumbnailaside_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/trackmouse/CMakeLists.txt b/effects/trackmouse/CMakeLists.txt
index 3e68bea37b..5a36dd208f 100644
--- a/effects/trackmouse/CMakeLists.txt
+++ b/effects/trackmouse/CMakeLists.txt
@@ -23,7 +23,7 @@ target_link_libraries(kwin_trackmouse_config
     KF5::XmlGui
 )
 
-kservice_desktop_to_json(kwin_trackmouse_config trackmouse_config.desktop)
+kcoreaddons_desktop_to_json(kwin_trackmouse_config trackmouse_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/windowgeometry/CMakeLists.txt b/effects/windowgeometry/CMakeLists.txt
index bbf2fc691c..0c7e3de391 100644
--- a/effects/windowgeometry/CMakeLists.txt
+++ b/effects/windowgeometry/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(kwin_windowgeometry_config
     KF5::XmlGui
 )
 
-kservice_desktop_to_json(kwin_windowgeometry_config windowgeometry_config.desktop)
+kcoreaddons_desktop_to_json(kwin_windowgeometry_config windowgeometry_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/wobblywindows/CMakeLists.txt b/effects/wobblywindows/CMakeLists.txt
index a2db98fc2d..f89d7d666c 100644
--- a/effects/wobblywindows/CMakeLists.txt
+++ b/effects/wobblywindows/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(kwin_wobblywindows_config
     KF5::Service
 )
 
-kservice_desktop_to_json(kwin_wobblywindows_config wobblywindows_config.desktop)
+kcoreaddons_desktop_to_json(kwin_wobblywindows_config wobblywindows_config.desktop)
 
 install(
     TARGETS
diff --git a/effects/zoom/CMakeLists.txt b/effects/zoom/CMakeLists.txt
index 7a86c08e4d..6ef2eeac9a 100644
--- a/effects/zoom/CMakeLists.txt
+++ b/effects/zoom/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(kwin_zoom_config
     KF5::XmlGui
 )
 
-kservice_desktop_to_json(kwin_zoom_config zoom_config.desktop)
+kcoreaddons_desktop_to_json(kwin_zoom_config zoom_config.desktop)
 
 install(
     TARGETS