diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
index 2eb93fda00a..b116748fb03 100644
--- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
@@ -42,11 +42,9 @@ using namespace ProjectExplorer;
 
 namespace CMakeProjectManager {
 
-const char CMAKETOOL_COUNT_KEY[] = "CMakeTools.Count";
-const char CMAKETOOL_DEFAULT_KEY[] = "CMakeTools.Default";
-const char CMAKETOOL_DATA_KEY[] = "CMakeTools.";
-const char CMAKETOOL_FILE_VERSION_KEY[] = "Version";
-const char CMAKETOOL_FILENAME[] = "/cmaketools.xml";
+// --------------------------------------------------------------------
+// CMakeToolManagerPrivate:
+// --------------------------------------------------------------------
 
 class CMakeToolManagerPrivate
 {
@@ -57,6 +55,16 @@ public:
 };
 static CMakeToolManagerPrivate *d = nullptr;
 
+// --------------------------------------------------------------------
+// Helper:
+// --------------------------------------------------------------------
+
+const char CMAKETOOL_COUNT_KEY[] = "CMakeTools.Count";
+const char CMAKETOOL_DEFAULT_KEY[] = "CMakeTools.Default";
+const char CMAKETOOL_DATA_KEY[] = "CMakeTools.";
+const char CMAKETOOL_FILE_VERSION_KEY[] = "Version";
+const char CMAKETOOL_FILENAME[] = "/cmaketools.xml";
+
 static FileName userSettingsFileName()
 {
     return FileName::fromString(ICore::userResourcePath() + CMAKETOOL_FILENAME);
@@ -182,6 +190,10 @@ static QList<CMakeTool *> autoDetectCMakeTools()
     return found;
 }
 
+// --------------------------------------------------------------------
+// CMakeToolManager:
+// --------------------------------------------------------------------
+
 CMakeToolManager *CMakeToolManager::m_instance = nullptr;
 
 CMakeToolManager::CMakeToolManager(QObject *parent) : QObject(parent)