1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
index fd7af452c7..85884edb46 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
@@ -35,7 +35,6 @@
 
 using namespace Core;
 using namespace Utils;
-using namespace ProjectExplorer;
 
 namespace CMakeProjectManager {
 
@@ -92,7 +91,7 @@ bool CMakeToolManager::registerCMakeTool(std::unique_ptr<CMakeTool> &&tool)
     if (!tool || Utils::contains(d->m_cmakeTools, tool.get()))
         return true;
 
-    const Core::Id toolId = tool->id();
+    const Utils::Id toolId = tool->id();
     QTC_ASSERT(toolId.isValid(),return false);
 
     //make sure the same id was not used before
@@ -139,7 +138,7 @@ void CMakeToolManager::setDefaultCMakeTool(const Id &id)
     ensureDefaultCMakeToolIsValid();
 }
 
-CMakeTool *CMakeToolManager::findByCommand(const FilePath &command)
+CMakeTool *CMakeToolManager::findByCommand(const Utils::FilePath &command)
 {
     return Utils::findOrDefault(d->m_cmakeTools, Utils::equal(&CMakeTool::cmakeExecutable, command));
 }
@@ -186,9 +185,9 @@ void CMakeToolManager::saveCMakeTools()
 
 void CMakeToolManager::ensureDefaultCMakeToolIsValid()
 {
-    const Core::Id oldId = d->m_defaultCMake;
+    const Utils::Id oldId = d->m_defaultCMake;
     if (d->m_cmakeTools.size() == 0) {
-        d->m_defaultCMake = Core::Id();
+        d->m_defaultCMake = Utils::Id();
     } else {
         if (findById(d->m_defaultCMake))
             return;