diff --git a/src/plugins/analyzerbase/analyzerbase_dependencies.pri b/src/plugins/analyzerbase/analyzerbase_dependencies.pri
index f522d75995ddd7ae33a93cca9a0acc5246135b42..d2eb90395b273437075dee8defc0bd845bf5400d 100644
--- a/src/plugins/analyzerbase/analyzerbase_dependencies.pri
+++ b/src/plugins/analyzerbase/analyzerbase_dependencies.pri
@@ -5,4 +5,5 @@ QTC_LIB_DEPENDS += \
QTC_PLUGIN_DEPENDS += \
coreplugin \
projectexplorer \
+ texteditor \
cpptools
diff --git a/src/plugins/android/android_dependencies.pri b/src/plugins/android/android_dependencies.pri
index 4258eb781b04458e3807e5bc37742c802595c322..5fe7ef6bee1bd6ac322439441ed5e5e31aa812a9 100644
--- a/src/plugins/android/android_dependencies.pri
+++ b/src/plugins/android/android_dependencies.pri
@@ -4,4 +4,6 @@ QTC_PLUGIN_DEPENDS += \
debugger \
projectexplorer \
qt4projectmanager \
+ qtsupport \
+ texteditor \
analyzerbase
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri
index af5484d1db5a762a4e52cec288ec00b7b1e72827..50bedbccf72eacd59b4a2e5e8279db54eaccacf4 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager_dependencies.pri
@@ -2,5 +2,4 @@ QTC_PLUGIN_NAME = AutotoolsProjectManager
QTC_PLUGIN_DEPENDS += \
projectexplorer \
coreplugin \
- cpptools \
- qtsupport
+ cpptools
diff --git a/src/plugins/bazaar/bazaar_dependencies.pri b/src/plugins/bazaar/bazaar_dependencies.pri
index a964c2be0e93b2aa4a28c8c8430d346eb5450810..a7c268a0d780f5e11eb8e3df84320a56a1f12602 100644
--- a/src/plugins/bazaar/bazaar_dependencies.pri
+++ b/src/plugins/bazaar/bazaar_dependencies.pri
@@ -2,7 +2,7 @@ QTC_PLUGIN_NAME = Bazaar
QTC_LIB_DEPENDS += \
utils
QTC_PLUGIN_DEPENDS += \
- projectexplorer \
+ locator \
texteditor \
coreplugin \
vcsbase
diff --git a/src/plugins/bineditor/bineditor_dependencies.pri b/src/plugins/bineditor/bineditor_dependencies.pri
index 825c980e92796233eecb94eb76106c64aed0a6a4..cbc6861ca1f81b05b33577bbb026c16f8760b524 100644
--- a/src/plugins/bineditor/bineditor_dependencies.pri
+++ b/src/plugins/bineditor/bineditor_dependencies.pri
@@ -2,5 +2,6 @@ QTC_PLUGIN_NAME = BinEditor
QTC_LIB_DEPENDS += \
utils
QTC_PLUGIN_DEPENDS += \
+ find \
texteditor \
coreplugin
diff --git a/src/plugins/clearcase/clearcase_dependencies.pri b/src/plugins/clearcase/clearcase_dependencies.pri
index 52d7309af5c994a6a4e3558f2283b04bb5310f39..3b39e2730eb8888906f456f84fce59de6eefbbdc 100644
--- a/src/plugins/clearcase/clearcase_dependencies.pri
+++ b/src/plugins/clearcase/clearcase_dependencies.pri
@@ -2,6 +2,7 @@ QTC_PLUGIN_NAME = ClearCase
QTC_LIB_DEPENDS += \
utils
QTC_PLUGIN_DEPENDS += \
+ locator \
projectexplorer \
texteditor \
coreplugin \
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri b/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri
index 7ebfd23a06a53e86439fdd83341afa4a188c3a18..7ae1e8c822c6fa9040f6a54899cac0a0308d901e 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri
@@ -1,5 +1,7 @@
QTC_PLUGIN_NAME = CMakeProjectManager
QTC_PLUGIN_DEPENDS += \
+ coreplugin \
+ locator \
projectexplorer \
cpptools \
texteditor \
diff --git a/src/plugins/cppeditor/cppeditor_dependencies.pri b/src/plugins/cppeditor/cppeditor_dependencies.pri
index a799ff93173c8002ed6e87563e4007b6e8685398..5150da6ea021633b24f764a092d7157ca2776d21 100644
--- a/src/plugins/cppeditor/cppeditor_dependencies.pri
+++ b/src/plugins/cppeditor/cppeditor_dependencies.pri
@@ -5,4 +5,5 @@ QTC_LIB_DEPENDS += \
QTC_PLUGIN_DEPENDS += \
texteditor \
coreplugin \
- cpptools
+ cpptools \
+ projectexplorer
diff --git a/src/plugins/cpptools/cpptools_dependencies.pri b/src/plugins/cpptools/cpptools_dependencies.pri
index b93363db2afc81737cdbf8a389564aed3c9ef9b8..15f93ba837660ef0a7eaa6c05487f7f7686a6fea 100644
--- a/src/plugins/cpptools/cpptools_dependencies.pri
+++ b/src/plugins/cpptools/cpptools_dependencies.pri
@@ -3,6 +3,7 @@ QTC_LIB_DEPENDS += \
languageutils \
cplusplus
QTC_PLUGIN_DEPENDS += \
+ coreplugin \
projectexplorer \
texteditor \
locator \
diff --git a/src/plugins/cvs/cvs_dependencies.pri b/src/plugins/cvs/cvs_dependencies.pri
index 612bc3dda144dd83357a6048ea19234110cafd4e..a10e575988cf4e1cf0aff0b31237cee715d1f75a 100644
--- a/src/plugins/cvs/cvs_dependencies.pri
+++ b/src/plugins/cvs/cvs_dependencies.pri
@@ -2,7 +2,7 @@ QTC_PLUGIN_NAME = CVS
QTC_LIB_DEPENDS += \
utils
QTC_PLUGIN_DEPENDS += \
- projectexplorer \
+ locator \
texteditor \
coreplugin \
vcsbase
diff --git a/src/plugins/designer/designer_dependencies.pri b/src/plugins/designer/designer_dependencies.pri
index 417689ea9ff8bb4fda5a4d94b63be0270028e807..d5b187f3773659d6f0b7e09b4b08b6118d8925de 100644
--- a/src/plugins/designer/designer_dependencies.pri
+++ b/src/plugins/designer/designer_dependencies.pri
@@ -4,5 +4,6 @@ QTC_LIB_DEPENDS += \
utils
QTC_PLUGIN_DEPENDS += \
cpptools \
+ projectexplorer \
texteditor \
coreplugin
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri b/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri
index 224aece4bd14b3e6b9faebe306179bf65a185d22..b33e88a4745ca23ac6ddbfadaba99bb01ef35adc 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri
+++ b/src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri
@@ -1,5 +1,6 @@
QTC_PLUGIN_NAME = GenericProjectManager
QTC_PLUGIN_DEPENDS += \
+ coreplugin \
projectexplorer \
cpptools \
texteditor \
diff --git a/src/plugins/git/git_dependencies.pri b/src/plugins/git/git_dependencies.pri
index e21fdc7299db8a144f7ed3cb19d36762806a7d0b..6e7123f2474d8fddca27cf9abe2e702e993b4725 100644
--- a/src/plugins/git/git_dependencies.pri
+++ b/src/plugins/git/git_dependencies.pri
@@ -2,7 +2,7 @@ QTC_PLUGIN_NAME = Git
QTC_LIB_DEPENDS += \
utils
QTC_PLUGIN_DEPENDS += \
- projectexplorer \
+ locator \
texteditor \
coreplugin \
vcsbase \
diff --git a/src/plugins/glsleditor/glsleditor_dependencies.pri b/src/plugins/glsleditor/glsleditor_dependencies.pri
index 073940cd73cb9b348b38765ebe02aa7290b77f93..da28d3dd098257dbe423c77c9ac4c1b7e99c3c1e 100644
--- a/src/plugins/glsleditor/glsleditor_dependencies.pri
+++ b/src/plugins/glsleditor/glsleditor_dependencies.pri
@@ -6,5 +6,4 @@ QTC_LIB_DEPENDS += \
QTC_PLUGIN_DEPENDS += \
coreplugin \
texteditor \
- projectexplorer \
cpptools
diff --git a/src/plugins/madde/madde_dependencies.pri b/src/plugins/madde/madde_dependencies.pri
index c5affe494d585ab1968e0191aecf003c18ee74f3..d2676a133a66bdf6b8647cb81905e79afd402719 100644
--- a/src/plugins/madde/madde_dependencies.pri
+++ b/src/plugins/madde/madde_dependencies.pri
@@ -1,4 +1,8 @@
QTC_PLUGIN_NAME = Madde
QTC_PLUGIN_DEPENDS += \
+ coreplugin \
+ debugger \
+ projectexplorer \
qt4projectmanager \
+ qtsupport \
remotelinux
diff --git a/src/plugins/mercurial/mercurial_dependencies.pri b/src/plugins/mercurial/mercurial_dependencies.pri
index 3f3428c747c315c4047cf796e89c6b4359e7e5d6..8de4e4595d450d2d036daf5ef62e0d881e382acb 100644
--- a/src/plugins/mercurial/mercurial_dependencies.pri
+++ b/src/plugins/mercurial/mercurial_dependencies.pri
@@ -2,7 +2,7 @@ QTC_PLUGIN_NAME = Mercurial
QTC_LIB_DEPENDS += \
utils
QTC_PLUGIN_DEPENDS += \
- projectexplorer \
+ locator \
texteditor \
coreplugin \
vcsbase
diff --git a/src/plugins/perforce/perforce_dependencies.pri b/src/plugins/perforce/perforce_dependencies.pri
index 8769ff4e34275318984a978735683607de5eff38..7e46fc79903ba5fdb5c59ccfb675dac711569527 100644
--- a/src/plugins/perforce/perforce_dependencies.pri
+++ b/src/plugins/perforce/perforce_dependencies.pri
@@ -2,7 +2,7 @@ QTC_PLUGIN_NAME = Perforce
QTC_LIB_DEPENDS += \
utils
QTC_PLUGIN_DEPENDS += \
- projectexplorer \
+ locator \
texteditor \
coreplugin \
vcsbase
diff --git a/src/plugins/pythoneditor/pythoneditor_dependencies.pri b/src/plugins/pythoneditor/pythoneditor_dependencies.pri
index 8c2256879e73529cb838eefeb0726a39cc69fc73..c336195f01f3f37f1c47ca2e08466cfd1b443897 100644
--- a/src/plugins/pythoneditor/pythoneditor_dependencies.pri
+++ b/src/plugins/pythoneditor/pythoneditor_dependencies.pri
@@ -2,6 +2,5 @@ QTC_PLUGIN_NAME = PythonEditor
QTC_PLUGIN_DEPENDS += \
coreplugin \
texteditor \
- cpptools \
qtsupport \
projectexplorer
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri b/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri
index b0e4f4021fab67728229a25d94e4deacd8524a8b..d72c37a060abb193e981c84eb7c1b223da1b7cb8 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager_dependencies.pri
@@ -1,7 +1,7 @@
QTC_PLUGIN_NAME = QbsProjectManager
QTC_PLUGIN_DEPENDS += \
+ coreplugin \
projectexplorer \
cpptools \
- texteditor \
qtsupport \
qmljstools
diff --git a/src/plugins/qmldesigner/qmldesigner_dependencies.pri b/src/plugins/qmldesigner/qmldesigner_dependencies.pri
index cb37cee50fd10e4baf079eac1d945e5d72c38d12..d341b0e0f6a9d19993de4baf1ede4a9f57d2a9d1 100644
--- a/src/plugins/qmldesigner/qmldesigner_dependencies.pri
+++ b/src/plugins/qmldesigner/qmldesigner_dependencies.pri
@@ -7,8 +7,7 @@ QTC_PLUGIN_DEPENDS += \
coreplugin \
texteditor \
qmljseditor \
- qt4projectmanager \
- qmlprojectmanager \
+ qtsupport \
projectexplorer
INCLUDEPATH *= \
$$PWD/../../../share/qtcreator/qml/qmlpuppet/interfaces \
diff --git a/src/plugins/qmljseditor/qmljseditor_dependencies.pri b/src/plugins/qmljseditor/qmljseditor_dependencies.pri
index 56134f0334809a8b31cf81bed7fad3140d147376..481638aa2a9b6e831b9fce7a7c091e7655bc17b3 100644
--- a/src/plugins/qmljseditor/qmljseditor_dependencies.pri
+++ b/src/plugins/qmljseditor/qmljseditor_dependencies.pri
@@ -4,6 +4,7 @@ QTC_LIB_DEPENDS += \
qmleditorwidgets
QTC_PLUGIN_DEPENDS += \
coreplugin \
+ find \
texteditor \
projectexplorer \
qmljstools
diff --git a/src/plugins/qmljstools/qmljstools_dependencies.pri b/src/plugins/qmljstools/qmljstools_dependencies.pri
index fec65a83be47dd9887a341c253beb29d1eafe2f2..2dd8e9b1c664dac2b4e66859edff9495e4ce6c88 100644
--- a/src/plugins/qmljstools/qmljstools_dependencies.pri
+++ b/src/plugins/qmljstools/qmljstools_dependencies.pri
@@ -4,6 +4,9 @@ QTC_LIB_DEPENDS += \
cplusplus \
qmljs
QTC_PLUGIN_DEPENDS += \
+ coreplugin \
+ find \
+ locator \
projectexplorer \
qtsupport \
texteditor \
diff --git a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri
index 9685afccc3dde26821d203cd2fdd5dec5d508773..47e65ba2359ba73caecbbf4a3d7945fc55201dd6 100644
--- a/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri
+++ b/src/plugins/qmlprofiler/qmlprofiler_dependencies.pri
@@ -3,8 +3,11 @@ QTC_LIB_DEPENDS += \
qmldebug \
extensionsystem
QTC_PLUGIN_DEPENDS += \
- coreplugin \
analyzerbase \
+ coreplugin \
+ debugger \
+ projectexplorer \
qmlprojectmanager \
- qt4projectmanager \
- qmljstools
+ qmljstools \
+ qtsupport \
+ texteditor
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri b/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri
index 26bb7e215f3c16265c573398d9426a6c2cc4d8d5..ab44cf70233bdd5444764885514f1efe72f23ade 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri
@@ -1,8 +1,7 @@
QTC_PLUGIN_NAME = QmlProjectManager
QTC_PLUGIN_DEPENDS += \
+ coreplugin \
projectexplorer \
- texteditor \
- qmljseditor \
qmljstools \
debugger \
qtsupport
diff --git a/src/plugins/qnx/qnx_dependencies.pri b/src/plugins/qnx/qnx_dependencies.pri
index e1019e0b920bf96b0fdd0c489e7273298c3f99c5..ff6219cb39603886eb18bbd0c6764ad4c4739282 100644
--- a/src/plugins/qnx/qnx_dependencies.pri
+++ b/src/plugins/qnx/qnx_dependencies.pri
@@ -1,6 +1,9 @@
QTC_PLUGIN_NAME = Qnx
QTC_PLUGIN_DEPENDS += \
coreplugin \
+ debugger \
+ projectexplorer \
qt4projectmanager \
+ qtsupport \
remotelinux \
texteditor
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
index b72e6d0181c053d05edf756f9e1d640d76d5a921..53dbae127b821219049b785304510081b589d39d 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
+++ b/src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
@@ -2,10 +2,11 @@ QTC_PLUGIN_NAME = Qt4ProjectManager
QTC_LIB_DEPENDS += \
qmljs
QTC_PLUGIN_DEPENDS += \
+ coreplugin \
projectexplorer \
qtsupport \
+ texteditor \
cpptools \
- debugger \
qmljstools
QTC_PLUGIN_RECOMMENDS += \
designer
diff --git a/src/plugins/qtsupport/qtsupport_dependencies.pri b/src/plugins/qtsupport/qtsupport_dependencies.pri
index 4cbf35cb2e5fe513c93aec615b7a5f022a937d78..fb03eb1c12518e5a043fba7bfccca40eb0390bbc 100644
--- a/src/plugins/qtsupport/qtsupport_dependencies.pri
+++ b/src/plugins/qtsupport/qtsupport_dependencies.pri
@@ -3,7 +3,9 @@ QTC_LIB_DEPENDS += \
qmljs \
utils
QTC_PLUGIN_DEPENDS += \
- projectexplorer
+ coreplugin \
+ projectexplorer \
+ texteditor
DEFINES *= \
QMAKE_AS_LIBRARY \
PROPARSER_THREAD_SAFE \
diff --git a/src/plugins/subversion/subversion_dependencies.pri b/src/plugins/subversion/subversion_dependencies.pri
index 3caa1e28fa742c5ad5e1c0d1620ad03ba6bada19..297af991b6d2157be400b0638b1d8fff64590632 100644
--- a/src/plugins/subversion/subversion_dependencies.pri
+++ b/src/plugins/subversion/subversion_dependencies.pri
@@ -2,7 +2,7 @@ QTC_PLUGIN_NAME = Subversion
QTC_LIB_DEPENDS += \
utils
QTC_PLUGIN_DEPENDS += \
- projectexplorer \
+ locator \
texteditor \
coreplugin \
vcsbase
diff --git a/src/plugins/todo/todo_dependencies.pri b/src/plugins/todo/todo_dependencies.pri
index e310abc5984a773067ed2be76bd3665e3f0332e0..5f98f13aa00451346e44180e1d06e66c0bb62988 100644
--- a/src/plugins/todo/todo_dependencies.pri
+++ b/src/plugins/todo/todo_dependencies.pri
@@ -4,5 +4,4 @@ QTC_LIB_DEPENDS += \
QTC_PLUGIN_DEPENDS += \
coreplugin \
projectexplorer \
- texteditor \
cpptools
diff --git a/src/plugins/valgrind/valgrind_dependencies.pri b/src/plugins/valgrind/valgrind_dependencies.pri
index cd56d7ea297a3003e708c0cae59f65e113f9cb38..ed2c6fff609a44246842778dedd5105fd76a31b2 100644
--- a/src/plugins/valgrind/valgrind_dependencies.pri
+++ b/src/plugins/valgrind/valgrind_dependencies.pri
@@ -5,5 +5,6 @@ QTC_LIB_DEPENDS += \
QTC_PLUGIN_DEPENDS += \
analyzerbase \
coreplugin \
+ projectexplorer \
texteditor \
remotelinux