diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 705cbfabc733c341987e32499787ec50aa7fc961..7b1aa6e254ba01238fdb23314fdef4e0f34fc079 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -122,8 +122,6 @@ DynamicLibrary {
         "Macro.h",
         "MatchingText.cpp",
         "MatchingText.h",
-        "ModelManagerInterface.cpp",
-        "ModelManagerInterface.h",
         "NamePrettyPrinter.cpp",
         "NamePrettyPrinter.h",
         "Overview.cpp",
@@ -142,8 +140,6 @@ DynamicLibrary {
         "SnapshotSymbolVisitor.h",
         "SymbolNameVisitor.cpp",
         "SymbolNameVisitor.h",
-        "TypeHierarchyBuilder.cpp",
-        "TypeHierarchyBuilder.h",
         "TypeOfExpression.cpp",
         "TypeOfExpression.h",
         "TypePrettyPrinter.cpp",
diff --git a/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in b/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
index 3bcb94e25cefb181c4bbf45525f050a093f9366d..70beca98a1c6cf8a572cd60cfc52ffe8d4708052 100644
--- a/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
+++ b/src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
@@ -17,5 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
         <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 9ca081487e476ceb91ea1597273a03afde6240c9..7b8f2ff30fd980ca3ae660079b2b2765b2eede90 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -7,7 +7,7 @@ QtcPlugin {
 
     Depends { name: "qt"; submodules: ['gui'] }
     Depends { name: "Core" }
-    Depends { name: "CPlusPlus" }
+    Depends { name: "CppTools" }
     Depends { name: "RemoteLinux" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
diff --git a/src/plugins/analyzerbase/analyzerbase_dependencies.pri b/src/plugins/analyzerbase/analyzerbase_dependencies.pri
index 65e1ef20faae1bbf703f97a84872fdc248ba71a1..8ac7abd387526470293b3d89209009320abef177 100644
--- a/src/plugins/analyzerbase/analyzerbase_dependencies.pri
+++ b/src/plugins/analyzerbase/analyzerbase_dependencies.pri
@@ -2,3 +2,4 @@ include(../../plugins/coreplugin/coreplugin.pri)
 include(../../libs/cplusplus/cplusplus.pri)
 include(../../plugins/projectexplorer/projectexplorer.pri)
 include(../../plugins/remotelinux/remotelinux.pri)
+include(../../plugins/cpptools/cpptools.pri)
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 34bd225eaeaf03d46a472f14985cd1a1f1bf4d24..4608cffe8c99fdbd7413a56befc8355843d8d460 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -100,7 +100,11 @@ QtcPlugin {
         "uicodecompletionsupport.h",
         "cppcompletionassistprovider.cpp",
         "cppcompletionassistprovider.h",
-        "cppcodestylepreferencesfactory.h"
+        "cppcodestylepreferencesfactory.h",
+        "ModelManagerInterface.cpp",
+        "ModelManagerInterface.h",
+        "TypeHierarchyBuilder.cpp",
+        "TypeHierarchyBuilder.h"
     ]
 }
 
diff --git a/src/plugins/debugger/Debugger.pluginspec.in b/src/plugins/debugger/Debugger.pluginspec.in
index 1b4327cc0aec20da74ded7f0d2866d0478a1553d..77d13834f8a56890276b26d8864f779d50a85a32 100644
--- a/src/plugins/debugger/Debugger.pluginspec.in
+++ b/src/plugins/debugger/Debugger.pluginspec.in
@@ -17,6 +17,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
         <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
         <!-- Debugger plugin adds items to the editor\'s context menu -->
         <dependency name=\"CppEditor\" version=\"$$QTCREATOR_VERSION\" type=\"optional\"/>
     </dependencyList>
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index a05b953f7ff7c755845aa3b3a8b9dccfe5ea23f2..0bfef636e1b3956b92f96586ec8cb2a1271ac49b 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -120,6 +120,7 @@ plugin_vcsbase.depends = plugin_find
 plugin_vcsbase.depends += plugin_texteditor
 plugin_vcsbase.depends += plugin_coreplugin
 plugin_vcsbase.depends += plugin_projectexplorer
+plugin_vcsbase.depends += plugin_cpptools
 
 plugin_perforce.subdir = perforce
 plugin_perforce.depends = plugin_vcsbase
@@ -253,6 +254,7 @@ plugin_qmldesigner.depends += plugin_qmljseditor
 plugin_qmldesigner.depends += plugin_projectexplorer
 plugin_qmldesigner.depends += plugin_qt4projectmanager
 plugin_qmldesigner.depends += plugin_qmlprojectmanager
+plugin_qmldesigner.depends += plugin_cpptools
 
 plugin_qmljsinspector.subdir = qmljsinspector
 plugin_qmljsinspector.depends += plugin_projectexplorer
@@ -283,6 +285,7 @@ plugin_analyzerbase.subdir = analyzerbase
 plugin_analyzerbase.depends = plugin_coreplugin
 plugin_analyzerbase.depends += plugin_projectexplorer
 plugin_analyzerbase.depends += plugin_remotelinux
+plugin_analyzerbase.depends += plugin_cpptools
 
 plugin_valgrind.subdir = valgrind
 plugin_valgrind.depends = plugin_coreplugin
@@ -300,6 +303,7 @@ plugin_qmljstools.depends = plugin_projectexplorer
 plugin_qmljstools.depends += plugin_coreplugin
 plugin_qmljstools.depends += plugin_texteditor
 plugin_qmljstools.depends += plugin_qtsupport
+plugin_qmljstools.depends += plugin_cpptools
 
 plugin_macros.subdir = macros
 plugin_macros.depends = plugin_texteditor
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 463661112923c866780814380bf9a227c2244253..9c13cbbd1ebe530e1bf176c2009864c04790afea 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -8,7 +8,7 @@ QtcPlugin {
     Depends { name: "qt"; submodules: ['gui'] }
     Depends { name: "Core" }
     Depends { name: "LanguageUtils" }
-    Depends { name: "CPlusPlus" }
+    Depends { name: "CppTools" }
     Depends { name: "QmlJS" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
diff --git a/src/plugins/todo/Todo.pluginspec.in b/src/plugins/todo/Todo.pluginspec.in
index edbb711cd6025bc5baba9bf511a42749f4ec376e..ac2f43aba1de93e11bce3fe17081358a06ff7616 100644
--- a/src/plugins/todo/Todo.pluginspec.in
+++ b/src/plugins/todo/Todo.pluginspec.in
@@ -16,5 +16,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
     <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
     <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
     <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
+    <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
   </dependencyList>
 </plugin>
diff --git a/src/plugins/vcsbase/VcsBase.pluginspec.in b/src/plugins/vcsbase/VcsBase.pluginspec.in
index 276ae7e0dd8fd09046d14908efd3b8900f215e96..9d0844c05bbdbdccd6615c8e16927c1a5a642b71 100644
--- a/src/plugins/vcsbase/VcsBase.pluginspec.in
+++ b/src/plugins/vcsbase/VcsBase.pluginspec.in
@@ -17,5 +17,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
         <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"TextEditor\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"ProjectExplorer\" version=\"$$QTCREATOR_VERSION\"/>
+        <dependency name=\"CppTools\" version=\"$$QTCREATOR_VERSION\"/>
     </dependencyList>
 </plugin>
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index 3db7e2c69bb936e74e18de5523853dc3bf7b55a9..16784fecee7a009e5c7a6fe589a80f3a3a5e7cdd 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -11,7 +11,7 @@ QtcPlugin {
     Depends { name: "Find" }
     Depends { name: "cpp" }
     Depends { name: "qt"; submodules: ['gui'] }
-    Depends { name: "CPlusPlus" }
+    Depends { name: "CppTools" }
 
     cpp.includePaths: [
         ".",