diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
index 46c50104ed9..e4f6d3bf5e7 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
@@ -51,8 +51,8 @@
 
 using namespace ProjectExplorer;
 
-using namespace CMakeProjectManager;
-using namespace CMakeProjectManager::Internal;
+namespace CMakeProjectManager {
+namespace Internal {
 
 namespace {
 void copySourcePathToClipboard(Utils::optional<QString> srcPath,
@@ -283,3 +283,6 @@ void CMakeTargetNode::setTargetInformation(const QList<Utils::FilePath> &artifac
                 + tmp.join("<br>");
     }
 }
+
+} // Internal
+} // CMakeBuildSystem
diff --git a/src/plugins/projectexplorer/buildsystem.h b/src/plugins/projectexplorer/buildsystem.h
index b73b459b7b1..96d37ec619d 100644
--- a/src/plugins/projectexplorer/buildsystem.h
+++ b/src/plugins/projectexplorer/buildsystem.h
@@ -86,7 +86,7 @@ public:
     const QList<BuildTargetInfo> applicationTargets() const;
     BuildTargetInfo buildTarget(const QString &buildKey) const;
 
-    class ParseGuard
+    class PROJECTEXPLORER_EXPORT ParseGuard
     {
         friend class BuildSystem;
         explicit ParseGuard(BuildSystem *p);