3 files changed, 31 insertions, 23 deletions
diff --git a/src/plugins/cpptools/cppprojectfile.cpp b/src/plugins/cpptools/cppprojectfile.cpp
index ba42a24bae..ca87fbfb3c 100644
--- a/src/plugins/cpptools/cppprojectfile.cpp
+++ b/src/plugins/cpptools/cppprojectfile.cpp
@@ -102,6 +102,28 @@ bool ProjectFile::isSource(ProjectFile::Kind kind)
     }
 }
 
+QDebug operator<<(QDebug stream, const CppTools::ProjectFile &cxxFile)
+{
+    const char *kind;
+    switch (cxxFile.kind) {
+    case CppTools::ProjectFile::CHeader: kind = "CHeader"; break;
+    case CppTools::ProjectFile::CSource: kind = "CSource"; break;
+    case CppTools::ProjectFile::CXXHeader: kind = "CXXHeader"; break;
+    case CppTools::ProjectFile::CXXSource: kind = "CXXSource"; break;
+    case CppTools::ProjectFile::ObjCHeader: kind = "ObjCHeader"; break;
+    case CppTools::ProjectFile::ObjCSource: kind = "ObjCSource"; break;
+    case CppTools::ProjectFile::ObjCXXHeader: kind = "ObjCXXHeader"; break;
+    case CppTools::ProjectFile::ObjCXXSource: kind = "ObjCXXSource"; break;
+    case CppTools::ProjectFile::CudaSource: kind = "CudaSource"; break;
+    case CppTools::ProjectFile::OpenCLSource: kind = "OpenCLSource"; break;
+    default: kind = "INVALID"; break;
+    }
+    stream << cxxFile.path << QLatin1String(", ") << kind;
+    return stream;
+}
+
+namespace Internal {
+
 ProjectFileAdder::ProjectFileAdder(QList<ProjectFile> &files)
     : m_files(files)
 {
@@ -135,24 +157,6 @@ void ProjectFileAdder::addMapping(const char *mimeName, ProjectFile::Kind kind)
         m_mapping.append(Pair(mimeType, kind));
 }
 
-QDebug operator<<(QDebug stream, const CppTools::ProjectFile &cxxFile)
-{
-    const char *kind;
-    switch (cxxFile.kind) {
-    case CppTools::ProjectFile::CHeader: kind = "CHeader"; break;
-    case CppTools::ProjectFile::CSource: kind = "CSource"; break;
-    case CppTools::ProjectFile::CXXHeader: kind = "CXXHeader"; break;
-    case CppTools::ProjectFile::CXXSource: kind = "CXXSource"; break;
-    case CppTools::ProjectFile::ObjCHeader: kind = "ObjCHeader"; break;
-    case CppTools::ProjectFile::ObjCSource: kind = "ObjCSource"; break;
-    case CppTools::ProjectFile::ObjCXXHeader: kind = "ObjCXXHeader"; break;
-    case CppTools::ProjectFile::ObjCXXSource: kind = "ObjCXXSource"; break;
-    case CppTools::ProjectFile::CudaSource: kind = "CudaSource"; break;
-    case CppTools::ProjectFile::OpenCLSource: kind = "OpenCLSource"; break;
-    default: kind = "INVALID"; break;
-    }
-    stream << cxxFile.path << QLatin1String(", ") << kind;
-    return stream;
-}
-
+} // namespace Internal
 } // namespace CppTools
+
diff --git a/src/plugins/cpptools/cppprojectfile.h b/src/plugins/cpptools/cppprojectfile.h
index abbdbe4395..3fa3ec398c 100644
--- a/src/plugins/cpptools/cppprojectfile.h
+++ b/src/plugins/cpptools/cppprojectfile.h
@@ -68,7 +68,11 @@ public:
     Kind kind;
 };
 
-class CPPTOOLS_EXPORT ProjectFileAdder
+QDebug operator<<(QDebug stream, const CppTools::ProjectFile &cxxFile);
+
+namespace Internal {
+
+class ProjectFileAdder
 {
 public:
     ProjectFileAdder(QList<ProjectFile> &files);
@@ -86,8 +90,7 @@ private:
     QFileInfo m_fileInfo;
 };
 
-QDebug operator<<(QDebug stream, const CppTools::ProjectFile &cxxFile);
-
+} // namespace Internal
 } // namespace CppTools
 
 #endif // CPPTOOLS_CPPPROJECTFILE_H
diff --git a/src/plugins/cpptools/cppprojects.cpp b/src/plugins/cpptools/cppprojects.cpp
index 9788ccf505..e5583c6da6 100644
--- a/src/plugins/cpptools/cppprojects.cpp
+++ b/src/plugins/cpptools/cppprojects.cpp
@@ -43,6 +43,7 @@
 #include <QTextStream>
 
 using namespace CppTools;
+using namespace CppTools::Internal;
 using namespace ProjectExplorer;
 
 ProjectPart::ProjectPart()