diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15fdb8c90ea5ed22c449b45375c5214327363e2e..70686fafa622d4d0d602c395bbd682ec99fad0c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,15 +28,22 @@ ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX MINUET
                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/app/minuet_version.h"
 )
 
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets Quick)
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+    Core
+    Widgets
+    Quick
+#    Gui
+)
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-    CoreAddons
-    I18n
+    DocTools
     XmlGui
+    I18n
+    CoreAddons
+    Completion
+    WidgetsAddons
     KIO
     Crash
-    DocTools
 )
 
 find_package(PkgConfig REQUIRED)
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index f802c2085f6099b1d69389e619170956e774c522..5c4eaa15ad5c9670bdb9b53062a36c8bd7ea287f 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -5,13 +5,11 @@ set(minuet_SRCS
 add_executable(minuet ${minuet_SRCS})
 
 target_link_libraries(minuet
-    Qt5::Core
-    Qt5::Gui
     Qt5::Widgets
-    KF5::XmlGui
-    KF5::KIOWidgets
     KF5::Crash
+    KF5::CoreAddons
     KF5::I18n
+    Minuet::Interfaces
     Minuet::Shell
 )
 
diff --git a/src/plugins/fluidsynthsoundbackend/CMakeLists.txt b/src/plugins/fluidsynthsoundbackend/CMakeLists.txt
index 55c5ba3b2538cea97fe2318163d2d98320102074..137ac174dbf60576f12aa395f69de0a14d5af8a8 100644
--- a/src/plugins/fluidsynthsoundbackend/CMakeLists.txt
+++ b/src/plugins/fluidsynthsoundbackend/CMakeLists.txt
@@ -5,6 +5,7 @@ set(fluidsynthsoundbackend_PLUGIN_SRCS
 add_library(minuetfluidsynthsoundbackend MODULE ${fluidsynthsoundbackend_PLUGIN_SRCS})
 
 target_link_libraries(minuetfluidsynthsoundbackend
+    Qt5::Core
     Minuet::Interfaces
 )
 
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 1e3af8d3553842c68ec7605922f78ee8ac275897..c0527e15505efcd5eb717cc84d35d5c904aed8ef 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -26,13 +26,12 @@ generate_export_header(minuetshell EXPORT_FILE_NAME minuetshellexport.h)
 
 target_link_libraries(minuetshell
     Qt5::Core
-    Qt5::Gui
-    Qt5::Quick
     Qt5::Widgets
+    Qt5::Quick
     KF5::CoreAddons
+    KF5::Completion
     KF5::WidgetsAddons
     KF5::KIOWidgets
-    KF5::Completion
     KF5::XmlGui
     KF5::I18n
     asound