diff --git a/src/plugins/analyzerbase/analyzerutils.cpp b/src/plugins/analyzerbase/analyzerutils.cpp
index cb221f045889118aa75a5f5d7e7597a49bc3dbb3..65e67457998dd7523df3877619af2127889d60ea 100644
--- a/src/plugins/analyzerbase/analyzerutils.cpp
+++ b/src/plugins/analyzerbase/analyzerutils.cpp
@@ -31,13 +31,14 @@
 
 #include "analyzerconstants.h"
 
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 #include <texteditor/basetexteditor.h>
 
 #include <utils/qtcassert.h>
 
 #include <cplusplus/ExpressionUnderCursor.h>
 #include <cplusplus/TypeOfExpression.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 
 #include <QTextCursor>
 
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
index 4257a5248ce2396d83b4ac801b6caf7d4a3860bb..2b4db4d84635dfdcd1bad2a1ea3acbec894027fc 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
@@ -49,7 +49,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/headerpath.h>
 #include <extensionsystem/pluginmanager.h>
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp
index d9918dd1ca5ba98aa7ec8318b5838311b8fd2363..d2d718b1d41b820f66aee10291c0813a772b005d 100644
--- a/src/plugins/classview/classviewmanager.cpp
+++ b/src/plugins/classview/classviewmanager.cpp
@@ -37,7 +37,7 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <texteditor/basetexteditor.h>
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 #include <cpptools/cpptoolsconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp
index 623ff78bd81c535073779fc34d3c716341d06e73..e312696faaaced38663f655ba4d6be9632b79126 100644
--- a/src/plugins/classview/classviewparser.cpp
+++ b/src/plugins/classview/classviewparser.cpp
@@ -38,7 +38,7 @@
 #include <cplusplus/Name.h>
 
 // other
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 #include <cplusplus/Overview.h>
 #include <cplusplus/Icons.h>
 #include <projectexplorer/projectexplorer.h>
diff --git a/src/plugins/classview/classviewparser.h b/src/plugins/classview/classviewparser.h
index fbf12963e5db6bc8f054068e3fd535c42d03d01c..b8ab34dde8c5a6d8a514b25254af1fba6272fbee 100644
--- a/src/plugins/classview/classviewparser.h
+++ b/src/plugins/classview/classviewparser.h
@@ -35,7 +35,6 @@
 #include "classviewparsertreeitem.h"
 
 #include <cplusplus/CPlusPlusForwardDeclarations.h>
-#include <cpptools/ModelManagerInterface.h>
 #include <cplusplus/CppDocument.h>
 
 // might be changed to forward declaration - is not done to be less dependent
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 823f17f374d2c12d94f637a78541a2d94e74eb8c..d59fbd26eafa32223f21cd5dff20bde8d591b83d 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -51,7 +51,7 @@
 #include <qtsupport/customexecutablerunconfiguration.h>
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 #include <utils/stringutils.h>
diff --git a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp
index 0e134c133ae1c33dc7d7680e982f76060ffad105..f490b2554cb90551a1417f951f928080373eed9e 100644
--- a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.cpp
@@ -31,7 +31,7 @@
 #include "cmakeproject.h"
 #include "cmakebuildconfiguration.h"
 
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 #include <projectexplorer/target.h>
 
 #include <QProcess>
diff --git a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h
index 96dc647cc6e63de302fa47eb869fd33a17a7ca55..c6d7f3c24c64c7105672e8230e759ac52b68a1a3 100644
--- a/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h
+++ b/src/plugins/cmakeprojectmanager/cmakeuicodemodelsupport.h
@@ -30,11 +30,12 @@
 #ifndef CMAKEUICODEMODELSUPPORT_H
 #define CMAKEUICODEMODELSUPPORT_H
 
-#include <cpptools/ModelManagerInterface.h>
 #include <cpptools/uicodecompletionsupport.h>
 
 #include <QDateTime>
 
