diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
index 40aa4d92a..999be53c5 100644
--- a/klipper/CMakeLists.txt
+++ b/klipper/CMakeLists.txt
@@ -42,12 +42,18 @@ kf5_add_kdeinit_executable(klipper ${klipper_KDEINIT_SRCS})
 set_target_properties(kdeinit_klipper PROPERTIES COMPILE_FLAGS -DHAVE_X11=1)
 target_link_libraries(kdeinit_klipper
     Qt5::X11Extras
+    KF5::Completion # klineedit - port away?
+    KF5::ConfigGui
+    KF5::CoreAddons
     KF5::DBusAddons
     KF5::GlobalAccel
-    KF5::WindowSystem
-    KF5::ConfigGui
+    KF5::IconThemes
+    KF5::Notifications
+    KF5::Service
     KF5::TextWidgets
-    KF5::KDELibs4Support
+    KF5::WindowSystem
+    KF5::WidgetsAddons
+    KF5::XmlGui
     ${X11_LIBRARIES}
     ${ZLIB_LIBRARY}
 )
diff --git a/klipper/clipcommandprocess.cpp b/klipper/clipcommandprocess.cpp
index 7a6fe03d3..424e20188 100644
--- a/klipper/clipcommandprocess.cpp
+++ b/klipper/clipcommandprocess.cpp
@@ -19,7 +19,7 @@
 
 #include "clipcommandprocess.h"
 
-#include <KCharMacroExpander>
+#include <KMacroExpander>
 
 #include "history.h"
 #include "historystringitem.h"
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index 9a3d6acd4..61425e0f8 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -33,9 +33,8 @@
 #include <KService>
 #include <KIconLoader>
 #include <KStringHandler>
-#include <KGlobal>
 #include <KMimeTypeTrader>
-#include <KCharMacroExpander>
+#include <KMacroExpander>
 
 #include "klippersettings.h"
 #include "clipcommandprocess.h"