Qbs/qmake: Fix dependencies of plugins

... based on output from dependencyinfo.py script

Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11
Reviewed-by: Christian Kandeler <[email protected]>
Reviewed-by: Christian Stenger <[email protected]>
Reviewed-by: Tobias Hunger <[email protected]>

93 files changed, 301 insertions, 84 deletions

diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 53f872c148e..4249cec1377 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -6,10 +6,12 @@ QtcPlugin {
     name: "AnalyzerBase"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Utils" }
+    Depends { name: "QtcSsh" }
+
     Depends { name: "Core" }
     Depends { name: "CppTools" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "QtcSsh" }
     Depends { name: "TextEditor" }
 
     files: [
diff --git a/src/plugins/analyzerbase/analyzerbase_dependencies.pri b/src/plugins/analyzerbase/analyzerbase_dependencies.pri
index d2eb90395b2..10c5c8b6dfb 100644
--- a/src/plugins/analyzerbase/analyzerbase_dependencies.pri
+++ b/src/plugins/analyzerbase/analyzerbase_dependencies.pri
@@ -1,7 +1,9 @@
 QTC_PLUGIN_NAME = AnalyzerBase
 QTC_LIB_DEPENDS += \
     cplusplus \
-    ssh
+    extensionsystem \
+    ssh \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     projectexplorer \
diff --git a/src/plugins/android/android_dependencies.pri b/src/plugins/android/android_dependencies.pri
index 70e5329f202..0064a8319ed 100644
--- a/src/plugins/android/android_dependencies.pri
+++ b/src/plugins/android/android_dependencies.pri
@@ -9,4 +9,8 @@ QTC_PLUGIN_DEPENDS += \
     analyzerbase
 
 QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
+    qmldebug \
+    ssh \
     utils
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
index 5b699a03e7c..cb64585b639 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
@@ -6,9 +6,10 @@ QtcPlugin {
     name: "AutotoolsProjectManager"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "QtSupport" }
     Depends { name: "CppTools" }
 
     files: [
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri
index 50bedbccf72..03fe3176cfe 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri
@@ -1,4 +1,7 @@
 QTC_PLUGIN_NAME = AutotoolsProjectManager
+QTC_LIB_DEPENDS += \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     projectexplorer \
     coreplugin \
diff --git a/src/plugins/baremetal/baremetal.qbs b/src/plugins/baremetal/baremetal.qbs
index 7f8287e2e55..53d221cca28 100644
--- a/src/plugins/baremetal/baremetal.qbs
+++ b/src/plugins/baremetal/baremetal.qbs
@@ -6,11 +6,14 @@ QtcPlugin {
     name: "BareMetal"
     provider: "Sander"
 
+    Depends { name: "Qt"; submodules: ["network", "widgets"]; }
+    Depends { name: "QtcSsh" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "Debugger" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "QtSupport" }
-    Depends { name: "Qt"; submodules: ["network", "widgets"]; }
 
     files: [
         "baremetalconstants.h",
diff --git a/src/plugins/baremetal/baremetal_dependencies.pri b/src/plugins/baremetal/baremetal_dependencies.pri
index 557e8047e6b..40e0e88a916 100644
--- a/src/plugins/baremetal/baremetal_dependencies.pri
+++ b/src/plugins/baremetal/baremetal_dependencies.pri
@@ -1,7 +1,8 @@
 QTC_PLUGIN_NAME = BareMetal
 QTC_LIB_DEPENDS += \
-    # nothing here at this time
-
+    extensionsystem \
+    ssh \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     debugger \
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index 7ecf5b8b0ff..92dfa3adffa 100644
--- a/src/plugins/bazaar/bazaar.qbs
+++ b/src/plugins/bazaar/bazaar.qbs
@@ -6,6 +6,8 @@ QtcPlugin {
     name: "Bazaar"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "VcsBase" }
diff --git a/src/plugins/bazaar/bazaar_dependencies.pri b/src/plugins/bazaar/bazaar_dependencies.pri
index 1009c58f690..5ec60392247 100644
--- a/src/plugins/bazaar/bazaar_dependencies.pri
+++ b/src/plugins/bazaar/bazaar_dependencies.pri
@@ -1,5 +1,6 @@
 QTC_PLUGIN_NAME = Bazaar
 QTC_LIB_DEPENDS += \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     texteditor \
diff --git a/src/plugins/bineditor/bineditor.qbs b/src/plugins/bineditor/bineditor.qbs
index a63bcc183fb..2e3109aa858 100644
--- a/src/plugins/bineditor/bineditor.qbs
+++ b/src/plugins/bineditor/bineditor.qbs
@@ -6,6 +6,9 @@ QtcPlugin {
     name: "BinEditor"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
 
diff --git a/src/plugins/bineditor/bineditor_dependencies.pri b/src/plugins/bineditor/bineditor_dependencies.pri
index 825c980e927..0b0a5cd20a3 100644
--- a/src/plugins/bineditor/bineditor_dependencies.pri
+++ b/src/plugins/bineditor/bineditor_dependencies.pri
@@ -1,5 +1,7 @@
 QTC_PLUGIN_NAME = BinEditor
 QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     texteditor \
diff --git a/src/plugins/bookmarks/bookmarks.qbs b/src/plugins/bookmarks/bookmarks.qbs
index b92b06d0724..b7c3549f616 100644
--- a/src/plugins/bookmarks/bookmarks.qbs
+++ b/src/plugins/bookmarks/bookmarks.qbs
@@ -6,6 +6,8 @@ QtcPlugin {
     name: "Bookmarks"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
diff --git a/src/plugins/bookmarks/bookmarks_dependencies.pri b/src/plugins/bookmarks/bookmarks_dependencies.pri
index faeb9015ced..3bad76cb90f 100644
--- a/src/plugins/bookmarks/bookmarks_dependencies.pri
+++ b/src/plugins/bookmarks/bookmarks_dependencies.pri
@@ -1,4 +1,7 @@
 QTC_PLUGIN_NAME = Bookmarks
+QTC_LIB_DEPENDS += \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     projectexplorer \
     coreplugin \
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs
index a80e8837ce1..757ba232c49 100644
--- a/src/plugins/classview/classview.qbs
+++ b/src/plugins/classview/classview.qbs
@@ -6,9 +6,11 @@ QtcPlugin {
     name: "ClassView"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "CPlusPlus" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "CppTools" }
-    Depends { name: "CPlusPlus" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
 
diff --git a/src/plugins/classview/classview_dependencies.pri b/src/plugins/classview/classview_dependencies.pri
index 4aa3b0527be..3f12f9251f5 100644
--- a/src/plugins/classview/classview_dependencies.pri
+++ b/src/plugins/classview/classview_dependencies.pri
@@ -1,5 +1,7 @@
 QTC_PLUGIN_NAME = ClassView
 QTC_LIB_DEPENDS += \
+    cplusplus \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs
index 8389ef56737..3533c936298 100644
--- a/src/plugins/clearcase/clearcase.qbs
+++ b/src/plugins/clearcase/clearcase.qbs
@@ -9,6 +9,8 @@ QtcPlugin {
     pluginspecreplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("osx") ? "true": "false")})
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
diff --git a/src/plugins/clearcase/clearcase_dependencies.pri b/src/plugins/clearcase/clearcase_dependencies.pri
index 52d7309af5c..3fcc07778b0 100644
--- a/src/plugins/clearcase/clearcase_dependencies.pri
+++ b/src/plugins/clearcase/clearcase_dependencies.pri
@@ -1,5 +1,6 @@
 QTC_PLUGIN_NAME = ClearCase
 QTC_LIB_DEPENDS += \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     projectexplorer \
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
index 9232f5d60af..a40b84f77be 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
@@ -6,9 +6,11 @@ QtcPlugin {
     name: "CMakeProjectManager"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "CppTools" }
-    Depends { name: "CPlusPlus" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
     Depends { name: "QtSupport" }
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri b/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri
index 25940e72600..123a3796acf 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri
@@ -1,4 +1,8 @@
 QTC_PLUGIN_NAME = CMakeProjectManager
+QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     projectexplorer \
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index dfa3d03654d..a8ffcb6dae6 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -13,6 +13,7 @@ QtcPlugin {
     }
     Depends { name: "Utils" }
     Depends { name: "Aggregation" }
+
     Depends { name: "app_version_header" }
 
     cpp.dynamicLibraries: {
diff --git a/src/plugins/coreplugin/coreplugin_dependencies.pri b/src/plugins/coreplugin/coreplugin_dependencies.pri
index a9741e10ebc..a976d2d36e8 100644
--- a/src/plugins/coreplugin/coreplugin_dependencies.pri
+++ b/src/plugins/coreplugin/coreplugin_dependencies.pri
@@ -1,4 +1,5 @@
 QTC_PLUGIN_NAME = Core
 QTC_LIB_DEPENDS += \
+    aggregation \
     extensionsystem \
     utils
diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs
index 623d48fce32..21a3f2c91cb 100644
--- a/src/plugins/cpaster/cpaster.qbs
+++ b/src/plugins/cpaster/cpaster.qbs
@@ -6,6 +6,8 @@ QtcPlugin {
     name: "CodePaster"
 
     Depends { name: "Qt"; submodules: ["widgets", "network"] }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
 
diff --git a/src/plugins/cpaster/cpaster_dependencies.pri b/src/plugins/cpaster/cpaster_dependencies.pri
index 0b5e4890db9..f398525848c 100644
--- a/src/plugins/cpaster/cpaster_dependencies.pri
+++ b/src/plugins/cpaster/cpaster_dependencies.pri
@@ -1,4 +1,7 @@
 QTC_PLUGIN_NAME = CodePaster
+QTC_LIB_DEPENDS += \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     texteditor \
     coreplugin
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index 8ddad62eee7..2319e75be44 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -7,11 +7,15 @@ QtcPlugin {
     name: "CppEditor"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Aggregation" }
+    Depends { name: "CPlusPlus" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "CppTools" }
-    Depends { name: "CPlusPlus" }
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
+
     Depends { name: "app_version_header" }
 
     files: [
diff --git a/src/plugins/cppeditor/cppeditor_dependencies.pri b/src/plugins/cppeditor/cppeditor_dependencies.pri
index 5150da6ea02..2b90476fc37 100644
--- a/src/plugins/cppeditor/cppeditor_dependencies.pri
+++ b/src/plugins/cppeditor/cppeditor_dependencies.pri
@@ -1,5 +1,7 @@
 QTC_PLUGIN_NAME = CppEditor
 QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
     utils \
     cplusplus
 QTC_PLUGIN_DEPENDS += \
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index ddbc4feace3..f305a77f4d1 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -7,11 +7,13 @@ QtcPlugin {
     name: "CppTools"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Aggregation" }
+    Depends { name: "CPlusPlus" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "CPlusPlus" }
-    Depends { name: "LanguageUtils" }
 
     cpp.defines: base
     Properties {
diff --git a/src/plugins/cpptools/cpptools_dependencies.pri b/src/plugins/cpptools/cpptools_dependencies.pri
index 82a3b3fdf7e..705d6334f37 100644
--- a/src/plugins/cpptools/cpptools_dependencies.pri
+++ b/src/plugins/cpptools/cpptools_dependencies.pri
@@ -1,7 +1,9 @@
 QTC_PLUGIN_NAME = CppTools
 QTC_LIB_DEPENDS += \
-    languageutils \
-    cplusplus
+    aggregation \
+    cplusplus \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     projectexplorer \
diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs
index 810ae1211bc..90b0e46951d 100644
--- a/src/plugins/cvs/cvs.qbs
+++ b/src/plugins/cvs/cvs.qbs
@@ -6,6 +6,8 @@ QtcPlugin {
     name: "CVS"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "VcsBase" }
diff --git a/src/plugins/cvs/cvs_dependencies.pri b/src/plugins/cvs/cvs_dependencies.pri
index 8761cf6570a..fe841c9502a 100644
--- a/src/plugins/cvs/cvs_dependencies.pri
+++ b/src/plugins/cvs/cvs_dependencies.pri
@@ -1,5 +1,6 @@
 QTC_PLUGIN_NAME = CVS
 QTC_LIB_DEPENDS += \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     texteditor \
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index c1203368215..13be56b48dd 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -6,15 +6,18 @@ QtcPlugin {
     name: "Debugger"
 
     Depends { name: "Qt"; submodules: ["widgets", "network", "script"] }
+    Depends { name: "Aggregation" }
+    Depends { name: "CPlusPlus" }
+    Depends { name: "QtcSsh" }
+    Depends { name: "QmlDebug" }
+    Depends { name: "LanguageUtils" }
+    Depends { name: "QmlJS" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "CppTools" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
-    Depends { name: "CPlusPlus" }
-    Depends { name: "QmlJS" }
-    Depends { name: "QmlDebug" }
-    Depends { name: "QtcSsh" }
-    Depends { name: "Utils" }
 
     cpp.includePaths: base.concat(["../../shared/registryaccess"])
 
diff --git a/src/plugins/debugger/debugger_dependencies.pri b/src/plugins/debugger/debugger_dependencies.pri
index d537fa70d5f..d337d67c3d4 100644
--- a/src/plugins/debugger/debugger_dependencies.pri
+++ b/src/plugins/debugger/debugger_dependencies.pri
@@ -1,6 +1,9 @@
 QTC_PLUGIN_NAME = Debugger
 QTC_LIB_DEPENDS += \
+    aggregation \
     cplusplus \
+    extensionsystem \
+    languageutils \
     utils \
     qmldebug \
     qmljs \
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index 1c19d80a3a7..af9c273c7b3 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -7,8 +7,10 @@ QtcPlugin {
     name: "Designer"
 
     Depends { name: "Qt"; submodules: ["widgets", "xml", "printsupport", "designer", "designercomponents"] }
-    Depends { name: "Core" }
     Depends { name: "CPlusPlus" }
+    Depends { name: "Utils" }
+
+    Depends { name: "Core" }
     Depends { name: "CppTools" }
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
diff --git a/src/plugins/designer/designer_dependencies.pri b/src/plugins/designer/designer_dependencies.pri
index d5b187f3773..fb76a7eb50b 100644
--- a/src/plugins/designer/designer_dependencies.pri
+++ b/src/plugins/designer/designer_dependencies.pri
@@ -1,6 +1,7 @@
 QTC_PLUGIN_NAME = Designer
 QTC_LIB_DEPENDS += \
     cplusplus \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     cpptools \
diff --git a/src/plugins/diffeditor/diffeditor.qbs b/src/plugins/diffeditor/diffeditor.qbs
index 56bd28e5fb8..6af0e8f37b4 100644
--- a/src/plugins/diffeditor/diffeditor.qbs
+++ b/src/plugins/diffeditor/diffeditor.qbs
@@ -6,10 +6,12 @@ QtcPlugin {
     name: "DiffEditor"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
 
-
     files: [
         "diffeditor.cpp",
         "diffeditor.h",
diff --git a/src/plugins/diffeditor/diffeditor_dependencies.pri b/src/plugins/diffeditor/diffeditor_dependencies.pri
index c47a77c9843..4433db61b30 100644
--- a/src/plugins/diffeditor/diffeditor_dependencies.pri
+++ b/src/plugins/diffeditor/diffeditor_dependencies.pri
@@ -1,5 +1,7 @@
 QTC_PLUGIN_NAME = DiffEditor
 QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     texteditor \
diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs
index 5ac7938928e..6b2f675366d 100644
--- a/src/plugins/fakevim/fakevim.qbs
+++ b/src/plugins/fakevim/fakevim.qbs
@@ -5,9 +5,12 @@ import QtcPlugin
 QtcPlugin {
     name: "FakeVim"
 
+    Depends { name: "Qt.widgets" }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
-    Depends { name: "Qt.widgets" }
 
     files: [
         "fakevimactions.cpp",
diff --git a/src/plugins/fakevim/fakevim_dependencies.pri b/src/plugins/fakevim/fakevim_dependencies.pri
index 51a82fc372b..1470816704c 100644
--- a/src/plugins/fakevim/fakevim_dependencies.pri
+++ b/src/plugins/fakevim/fakevim_dependencies.pri
@@ -1,4 +1,8 @@
 QTC_PLUGIN_NAME = FakeVim
+QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     texteditor
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
index 72729967a37..359215d54fd 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
@@ -6,8 +6,9 @@ QtcPlugin {
     name: "GenericProjectManager"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
-    Depends { name: "CPlusPlus" }
     Depends { name: "CppTools" }
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri b/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri
index b33e88a4745..163aa39e9e6 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri
+++ b/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri
@@ -1,4 +1,7 @@
 QTC_PLUGIN_NAME = GenericProjectManager
+QTC_LIB_DEPENDS += \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     projectexplorer \
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index d10d7670625..eacdf24f830 100644
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -6,6 +6,8 @@ QtcPlugin {
     name: "Git"
 
     Depends { name: "Qt"; submodules: ["widgets", "network"] }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "VcsBase" }
diff --git a/src/plugins/git/git_dependencies.pri b/src/plugins/git/git_dependencies.pri
index e78d2e2e5d7..fd920d4da6e 100644
--- a/src/plugins/git/git_dependencies.pri
+++ b/src/plugins/git/git_dependencies.pri
@@ -1,5 +1,6 @@
 QTC_PLUGIN_NAME = Git
 QTC_LIB_DEPENDS += \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     texteditor \
diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs
index e9c97944643..4bce00cfaa3 100644
--- a/src/plugins/glsleditor/glsleditor.qbs
+++ b/src/plugins/glsleditor/glsleditor.qbs
@@ -6,12 +6,14 @@ QtcPlugin {
     name: "GLSLEditor"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Aggregation" }
+    Depends { name: "GLSL" }
+    Depends { name: "CPlusPlus" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
-    Depends { name: "ProjectExplorer" }
     Depends { name: "CppTools" }
-    Depends { name: "GLSL" }
-    Depends { name: "CPlusPlus" }
 
     files: [
         "glslautocompleter.cpp",
diff --git a/src/plugins/glsleditor/glsleditor_dependencies.pri b/src/plugins/glsleditor/glsleditor_dependencies.pri
index da28d3dd098..a238c8c9db1 100644
--- a/src/plugins/glsleditor/glsleditor_dependencies.pri
+++ b/src/plugins/glsleditor/glsleditor_dependencies.pri
@@ -1,5 +1,7 @@
 QTC_PLUGIN_NAME = GLSLEditor
 QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
     glsl \
     utils \
     cplusplus
diff --git a/src/plugins/helloworld/helloworld_dependencies.pri b/src/plugins/helloworld/helloworld_dependencies.pri
index bdf7d508841..3265c8d762d 100644
--- a/src/plugins/helloworld/helloworld_dependencies.pri
+++ b/src/plugins/helloworld/helloworld_dependencies.pri
@@ -1,6 +1,6 @@
 QTC_PLUGIN_NAME = HelloWorld
 QTC_LIB_DEPENDS += \
-    # nothing here at this time
+    extensionsystem
 
 QTC_PLUGIN_DEPENDS += \
     coreplugin
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 1761d5359c4..bcf629a5227 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -10,8 +10,11 @@ QtcPlugin {
         condition: Qt.core.versionMajor >= 5;
         name: "Qt"; submodules: ["printsupport", "webkitwidgets"];
     }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
 
     Depends { name: "Core" }
+
     Depends { name: "app_version_header" }
 
     cpp.defines: base.concat(["QT_CLUCENE_SUPPORT"])
diff --git a/src/plugins/help/help_dependencies.pri b/src/plugins/help/help_dependencies.pri
index df048080748..78b2513fbdb 100644
--- a/src/plugins/help/help_dependencies.pri
+++ b/src/plugins/help/help_dependencies.pri
@@ -1,3 +1,7 @@
 QTC_PLUGIN_NAME = Help
+QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index 2004340e93b..3fb6057e17e 100644
--- a/src/plugins/imageviewer/imageviewer.qbs
+++ b/src/plugins/imageviewer/imageviewer.qbs
@@ -6,6 +6,9 @@ QtcPlugin {
     name: "ImageViewer"
 
     Depends { name: "Qt"; submodules: ["widgets", "svg"] }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
 
     files: [
diff --git a/src/plugins/imageviewer/imageviewer_dependencies.pri b/src/plugins/imageviewer/imageviewer_dependencies.pri
index 58a962f6464..bd6e9dc3585 100644
--- a/src/plugins/imageviewer/imageviewer_dependencies.pri
+++ b/src/plugins/imageviewer/imageviewer_dependencies.pri
@@ -1,5 +1,7 @@
 QTC_PLUGIN_NAME = ImageViewer
 QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin
diff --git a/src/plugins/macros/macros.qbs b/src/plugins/macros/macros.qbs
index f6dac5cb8f3..97a81bececf 100644
--- a/src/plugins/macros/macros.qbs
+++ b/src/plugins/macros/macros.qbs
@@ -6,8 +6,12 @@ QtcPlugin {
     name: "Macros"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
+
     Depends { name: "app_version_header" }
 
     files: [
diff --git a/src/plugins/macros/macros_dependencies.pri b/src/plugins/macros/macros_dependencies.pri
index e7850c9d526..9028b0c5c53 100644
--- a/src/plugins/macros/macros_dependencies.pri
+++ b/src/plugins/macros/macros_dependencies.pri
@@ -1,4 +1,8 @@
 QTC_PLUGIN_NAME = Macros
+QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     texteditor
diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs
index e6fec9fbedc..11a9354a5f7 100644
--- a/src/plugins/mercurial/mercurial.qbs
+++ b/src/plugins/mercurial/mercurial.qbs
@@ -6,6 +6,8 @@ QtcPlugin {
     name: "Mercurial"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Utils"}
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "VcsBase" }
diff --git a/src/plugins/mercurial/mercurial_dependencies.pri b/src/plugins/mercurial/mercurial_dependencies.pri
index de8a0df27ac..eeeae51802d 100644
--- a/src/plugins/mercurial/mercurial_dependencies.pri
+++ b/src/plugins/mercurial/mercurial_dependencies.pri
@@ -1,5 +1,6 @@
 QTC_PLUGIN_NAME = Mercurial
 QTC_LIB_DEPENDS += \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     texteditor \
diff --git a/src/plugins/perforce/perforce.qbs b/src/plugins/perforce/perforce.qbs
index 155da2891f0..6999147c9ed 100644
--- a/src/plugins/perforce/perforce.qbs
+++ b/src/plugins/perforce/perforce.qbs
@@ -6,6 +6,8 @@ QtcPlugin {
     name: "Perforce"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "VcsBase" }
diff --git a/src/plugins/perforce/perforce_dependencies.pri b/src/plugins/perforce/perforce_dependencies.pri
index dca91be311c..6ea68191155 100644
--- a/src/plugins/perforce/perforce_dependencies.pri
+++ b/src/plugins/perforce/perforce_dependencies.pri
@@ -1,5 +1,6 @@
 QTC_PLUGIN_NAME = Perforce
 QTC_LIB_DEPENDS += \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     texteditor \
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 5f8abc5ae1e..4af1c12e177 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -8,9 +8,12 @@ QtcPlugin {
 
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
     Depends { name: "Qt.quick"; condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1"); }
+    Depends { name: "Aggregation" }
+    Depends { name: "QtcSsh" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
-    Depends { name: "QtcSsh" }
 
     cpp.defines: base.concat("QTC_CPU=X86Architecture")
     Properties {
diff --git a/src/plugins/projectexplorer/projectexplorer_dependencies.pri b/src/plugins/projectexplorer/projectexplorer_dependencies.pri
index ab0a5facc4e..df12aea6131 100644
--- a/src/plugins/projectexplorer/projectexplorer_dependencies.pri
+++ b/src/plugins/projectexplorer/projectexplorer_dependencies.pri
@@ -1,5 +1,7 @@
 QTC_PLUGIN_NAME = ProjectExplorer
 QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
     ssh \
     utils
 QTC_PLUGIN_DEPENDS += \
diff --git a/src/plugins/pythoneditor/pythoneditor.qbs b/src/plugins/pythoneditor/pythoneditor.qbs
index 0881ff31fc6..c7e5c3b6859 100644
--- a/src/plugins/pythoneditor/pythoneditor.qbs
+++ b/src/plugins/pythoneditor/pythoneditor.qbs
@@ -6,9 +6,10 @@ QtcPlugin {
     name: "PythonEditor"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
-    Depends { name: "CppTools" }
     Depends { name: "QtSupport" }
     Depends { name: "ProjectExplorer" }
 
diff --git a/src/plugins/pythoneditor/pythoneditor_dependencies.pri b/src/plugins/pythoneditor/pythoneditor_dependencies.pri
index c336195f01f..81fbcab5818 100644
--- a/src/plugins/pythoneditor/pythoneditor_dependencies.pri
+++ b/src/plugins/pythoneditor/pythoneditor_dependencies.pri
@@ -1,4 +1,7 @@
 QTC_PLUGIN_NAME = PythonEditor
+QTC_LIB_DEPENDS += \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     texteditor \
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
index 69cf233d729..1d12592c826 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
@@ -30,15 +30,10 @@ QtcPlugin {
 
     condition: project.buildQbsProjectManager
 
-    Depends { name: "Qt"; submodules: [ "widgets", "script" ] }
-    Depends { name: "ProjectExplorer" }
-    Depends { name: "Core" }
-    Depends { name: "CppTools" }
-    Depends { name: "TextEditor" }
-    Depends { name: "QtSupport" }
-    Depends { name: "QmlJS" }
-    Depends { name: "QmlJSTools" }
     property bool useInternalQbsProducts: project.qbsSubModuleExists && !project.useExternalQbs
+
+    Depends { name: "Qt"; submodules: [ "widgets", "script" ] }
+    Depends { name: "Aggregation" }
     Depends {
         name: "qbscore"
         condition: product.useInternalQbsProducts
@@ -47,6 +42,14 @@ QtcPlugin {
         name: "qbsqtprofilesetup"
         condition: product.useInternalQbsProducts
     }
+    Depends { name: "QmlJS" }
+    Depends { name: "Utils" }
+
+    Depends { name: "ProjectExplorer" }
+    Depends { name: "Core" }
+    Depends { name: "CppTools" }
+    Depends { name: "QtSupport" }
+    Depends { name: "QmlJSTools" }
 
     cpp.defines: base.concat([
         'QML_BUILD_STATIC_LIB',
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri b/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri
index d72c37a060a..749f6ee59ef 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri
@@ -1,4 +1,9 @@
 QTC_PLUGIN_NAME = QbsProjectManager
+# The Qbs libraries require special code and can not be covered here!
+QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
+    qmljs
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     projectexplorer \
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
index eaddefb367e..02ed30622a1 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
@@ -6,11 +6,14 @@ QtcPlugin {
     name: "QmakeProjectManager"
 
     Depends { name: "Qt"; submodules: ["widgets", "network"] }
+    Depends { name: "Aggregation" }
+    Depends { name: "QmlJS" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "QtSupport" }
     Depends { name: "CppTools" }
-    Depends { name: "QmlJS" }
     Depends { name: "TextEditor" }
     Depends { name: "QmlJSTools" }
 
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager_dependencies.pri b/src/plugins/qmakeprojectmanager/qmakeprojectmanager_dependencies.pri
index b09b47ba205..8a21217dc95 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager_dependencies.pri
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager_dependencies.pri
@@ -1,6 +1,9 @@
 QTC_PLUGIN_NAME = QmakeProjectManager
 QTC_LIB_DEPENDS += \
-    qmljs
+    aggregation \
+    extensionsystem \
+    qmljs \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     projectexplorer \
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index 4ff7cabba63..51e7c82c5cd 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -6,14 +6,16 @@ QtcPlugin {
     name: "QmlJSEditor"
 
     Depends { name: "Qt"; submodules: ["widgets", "script"] }
+    Depends { name: "Aggregation" }
+    Depends { name: "LanguageUtils" }
+    Depends { name: "Utils" }
+    Depends { name: "QmlEditorWidgets" }
+    Depends { name: "QmlJS" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "QmlJSTools" }
-    Depends { name: "QmlJS" }
-    Depends { name: "LanguageUtils" }
-    Depends { name: "QmlEditorWidgets" }
-    Depends { name: "CPlusPlus" }
 
     files: [
         "jsfilewizard.cpp",
diff --git a/src/plugins/qmljseditor/qmljseditor_dependencies.pri b/src/plugins/qmljseditor/qmljseditor_dependencies.pri
index 56134f03348..00faea24218 100644
--- a/src/plugins/qmljseditor/qmljseditor_dependencies.pri
+++ b/src/plugins/qmljseditor/qmljseditor_dependencies.pri
@@ -1,7 +1,11 @@
 QTC_PLUGIN_NAME = QmlJSEditor
 QTC_LIB_DEPENDS += \
-    utils \
-    qmleditorwidgets
+    aggregation \
+    extensionsystem \
+    languageutils \
+    qmljs \
+    qmleditorwidgets \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     texteditor \
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index ffbd0624322..714528ac3d6 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -6,13 +6,16 @@ QtcPlugin {
     name: "QmlJSTools"
 
     Depends { name: "Qt"; submodules: ["script", "widgets"] }
-    Depends { name: "Core" }
+    Depends { name: "Aggregation" }
+    Depends { name: "CPlusPlus" }
     Depends { name: "LanguageUtils" }
-    Depends { name: "CppTools" }
     Depends { name: "QmlJS" }
+    Depends { name: "Utils" }
+
+    Depends { name: "Core" }
+    Depends { name: "CppTools" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
-    Depends { name: "QmlDebug" }
     Depends { name: "QtSupport" }
 
     files: [
diff --git a/src/plugins/qmljstools/qmljstools_dependencies.pri b/src/plugins/qmljstools/qmljstools_dependencies.pri
index 198ce543edd..09ecb21ec8c 100644
--- a/src/plugins/qmljstools/qmljstools_dependencies.pri
+++ b/src/plugins/qmljstools/qmljstools_dependencies.pri
@@ -1,8 +1,11 @@
 QTC_PLUGIN_NAME = QmlJSTools
 QTC_LIB_DEPENDS += \
-    languageutils \
+    aggregation \
     cplusplus \
-    qmljs
+    extensionsystem \
+    languageutils \
+    qmljs \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     projectexplorer \
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index e102665d3f9..a06f46beffb 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -8,17 +8,17 @@ QtcPlugin {
 
     Depends { name: "Qt"; submodules: ["widgets", "network"] }
     Depends { name: "Qt.quick"; condition: product.condition; }
+    Depends { name: "Aggregation" }
+    Depends { name: "QmlJS" }
+    Depends { name: "QmlDebug" }
+    Depends { name: "QtcSsh" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "AnalyzerBase" }
-    Depends { name: "QmakeProjectManager" }
-    Depends { name: "RemoteLinux" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "QtSupport" }
     Depends { name: "TextEditor" }
-    Depends { name: "QmlDebug" }
-    Depends { name: "QmlJS" }
-    Depends { name: "QmlJSTools" }
-    Depends { name: "CPlusPlus" }
 
     Group {
         name: "General"
diff --git a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri
index 80aadfe4f28..f0e4624980d 100644
--- a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri
+++ b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri
@@ -1,11 +1,14 @@
 QTC_PLUGIN_NAME = QmlProfiler
 QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
     qmldebug \
-    extensionsystem
+    qmljs \
+    ssh \
+    utils
 QTC_PLUGIN_DEPENDS += \
     analyzerbase \
     coreplugin \
     projectexplorer \
-    qmljstools \
     qtsupport \
     texteditor
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index 9aa2166f3ff..80113871f07 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -6,15 +6,13 @@ QtcPlugin {
     name: "QmlProjectManager"
 
     Depends { name: "Qt"; submodules: ["widgets", "network"] }
+    Depends { name: "QmlJS" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "TextEditor" }
-    Depends { name: "QmlJSEditor" }
-    Depends { name: "QmlJS" }
     Depends { name: "QmlJSTools" }
-    Depends { name: "QmlDebug" }
     Depends { name: "QtSupport" }
-    Depends { name: "app_version_header" }
 
     Group {
         name: "General"
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri b/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri
index a16b0a3886b..ee0072b42ee 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri
@@ -1,4 +1,8 @@
 QTC_PLUGIN_NAME = QmlProjectManager
+QTC_LIB_DEPENDS += \
+    extensionsystem \
+    qmljs \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     projectexplorer \
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index 5332a2abc35..79cbe84d3fd 100644
--- a/src/plugins/qnx/qnx.qbs
+++ b/src/plugins/qnx/qnx.qbs
@@ -6,16 +6,19 @@ QtcPlugin {
     name: "Qnx"
     provider: "BlackBerry"
 
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
+    Depends { name: "QtcSsh" }
+    Depends { name: "QmlDebug" }
+    Depends { name: "Utils" }
+
+    Depends { name: "AnalyzerBase" }
     Depends { name: "Core" }
     Depends { name: "Debugger" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "QmlDebug" }
     Depends { name: "QtSupport" }
     Depends { name: "QmakeProjectManager" }
     Depends { name: "RemoteLinux" }
     Depends { name: "TextEditor" }
-    Depends { name: "QmlDebug" }
-    Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
 
     files: [
         "bardescriptordocument.cpp",
diff --git a/src/plugins/qnx/qnx_dependencies.pri b/src/plugins/qnx/qnx_dependencies.pri
index 808193060ed..7bc06be9c01 100644
--- a/src/plugins/qnx/qnx_dependencies.pri
+++ b/src/plugins/qnx/qnx_dependencies.pri
@@ -1,5 +1,11 @@
 QTC_PLUGIN_NAME = Qnx
+QTC_LIB_DEPENDS += \
+    extensionsystem \
+    ssh \
+    qmldebug \
+    utils
 QTC_PLUGIN_DEPENDS += \
+    analyzerbase \
     coreplugin \
     debugger \
     projectexplorer \
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index dc9060481af..caf11a41068 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -8,10 +8,12 @@ QtcPlugin {
 
     Depends { name: "Qt"; submodules: ["widgets"]; }
     Depends { name: "Qt.quick"; condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1"); }
+    Depends { name: "Aggregation" }
+    Depends { name: "QmlJS" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "TextEditor" }
-    Depends { name: "QmlJS" }
     Depends { name: "CppTools" }
 
     cpp.includePaths: base.concat([
diff --git a/src/plugins/qtsupport/qtsupport_dependencies.pri b/src/plugins/qtsupport/qtsupport_dependencies.pri
index 88d89ae173d..9adcd996e94 100644
--- a/src/plugins/qtsupport/qtsupport_dependencies.pri
+++ b/src/plugins/qtsupport/qtsupport_dependencies.pri
@@ -1,12 +1,13 @@
 QTC_PLUGIN_NAME = QtSupport
 QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
     qmljs \
     utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     cpptools \
-    projectexplorer \
-    texteditor
+    projectexplorer
 DEFINES *= \
     QMAKE_AS_LIBRARY \
     PROPARSER_THREAD_SAFE \
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 87d3984733e..cc22cdff195 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -6,13 +6,15 @@ QtcPlugin {
     name: "RemoteLinux"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "QtcSsh" }
+    Depends { name: "QmlDebug" }
+    Depends { name: "Utils" }
+
     Depends { name: "AnalyzerBase" }
     Depends { name: "Core" }
     Depends { name: "Debugger" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "QmlDebug" }
     Depends { name: "QtSupport" }
-    Depends { name: "QtcSsh" }
 
     files: [
         "abstractpackagingstep.cpp",
diff --git a/src/plugins/remotelinux/remotelinux_dependencies.pri b/src/plugins/remotelinux/remotelinux_dependencies.pri
index 682503fc07e..f10e2a91ec1 100644
--- a/src/plugins/remotelinux/remotelinux_dependencies.pri
+++ b/src/plugins/remotelinux/remotelinux_dependencies.pri
@@ -1,4 +1,9 @@
 QTC_PLUGIN_NAME = RemoteLinux
+QTC_LIB_DEPENDS += \
+    extensionsystem \
+    qmldebug \
+    ssh \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     debugger \
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index 193c9b75133..3bc41153890 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -5,8 +5,11 @@ import QtcPlugin
 QtcPlugin {
     name: "ResourceEditor"
 
-    Depends { name: "Core" }
     Depends { name: "Qt"; submodules: ["widgets", "xml"] }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
+
+    Depends { name: "Core" }
 
     Group {
         name: "General"
diff --git a/src/plugins/resourceeditor/resourceeditor_dependencies.pri b/src/plugins/resourceeditor/resourceeditor_dependencies.pri
index 8a82e801cfc..83c79618066 100644
--- a/src/plugins/resourceeditor/resourceeditor_dependencies.pri
+++ b/src/plugins/resourceeditor/resourceeditor_dependencies.pri
@@ -1,5 +1,7 @@
 QTC_PLUGIN_NAME = ResourceEditor
 QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index b92fff54f35..e69bceaa0a8 100644
--- a/src/plugins/subversion/subversion.qbs
+++ b/src/plugins/subversion/subversion.qbs
@@ -6,6 +6,8 @@ QtcPlugin {
     name: "Subversion"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "VcsBase" }
diff --git a/src/plugins/tasklist/tasklist.qbs b/src/plugins/tasklist/tasklist.qbs
index ef105ea216c..725a7d8de68 100644
--- a/src/plugins/tasklist/tasklist.qbs
+++ b/src/plugins/tasklist/tasklist.qbs
@@ -6,9 +6,10 @@ QtcPlugin {
     name: "TaskList"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "TextEditor" }
 
     files: [
         "stopmonitoringhandler.cpp",
diff --git a/src/plugins/tasklist/tasklist_dependencies.pri b/src/plugins/tasklist/tasklist_dependencies.pri
index af8c39d7804..b0d1110939b 100644
--- a/src/plugins/tasklist/tasklist_dependencies.pri
+++ b/src/plugins/tasklist/tasklist_dependencies.pri
@@ -1,4 +1,7 @@
 QTC_PLUGIN_NAME = TaskList
+QTC_LIB_DEPENDS += \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     projectexplorer
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index f6472f7a18d..5d44e8fb763 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -6,6 +6,9 @@ QtcPlugin {
     name: "TextEditor"
 
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script", "printsupport"] }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
 
     cpp.includePaths: base.concat([path]) // Needed for the highlighterengine autotest.
diff --git a/src/plugins/texteditor/texteditor_dependencies.pri b/src/plugins/texteditor/texteditor_dependencies.pri
index 389caeeaa66..1bab312c8a8 100644
--- a/src/plugins/texteditor/texteditor_dependencies.pri
+++ b/src/plugins/texteditor/texteditor_dependencies.pri
@@ -1,5 +1,7 @@
 QTC_PLUGIN_NAME = TextEditor
 QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin
diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs
index d316c081c61..b97649a3e8b 100644
--- a/src/plugins/todo/todo.qbs
+++ b/src/plugins/todo/todo.qbs
@@ -6,12 +6,13 @@ QtcPlugin {
     name: "Todo"
 
     Depends { name: "Qt.widgets" }
+    Depends { name: "CPlusPlus" }
+    Depends { name: "QmlJS" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
-    Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "CPlusPlus" }
     Depends { name: "CppTools" }
-    Depends { name: "QmlJS" }
 
     files: [
         "constants.h",
diff --git a/src/plugins/todo/todo_dependencies.pri b/src/plugins/todo/todo_dependencies.pri
index 5f98f13aa00..66d9a427eee 100644
--- a/src/plugins/todo/todo_dependencies.pri
+++ b/src/plugins/todo/todo_dependencies.pri
@@ -1,6 +1,9 @@
 QTC_PLUGIN_NAME = Todo
 QTC_LIB_DEPENDS += \
-    qmljs
+    cplusplus \
+    extensionsystem \
+    qmljs \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     projectexplorer \
diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs
index 40e56cfad90..be4722aaba3 100644
--- a/src/plugins/updateinfo/updateinfo.qbs
+++ b/src/plugins/updateinfo/updateinfo.qbs
@@ -5,8 +5,10 @@ import QtcPlugin
 QtcPlugin {
     name: "UpdateInfo"
 
-    Depends { name: "Core" }
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
+    Depends { name: "Utils" }
+
+    Depends { name: "Core" }
 
     property bool enable: false
     pluginspecreplacements: ({"UPDATEINFO_EXPERIMENTAL_STR": (enable ? "false": "true")})
diff --git a/src/plugins/updateinfo/updateinfo_dependencies.pri b/src/plugins/updateinfo/updateinfo_dependencies.pri
index 2c4a97d0bda..4c3a1591c51 100644
--- a/src/plugins/updateinfo/updateinfo_dependencies.pri
+++ b/src/plugins/updateinfo/updateinfo_dependencies.pri
@@ -1,5 +1,6 @@
 QTC_PLUGIN_NAME = UpdateInfo
 QTC_LIB_DEPENDS += \
-    extensionsystem
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin
diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs
index 7011248e45d..beff9f2922c 100644
--- a/src/plugins/valgrind/valgrind.qbs
+++ b/src/plugins/valgrind/valgrind.qbs
@@ -6,13 +6,15 @@ QtcPlugin {
     name: "Valgrind"
 
     Depends { name: "Qt"; submodules: ["widgets", "network"] }
+    Depends { name: "CPlusPlus"}
+    Depends { name: "QtcSsh" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "AnalyzerBase" }
-    Depends { name: "Debugger" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
     Depends { name: "RemoteLinux" }
-    Depends { name: "CPlusPlus"}
 
     Group {
         name: "General"
diff --git a/src/plugins/valgrind/valgrind_dependencies.pri b/src/plugins/valgrind/valgrind_dependencies.pri
index ed2c6fff609..4faca50ffd7 100644
--- a/src/plugins/valgrind/valgrind_dependencies.pri
+++ b/src/plugins/valgrind/valgrind_dependencies.pri
@@ -1,6 +1,8 @@
 QTC_PLUGIN_NAME = Valgrind
 QTC_LIB_DEPENDS += \
     cplusplus \
+    extensionsystem \
+    ssh \
     utils
 QTC_PLUGIN_DEPENDS += \
     analyzerbase \
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index 1abc87493eb..b6d5b9a621d 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -5,12 +5,15 @@ import QtcPlugin
 QtcPlugin {
     name: "VcsBase"
 
+    Depends { name: "Qt.widgets" }
+    Depends { name: "Aggregation" }
+    Depends { name: "CPlusPlus" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
-    Depends { name: "Qt.widgets" }
     Depends { name: "CppTools" }
-    Depends { name: "CPlusPlus" }
 
     files: [
         "baseannotationhighlighter.cpp",
diff --git a/src/plugins/vcsbase/vcsbase_dependencies.pri b/src/plugins/vcsbase/vcsbase_dependencies.pri
index 7126e57c9f3..95a11af0740 100644
--- a/src/plugins/vcsbase/vcsbase_dependencies.pri
+++ b/src/plugins/vcsbase/vcsbase_dependencies.pri
@@ -1,4 +1,9 @@
 QTC_PLUGIN_NAME = VcsBase
+QTC_LIB_DEPENDS += \
+    aggregation \
+    cplusplus \
+    extensionsystem \
+    utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     texteditor \
diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs
index 70fd6cc691f..ef284403b41 100644
--- a/src/plugins/welcome/welcome.qbs
+++ b/src/plugins/welcome/welcome.qbs
@@ -8,8 +8,10 @@ QtcPlugin {
 
     Depends { name: "Qt"; submodules: ["widgets", "network"] }
     Depends { name: "Qt.quick"; condition: product.condition; }
+    Depends { name: "Aggregation" }
+    Depends { name: "Utils" }
+
     Depends { name: "Core" }
-    Depends { name: "ProjectExplorer" }
 
     files: [
         "welcomeplugin.cpp",
diff --git a/src/plugins/welcome/welcome_dependencies.pri b/src/plugins/welcome/welcome_dependencies.pri
index 61c1aa505b7..79306957db3 100644
--- a/src/plugins/welcome/welcome_dependencies.pri
+++ b/src/plugins/welcome/welcome_dependencies.pri
@@ -1,5 +1,7 @@
 QTC_PLUGIN_NAME = Welcome
 QTC_LIB_DEPENDS += \
+    aggregation \
+    extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
     coreplugin