+namespace CppTools { class CppModelManagerInterface; }
+
 namespace CMakeProjectManager {
 namespace Internal {
 
diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp
index ce4473f1067df4674e03462958266509d8a292ca..54238f45b26e07f137c78bce181a830ff3880b87 100644
--- a/src/plugins/cppeditor/cppelementevaluator.cpp
+++ b/src/plugins/cppeditor/cppelementevaluator.cpp
@@ -30,7 +30,7 @@
 #include "cppelementevaluator.h"
 
 #include <cpptools/cpptoolsreuse.h>
-#include <cpptools/TypeHierarchyBuilder.h>
+#include <cpptools/typehierarchybuilder.h>
 
 #include <cplusplus/ExpressionUnderCursor.h>
 #include <cplusplus/Icons.h>
diff --git a/src/plugins/cpptools/abstracteditorsupport.cpp b/src/plugins/cpptools/abstracteditorsupport.cpp
index b1a149c13bedfc75ed56ef1d42d667df78f06c7f..6410473e34d2cf3ac1ce00c2e6a3013f5854c25c 100644
--- a/src/plugins/cpptools/abstracteditorsupport.cpp
+++ b/src/plugins/cpptools/abstracteditorsupport.cpp
@@ -30,8 +30,7 @@
 #include "abstracteditorsupport.h"
 
 #include "cppfilesettingspage.h"
-#include "ModelManagerInterface.h"
-
+#include "cppmodelmanagerinterface.h"
 #include <cplusplus/Overview.h>
 
 #include <QDebug>
diff --git a/src/plugins/cpptools/builtinindexingsupport.h b/src/plugins/cpptools/builtinindexingsupport.h
index 8bd3b2ad69a13c406fe0f10e5f48cec8bc12fd7b..53b70c40dbc98474b0313e78da75e56ace0f8b17 100644
--- a/src/plugins/cpptools/builtinindexingsupport.h
+++ b/src/plugins/cpptools/builtinindexingsupport.h
@@ -31,7 +31,7 @@
 #define BUILTININDEXINGSUPPORT_H
 
 #include "cppindexingsupport.h"
-#include "ModelManagerInterface.h"
+#include "cppmodelmanagerinterface.h"
 
 #include <QFutureSynchronizer>
 
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index 09e66d02ae7551b096fa12fb15addc04fc031bfd..4d8283c1453f04352f70212adefca73b846c2bf8 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -30,7 +30,7 @@
 #include "cppfindreferences.h"
 
 #include "cpptoolsconstants.h"
-#include "ModelManagerInterface.h"
+#include "cppmodelmanagerinterface.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/futureprogress.h>
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index 44b4e34773827ae68ac65bf3d118fc764b3a9472..768129286d9b659f2686d37da2c27604d5e778a9 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -32,7 +32,7 @@
 
 #include "cpptools_global.h"
 #include "cpptoolsconstants.h"
-#include "ModelManagerInterface.h"
+#include "cppmodelmanagerinterface.h"
 
 #include <projectexplorer/project.h>
 #include <texteditor/basetexteditor.h>
diff --git a/src/plugins/cpptools/ModelManagerInterface.cpp b/src/plugins/cpptools/cppmodelmanagerinterface.cpp
similarity index 98%
rename from src/plugins/cpptools/ModelManagerInterface.cpp
rename to src/plugins/cpptools/cppmodelmanagerinterface.cpp
index 97992771801552843f62131d5a12ac839487dc82..da9cc55605b3423201e5a941a646c829a389ed48 100644
--- a/src/plugins/cpptools/ModelManagerInterface.cpp
+++ b/src/plugins/cpptools/cppmodelmanagerinterface.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "ModelManagerInterface.h"
+#include "cppmodelmanagerinterface.h"
 
 #include <cplusplus/pp-engine.h>
 
diff --git a/src/plugins/cpptools/ModelManagerInterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h
similarity index 100%
rename from src/plugins/cpptools/ModelManagerInterface.h
rename to src/plugins/cpptools/cppmodelmanagerinterface.h
diff --git a/src/plugins/cpptools/cpprefactoringchanges.h b/src/plugins/cpptools/cpprefactoringchanges.h
index d01637a6073773103e21e304f847d345eba12739..833553a19d9efd71d5dbe9cd666d61fed6df872d 100644
--- a/src/plugins/cpptools/cpprefactoringchanges.h
+++ b/src/plugins/cpptools/cpprefactoringchanges.h
@@ -31,7 +31,7 @@
 #define CPPREFACTORINGCHANGES_H
 
 #include "cpptools_global.h"
-#include "ModelManagerInterface.h"
+#include "cppmodelmanagerinterface.h"
 
 #include <texteditor/refactoringchanges.h>
 
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index ff8999f7fdd51aa6c646c0c1887f812cf7c198ee..f77e869d68e56cc33282801d4746098c66abfeb7 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -6,6 +6,7 @@ HEADERS += completionsettingspage.h \
     cppcurrentdocumentfilter.h \
     cppfunctionsfilter.h \
     cppmodelmanager.h \
+    cppmodelmanagerinterface.h \
     cpplocatorfilter.h \
     cpptools_global.h \
     cpptoolsconstants.h \
@@ -39,8 +40,7 @@ HEADERS += completionsettingspage.h \
     cpplocalsymbols.h \
     cppsemanticinfo.h \
     cppcompletionassistprovider.h \
-    ModelManagerInterface.h \
-    TypeHierarchyBuilder.h \
+    typehierarchybuilder.h \
     cppindexingsupport.h \
     builtinindexingsupport.h \
     cpppointerdeclarationformatter.h \
@@ -51,6 +51,7 @@ SOURCES += completionsettingspage.cpp \
     cppcurrentdocumentfilter.cpp \
     cppfunctionsfilter.cpp \
     cppmodelmanager.cpp \
+    cppmodelmanagerinterface.cpp \
     cpplocatorfilter.cpp \
     cpptoolseditorsupport.cpp \
     cpptoolsplugin.cpp \
@@ -82,8 +83,7 @@ SOURCES += completionsettingspage.cpp \
     cpplocalsymbols.cpp \
     cppsemanticinfo.cpp \
     cppcompletionassistprovider.cpp \
-    ModelManagerInterface.cpp \
-    TypeHierarchyBuilder.cpp \
+    typehierarchybuilder.cpp \
     cppindexingsupport.cpp \
     builtinindexingsupport.cpp \
     cpppointerdeclarationformatter.cpp \
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 6d3f78642e3f6c2c4b6bb9fde3e6ea4b4f8a9445..a6a98539b8d4198920cbf46556010c2a7626103c 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -17,10 +17,6 @@ QtcPlugin {
     Depends { name: "LanguageUtils" }
 
     files: [
-        "ModelManagerInterface.cpp",
-        "ModelManagerInterface.h",
-        "TypeHierarchyBuilder.cpp",
-        "TypeHierarchyBuilder.h",
         "abstracteditorsupport.cpp",
         "abstracteditorsupport.h",
         "commentssettings.cpp",
@@ -72,6 +68,8 @@ QtcPlugin {
         "cpplocatorfilter.h",
         "cppmodelmanager.cpp",
         "cppmodelmanager.h",
+        "cppmodelmanagerinterface.cpp",
+        "cppmodelmanagerinterface.h",
         "cppqtstyleindenter.cpp",
         "cppqtstyleindenter.h",
         "cpppointerdeclarationformatter.cpp",
@@ -102,6 +100,8 @@ QtcPlugin {
         "symbolfinder.h",
         "symbolsfindfilter.cpp",
         "symbolsfindfilter.h",
+        "typehierarchybuilder.cpp",
+        "typehierarchybuilder.h",
         "uicodecompletionsupport.cpp",
         "uicodecompletionsupport.h",
         "builtinindexingsupport.cpp",
diff --git a/src/plugins/cpptools/TypeHierarchyBuilder.cpp b/src/plugins/cpptools/typehierarchybuilder.cpp
similarity index 99%
rename from src/plugins/cpptools/TypeHierarchyBuilder.cpp
rename to src/plugins/cpptools/typehierarchybuilder.cpp
index 8fbce81509635aa612f43fec074991bef4a8f312..29e8ac5c7e3ba21dcd0d66bbbafb8e58550dd8f5 100644
--- a/src/plugins/cpptools/TypeHierarchyBuilder.cpp
+++ b/src/plugins/cpptools/typehierarchybuilder.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "TypeHierarchyBuilder.h"
+#include "typehierarchybuilder.h"
 
 #include <cplusplus/DependencyTable.h>
 #include <cplusplus/FindUsages.h>
diff --git a/src/plugins/cpptools/TypeHierarchyBuilder.h b/src/plugins/cpptools/typehierarchybuilder.h
similarity index 98%
rename from src/plugins/cpptools/TypeHierarchyBuilder.h
rename to src/plugins/cpptools/typehierarchybuilder.h
index ccbd8ac8302be99a5120224366c65d60f89ee1bc..64a6501a9d9df430d50981eaaa83cd374678c6a5 100644
--- a/src/plugins/cpptools/TypeHierarchyBuilder.h
+++ b/src/plugins/cpptools/typehierarchybuilder.h
@@ -31,7 +31,7 @@
 #define CPPTOOLS_TYPEHIERARCHYBUILDER_H
 
 #include "cpptools_global.h"
-#include "ModelManagerInterface.h"
+#include "cppmodelmanagerinterface.h"
 
 #include <cplusplus/Overview.h>
 
diff --git a/src/plugins/cpptools/uicodecompletionsupport.h b/src/plugins/cpptools/uicodecompletionsupport.h
index 219e13bc9435746edd8a2216ba77f5236aad3d0e..6bfd86430f6aa85849af61ab53b71a69bc9a2431 100644
--- a/src/plugins/cpptools/uicodecompletionsupport.h
+++ b/src/plugins/cpptools/uicodecompletionsupport.h
@@ -33,7 +33,7 @@
 
 #include "cpptools_global.h"
 #include "abstracteditorsupport.h"
-#include "ModelManagerInterface.h"
+#include "cppmodelmanagerinterface.h"
 
 #include <QDateTime>
 #include <QProcess>
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 2f4f2b35c414bde929fedcb19981a7e83d51cf7e..78bcff49d25ddecd51a74afed3ffb885b0931095 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -65,7 +65,7 @@
 #include <utils/hostosinfo.h>
 
 #include <cplusplus/findcdbbreakpoint.h>
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 
 #include <QDir>
 #include <QMessageBox>
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index cb8a25351912b08a70e5dcd892e48d8770ec0bb1..88e4fd03286d5a6d00dee54c823b055933b3cefc 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -77,7 +77,7 @@
 #include <coreplugin/modemanager.h>
 
 #include <cppeditor/cppeditorconstants.h>
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 
 #include <extensionsystem/invoker.h>
 
diff --git a/src/plugins/debugger/sourceutils.cpp b/src/plugins/debugger/sourceutils.cpp
index 85d8db624ac5e5ca23e51d38adecb9ac847d9b77..c495151e415a594640f32ca7f57e8ba400ee0f76 100644
--- a/src/plugins/debugger/sourceutils.cpp
+++ b/src/plugins/debugger/sourceutils.cpp
@@ -36,7 +36,7 @@
 #include <cpptools/abstracteditorsupport.h>
 #include <cpptools/cppprojectfile.h>
 
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 #include <cplusplus/ExpressionUnderCursor.h>
 #include <cplusplus/Overview.h>
 
diff --git a/src/plugins/designer/codemodelhelpers.cpp b/src/plugins/designer/codemodelhelpers.cpp
index 2a4225033fafb7a1969f9befebf4da6eb14191f9..ffb136080b6cba775602c625cc22070321561913 100644
--- a/src/plugins/designer/codemodelhelpers.cpp
+++ b/src/plugins/designer/codemodelhelpers.cpp
@@ -29,7 +29,7 @@
 
 #include "codemodelhelpers.h"
 
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/project.h>
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index d08c6686dc4dd8d53e86ab116df4bf27a1483766..ea3b11a373d9b2678883956b3915319a1cb27c03 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -38,7 +38,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
 #include <cpptools/cpptoolsconstants.h>
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/abi.h>
 #include <projectexplorer/buildsteplist.h>
diff --git a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
index 3c1337e229932501324952dbc0cd6b2fbcfa59d8..5bbe9e61bd1f59906a115c5a0e4f2ea2bbb7dcc6 100644
--- a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
+++ b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
@@ -32,7 +32,7 @@
 #include <qmljs/qmljsinterpreter.h>
 #include <cplusplus/Overview.h>
 #include <cplusplus/TypeOfExpression.h>
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp
index 1dd9ce9c852a7dce0a02faa7394ce79aebe90adc..18de28ba272a2fc872e532a282ea8c7b8fc81049 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -37,7 +37,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/messagemanager.h>
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 #include <qmljs/qmljsbind.h>
 #include <texteditor/basetexteditor.h>
 #include <projectexplorer/buildconfiguration.h>
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index d504611e685199adade4e66cf63546d4bbf10911..ee10f0d4e337309e55c53e5f7fe9dbd09cdb6f79 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -51,7 +51,7 @@
 #include <qtsupport/profilereader.h>
 #include <qtsupport/qtkitinformation.h>
 
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/stringutils.h>
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 948ad8937a9ca39753acec23ebe52710ff7b063e..ef4e079a26b31e305ccfbd530f9cee48d2240269 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -41,7 +41,7 @@
 #include <coreplugin/icontext.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/documentmanager.h>
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 #include <qmljstools/qmljsmodelmanager.h>
 #include <projectexplorer/buildtargetinfo.h>
 #include <projectexplorer/deploymentdata.h>
diff --git a/src/plugins/todo/cpptodoitemsscanner.h b/src/plugins/todo/cpptodoitemsscanner.h
index f1368593cf25a359c7820eecc8cc73f5afbdf9dc..8b74469805de6895922e5f65804d2ac9341ec994 100644
--- a/src/plugins/todo/cpptodoitemsscanner.h
+++ b/src/plugins/todo/cpptodoitemsscanner.h
@@ -33,7 +33,7 @@
 
 #include "todoitemsscanner.h"
 
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 
 namespace Todo {
 namespace Internal {
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 4eda4e1ecfc55800e2b5b9be80789afae5457611..34c390200c58608d144912787db74c41a6dc2112 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -39,7 +39,7 @@
 #include "vcsplugin.h"
 
 #include <aggregation/aggregate.h>
-#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cppmodelmanagerinterface.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <utils/checkablemessagebox.h>