diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
--- a/libs/flake/CMakeLists.txt
+++ b/libs/flake/CMakeLists.txt
@@ -230,6 +230,9 @@
     PRIVATE
         koplugin
         KF5::IconThemes
+        KF5::ConfigCore
+        KF5::WidgetsAddons
+        KF5::CoreAddons
         Qt5::Svg
 )
 
diff --git a/libs/main/CMakeLists.txt b/libs/main/CMakeLists.txt
--- a/libs/main/CMakeLists.txt
+++ b/libs/main/CMakeLists.txt
@@ -99,8 +99,11 @@
     PRIVATE
         koplugin
         KF5::Notifications
+        KF5::CoreAddons
         KF5::ItemViews
         KF5::KIOFileWidgets
+        KF5::KIOCore
+        KF5::Completion
         KF5::IconThemes
         KF5::DBusAddons
 )
diff --git a/libs/odf/CMakeLists.txt b/libs/odf/CMakeLists.txt
--- a/libs/odf/CMakeLists.txt
+++ b/libs/odf/CMakeLists.txt
@@ -56,6 +56,8 @@
     PRIVATE
         koversion
         KF5::I18n
+        KF5::ConfigCore
+        KF5::CoreAddons
 )
 
 set_target_properties(koodf PROPERTIES
diff --git a/libs/store/CMakeLists.txt b/libs/store/CMakeLists.txt
--- a/libs/store/CMakeLists.txt
+++ b/libs/store/CMakeLists.txt
@@ -31,12 +31,14 @@
     PUBLIC
         Qt5::Xml
         Qt5::Core
+        Qt5::Widgets
         KF5::KIOCore
     PRIVATE
         Qt5::Gui
         KF5::Archive
         KF5::Wallet
         KF5::KIOWidgets
+        KF5::WidgetsAddons
         KF5::I18n
 )
 if( Qca-qt5_FOUND )
diff --git a/libs/widgets/CMakeLists.txt b/libs/widgets/CMakeLists.txt
--- a/libs/widgets/CMakeLists.txt
+++ b/libs/widgets/CMakeLists.txt
@@ -124,6 +124,7 @@
         KF5::ConfigCore
         KF5::Codecs
         KF5::Completion
+        KF5::CoreAddons
         KF5::IconThemes
 )
 
diff --git a/plugins/textshape/CMakeLists.txt b/plugins/textshape/CMakeLists.txt
--- a/plugins/textshape/CMakeLists.txt
+++ b/plugins/textshape/CMakeLists.txt
@@ -179,7 +179,17 @@
 
 calligra_shape_desktop_to_json(calligra_shape_text calligra_shape_text.desktop)
 
-target_link_libraries(calligra_shape_text kotext kotextlayout kowidgets KF5::KIOCore KF5::KIOFileWidgets KF5::KIOWidgets KF5::ItemViews KF5::WidgetsAddons
+target_link_libraries(calligra_shape_text
+  kotext
+  kotextlayout
+  kowidgets
+  KF5::KIOCore
+  KF5::KIOFileWidgets
+  KF5::KIOWidgets
+  KF5::ItemViews
+  KF5::WidgetsAddons
+  KF5::Completion
+  Qt5::Network
 )
 
 if( SHOULD_BUILD_FEATURE_RDF )
diff --git a/sheets/CMakeLists.txt b/sheets/CMakeLists.txt
--- a/sheets/CMakeLists.txt
+++ b/sheets/CMakeLists.txt
@@ -5,15 +5,15 @@
     add_definitions(-Wno-deprecated -Wno-deprecated-declarations)
 endif ()
 
+if (SHOULD_BUILD_PART_SHEETS)
+
 include_directories( ${CMAKE_SOURCE_DIR}/interfaces
                     ${KOMAIN_INCLUDES}
                     ${KOTEXT_INCLUDES}
                     ${TEXTLAYOUT_INCLUDES}
                     ${Boost_INCLUDE_DIR}
                     ${EIGEN3_INCLUDE_DIR} )
 
-if (SHOULD_BUILD_PART_SHEETS)
-
 # have their own translation domain
 add_subdirectory( shape )
 add_subdirectory( plugins )
@@ -328,6 +328,7 @@
         KF5::KDELibs4Support
     PRIVATE
         koplugin
+        KF5::Completion
 )
 
 set_target_properties(calligrasheetsodf PROPERTIES
@@ -348,6 +349,8 @@
         calligrasheetsodf
     PRIVATE
         koplugin
+        KF5::Completion
+        KF5::GuiAddons
         KF5::SonnetCore
         KF5::SonnetUi
         KF5::NotifyConfig
diff --git a/sheets/shape/CMakeLists.txt b/sheets/shape/CMakeLists.txt
--- a/sheets/shape/CMakeLists.txt
+++ b/sheets/shape/CMakeLists.txt
@@ -25,7 +25,7 @@
 add_library(calligra_shape_spreadsheet MODULE TableShapeFactory.cpp)
 calligra_shape_desktop_to_json(calligra_shape_spreadsheet calligra_shape_spreadsheet.desktop)
 
-target_link_libraries(calligra_shape_spreadsheet-deferred calligrasheetscommon)
+target_link_libraries(calligra_shape_spreadsheet-deferred PUBLIC calligrasheetscommon PRIVATE KF5::Completion)
 target_link_libraries(calligra_shape_spreadsheet flake KF5::KDELibs4Support)
 
 install(TARGETS calligra_shape_spreadsheet-deferred DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/deferred)
diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt
--- a/stage/part/CMakeLists.txt
+++ b/stage/part/CMakeLists.txt
@@ -163,6 +163,7 @@
         koplugin
         KF5::Archive
         KF5::IconThemes
+        KF5::Completion
         Qt5::Svg
 #         Qt5::WebKitWidgets
 )
diff --git a/words/part/CMakeLists.txt b/words/part/CMakeLists.txt
--- a/words/part/CMakeLists.txt
+++ b/words/part/CMakeLists.txt
@@ -123,6 +123,7 @@
     PRIVATE
         kotextlayout
         KF5::IconThemes
+        KF5::Completion
 )
 if( SHOULD_BUILD_FEATURE_RDF )
     target_link_libraries(wordsprivate
@@ -145,7 +146,7 @@
 
 calligra_part_desktop_to_json(calligrawordspart wordspart.desktop)
 
-target_link_libraries(calligrawordspart   wordsprivate )
+target_link_libraries(calligrawordspart   wordsprivate KF5::CoreAddons)
 
 install(TARGETS calligrawordspart  DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/parts)