diff --git a/src/project_manager/ros_project.cpp b/src/project_manager/ros_project.cpp
index cab1bb45..f4afa567 100644
--- a/src/project_manager/ros_project.cpp
+++ b/src/project_manager/ros_project.cpp
@@ -127,7 +127,7 @@ const int UPDATE_INTERVAL = 300;
 
 ROSProject::ROSProject(const Utils::FilePath &fileName) :
     ProjectExplorer::Project(Constants::ROS_MIME_TYPE, fileName),
-    m_cppCodeModelUpdater(new CppEditor::CppProjectUpdater),
+    m_cppCodeModelUpdater(ProjectUpdaterFactory::createCppProjectUpdater()),
     m_project_loaded(false),
     m_asyncUpdateFutureInterface(nullptr),
     m_asyncBuildCodeModelFutureInterface(nullptr)
diff --git a/src/project_manager/ros_project.h b/src/project_manager/ros_project.h
index 84bacd27..4540bef3 100644
--- a/src/project_manager/ros_project.h
+++ b/src/project_manager/ros_project.h
@@ -32,6 +32,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <coreplugin/idocument.h>
 #include <projectexplorer/rawprojectpart.h>
+#include <projectexplorer/projectupdater.h>
 
 #include <QFuture>
 #include <QFutureWatcher>
@@ -39,10 +40,6 @@
 #include <QTimer>
 #include <QFileSystemWatcher>
 
-namespace CppEditor {
-    class CppProjectUpdater;
-}
-
 namespace ROSProjectManager {
 namespace Internal {
 
@@ -88,7 +85,7 @@ private slots:
     ROSUtils::PackageInfoMap        m_wsPackageInfo;
     ROSUtils::PackageBuildInfoMap   m_wsPackageBuildInfo;
 
-    CppEditor::CppProjectUpdater *m_cppCodeModelUpdater;
+    ProjectExplorer::ProjectUpdater *m_cppCodeModelUpdater;
 
     // Watching Directories to keep Project Tree updated
     QTimer m_asyncUpdateTimer;