C++: Remove unneeded qualifications

Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I6fbe13ddc1485efe95c3156097bf41d90c0febac
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>

54 files changed, 303 insertions, 305 deletions

diff --git a/src/libs/3rdparty/cplusplus/Control.cpp b/src/libs/3rdparty/cplusplus/Control.cpp
index 75f49d72b1..afdd679056 100644
--- a/src/libs/3rdparty/cplusplus/Control.cpp
+++ b/src/libs/3rdparty/cplusplus/Control.cpp
@@ -827,7 +827,7 @@ TopLevelDeclarationProcessor *Control::topLevelDeclarationProcessor() const
     return d->processor;
 }
 
-void Control::setTopLevelDeclarationProcessor(CPlusPlus::TopLevelDeclarationProcessor *processor)
+void Control::setTopLevelDeclarationProcessor(TopLevelDeclarationProcessor *processor)
 {
     d->processor = processor;
 }
diff --git a/src/libs/3rdparty/cplusplus/Scope.cpp b/src/libs/3rdparty/cplusplus/Scope.cpp
index ab45887e8c..107df10dff 100644
--- a/src/libs/3rdparty/cplusplus/Scope.cpp
+++ b/src/libs/3rdparty/cplusplus/Scope.cpp
@@ -28,9 +28,9 @@
 
 #include <cstring>
 
-using namespace CPlusPlus;
+namespace CPlusPlus {
 
-class CPlusPlus::SymbolTable
+class SymbolTable
 {
     SymbolTable(const SymbolTable &other);
     void operator =(const SymbolTable &other);
@@ -293,3 +293,5 @@ unsigned Scope::endOffset() const
 
 void Scope::setEndOffset(unsigned offset)
 { _endOffset = offset; }
+
+} // namespace CPlusPlus
diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index e28f089322..3c98a24989 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -503,7 +503,7 @@ QString Document::functionAt(int line, int column, int *lineOpeningDeclaratorPar
     if (line < 1 || column < 1)
         return QString();
 
-    CPlusPlus::Symbol *symbol = lastVisibleSymbolAt(line, column);
+    Symbol *symbol = lastVisibleSymbolAt(line, column);
     if (!symbol)
         return QString();
 
diff --git a/src/libs/cplusplus/LookupItem.cpp b/src/libs/cplusplus/LookupItem.cpp
index 4d41328322..66ca1a8226 100644
--- a/src/libs/cplusplus/LookupItem.cpp
+++ b/src/libs/cplusplus/LookupItem.cpp
@@ -38,7 +38,7 @@
 
 using namespace CPlusPlus;
 
-uint CPlusPlus::qHash(const CPlusPlus::LookupItem &key)
+uint CPlusPlus::qHash(const LookupItem &key)
 {
     const uint h1 = QT_PREPEND_NAMESPACE(qHash)(key.type().type());
     const uint h2 = QT_PREPEND_NAMESPACE(qHash)(key.scope());
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 0172584115..85e9b72642 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -747,7 +747,7 @@ bool ResolveExpression::visit(SimpleNameAST *ast)
             if (typeItems.empty())
                 continue;
 
-            CPlusPlus::Clone cloner(_context.bindings()->control().data());
+            Clone cloner(_context.bindings()->control().data());
 
             for (int n = 0; n < typeItems.size(); ++ n) {
                 FullySpecifiedType newType = cloner.type(typeItems[n].type(), 0);
diff --git a/src/plugins/clangcodemodel/clangcompleter.cpp b/src/plugins/clangcodemodel/clangcompleter.cpp
index fee1b12f35..3e39473894 100644
--- a/src/plugins/clangcodemodel/clangcompleter.cpp
+++ b/src/plugins/clangcodemodel/clangcompleter.cpp
@@ -46,12 +46,16 @@
 
 //#define TIME_COMPLETION
 
-class ClangCodeModel::ClangCompleter::PrivateData
+using namespace ClangCodeModel::Internal;
+
+namespace ClangCodeModel {
+
+class ClangCompleter::PrivateData
 {
 public:
     PrivateData()
         : m_mutex(QMutex::Recursive)
-        , m_unit(Internal::Unit::create())
+        , m_unit(Unit::create())
         , m_isSignalSlotCompletion(false)
     {
     }
@@ -60,7 +64,7 @@ public:
     {
     }
 
-    bool parseFromFile(const Internal::UnsavedFiles &unsavedFiles)
+    bool parseFromFile(const UnsavedFiles &unsavedFiles)
     {
         Q_ASSERT(!m_unit->isLoaded());
         if (m_unit->fileName().isEmpty())
@@ -80,13 +84,10 @@ public:
 
 public:
     QMutex m_mutex;
-    Internal::Unit::Ptr m_unit;
+    Unit::Ptr m_unit;
     bool m_isSignalSlotCompletion;
 };
 
-using namespace ClangCodeModel;
-using namespace ClangCodeModel::Internal;
-
 /**
  * @brief Constructs with highest possible priority
  */
@@ -127,7 +128,7 @@ QString ClangCompleter::fileName() const
 void ClangCompleter::setFileName(const QString &fileName)
 {
     if (d->m_unit->fileName() != fileName) {
-        d->m_unit = Internal::Unit::create(fileName);
+        d->m_unit = Unit::create(fileName);
     }
 }
 
@@ -208,3 +209,5 @@ QMutex *ClangCompleter::mutex() const
 {
     return &d->m_mutex;
 }
+
+} // namespace ClangCodeModel
diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp
index 2c845d785c..c00d5b1e28 100644
--- a/src/plugins/clangcodemodel/clangcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangcompletion.cpp
@@ -190,7 +190,7 @@ namespace Internal {
 // ClangCompletionAssistProvider
 // -----------------------------
 ClangCompletionAssistProvider::ClangCompletionAssistProvider()
-    : m_clangCompletionWrapper(new ClangCodeModel::ClangCompleter)
+    : m_clangCompletionWrapper(new ClangCompleter)
 {
 }
 
@@ -215,15 +215,15 @@ AssistInterface *ClangCompletionAssistProvider::createAssistInterface(
     foreach (ProjectPart::Ptr part, parts) {
         if (part.isNull())
             continue;
-        options = ClangCodeModel::Utils::createClangOptions(part, filePath);
+        options = Utils::createClangOptions(part, filePath);
         pchInfo = PchManager::instance()->pchInfo(part);
         if (!pchInfo.isNull())
-            options.append(ClangCodeModel::Utils::createPCHInclusionOptions(pchInfo->fileName()));
+            options.append(Utils::createPCHInclusionOptions(pchInfo->fileName()));
         headerPaths = part->headerPaths;
         break;
     }
 
-    return new ClangCodeModel::ClangCompletionAssistInterface(
+    return new ClangCompletionAssistInterface(
                 m_clangCompletionWrapper,
                 document, position, filePath, reason,
                 options, headerPaths, pchInfo);
@@ -287,7 +287,7 @@ public:
     virtual int activeArgument(const QString &prefix) const;
 
 private:
-    QList<ClangCodeModel::CodeCompletionResult> m_functionSymbols;
+    QList<CodeCompletionResult> m_functionSymbols;
     mutable int m_currentArg;
 };
 
@@ -323,7 +323,7 @@ int ClangFunctionHintModel::activeArgument(const QString &prefix) const
     SimpleLexer tokenize;
     Tokens tokens = tokenize(prefix);
     for (int i = 0; i < tokens.count(); ++i) {
-        const CPlusPlus::Token &tk = tokens.at(i);
+        const Token &tk = tokens.at(i);
         if (tk.is(T_LPAREN))
             ++parcount;
         else if (tk.is(T_RPAREN))
@@ -544,7 +544,7 @@ ClangCompletionAssistInterface::ClangCompletionAssistInterface(ClangCompleter::P
         const QString &fileName,
         AssistReason reason,
         const QStringList &options,
-        const QList<CppTools::ProjectPart::HeaderPath> &headerPaths,
+        const QList<ProjectPart::HeaderPath> &headerPaths,
         const PchInfo::Ptr &pchInfo)
     : AssistInterface(document, position, fileName, reason)
     , m_clangWrapper(clangWrapper)
@@ -719,7 +719,7 @@ int ClangCompletionAssistProcessor::startOfOperator(int pos,
         tokenize.setSkipComments(false);
         const Tokens &tokens = tokenize(tc.block().text(), BackwardsScanner::previousBlockState(tc.block()));
         const int tokenIdx = SimpleLexer::tokenBefore(tokens, qMax(0, tc.positionInBlock() - 1)); // get the token at the left of the cursor
-        const CPlusPlus::Token tk = (tokenIdx == -1) ? CPlusPlus::Token() : tokens.at(tokenIdx);
+        const Token tk = (tokenIdx == -1) ? Token() : tokens.at(tokenIdx);
 
         if (*kind == T_DOXY_COMMENT && !(tk.is(T_DOXY_COMMENT) || tk.is(T_CPP_DOXY_COMMENT))) {
             *kind = T_EOF_SYMBOL;
@@ -740,7 +740,7 @@ int ClangCompletionAssistProcessor::startOfOperator(int pos,
         }
         else if (*kind == T_LPAREN) {
             if (tokenIdx > 0) {
-                const CPlusPlus::Token &previousToken = tokens.at(tokenIdx - 1); // look at the token at the left of T_LPAREN
+                const Token &previousToken = tokens.at(tokenIdx - 1); // look at the token at the left of T_LPAREN
                 switch (previousToken.kind()) {
                 case T_IDENTIFIER:
                 case T_GREATER:
@@ -761,7 +761,7 @@ int ClangCompletionAssistProcessor::startOfOperator(int pos,
             if (tokens.size() >= 3) {
                 if (tokens.at(0).is(T_POUND) && tokens.at(1).is(T_IDENTIFIER) && (tokens.at(2).is(T_STRING_LITERAL) ||
                                                                                   tokens.at(2).is(T_ANGLE_STRING_LITERAL))) {
-                    const CPlusPlus::Token &directiveToken = tokens.at(1);
+                    const Token &directiveToken = tokens.at(1);
                     QString directive = tc.block().text().mid(directiveToken.bytesBegin(),
                                                               directiveToken.bytes());
                     if (directive == QLatin1String("include") ||
@@ -830,7 +830,7 @@ bool ClangCompletionAssistProcessor::accepts() const
                     tokenize.setSkipComments(false);
                     const Tokens &tokens = tokenize(tc.block().text(), BackwardsScanner::previousBlockState(tc.block()));
                     const int tokenIdx = SimpleLexer::tokenBefore(tokens, qMax(0, tc.positionInBlock() - 1));
-                    const CPlusPlus::Token tk = (tokenIdx == -1) ? CPlusPlus::Token() : tokens.at(tokenIdx);
+                    const Token tk = (tokenIdx == -1) ? Token() : tokens.at(tokenIdx);
 
                     if (!tk.isComment() && !tk.isLiteral()) {
                         return true;
@@ -839,7 +839,7 @@ bool ClangCompletionAssistProcessor::accepts() const
                                && tokens.at(0).kind() == T_POUND
                                && tokens.at(1).kind() == T_IDENTIFIER) {
                         const QString &line = tc.block().text();
-                        const CPlusPlus::Token &idToken = tokens.at(1);
+                        const Token &idToken = tokens.at(1);
                         const QStringRef &identifier =
                                 line.midRef(idToken.bytesBegin(),
                                             idToken.bytesEnd() - idToken.bytesBegin());
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index 55a4ee8f61..15df82cae5 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -66,5 +66,5 @@ CppTools::CppCompletionAssistProvider *ModelManagerSupport::completionAssistProv
 CppTools::BaseEditorDocumentProcessor *ModelManagerSupport::editorDocumentProcessor(
         TextEditor::TextDocument *baseTextDocument)
 {
-    return new ClangCodeModel::ClangEditorDocumentProcessor(baseTextDocument);
+    return new ClangEditorDocumentProcessor(baseTextDocument);
 }
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp
index 82cbbd5483..f985d07978 100644
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -75,7 +75,7 @@ UnsavedFiles createUnsavedFiles(WorkingCopy workingCopy)
     // TODO: Reason: the UnsavedFile needs a QByteArray.
 
     QSet< ::Utils::FileName> modifiedFiles;
-    foreach (IDocument *doc, Core::DocumentManager::modifiedDocuments())
+    foreach (IDocument *doc, DocumentManager::modifiedDocuments())
         modifiedFiles.insert(doc->filePath());
 
     UnsavedFiles result;
@@ -112,7 +112,7 @@ QStringList createClangOptions(const ProjectPart::Ptr &pPart, const QString &fil
 
 static QString getResourceDir()
 {
-    QDir dir(Core::ICore::instance()->resourcePath() + QLatin1String("/cplusplus/clang/") +
+    QDir dir(ICore::instance()->resourcePath() + QLatin1String("/cplusplus/clang/") +
              QLatin1String(CLANG_VERSION) + QLatin1String("/include"));
     if (!dir.exists() || !QFileInfo(dir, QLatin1String("stdint.h")).exists())
         dir = QDir(QLatin1String(CLANG_RESOURCE_DIR));
@@ -144,18 +144,17 @@ QStringList createClangOptions(const ProjectPart::Ptr &pPart, ProjectFile::Kind
         result << QLatin1String("-v");
 
     const bool objcExt = pPart->languageExtensions & ProjectPart::ObjectiveCExtensions;
-    result << CppTools::CompilerOptionsBuilder::createLanguageOption(fileKind, objcExt);
-    result << CppTools::CompilerOptionsBuilder::createOptionsForLanguage(
-                                                      pPart->languageVersion,
-                                                      pPart->languageExtensions,
-                                                      maybeIncludeBorlandExtensions());
-    result << CppTools::CompilerOptionsBuilder::createDefineOptions(pPart->toolchainDefines);
-    result << CppTools::CompilerOptionsBuilder::createDefineOptions(pPart->projectDefines);
-    result << CppTools::CompilerOptionsBuilder::createHeaderPathOptions(pPart->headerPaths,
-                                                                        isBlacklisted);
+    result << CompilerOptionsBuilder::createLanguageOption(fileKind, objcExt);
+    result << CompilerOptionsBuilder::createOptionsForLanguage(
+                  pPart->languageVersion,
+                  pPart->languageExtensions,
+                  maybeIncludeBorlandExtensions());
+    result << CompilerOptionsBuilder::createDefineOptions(pPart->toolchainDefines);
+    result << CompilerOptionsBuilder::createDefineOptions(pPart->projectDefines);
+    result << CompilerOptionsBuilder::createHeaderPathOptions(pPart->headerPaths, isBlacklisted);
 
     // Inject header file
-    static const QString injectedHeader = Core::ICore::instance()->resourcePath()
+    static const QString injectedHeader = ICore::instance()->resourcePath()
             + QLatin1String("/cplusplus/qt%1-qobjectdefs-injected.h");
 //    if (qtVersion == ProjectPart::Qt4)
 //        opts << QLatin1String("-include") << injectedHeader.arg(QLatin1Char('4'));
diff --git a/src/plugins/clangcodemodel/indexer.cpp b/src/plugins/clangcodemodel/indexer.cpp
index 74a8f45ec0..5e37536390 100644
--- a/src/plugins/clangcodemodel/indexer.cpp
+++ b/src/plugins/clangcodemodel/indexer.cpp
@@ -244,7 +244,7 @@ protected:
             indexingResults.reserve(m_allFiles.size());
 
             foreach (const QString &fn, m_allFiles.keys()) {
-                QVector<ClangCodeModel::Symbol> symbols; unfoldSymbols(symbols, fn);
+                QVector<Symbol> symbols; unfoldSymbols(symbols, fn);
                 QSet<QString> processedFiles = QSet<QString>::fromList(m_allFiles.keys());
                 Unit::Ptr unit = Unit::create(fn);
                 IndexingResult indexingResult(symbols, processedFiles, unit, projectPart);
@@ -487,18 +487,18 @@ protected:
         }
     }
 
-    void unfoldSymbols(QVector<ClangCodeModel::Symbol> &result, const QString &fileName) {
+    void unfoldSymbols(QVector<Symbol> &result, const QString &fileName) {
         const QVector<Symbol *> symbolsForFile = file(fileName)->symbols();
         foreach (const Symbol *s, symbolsForFile) {
             unfoldSymbols(s, result);
         }
     }
 
-    void unfoldSymbols(const Symbol *s, QVector<ClangCodeModel::Symbol> &result) {
+    void unfoldSymbols(const Symbol *s, QVector<Symbol> &result) {
         if (!s->file)
             return;
 
-        ClangCodeModel::Symbol sym;
+        Symbol sym;
         sym.m_name = s->spellingName;
         sym.m_qualification = s->spellingName;
 
@@ -509,16 +509,16 @@ protected:
         sym.m_location = SourceLocation(s->file->name(), s->line, s->column, s->offset);
 
         switch (s->kind) {
-        case CXCursor_EnumDecl: sym.m_kind = ClangCodeModel::Symbol::Enum; break;
+        case CXCursor_EnumDecl: sym.m_kind = Symbol::Enum; break;
         case CXCursor_StructDecl:
-        case CXCursor_ClassDecl: sym.m_kind = ClangCodeModel::Symbol::Class; break;
-        case CXCursor_CXXMethod: sym.m_kind = ClangCodeModel::Symbol::Method; break;
+        case CXCursor_ClassDecl: sym.m_kind = Symbol::Class; break;
+        case CXCursor_CXXMethod: sym.m_kind = Symbol::Method; break;
         case CXCursor_FunctionTemplate:
-        case CXCursor_FunctionDecl: sym.m_kind = ClangCodeModel::Symbol::Function; break;
-        case CXCursor_DeclStmt: sym.m_kind = ClangCodeModel::Symbol::Declaration; break;
-        case CXCursor_Constructor: sym.m_kind = ClangCodeModel::Symbol::Constructor; break;
-        case CXCursor_Destructor: sym.m_kind = ClangCodeModel::Symbol::Destructor; break;
-        default: sym.m_kind = ClangCodeModel::Symbol::Unknown; break;
+        case CXCursor_FunctionDecl: sym.m_kind = Symbol::Function; break;
+        case CXCursor_DeclStmt: sym.m_kind = Symbol::Declaration; break;
+        case CXCursor_Constructor: sym.m_kind = Symbol::Constructor; break;
+        case CXCursor_Destructor: sym.m_kind = Symbol::Destructor; break;
+        default: sym.m_kind = Symbol::Unknown; break;
         }
 
         result.append(sym);
@@ -588,7 +588,7 @@ restart:
                 goto restart;
             }
 
-            QStringList opts = ClangCodeModel::Utils::createClangOptions(pPart, fd.m_fileName);
+            QStringList opts = Utils::createClangOptions(pPart, fd.m_fileName);
             if (!pchInfo.isNull())
                 opts.append(Utils::createPCHInclusionOptions(pchInfo->fileName()));
 
diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp
index f70cb60fba..c179d878c4 100644
--- a/src/plugins/classview/classviewmanager.cpp
+++ b/src/plugins/classview/classviewmanager.cpp
@@ -369,7 +369,7 @@ void Manager::onProjectListChanged()
    \sa CppTools::Constants::TASK_INDEX
 */
 
-void Manager::onTaskStarted(Core::Id type)
+void Manager::onTaskStarted(Id type)
 {
     if (type != CppTools::Constants::TASK_INDEX)
         return;
@@ -385,7 +385,7 @@ void Manager::onTaskStarted(Core::Id type)
    \sa CppTools::Constants::TASK_INDEX
 */
 
-void Manager::onAllTasksFinished(Core::Id type)
+void Manager::onAllTasksFinished(Id type)
 {
     if (type != CppTools::Constants::TASK_INDEX)
         return;
diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp
index 3dc19a1250..20d05940a7 100644
--- a/src/plugins/classview/classviewparser.cpp
+++ b/src/plugins/classview/classviewparser.cpp
@@ -718,25 +718,24 @@ void Parser::emitCurrentTree()
     Generates a project node file list for the root node \a node.
 */
 
-QStringList Parser::projectNodeFileList(const ProjectExplorer::FolderNode *node) const
+QStringList Parser::projectNodeFileList(const FolderNode *node) const
 {
     QStringList list;
     if (!node)
         return list;
 
-    QList<ProjectExplorer::FileNode *> fileNodes = node->fileNodes();
-    QList<ProjectExplorer::FolderNode *> subFolderNodes = node->subFolderNodes();
+    QList<FileNode *> fileNodes = node->fileNodes();
+    QList<FolderNode *> subFolderNodes = node->subFolderNodes();
 
-    foreach (const ProjectExplorer::FileNode *file, fileNodes) {
+    foreach (const FileNode *file, fileNodes) {
         if (file->isGenerated())
             continue;
 
         list << file->path();
     }
 
-    foreach (const ProjectExplorer::FolderNode *folder, subFolderNodes) {
-        if (folder->nodeType() != ProjectExplorer::FolderNodeType
-                && folder->nodeType() != ProjectExplorer::VirtualFolderNodeType)
+    foreach (const FolderNode *folder, subFolderNodes) {
+        if (folder->nodeType() != FolderNodeType && folder->nodeType() != VirtualFolderNodeType)
             continue;
         list << projectNodeFileList(folder);
     }
@@ -751,8 +750,7 @@ QStringList Parser::projectNodeFileList(const ProjectExplorer::FolderNode *node)
     Returns a list of projects which were added to the item.
 */
 
-QStringList Parser::addProjectNode(const ParserTreeItem::Ptr &item,
-                                     const ProjectExplorer::ProjectNode *node)
+QStringList Parser::addProjectNode(const ParserTreeItem::Ptr &item, const ProjectNode *node)
 {
     QStringList projectList;
     if (!node)
@@ -777,9 +775,9 @@ QStringList Parser::addProjectNode(const ParserTreeItem::Ptr &item,
     }
 
     // subnodes
-    QList<ProjectExplorer::ProjectNode *> projectNodes = node->subProjectNodes();
+    QList<ProjectNode *> projectNodes = node->subProjectNodes();
 
-    foreach (const ProjectExplorer::ProjectNode *project, projectNodes) {
+    foreach (const ProjectNode *project, projectNodes) {
         ParserTreeItem::Ptr itemPrj(new ParserTreeItem());
         SymbolInformation information(project->displayName(), project->path());
 
@@ -813,11 +811,10 @@ QStringList Parser::getAllFiles(const ProjectNode *node)
         d->cachedPrjFileLists[nodePath] = fileList;
     }
     // subnodes
-    QList<ProjectExplorer::ProjectNode *> projectNodes = node->subProjectNodes();
+    QList<ProjectNode *> projectNodes = node->subProjectNodes();
 
-    foreach (const ProjectExplorer::ProjectNode *project, projectNodes) {
+    foreach (const ProjectNode *project, projectNodes)
         fileList += getAllFiles(project);
-    }
     return fileList;
 }
 
diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
index 94f3bc9842..9ec2110916 100644
--- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
+++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
@@ -1342,7 +1342,7 @@ void CppCodeModelInspectorDialog::onWorkingCopyDocumentSelected(const QModelInde
 
 void CppCodeModelInspectorDialog::refresh()
 {
-    CppTools::CppModelManager *cmmi = CppTools::CppModelManager::instance();
+    CppModelManager *cmmi = CppModelManager::instance();
 
     const int oldSnapshotIndex = m_ui->snapshotSelector->currentIndex();
     const bool selectEditorRelevant
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 3b4c568d71..565590cb88 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -105,7 +105,7 @@ public:
     CppEditorWidgetPrivate(CppEditorWidget *q);
 
 public:
-    QPointer<CppTools::CppModelManager> m_modelManager;
+    QPointer<CppModelManager> m_modelManager;
 
     CppEditorDocument *m_cppEditorDocument;
     CppEditorOutline *m_cppEditorOutline;
@@ -114,7 +114,7 @@ public:
 
     CppLocalRenaming m_localRenaming;
 
-    CppTools::SemanticInfo m_lastSemanticInfo;
+    SemanticInfo m_lastSemanticInfo;
     QuickFixOperations m_quickFixes;
 
     CppUseSelectionsUpdater m_useSelectionsUpdater;
@@ -172,7 +172,7 @@ void CppEditorWidget::finalizeInitialization()
             SLOT(updateSelectionsForVariableUnderCursor(QList<QTextEdit::ExtraSelection>)));
 
     connect(&d->m_useSelectionsUpdater, &CppUseSelectionsUpdater::finished,
-            [this] (CppTools::SemanticInfo::LocalUseMap localUses) {
+            [this] (SemanticInfo::LocalUseMap localUses) {
                 QTC_CHECK(isSemanticInfoValidExceptLocalUses());
                 d->m_lastSemanticInfo.localUsesUpdated = true;
                 d->m_lastSemanticInfo.localUses = localUses;
@@ -242,7 +242,7 @@ CppEditorDocument *CppEditorWidget::cppEditorDocument() const
     return d->m_cppEditorDocument;
 }
 
-CppTools::CppEditorOutline *CppEditorWidget::outline() const
+CppEditorOutline *CppEditorWidget::outline() const
 {
     return d->m_cppEditorOutline;
 }
@@ -588,7 +588,7 @@ void CppEditorWidget::applyFontSettings()
 
 void CppEditorWidget::slotCodeStyleSettingsChanged(const QVariant &)
 {
-    CppTools::QtStyleCodeFormatter formatter;
+    QtStyleCodeFormatter formatter;
     formatter.invalidateCache(document());
 }
 
diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp
index 884b31e3ee..527252d0c9 100644
--- a/src/plugins/cppeditor/cppeditorplugin.cpp
+++ b/src/plugins/cppeditor/cppeditorplugin.cpp
@@ -95,7 +95,7 @@ public:
         setEditorWidgetCreator([]() { return new CppEditorWidget; });
         setEditorCreator([]() { return new CppEditor; });
         setAutoCompleterCreator([]() { return new CppAutoCompleter; });
-        setCommentStyle(Utils::CommentDefinition::CppStyle);
+        setCommentStyle(CommentDefinition::CppStyle);
         setCodeFoldingSupported(true);
         setMarksVisible(true);
         setParenthesesMatchingEnabled(true);
@@ -107,7 +107,7 @@ public:
 
         addHoverHandler(new CppHoverHandler);
 
-        if (!Utils::HostOsInfo::isMacHost() && !Utils::HostOsInfo::isWindowsHost()) {
+        if (!HostOsInfo::isMacHost() && !HostOsInfo::isWindowsHost()) {
             FileIconProvider::registerIconOverlayForMimeType(
                         QIcon(creatorTheme()->imageFile(Theme::IconOverlayCppSource, QLatin1String(":/cppeditor/images/qt_cpp.png"))),
                         Constants::CPP_SOURCE_MIMETYPE);
@@ -153,7 +153,7 @@ CppQuickFixAssistProvider *CppEditorPlugin::quickFixProvider() const
 
 bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
 {
-    if (!Core::MimeDatabase::addMimeTypes(QLatin1String(":/cppeditor/CppEditor.mimetypes.xml"), errorMessage))
+    if (!MimeDatabase::addMimeTypes(QLatin1String(":/cppeditor/CppEditor.mimetypes.xml"), errorMessage))
         return false;
 
     addAutoReleasedObject(new CppEditorFactory);
@@ -203,7 +203,7 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err
             new QAction(tr("Open Function Declaration/Definition in Next Split"), this);
     cmd = ActionManager::registerAction(openDeclarationDefinitionInNextSplit,
         Constants::OPEN_DECLARATION_DEFINITION_IN_NEXT_SPLIT, context, true);
-    cmd->setDefaultKeySequence(QKeySequence(Utils::HostOsInfo::isMacHost()
+    cmd->setDefaultKeySequence(QKeySequence(HostOsInfo::isMacHost()
                                             ? tr("Meta+E, Shift+F2")
                                             : tr("Ctrl+E, Shift+F2")));
     connect(openDeclarationDefinitionInNextSplit, SIGNAL(triggered()),
@@ -225,8 +225,8 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err
     cppToolsMenu->addAction(cmd);
 
     m_openIncludeHierarchyAction = new QAction(tr("Open Include Hierarchy"), this);
-    cmd = Core::ActionManager::registerAction(m_openIncludeHierarchyAction, Constants::OPEN_INCLUDE_HIERARCHY, context);
-    cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+Shift+I") : tr("Ctrl+Shift+I")));
+    cmd = ActionManager::registerAction(m_openIncludeHierarchyAction, Constants::OPEN_INCLUDE_HIERARCHY, context);
+    cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+Shift+I") : tr("Ctrl+Shift+I")));
     connect(m_openIncludeHierarchyAction, SIGNAL(triggered()), this, SLOT(openIncludeHierarchy()));
     contextMenu->addAction(cmd);
     cppToolsMenu->addAction(cmd);
@@ -258,7 +258,7 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err
     cppToolsMenu->addSeparator(globalContext);
     QAction *inspectCppCodeModel = new QAction(tr("Inspect C++ Code Model..."), this);
     cmd = ActionManager::registerAction(inspectCppCodeModel, Constants::INSPECT_CPP_CODEMODEL, globalContext);
-    cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+Shift+F12") : tr("Ctrl+Shift+F12")));
+    cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+Shift+F12") : tr("Ctrl+Shift+F12")));
     connect(inspectCppCodeModel, SIGNAL(triggered()), this, SLOT(inspectCppCodeModel()));
     cppToolsMenu->addAction(cmd);
 
@@ -322,7 +322,7 @@ void CppEditorPlugin::showPreProcessorDialog()
         editorWidget->showPreProcessorWidget();
 }
 
-void CppEditorPlugin::onTaskStarted(Core::Id type)
+void CppEditorPlugin::onTaskStarted(Id type)
 {
     if (type == CppTools::Constants::TASK_INDEX) {
         m_renameSymbolUnderCursorAction->setEnabled(false);
@@ -333,7 +333,7 @@ void CppEditorPlugin::onTaskStarted(Core::Id type)
     }
 }
 
-void CppEditorPlugin::onAllTasksFinished(Core::Id type)
+void CppEditorPlugin::onAllTasksFinished(Id type)
 {
     if (type == CppTools::Constants::TASK_INDEX) {
         m_renameSymbolUnderCursorAction->setEnabled(true);
@@ -375,8 +375,8 @@ void CppEditorPlugin::openTypeHierarchy()
 void CppEditorPlugin::openIncludeHierarchy()
 {
     if (currentCppEditorWidget()) {
-        Core::NavigationWidget *navigation = Core::NavigationWidget::instance();
-        navigation->activateSubWidget(Core::Id(Constants::INCLUDE_HIERARCHY_ID));
+        NavigationWidget *navigation = NavigationWidget::instance();
+        navigation->activateSubWidget(Id(Constants::INCLUDE_HIERARCHY_ID));
         emit includeHierarchyRequested();
     }
 }
diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp
index d38437d315..15f032d7a5 100644
--- a/src/plugins/cppeditor/cppelementevaluator.cpp
+++ b/src/plugins/cppeditor/cppelementevaluator.cpp
@@ -128,7 +128,7 @@ void CppElementEvaluator::checkDiagnosticMessage(int pos)
     }
 }
 
-bool CppElementEvaluator::matchIncludeFile(const CPlusPlus::Document::Ptr &document, unsigned line)
+bool CppElementEvaluator::matchIncludeFile(const Document::Ptr &document, unsigned line)
 {
     foreach (const Document::Include &includeFile, document->resolvedIncludes()) {
         if (includeFile.line() == line) {
@@ -139,7 +139,7 @@ bool CppElementEvaluator::matchIncludeFile(const CPlusPlus::Document::Ptr &docum
     return false;
 }
 
-bool CppElementEvaluator::matchMacroInUse(const CPlusPlus::Document::Ptr &document, unsigned pos)
+bool CppElementEvaluator::matchMacroInUse(const Document::Ptr &document, unsigned pos)
 {
     foreach (const Document::MacroUse &use, document->macroUses()) {
         if (use.containsUtf16charOffset(pos)) {
@@ -322,7 +322,7 @@ bool CppClass::operator==(const CppClass &other)
     return this->declaration == other.declaration;
 }
 
-void CppClass::lookupBases(Symbol *declaration, const CPlusPlus::LookupContext &context)
+void CppClass::lookupBases(Symbol *declaration, const LookupContext &context)
 {
     typedef QPair<ClassOrNamespace *, CppClass *> Data;
 
@@ -353,7 +353,7 @@ void CppClass::lookupBases(Symbol *declaration, const CPlusPlus::LookupContext &
     }
 }
 
-void CppClass::lookupDerived(CPlusPlus::Symbol *declaration, const CPlusPlus::Snapshot &snapshot)
+void CppClass::lookupDerived(Symbol *declaration, const Snapshot &snapshot)
 {
     typedef QPair<CppClass *, CppTools::TypeHierarchy> Data;
 
@@ -446,7 +446,7 @@ CppVariable::CppVariable(Symbol *declaration, const LookupContext &context, Scop
     }
 }
 
-CppEnumerator::CppEnumerator(CPlusPlus::EnumeratorDeclaration *declaration)
+CppEnumerator::CppEnumerator(EnumeratorDeclaration *declaration)
     : CppDeclarableElement(declaration)
 {
     helpCategory = TextEditor::HelpItem::Enum;
diff --git a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
index ee3b5e72ab..9d398af513 100644
--- a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
+++ b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
@@ -308,7 +308,7 @@ inline LookupItem skipForwardDeclarations(const QList<LookupItem> &resolvedSymbo
 }
 
 CppEditorWidget::Link attemptFuncDeclDef(const QTextCursor &cursor,
-    CppEditorWidget *, CPlusPlus::Snapshot snapshot, const CPlusPlus::Document::Ptr &document,
+    CppEditorWidget *, Snapshot snapshot, const Document::Ptr &document,
     SymbolFinder *symbolFinder)
 {
     Link result;
@@ -624,7 +624,7 @@ TextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &curs
             continue;
         if (ch == QLatin1Char('(') && !expression.isEmpty()) {
             tc.setPosition(pos);
-            if (TextEditor::TextBlockUserData::findNextClosingParenthesis(&tc, true))
+            if (TextBlockUserData::findNextClosingParenthesis(&tc, true))
                 expression.append(tc.selectedText());
         }
 
@@ -684,8 +684,7 @@ TextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &curs
                     params.openInNextSplit = inNextSplit;
 
                     if (m_virtualFunctionAssistProvider->configure(params)) {
-                        m_widget->invokeAssist(TextEditor::FollowSymbol,
-                                               m_virtualFunctionAssistProvider);
+                        m_widget->invokeAssist(FollowSymbol, m_virtualFunctionAssistProvider);
                         m_virtualFunctionAssistProvider->clearParams();
                     }
 
diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp
index f7af544345..1f7d9528c2 100644
--- a/src/plugins/cppeditor/cpphighlighter.cpp
+++ b/src/plugins/cppeditor/cpphighlighter.cpp
@@ -45,22 +45,22 @@ using namespace TextEditor;
 using namespace CPlusPlus;
 
 CppHighlighter::CppHighlighter(QTextDocument *document) :
-    TextEditor::SyntaxHighlighter(document)
+    SyntaxHighlighter(document)
 {
-    static QVector<TextEditor::TextStyle> categories;
+    static QVector<TextStyle> categories;
     if (categories.isEmpty()) {
-        categories << TextEditor::C_NUMBER
-                   << TextEditor::C_STRING
-                   << TextEditor::C_TYPE
-                   << TextEditor::C_KEYWORD
-                   << TextEditor::C_PRIMITIVE_TYPE
-                   << TextEditor::C_OPERATOR
-                   << TextEditor::C_PREPROCESSOR
-                   << TextEditor::C_LABEL
-                   << TextEditor::C_COMMENT
-                   << TextEditor::C_DOXYGEN_COMMENT
-                   << TextEditor::C_DOXYGEN_TAG
-                   << TextEditor::C_VISUAL_WHITESPACE;
+        categories << C_NUMBER
+                   << C_STRING
+                   << C_TYPE
+                   << C_KEYWORD
+                   << C_PRIMITIVE_TYPE
+                   << C_OPERATOR
+                   << C_PREPROCESSOR
+                   << C_LABEL
+                   << C_COMMENT
+                   << C_DOXYGEN_COMMENT
+                   << C_DOXYGEN_TAG
+                   << C_VISUAL_WHITESPACE;
     }
     setTextFormatCategories(categories);
 }
diff --git a/src/plugins/cppeditor/cppincludehierarchymodel.cpp b/src/plugins/cppeditor/cppincludehierarchymodel.cpp
index 07bbe84e5e..7d0bc5bcf6 100644
--- a/src/plugins/cppeditor/cppincludehierarchymodel.cpp
+++ b/src/plugins/cppeditor/cppincludehierarchymodel.cpp
@@ -51,7 +51,7 @@ namespace {
 
 Snapshot globalSnapshot()
 {
-    return CppTools::CppModelManager::instance()->snapshot();
+    return CppModelManager::instance()->snapshot();
 }
 
 } // anonymous namespace
diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp
index e6f982131d..21d611182d 100644
--- a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp
+++ b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp
@@ -278,7 +278,7 @@ class InsertVirtualMethodsModel : public QAbstractItemModel
 public:
     InsertVirtualMethodsModel(QObject *parent = 0) : QAbstractItemModel(parent)
     {
-        const TextEditor::FontSettings &fs = TextEditor::TextEditorSettings::fontSettings();
+        const FontSettings &fs = TextEditorSettings::fontSettings();
         formatReimpFunc = fs.formatFor(C_DISABLED_CODE);
     }
 
diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp
index 1ad54e67c0..e9992f4320 100644
--- a/src/plugins/cppeditor/cppquickfix_test.cpp
+++ b/src/plugins/cppeditor/cppquickfix_test.cpp
@@ -212,7 +212,7 @@ QuickFixOperationTest::QuickFixOperationTest(const QList<QuickFixTestDocument::P
 
     // Perform operation if there is one
     CppQuickFixInterface quickFixInterface(m_documentWithMarker->m_editorWidget, ExplicitlyInvoked);
-    TextEditor::QuickFixOperations operations;
+    QuickFixOperations operations;
     factory->match(quickFixInterface, operations);
     if (operations.isEmpty()) {
         QVERIFY(testDocuments.first()->m_expectedSource.isEmpty());
@@ -259,7 +259,7 @@ QuickFixOfferedOperationsTest::QuickFixOfferedOperationsTest(
 {
     // Get operations
     CppQuickFixInterface quickFixInterface(m_documentWithMarker->m_editorWidget, ExplicitlyInvoked);
-    TextEditor::QuickFixOperations actualOperations;
+    QuickFixOperations actualOperations;
     factory->match(quickFixInterface, actualOperations);
 
     // Convert to QStringList
diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/cppquickfixassistant.cpp
index 6bfb0e5d51..bac1af9f1a 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.cpp
+++ b/src/plugins/cppeditor/cppquickfixassistant.cpp
@@ -63,9 +63,9 @@ IAssistProcessor *CppQuickFixAssistProvider::createProcessor() const
     return new QuickFixAssistProcessor(this);
 }
 
-QList<TextEditor::QuickFixFactory *> CppQuickFixAssistProvider::quickFixFactories() const
+QList<QuickFixFactory *> CppQuickFixAssistProvider::quickFixFactories() const
 {
-    QList<TextEditor::QuickFixFactory *> results;
+    QList<QuickFixFactory *> results;
     foreach (CppQuickFixFactory *f, ExtensionSystem::PluginManager::getObjects<CppQuickFixFactory>())
         results.append(f);
     return results;
@@ -75,19 +75,19 @@ QList<TextEditor::QuickFixFactory *> CppQuickFixAssistProvider::quickFixFactorie
 // CppQuickFixAssistInterface
 // --------------------------
 CppQuickFixInterface::CppQuickFixInterface(CppEditorWidget *editor,
-                                                       TextEditor::AssistReason reason)
+                                                       AssistReason reason)
     : AssistInterface(editor->document(), editor->position(),
                       editor->textDocument()->filePath().toString(), reason)
     , m_editor(editor)
     , m_semanticInfo(editor->semanticInfo())
-    , m_snapshot(CppTools::CppModelManager::instance()->snapshot())
+    , m_snapshot(CppModelManager::instance()->snapshot())
     , m_currentFile(CppRefactoringChanges::file(editor, m_semanticInfo.doc))
     , m_context(m_semanticInfo.doc, m_snapshot)
 {
     QTC_CHECK(m_semanticInfo.doc);
     QTC_CHECK(m_semanticInfo.doc->translationUnit());
     QTC_CHECK(m_semanticInfo.doc->translationUnit()->ast());
-    CPlusPlus::ASTPath astPath(m_semanticInfo.doc);
+    ASTPath astPath(m_semanticInfo.doc);
     m_path = astPath(editor->textCursor());
 }
 
@@ -126,7 +126,7 @@ bool CppQuickFixInterface::isCursorOn(unsigned tokenIndex) const
     return currentFile()->isCursorOn(tokenIndex);
 }
 
-bool CppQuickFixInterface::isCursorOn(const CPlusPlus::AST *ast) const
+bool CppQuickFixInterface::isCursorOn(const AST *ast) const
 {
     return currentFile()->isCursorOn(ast);
 }
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index a0b182fae1..e591f74a3a 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -261,7 +261,7 @@ Namespace *isNamespaceFunction(const LookupContext &context, Function *function)
 
 // Given include is e.g. "afile.h" or <afile.h> (quotes/angle brackets included!).
 void insertNewIncludeDirective(const QString &include, CppRefactoringFilePtr file,
-                               const CPlusPlus::Document::Ptr &cppDocument)
+                               const Document::Ptr &cppDocument)
 {
     // Find optimal position
     using namespace IncludeUtils;
@@ -2636,7 +2636,7 @@ void InsertDefFromDecl::match(const CppQuickFixInterface &interface, QuickFixOpe
                                 return;
 
                             // Check if there is already a definition
-                            CppTools::SymbolFinder symbolFinder;
+                            SymbolFinder symbolFinder;
                             if (symbolFinder.findMatchingDefinition(decl, interface.snapshot(),
                                                                     true)) {
                                 return;
@@ -2729,7 +2729,7 @@ public:
         , m_classDecl(0)
         , m_offerQuickFix(true)
     {
-        setDescription(TextEditor::QuickFixFactory::tr("Create Getter and Setter Member Functions"));
+        setDescription(QuickFixFactory::tr("Create Getter and Setter Member Functions"));
 
         const QList<AST *> &path = interface.path();
         // We expect something like
@@ -3881,8 +3881,8 @@ public:
     {
         setDescription(
                 mode == FromPointer
-                ? TextEditor::QuickFixFactory::tr("Convert to Stack Variable")
-                : TextEditor::QuickFixFactory::tr("Convert to Pointer"));
+                ? QuickFixFactory::tr("Convert to Stack Variable")
+                : QuickFixFactory::tr("Convert to Pointer"));
     }
 
     void perform() Q_DECL_OVERRIDE
@@ -4220,7 +4220,7 @@ public:
         , m_signalName(signalName)
         , m_storageName(storageName)
     {
-        setDescription(TextEditor::QuickFixFactory::tr("Generate Missing Q_PROPERTY Members..."));
+        setDescription(QuickFixFactory::tr("Generate Missing Q_PROPERTY Members..."));
     }
 
     void perform()
diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp
index f20c6c535f..49517fb3e9 100644
--- a/src/plugins/cppeditor/cpptypehierarchy.cpp
+++ b/src/plugins/cppeditor/cpptypehierarchy.cpp
@@ -100,7 +100,7 @@ CppTypeHierarchyWidget::CppTypeHierarchyWidget() :
     m_inspectedClass->setMargin(5);
     m_model = new CppTypeHierarchyModel(this);
     m_treeView = new NavigationTreeView(this);
-    m_treeView->setActivationMode(Utils::SingleClickActivation);
+    m_treeView->setActivationMode(SingleClickActivation);
     m_delegate = new AnnotatedItemDelegate(this);
     m_delegate->setDelimiter(QLatin1String(" "));
     m_delegate->setAnnotationRole(AnnotationRole);
diff --git a/src/plugins/cppeditor/cppuseselectionsupdater.cpp b/src/plugins/cppeditor/cppuseselectionsupdater.cpp
index 88570e370b..940bcc815b 100644
--- a/src/plugins/cppeditor/cppuseselectionsupdater.cpp
+++ b/src/plugins/cppeditor/cppuseselectionsupdater.cpp
@@ -360,7 +360,7 @@ void CppUseSelectionsUpdater::handleSymbolCaseAsynchronously(const Document::Ptr
 void CppUseSelectionsUpdater::handleSymbolCaseSynchronously(const Document::Ptr document,
                                                             const Snapshot &snapshot)
 {
-    const CPlusPlus::Document::Ptr previousDocument = m_document;
+    const Document::Ptr previousDocument = m_document;
     m_document = document;
 
     const Params params = Params(m_editorWidget->textCursor(), document, snapshot);
diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
index 3068f91db2..a324a583de 100644
--- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
+++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
@@ -128,12 +128,12 @@ public:
         : m_params(params)
     {}
 
-    IAssistProposal *immediateProposal(const TextEditor::AssistInterface *) Q_DECL_OVERRIDE
+    IAssistProposal *immediateProposal(const AssistInterface *) Q_DECL_OVERRIDE
     {
         QTC_ASSERT(m_params.function, return 0);
 
         AssistProposalItem *hintItem
-                = new VirtualFunctionProposalItem(TextEditor::TextEditorWidget::Link());
+                = new VirtualFunctionProposalItem(TextEditorWidget::Link());
         hintItem->setText(QCoreApplication::translate("VirtualFunctionsAssistProcessor",
                                                       "...searching overrides"));
         hintItem->setOrder(-1000);
@@ -180,8 +180,7 @@ private:
 
     AssistProposalItem *itemFromFunction(Function *func) const
     {
-        const TextEditor::TextEditorWidget::Link link
-                = CppTools::linkToSymbol(maybeDefinitionFor(func));
+        const TextEditorWidget::Link link = CppTools::linkToSymbol(maybeDefinitionFor(func));
         QString text = m_overview.prettyName(LookupContext::fullyQualifiedName(func));
         if (func->isPureVirtual())
             text += QLatin1String(" = 0");
@@ -196,7 +195,7 @@ private:
     VirtualFunctionAssistProvider::Parameters m_params;
     Overview m_overview;
     Icons m_icons;
-    mutable CppTools::SymbolFinder m_finder;
+    mutable SymbolFinder m_finder;
 };
 
 VirtualFunctionAssistProvider::VirtualFunctionAssistProvider()
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index 355d59424a..a49f3b84e4 100644
--- a/src/plugins/cpptools/cppcodeformatter.cpp
+++ b/src/plugins/cpptools/cppcodeformatter.cpp
@@ -703,7 +703,7 @@ int CodeFormatter::tokenCount() const
     return m_tokens.size();
 }
 
-const CPlusPlus::Token &CodeFormatter::currentToken() const
+const Token &CodeFormatter::currentToken() const
 {
     return m_currentToken;
 }
@@ -1111,7 +1111,7 @@ void CodeFormatter::dump() const
 
 namespace CppTools {
 namespace Internal {
-    class CppCodeFormatterData: public TextEditor::CodeFormatterData
+    class CppCodeFormatterData: public CodeFormatterData
     {
     public:
         CodeFormatter::BlockData m_data;
@@ -1123,7 +1123,7 @@ QtStyleCodeFormatter::QtStyleCodeFormatter()
 {
 }
 
-QtStyleCodeFormatter::QtStyleCodeFormatter(const TextEditor::TabSettings &tabSettings,
+QtStyleCodeFormatter::QtStyleCodeFormatter(const TabSettings &tabSettings,
                                            const CppCodeStyleSettings &settings)
     : m_tabSettings(tabSettings)
     , m_styleSettings(settings)
@@ -1131,7 +1131,7 @@ QtStyleCodeFormatter::QtStyleCodeFormatter(const TextEditor::TabSettings &tabSet
     setTabSize(tabSettings.m_tabSize);
 }
 
-void QtStyleCodeFormatter::setTabSettings(const TextEditor::TabSettings &tabSettings)
+void QtStyleCodeFormatter::setTabSettings(const TabSettings &tabSettings)
 {
     m_tabSettings = tabSettings;
     setTabSize(tabSettings.m_tabSize);
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp
index 787963a3fb..85a3344590 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.cpp
+++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp
@@ -221,7 +221,7 @@ namespace CppTools {
 
 namespace Internal {
 
-static void applyRefactorings(QTextDocument *textDocument, TextEditor::TextEditorWidget *editor,
+static void applyRefactorings(QTextDocument *textDocument, TextEditorWidget *editor,
                               const CppCodeStyleSettings &settings)
 {
     // Preprocess source
@@ -282,7 +282,7 @@ CppCodeStylePreferencesWidget::CppCodeStylePreferencesWidget(QWidget *parent)
 
     setVisualizeWhitespace(true);
 
-    connect(m_ui->tabSettingsWidget, &TextEditor::TabSettingsWidget::settingsChanged,
+    connect(m_ui->tabSettingsWidget, &TabSettingsWidget::settingsChanged,
             this, &CppCodeStylePreferencesWidget::slotTabSettingsChanged);
     connect(m_ui->indentBlockBraces, &QCheckBox::toggled,
             this, &CppCodeStylePreferencesWidget::slotCodeStyleSettingsChanged);
@@ -382,7 +382,7 @@ CppCodeStyleSettings CppCodeStylePreferencesWidget::cppCodeStyleSettings() const
     return set;
 }
 
-void CppCodeStylePreferencesWidget::setTabSettings(const TextEditor::TabSettings &settings)
+void CppCodeStylePreferencesWidget::setTabSettings(const TabSettings &settings)
 {
     m_ui->tabSettingsWidget->setTabSettings(settings);
 }
@@ -416,7 +416,7 @@ void CppCodeStylePreferencesWidget::setCodeStyleSettings(const CppCodeStyleSetti
         updatePreview();
 }
 
-void CppCodeStylePreferencesWidget::slotCurrentPreferencesChanged(TextEditor::ICodeStylePreferences *preferences, bool preview)
+void CppCodeStylePreferencesWidget::slotCurrentPreferencesChanged(ICodeStylePreferences *preferences, bool preview)
 {
     const bool enable = !preferences->isReadOnly() && !m_preferences->currentDelegate();
     m_ui->tabSettingsWidget->setEnabled(enable);
@@ -443,7 +443,7 @@ void CppCodeStylePreferencesWidget::slotCodeStyleSettingsChanged()
     updatePreview();
 }
 
-void CppCodeStylePreferencesWidget::slotTabSettingsChanged(const TextEditor::TabSettings &settings)
+void CppCodeStylePreferencesWidget::slotTabSettingsChanged(const TabSettings &settings)
 {
     if (m_blockUpdates)
         return;
@@ -463,9 +463,9 @@ void CppCodeStylePreferencesWidget::updatePreview()
             ? m_preferences
             : CppToolsSettings::instance()->cppCodeStyle();
     const CppCodeStyleSettings ccss = cppCodeStylePreferences->currentCodeStyleSettings();
-    const TextEditor::TabSettings ts = cppCodeStylePreferences->currentTabSettings();
+    const TabSettings ts = cppCodeStylePreferences->currentTabSettings();
     QtStyleCodeFormatter formatter(ts, ccss);
-    foreach (TextEditor::SnippetEditorWidget *preview, m_previews) {
+    foreach (SnippetEditorWidget *preview, m_previews) {
         preview->textDocument()->setTabSettings(ts);
         preview->setCodeStyle(cppCodeStylePreferences);
 
@@ -485,14 +485,14 @@ void CppCodeStylePreferencesWidget::updatePreview()
     }
 }
 
-void CppCodeStylePreferencesWidget::decorateEditors(const TextEditor::FontSettings &fontSettings)
+void CppCodeStylePreferencesWidget::decorateEditors(const FontSettings &fontSettings)
 {
     const ISnippetProvider *provider = ExtensionSystem::PluginManager::getObject<ISnippetProvider>(
         [](ISnippetProvider *current) {
             return current->groupId() == QLatin1String(CppEditor::Constants::CPP_SNIPPETS_GROUP_ID);
         });
 
-    foreach (TextEditor::SnippetEditorWidget *editor, m_previews) {
+    foreach (SnippetEditorWidget *editor, m_previews) {
         editor->textDocument()->setFontSettings(fontSettings);
         if (provider)
             provider->decorateEditor(editor);
@@ -501,7 +501,7 @@ void CppCodeStylePreferencesWidget::decorateEditors(const TextEditor::FontSettin
 
 void CppCodeStylePreferencesWidget::setVisualizeWhitespace(bool on)
 {
-    foreach (TextEditor::SnippetEditorWidget *editor, m_previews) {
+    foreach (SnippetEditorWidget *editor, m_previews) {
         DisplaySettings displaySettings = editor->displaySettings();
         displaySettings.m_visualizeWhitespace = on;
         editor->setDisplaySettings(displaySettings);
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp
index 717687b6a6..d9cd68cee8 100644
--- a/src/plugins/cpptools/cppcompletion_test.cpp
+++ b/src/plugins/cpptools/cppcompletion_test.cpp
@@ -58,7 +58,7 @@ namespace {
 
 typedef QByteArray _;
 
-class CompletionTestCase : public CppTools::Tests::TestCase
+class CompletionTestCase : public Tests::TestCase
 {
 public:
     CompletionTestCase(const QByteArray &sourceText, const QByteArray &textToInsert = QByteArray())
@@ -82,7 +82,7 @@ public:
         m_editor = EditorManager::openEditor(fileName);
         QVERIFY(m_editor);
         closeEditorAtEndOfTestCase(m_editor);
-        m_editorWidget = qobject_cast<TextEditor::TextEditorWidget *>(m_editor->widget());
+        m_editorWidget = qobject_cast<TextEditorWidget *>(m_editor->widget());
         QVERIFY(m_editorWidget);
 
         m_textDocument = m_editorWidget->document();
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index 701cfba31a..4650f43d32 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -423,9 +423,8 @@ AssistInterface *InternalCompletionAssistProvider::createAssistInterface(
     QTC_ASSERT(document, return 0);
 
     CppModelManager *modelManager = CppModelManager::instance();
-    return new CppTools::Internal::CppCompletionAssistInterface(filePath, document, isObjCEnabled,
-                                                                position, reason,
-                                                                modelManager->workingCopy());
+    return new CppCompletionAssistInterface(filePath, document, isObjCEnabled, position, reason,
+                                            modelManager->workingCopy());
 }
 
 // -----------------
@@ -729,7 +728,7 @@ IAssistProposal *InternalCppCompletionAssistProcessor::createContentProposal()
 }
 
 IAssistProposal *InternalCppCompletionAssistProcessor::createHintProposal(
-    QList<CPlusPlus::Function *> functionSymbols) const
+    QList<Function *> functionSymbols) const
 {
     IFunctionHintProposalModel *model =
             new CppFunctionHintModel(functionSymbols, m_model->m_typeOfExpression);
@@ -1038,8 +1037,7 @@ void InternalCppCompletionAssistProcessor::addCompletionItem(const QString &text
     m_completions.append(item);
 }
 
-void InternalCppCompletionAssistProcessor::addCompletionItem(CPlusPlus::Symbol *symbol,
-                                                             int order)
+void InternalCppCompletionAssistProcessor::addCompletionItem(Symbol *symbol, int order)
 {
     ConvertToCompletionItem toCompletionItem;
     AssistProposalItem *item = toCompletionItem(symbol);
@@ -1050,7 +1048,7 @@ void InternalCppCompletionAssistProcessor::addCompletionItem(CPlusPlus::Symbol *
     }
 }
 
-void InternalCppCompletionAssistProcessor::completeObjCMsgSend(CPlusPlus::ClassOrNamespace *binding,
+void InternalCppCompletionAssistProcessor::completeObjCMsgSend(ClassOrNamespace *binding,
                                                                bool staticClassAccess)
 {
     QList<Scope*> memberScopes;
@@ -1077,12 +1075,12 @@ void InternalCppCompletionAssistProcessor::completeObjCMsgSend(CPlusPlus::ClassO
                             Symbol *arg = method->argumentAt(i);
                             text += QString::fromUtf8(selectorName->nameAt(i)->identifier()->chars());
                             text += QLatin1Char(':');
-                            text += TextEditor::Snippet::kVariableDelimiter;
+                            text += Snippet::kVariableDelimiter;
                             text += QLatin1Char('(');
                             text += oo.prettyType(arg->type());
                             text += QLatin1Char(')');
                             text += oo.prettyName(arg->name());
-                            text += TextEditor::Snippet::kVariableDelimiter;
+                            text += Snippet::kVariableDelimiter;
                         }
                     } else {
                         text = QString::fromUtf8(selectorName->identifier()->chars());
@@ -1294,7 +1292,7 @@ int InternalCppCompletionAssistProcessor::startCompletionInternal(const QString
     return -1;
 }
 
-void InternalCppCompletionAssistProcessor::globalCompletion(CPlusPlus::Scope *currentScope)
+void InternalCppCompletionAssistProcessor::globalCompletion(Scope *currentScope)
 {
     const LookupContext &context = m_model->m_typeOfExpression->context();
 
@@ -1371,8 +1369,7 @@ void InternalCppCompletionAssistProcessor::globalCompletion(CPlusPlus::Scope *cu
     addSnippets();
 }
 
-bool InternalCppCompletionAssistProcessor::completeMember(
-        const QList<CPlusPlus::LookupItem> &baseResults)
+bool InternalCppCompletionAssistProcessor::completeMember(const QList<LookupItem> &baseResults)
 {
     const LookupContext &context = m_model->m_typeOfExpression->context();
 
@@ -1398,8 +1395,7 @@ bool InternalCppCompletionAssistProcessor::completeMember(
     return false;
 }
 
-bool InternalCppCompletionAssistProcessor::completeScope(
-        const QList<CPlusPlus::LookupItem> &results)
+bool InternalCppCompletionAssistProcessor::completeScope(const QList<LookupItem> &results)
 {
     const LookupContext &context = m_model->m_typeOfExpression->context();
     if (results.isEmpty())
@@ -1466,7 +1462,7 @@ bool InternalCppCompletionAssistProcessor::completeScope(
     return !m_completions.isEmpty();
 }
 
-void InternalCppCompletionAssistProcessor::completeNamespace(CPlusPlus::ClassOrNamespace *b)
+void InternalCppCompletionAssistProcessor::completeNamespace(ClassOrNamespace *b)
 {
     QSet<ClassOrNamespace *> bindingsVisited;
     QList<ClassOrNamespace *> bindingsToVisit;
@@ -1506,8 +1502,7 @@ void InternalCppCompletionAssistProcessor::completeNamespace(CPlusPlus::ClassOrN
     }
 }
 
-void InternalCppCompletionAssistProcessor::completeClass(CPlusPlus::ClassOrNamespace *b,
-                                                         bool staticLookup)
+void InternalCppCompletionAssistProcessor::completeClass(ClassOrNamespace *b, bool staticLookup)
 {
     QSet<ClassOrNamespace *> bindingsVisited;
     QList<ClassOrNamespace *> bindingsToVisit;
@@ -1586,7 +1581,7 @@ void InternalCppCompletionAssistProcessor::addClassMembersToCompletion(Scope *sc
 }
 
 bool InternalCppCompletionAssistProcessor::completeQtMethod(
-        const QList<CPlusPlus::LookupItem> &results,
+        const QList<LookupItem> &results,
         bool wantSignals)
 {
     if (results.isEmpty())
@@ -1705,7 +1700,7 @@ void InternalCppCompletionAssistProcessor::addKeywords()
 }
 
 void InternalCppCompletionAssistProcessor::addMacros(const QString &fileName,
-                                                     const CPlusPlus::Snapshot &snapshot)
+                                                     const Snapshot &snapshot)
 {
     QSet<QString> processed;
     QSet<QString> definedMacros;
@@ -1716,7 +1711,7 @@ void InternalCppCompletionAssistProcessor::addMacros(const QString &fileName,
         addCompletionItem(macroName, m_icons.macroIcon(), MacrosOrder);
 }
 
-void InternalCppCompletionAssistProcessor::addMacros_helper(const CPlusPlus::Snapshot &snapshot,
+void InternalCppCompletionAssistProcessor::addMacros_helper(const Snapshot &snapshot,
                                                     const QString &fileName,
                                                     QSet<QString> *processed,
                                                     QSet<QString> *definedMacros)
@@ -1740,7 +1735,7 @@ void InternalCppCompletionAssistProcessor::addMacros_helper(const CPlusPlus::Sna
     }
 }
 
-bool InternalCppCompletionAssistProcessor::completeConstructorOrFunction(const QList<CPlusPlus::LookupItem> &results,
+bool InternalCppCompletionAssistProcessor::completeConstructorOrFunction(const QList<LookupItem> &results,
                                                                          int endOfExpression,
                                                                          bool toolTipOnly)
 {
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index 681f80f24b..a4374bdd6c 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -314,24 +314,23 @@ static void find_helper(QFutureInterface<Usage> &future,
     future.setProgressValue(files.size());
 }
 
-void CppFindReferences::findUsages(CPlusPlus::Symbol *symbol,
-                                   const CPlusPlus::LookupContext &context)
+void CppFindReferences::findUsages(Symbol *symbol, const LookupContext &context)
 {
     findUsages(symbol, context, QString(), false);
 }
 
-void CppFindReferences::findUsages(CPlusPlus::Symbol *symbol,
-                                   const CPlusPlus::LookupContext &context,
+void CppFindReferences::findUsages(Symbol *symbol,
+                                   const LookupContext &context,
                                    const QString &replacement,
                                    bool replace)
 {
     Overview overview;
-    Core::SearchResult *search = Core::SearchResultWindow::instance()->startNewSearch(tr("C++ Usages:"),
+    SearchResult *search = SearchResultWindow::instance()->startNewSearch(tr("C++ Usages:"),
                                                 QString(),
                                                 overview.prettyName(context.fullyQualifiedName(symbol)),
-                                                replace ? Core::SearchResultWindow::SearchAndReplace
-                                                        : Core::SearchResultWindow::SearchOnly,
-                                                Core::SearchResultWindow::PreserveCaseDisabled,
+                                                replace ? SearchResultWindow::SearchAndReplace
+                                                        : SearchResultWindow::SearchOnly,
+                                                SearchResultWindow::PreserveCaseDisabled,
                                                 QLatin1String("CppEditor"));
     search->setTextToReplace(replacement);
     connect(search, SIGNAL(replaceButtonClicked(QString,QList<Core::SearchResultItem>,bool)),
@@ -346,7 +345,7 @@ void CppFindReferences::findUsages(CPlusPlus::Symbol *symbol,
     findAll_helper(search, symbol, context);
 }
 
-void CppFindReferences::renameUsages(CPlusPlus::Symbol *symbol, const CPlusPlus::LookupContext &context,
+void CppFindReferences::renameUsages(Symbol *symbol, const LookupContext &context,
                                      const QString &replacement)
 {
     if (const Identifier *id = symbol->identifier()) {
@@ -356,8 +355,8 @@ void CppFindReferences::renameUsages(CPlusPlus::Symbol *symbol, const CPlusPlus:
     }
 }
 
-void CppFindReferences::findAll_helper(Core::SearchResult *search, CPlusPlus::Symbol *symbol,
-                                       const CPlusPlus::LookupContext &context)
+void CppFindReferences::findAll_helper(SearchResult *search, Symbol *symbol,
+                                       const LookupContext &context)
 {
     if (!(symbol && symbol->identifier())) {
         search->finishSearch(false);
@@ -367,7 +366,7 @@ void CppFindReferences::findAll_helper(Core::SearchResult *search, CPlusPlus::Sy
     connect(search, SIGNAL(activated(Core::SearchResultItem)),
             this, SLOT(openEditor(Core::SearchResultItem)));
 
-    Core::SearchResultWindow::instance()->popup(IOutputPane::ModeSwitch | IOutputPane::WithFocus);
+    SearchResultWindow::instance()->popup(IOutputPane::ModeSwitch | IOutputPane::WithFocus);
     const WorkingCopy workingCopy = m_modelManager->workingCopy();
     QFuture<Usage> result;
     result = QtConcurrent::run(&find_helper, workingCopy, context, symbol);
@@ -380,19 +379,19 @@ void CppFindReferences::findAll_helper(Core::SearchResult *search, CPlusPlus::Sy
 }
 
 void CppFindReferences::onReplaceButtonClicked(const QString &text,
-                                               const QList<Core::SearchResultItem> &items,
+                                               const QList<SearchResultItem> &items,
                                                bool preserveCase)
 {
     const QStringList fileNames = TextEditor::BaseFileFind::replaceAll(text, items, preserveCase);
     if (!fileNames.isEmpty()) {
         m_modelManager->updateSourceFiles(fileNames.toSet());
-        Core::SearchResultWindow::instance()->hide();
+        SearchResultWindow::instance()->hide();
     }
 }
 
 void CppFindReferences::searchAgain()
 {
-    Core::SearchResult *search = qobject_cast<Core::SearchResult *>(sender());
+    SearchResult *search = qobject_cast<SearchResult *>(sender());
     CppFindReferencesParameters parameters = search->userData().value<CppFindReferencesParameters>();
     Snapshot snapshot = CppModelManager::instance()->snapshot();
     search->restart();
@@ -444,7 +443,7 @@ private:
 };
 }
 
-CPlusPlus::Symbol *CppFindReferences::findSymbol(const CppFindReferencesParameters &parameters,
+Symbol *CppFindReferences::findSymbol(const CppFindReferencesParameters &parameters,
                                       const Snapshot &snapshot, LookupContext *context)
 {
     QTC_ASSERT(context, return 0);
@@ -473,7 +472,7 @@ CPlusPlus::Symbol *CppFindReferences::findSymbol(const CppFindReferencesParamete
 void CppFindReferences::displayResults(int first, int last)
 {
     QFutureWatcher<Usage> *watcher = static_cast<QFutureWatcher<Usage> *>(sender());
-    Core::SearchResult *search = m_watchers.value(watcher);
+    SearchResult *search = m_watchers.value(watcher);
     if (!search) {
         // search was deleted while it was running
         watcher->cancel();
@@ -492,7 +491,7 @@ void CppFindReferences::displayResults(int first, int last)
 void CppFindReferences::searchFinished()
 {
     QFutureWatcher<Usage> *watcher = static_cast<QFutureWatcher<Usage> *>(sender());
-    Core::SearchResult *search = m_watchers.value(watcher);
+    SearchResult *search = m_watchers.value(watcher);
     if (search)
         search->finishSearch(watcher->isCanceled());
     m_watchers.remove(watcher);
@@ -501,7 +500,7 @@ void CppFindReferences::searchFinished()
 
 void CppFindReferences::cancel()
 {
-    Core::SearchResult *search = qobject_cast<Core::SearchResult *>(sender());
+    SearchResult *search = qobject_cast<SearchResult *>(sender());
     QTC_ASSERT(search, return);
     QFutureWatcher<Usage> *watcher = m_watchers.key(search);
     QTC_ASSERT(watcher, return);
@@ -510,7 +509,7 @@ void CppFindReferences::cancel()
 
 void CppFindReferences::setPaused(bool paused)
 {
-    Core::SearchResult *search = qobject_cast<Core::SearchResult *>(sender());
+    SearchResult *search = qobject_cast<SearchResult *>(sender());
     QTC_ASSERT(search, return);
     QFutureWatcher<Usage> *watcher = m_watchers.key(search);
     QTC_ASSERT(watcher, return);
@@ -518,7 +517,7 @@ void CppFindReferences::setPaused(bool paused)
         watcher->setPaused(paused);
 }
 
-void CppFindReferences::openEditor(const Core::SearchResultItem &item)
+void CppFindReferences::openEditor(const SearchResultItem &item)
 {
     if (item.path.size() > 0) {
         EditorManager::openEditorAt(QDir::fromNativeSeparators(item.path.first()),
@@ -640,20 +639,20 @@ void CppFindReferences::findMacroUses(const Macro &macro)
 
 void CppFindReferences::findMacroUses(const Macro &macro, const QString &replacement, bool replace)
 {
-    Core::SearchResult *search = Core::SearchResultWindow::instance()->startNewSearch(
+    SearchResult *search = SearchResultWindow::instance()->startNewSearch(
                 tr("C++ Macro Usages:"),
                 QString(),
                 macro.nameToQString(),
-                replace ? Core::SearchResultWindow::SearchAndReplace
-                        : Core::SearchResultWindow::SearchOnly,
-                Core::SearchResultWindow::PreserveCaseDisabled,
+                replace ? SearchResultWindow::SearchAndReplace
+                        : SearchResultWindow::SearchOnly,
+                SearchResultWindow::PreserveCaseDisabled,
                 QLatin1String("CppEditor"));
 
     search->setTextToReplace(replacement);
     connect(search, SIGNAL(replaceButtonClicked(QString,QList<Core::SearchResultItem>,bool)),
             SLOT(onReplaceButtonClicked(QString,QList<Core::SearchResultItem>,bool)));
 
-    Core::SearchResultWindow::instance()->popup(IOutputPane::ModeSwitch | IOutputPane::WithFocus);
+    SearchResultWindow::instance()->popup(IOutputPane::ModeSwitch | IOutputPane::WithFocus);
 
     connect(search, SIGNAL(activated(Core::SearchResultItem)),
             this, SLOT(openEditor(Core::SearchResultItem)));
@@ -689,7 +688,7 @@ void CppFindReferences::renameMacroUses(const Macro &macro, const QString &repla
     findMacroUses(macro, textToReplace, true);
 }
 
-void CppFindReferences::createWatcher(const QFuture<Usage> &future, Core::SearchResult *search)
+void CppFindReferences::createWatcher(const QFuture<Usage> &future, SearchResult *search)
 {
     QFutureWatcher<Usage> *watcher = new QFutureWatcher<Usage>();
     watcher->setPendingResultsLimit(1);
diff --git a/src/plugins/cpptools/cppincludesfilter.cpp b/src/plugins/cpptools/cppincludesfilter.cpp
index 736e4f9c99..1ed1d19c37 100644
--- a/src/plugins/cpptools/cppincludesfilter.cpp
+++ b/src/plugins/cpptools/cppincludesfilter.cpp
@@ -146,13 +146,13 @@ CppIncludesFilter::CppIncludesFilter()
             this, &CppIncludesFilter::markOutdated);
     connect(CppModelManager::instance(), &CppModelManager::aboutToRemoveFiles,
             this, &CppIncludesFilter::markOutdated);
-    connect(Core::DocumentModel::model(), &QAbstractItemModel::rowsInserted,
+    connect(DocumentModel::model(), &QAbstractItemModel::rowsInserted,
             this, &CppIncludesFilter::markOutdated);
-    connect(Core::DocumentModel::model(), &QAbstractItemModel::rowsRemoved,
+    connect(DocumentModel::model(), &QAbstractItemModel::rowsRemoved,
             this, &CppIncludesFilter::markOutdated);
-    connect(Core::DocumentModel::model(), &QAbstractItemModel::dataChanged,
+    connect(DocumentModel::model(), &QAbstractItemModel::dataChanged,
             this, &CppIncludesFilter::markOutdated);
-    connect(Core::DocumentModel::model(), &QAbstractItemModel::modelReset,
+    connect(DocumentModel::model(), &QAbstractItemModel::modelReset,
             this, &CppIncludesFilter::markOutdated);
 }
 
@@ -162,11 +162,11 @@ void CppIncludesFilter::prepareSearch(const QString &entry)
     if (m_needsUpdate) {
         m_needsUpdate = false;
         QSet<QString> seedPaths;
-        foreach (ProjectExplorer::Project *project, ProjectExplorer::SessionManager::projects()) {
-            foreach (const QString &filePath, project->files(ProjectExplorer::Project::AllFiles))
+        foreach (Project *project, SessionManager::projects()) {
+            foreach (const QString &filePath, project->files(Project::AllFiles))
                 seedPaths.insert(filePath);
         }
-        foreach (Core::DocumentModel::Entry *entry, Core::DocumentModel::entries()) {
+        foreach (DocumentModel::Entry *entry, DocumentModel::entries()) {
             if (entry)
                 seedPaths.insert(entry->fileName());
         }
diff --git a/src/plugins/cpptools/cpplocalsymbols.cpp b/src/plugins/cpptools/cpplocalsymbols.cpp
index c6a23cb930..84e2d58e5a 100644
--- a/src/plugins/cpptools/cpplocalsymbols.cpp
+++ b/src/plugins/cpptools/cpplocalsymbols.cpp
@@ -306,7 +306,7 @@ private:
 } // end of anonymous namespace
 
 
-LocalSymbols::LocalSymbols(CPlusPlus::Document::Ptr doc, CPlusPlus::DeclarationAST *ast)
+LocalSymbols::LocalSymbols(Document::Ptr doc, DeclarationAST *ast)
 {
     FindLocalSymbols findLocalSymbols(doc);
     findLocalSymbols(ast);
diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
index 037094430c..9c5dc9b684 100644
--- a/src/plugins/cpptools/cpplocatorfilter.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter.cpp
@@ -120,6 +120,6 @@ QList<Core::LocatorFilterEntry> CppLocatorFilter::matchesFor(
 
 void CppLocatorFilter::accept(Core::LocatorFilterEntry selection) const
 {
-    IndexItem::Ptr info = qvariant_cast<CppTools::IndexItem::Ptr>(selection.internalData);
+    IndexItem::Ptr info = qvariant_cast<IndexItem::Ptr>(selection.internalData);
     Core::EditorManager::openEditorAt(info->fileName(), info->line(), info->column());
 }
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 680ff85cff..629aa5352c 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -125,13 +125,13 @@ class CppModelManagerPrivate
 public:
     // Snapshot
     mutable QMutex m_snapshotMutex;
-    CPlusPlus::Snapshot m_snapshot;
+    Snapshot m_snapshot;
 
     // Project integration
     mutable QMutex m_projectMutex;
     QMap<ProjectExplorer::Project *, ProjectInfo> m_projectToProjectsInfo;
-    QMap<Utils::FileName, QList<CppTools::ProjectPart::Ptr> > m_fileToProjectParts;
-    QMap<QString, CppTools::ProjectPart::Ptr> m_projectFileToProjectPart;
+    QMap<Utils::FileName, QList<ProjectPart::Ptr> > m_fileToProjectParts;
+    QMap<QString, ProjectPart::Ptr> m_projectFileToProjectPart;
     // The members below are cached/(re)calculated from the projects and/or their project parts
     bool m_dirty;
     QStringList m_projectFiles;
@@ -236,7 +236,7 @@ QString CppModelManager::editorConfigurationFileName()
 
 QString CppModelManager::configurationFileName()
 {
-    return CPlusPlus::Preprocessor::configurationFileName;
+    return Preprocessor::configurationFileName;
 }
 
 void CppModelManager::updateModifiedSourceFiles()
@@ -312,7 +312,7 @@ CppModelManager::CppModelManager(QObject *parent)
             this, SLOT(onCoreAboutToClose()));
 
     qRegisterMetaType<CPlusPlus::Document::Ptr>("CPlusPlus::Document::Ptr");
-    qRegisterMetaType<QList<CPlusPlus::Document::DiagnosticMessage>>(
+    qRegisterMetaType<QList<Document::DiagnosticMessage>>(
                 "QList<CPlusPlus::Document::DiagnosticMessage>");
 
     d->m_modelManagerSupportFallback.reset(new ModelManagerSupportInternal);
@@ -503,36 +503,36 @@ void CppModelManager::unregisterCppEditorDocument(const QString &filePath)
     }
 }
 
-QList<int> CppModelManager::references(CPlusPlus::Symbol *symbol, const LookupContext &context)
+QList<int> CppModelManager::references(Symbol *symbol, const LookupContext &context)
 {
     return d->m_findReferences->references(symbol, context);
 }
 
-void CppModelManager::findUsages(CPlusPlus::Symbol *symbol, const CPlusPlus::LookupContext &context)
+void CppModelManager::findUsages(Symbol *symbol, const LookupContext &context)
 {
     if (symbol->identifier())
         d->m_findReferences->findUsages(symbol, context);
 }
 
-void CppModelManager::renameUsages(CPlusPlus::Symbol *symbol,
-                                   const CPlusPlus::LookupContext &context,
+void CppModelManager::renameUsages(Symbol *symbol,
+                                   const LookupContext &context,
                                    const QString &replacement)
 {
     if (symbol->identifier())
         d->m_findReferences->renameUsages(symbol, context, replacement);
 }
 
-void CppModelManager::findMacroUsages(const CPlusPlus::Macro &macro)
+void CppModelManager::findMacroUsages(const Macro &macro)
 {
     d->m_findReferences->findMacroUses(macro);
 }
 
-void CppModelManager::renameMacroUsages(const CPlusPlus::Macro &macro, const QString &replacement)
+void CppModelManager::renameMacroUsages(const Macro &macro, const QString &replacement)
 {
     d->m_findReferences->renameMacroUses(macro, replacement);
 }
 
-void CppModelManager::replaceSnapshot(const CPlusPlus::Snapshot &newSnapshot)
+void CppModelManager::replaceSnapshot(const Snapshot &newSnapshot)
 {
     QMutexLocker snapshotLocker(&d->m_snapshotMutex);
     d->m_snapshot = newSnapshot;
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp
index 1e14de0ecf..8c45d9319d 100644
--- a/src/plugins/cpptools/cppmodelmanager_test.cpp
+++ b/src/plugins/cpptools/cppmodelmanager_test.cpp
@@ -149,13 +149,13 @@ public:
 
     bool writeContents(const QByteArray &contents) const
     {
-        return CppTools::Tests::TestCase::writeFile(m_filePath, contents);
+        return TestCase::writeFile(m_filePath, contents);
     }
 
 private:
     void restoreContents() const
     {
-        CppTools::Tests::TestCase::writeFile(m_filePath, m_originalFileContents);
+        TestCase::writeFile(m_filePath, m_originalFileContents);
     }
 
     QByteArray m_originalFileContents;
diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
index 9ac573c38d..afe813562a 100644
--- a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
+++ b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
@@ -67,7 +67,7 @@ QString stripCursor(const QString &source)
     return copy;
 }
 
-class PointerDeclarationFormatterTestCase : public CppTools::Tests::TestCase
+class PointerDeclarationFormatterTestCase : public Tests::TestCase
 {
 public:
     PointerDeclarationFormatterTestCase(const QByteArray &source,
diff --git a/src/plugins/cpptools/cppprojects.cpp b/src/plugins/cpptools/cppprojects.cpp
index b58cb739b3..9788ccf505 100644
--- a/src/plugins/cpptools/cppprojects.cpp
+++ b/src/plugins/cpptools/cppprojects.cpp
@@ -50,7 +50,7 @@ ProjectPart::ProjectPart()
     , languageVersion(CXX14)
     , languageExtensions(NoExtensions)
     , qtVersion(UnknownQt)
-    , warningFlags(ProjectExplorer::ToolChain::WarningsDefault)
+    , warningFlags(ToolChain::WarningsDefault)
     , selectedForBuilding(true)
 {
 }
@@ -62,7 +62,7 @@ ProjectPart::ProjectPart()
     \param cxxflags C++ or Objective-C++ flags.
     \param cflags C or ObjectiveC flags if possible, \a cxxflags otherwise.
 */
-void ProjectPart::evaluateToolchain(const ProjectExplorer::ToolChain *tc,
+void ProjectPart::evaluateToolchain(const ToolChain *tc,
                                     const QStringList &commandLineFlags,
                                     const Utils::FileName &sysRoot)
 {
@@ -136,7 +136,7 @@ QByteArray ProjectPart::readProjectConfigFile(const ProjectPart::Ptr &part)
 ProjectInfo::ProjectInfo()
 {}
 
-ProjectInfo::ProjectInfo(QPointer<ProjectExplorer::Project> project)
+ProjectInfo::ProjectInfo(QPointer<Project> project)
     : m_project(project)
 {}
 
@@ -175,7 +175,7 @@ bool ProjectInfo::isValid() const
     return !m_project.isNull();
 }
 
-QPointer<ProjectExplorer::Project> ProjectInfo::project() const
+QPointer<Project> ProjectInfo::project() const
 {
     return m_project;
 }
@@ -447,11 +447,11 @@ void ProjectPartBuilder::createProjectPart(const QStringList &theSources,
                                            ProjectPart::LanguageVersion languageVersion,
                                            ProjectPart::LanguageExtensions languageExtensions)
 {
-    CppTools::ProjectPart::Ptr part(m_templatePart->copy());
+    ProjectPart::Ptr part(m_templatePart->copy());
     part->displayName = partName;
 
     QTC_ASSERT(part->project, return);
-    if (ProjectExplorer::Target *activeTarget = part->project->activeTarget()) {
+    if (Target *activeTarget = part->project->activeTarget()) {
         if (Kit *kit = activeTarget->kit()) {
             if (ToolChain *toolChain = ToolChainKitInformation::toolChain(kit)) {
                 const QStringList flags = languageVersion >= ProjectPart::CXX98 ? m_cxxFlags
@@ -463,7 +463,7 @@ void ProjectPartBuilder::createProjectPart(const QStringList &theSources,
 
     part->languageExtensions |= languageExtensions;
 
-    CppTools::ProjectFileAdder adder(part->files);
+    ProjectFileAdder adder(part->files);
     foreach (const QString &file, theSources)
         adder.maybeAdd(file);
 
diff --git a/src/plugins/cpptools/cppqtstyleindenter.cpp b/src/plugins/cpptools/cppqtstyleindenter.cpp
index 4858d540fc..e55bd274e9 100644
--- a/src/plugins/cpptools/cppqtstyleindenter.cpp
+++ b/src/plugins/cpptools/cppqtstyleindenter.cpp
@@ -107,7 +107,7 @@ void CppQtStyleIndenter::indentBlock(QTextDocument *doc,
 {
     Q_UNUSED(doc)
 
-    CppTools::QtStyleCodeFormatter codeFormatter(tabSettings, codeStyleSettings());
+    QtStyleCodeFormatter codeFormatter(tabSettings, codeStyleSettings());
 
     codeFormatter.updateStateUntil(block);
     int indent;
@@ -140,7 +140,7 @@ void CppQtStyleIndenter::indent(QTextDocument *doc,
         QTextBlock block = doc->findBlock(cursor.selectionStart());
         const QTextBlock end = doc->findBlock(cursor.selectionEnd()).next();
 
-        CppTools::QtStyleCodeFormatter codeFormatter(tabSettings, codeStyleSettings());
+        QtStyleCodeFormatter codeFormatter(tabSettings, codeStyleSettings());
         codeFormatter.updateStateUntil(block);
 
         QTextCursor tc = cursor;
@@ -161,15 +161,15 @@ void CppQtStyleIndenter::indent(QTextDocument *doc,
 
 void CppQtStyleIndenter::setCodeStylePreferences(TextEditor::ICodeStylePreferences *preferences)
 {
-    CppTools::CppCodeStylePreferences *cppCodeStylePreferences
-            = qobject_cast<CppTools::CppCodeStylePreferences *>(preferences);
+    CppCodeStylePreferences *cppCodeStylePreferences
+            = qobject_cast<CppCodeStylePreferences *>(preferences);
     if (cppCodeStylePreferences)
         m_cppCodeStylePreferences = cppCodeStylePreferences;
 }
 
 void CppQtStyleIndenter::invalidateCache(QTextDocument *doc)
 {
-    CppTools::QtStyleCodeFormatter formatter;
+    QtStyleCodeFormatter formatter;
     formatter.invalidateCache(doc);
 }
 
diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp
index b9608c977f..2ea6e57493 100644
--- a/src/plugins/cpptools/cpprefactoringchanges.cpp
+++ b/src/plugins/cpptools/cpprefactoringchanges.cpp
@@ -40,9 +40,10 @@
 #include <utils/qtcassert.h>
 
 using namespace CPlusPlus;
-using namespace CppTools;
 
-class CppTools::CppRefactoringChangesData : public TextEditor::RefactoringChangesData
+namespace CppTools {
+
+class CppRefactoringChangesData : public TextEditor::RefactoringChangesData
 {
 public:
     CppRefactoringChangesData(const Snapshot &snapshot)
@@ -262,3 +263,5 @@ void CppRefactoringFile::fileChanged()
     m_cppDocument.clear();
     RefactoringFile::fileChanged();
 }
+
+} // namespace CppTools
diff --git a/src/plugins/cpptools/cppsemanticinfoupdater.cpp b/src/plugins/cpptools/cppsemanticinfoupdater.cpp
index 9c9d87ac6a..a850896992 100644
--- a/src/plugins/cpptools/cppsemanticinfoupdater.cpp
+++ b/src/plugins/cpptools/cppsemanticinfoupdater.cpp
@@ -53,11 +53,11 @@ namespace CppTools {
 class SemanticInfoUpdaterPrivate
 {
 public:
-    class FuturizedTopLevelDeclarationProcessor: public CPlusPlus::TopLevelDeclarationProcessor
+    class FuturizedTopLevelDeclarationProcessor: public TopLevelDeclarationProcessor
     {
     public:
         FuturizedTopLevelDeclarationProcessor(QFutureInterface<void> &future): m_future(future) {}
-        bool processDeclaration(CPlusPlus::DeclarationAST *) { return !isCanceled(); }
+        bool processDeclaration(DeclarationAST *) { return !isCanceled(); }
         bool isCanceled() { return m_future.isCanceled(); }
     private:
         QFutureInterface<void> m_future;
diff --git a/src/plugins/cpptools/cppsourceprocessor_test.cpp b/src/plugins/cpptools/cppsourceprocessor_test.cpp
index ecc0899fcc..e5765be053 100644
--- a/src/plugins/cpptools/cppsourceprocessor_test.cpp
+++ b/src/plugins/cpptools/cppsourceprocessor_test.cpp
@@ -208,7 +208,7 @@ void CppToolsPlugin::test_cppsourceprocessor_includeNext()
     const QString customHeaderPath = data.directory(QLatin1String("customIncludePath"));
     const QString systemHeaderPath = data.directory(QLatin1String("systemIncludePath"));
 
-    CppSourceProcessor::DocumentCallback documentCallback = [](const CPlusPlus::Document::Ptr &){};
+    CppSourceProcessor::DocumentCallback documentCallback = [](const Document::Ptr &){};
     CppSourceProcessor sourceProcessor(Snapshot(), documentCallback);
     ProjectPart::HeaderPaths headerPaths = ProjectPart::HeaderPaths()
         << ProjectPart::HeaderPath(customHeaderPath, ProjectPart::HeaderPath::IncludePath)
diff --git a/src/plugins/cpptools/cpptoolsreuse.cpp b/src/plugins/cpptools/cpptoolsreuse.cpp
index 211f878428..fc1b9fcfe6 100644
--- a/src/plugins/cpptools/cpptoolsreuse.cpp
+++ b/src/plugins/cpptools/cpptoolsreuse.cpp
@@ -92,7 +92,7 @@ static bool isOwnershipRAIIName(const QString &name)
     return knownNames.contains(name);
 }
 
-bool isOwnershipRAIIType(CPlusPlus::Symbol *symbol, const LookupContext &context)
+bool isOwnershipRAIIType(Symbol *symbol, const LookupContext &context)
 {
     if (!symbol)
         return false;
diff --git a/src/plugins/cpptools/cpptoolssettings.cpp b/src/plugins/cpptools/cpptoolssettings.cpp
index 366769b3d7..efc20ca8f4 100644
--- a/src/plugins/cpptools/cpptoolssettings.cpp
+++ b/src/plugins/cpptools/cpptoolssettings.cpp
@@ -84,13 +84,13 @@ CppToolsSettings::CppToolsSettings(QObject *parent)
 
     qRegisterMetaType<CppTools::CppCodeStyleSettings>("CppTools::CppCodeStyleSettings");
 
-    QSettings *s = Core::ICore::settings();
+    QSettings *s = ICore::settings();
     d->m_commentsSettings.fromSettings(QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP), s);
     d->m_completionSettingsPage = new CompletionSettingsPage(this);
     ExtensionSystem::PluginManager::addObject(d->m_completionSettingsPage);
 
     // code style factory
-    ICodeStylePreferencesFactory *factory = new CppTools::CppCodeStylePreferencesFactory();
+    ICodeStylePreferencesFactory *factory = new CppCodeStylePreferencesFactory();
     TextEditorSettings::registerCodeStyleFactory(factory);
 
     // code style pool
@@ -206,7 +206,7 @@ CppToolsSettings::CppToolsSettings(QObject *parent)
             // create custom code style out of old settings
             QVariant v;
             v.setValue(legacyCodeStyleSettings);
-            TextEditor::ICodeStylePreferences *oldCreator = pool->createCodeStyle(
+            ICodeStylePreferences *oldCreator = pool->createCodeStyle(
                      "legacy", legacyTabSettings, v, tr("Old Creator"));
 
             // change the current delegate and save
@@ -261,7 +261,7 @@ void CppToolsSettings::setCommentsSettings(const CommentsSettings &commentsSetti
 
     d->m_commentsSettings = commentsSettings;
     d->m_commentsSettings.toSettings(QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP),
-                                     Core::ICore::settings());
+                                     ICore::settings());
 }
 
 static QString sortEditorDocumentOutlineKey()
diff --git a/src/plugins/cpptools/doxygengenerator.cpp b/src/plugins/cpptools/doxygengenerator.cpp
index 508a5d4561..825e81192e 100644
--- a/src/plugins/cpptools/doxygengenerator.cpp
+++ b/src/plugins/cpptools/doxygengenerator.cpp
@@ -119,7 +119,7 @@ QString DoxygenGenerator::generate(QTextCursor cursor)
     return generate(cursor, doc->translationUnit()->ast()->asDeclaration());
 }
 
-QString DoxygenGenerator::generate(QTextCursor cursor, CPlusPlus::DeclarationAST *decl)
+QString DoxygenGenerator::generate(QTextCursor cursor, DeclarationAST *decl)
 {
     SpecifierAST *spec = 0;
     DeclaratorAST *decltr = 0;
diff --git a/src/plugins/cpptools/includeutils.cpp b/src/plugins/cpptools/includeutils.cpp
index 3cd20982f7..f3184dbd53 100644
--- a/src/plugins/cpptools/includeutils.cpp
+++ b/src/plugins/cpptools/includeutils.cpp
@@ -217,7 +217,7 @@ int LineForNewIncludeDirective::operator()(const QString &newIncludeFileName,
         *newLinesToAppend = false;
 
     const QString pureIncludeFileName = newIncludeFileName.mid(1, newIncludeFileName.length() - 2);
-    const CPlusPlus::Client::IncludeType newIncludeType =
+    const Client::IncludeType newIncludeType =
         newIncludeFileName.startsWith(QLatin1Char('"')) ? Client::IncludeLocal
                                                         : Client::IncludeGlobal;
 
@@ -391,11 +391,11 @@ QList<IncludeGroup> IncludeGroup::detectIncludeGroupsByIncludeType(const QList<I
 {
     // Create sub groups
     QList<IncludeGroup> result;
-    CPlusPlus::Client::IncludeType lastIncludeType;
+    Client::IncludeType lastIncludeType;
     QList<Include> currentIncludes;
     bool isFirst = true;
     foreach (const Include &include, includes) {
-        const CPlusPlus::Client::IncludeType currentIncludeType = include.type();
+        const Client::IncludeType currentIncludeType = include.type();
 
         // First include...
         if (isFirst) {
diff --git a/src/plugins/cpptools/insertionpointlocator.cpp b/src/plugins/cpptools/insertionpointlocator.cpp
index 77d721c5a5..767a67cd6d 100644
--- a/src/plugins/cpptools/insertionpointlocator.cpp
+++ b/src/plugins/cpptools/insertionpointlocator.cpp
@@ -497,7 +497,7 @@ static InsertionLocation nextToSurroundingDefinitions(Symbol *declaration,
         return noResult;
 
     // scan preceding declarations for a function declaration (and see if it is defined)
-    CppTools::SymbolFinder symbolFinder;
+    SymbolFinder symbolFinder;
     Function *definitionFunction = 0;
     QString prefix, suffix;
     Declaration *surroundingFunctionDecl = 0;
@@ -572,7 +572,7 @@ QList<InsertionLocation> InsertionPointLocator::methodDefinition(Symbol *declara
         return result;
 
     if (useSymbolFinder) {
-        CppTools::SymbolFinder symbolFinder;
+        SymbolFinder symbolFinder;
         if (symbolFinder.findMatchingDefinition(declaration, m_refactoringChanges.snapshot(), true))
             return result;
     }
diff --git a/src/plugins/cpptools/searchsymbols.cpp b/src/plugins/cpptools/searchsymbols.cpp
index 2574c6ca07..807124fa8a 100644
--- a/src/plugins/cpptools/searchsymbols.cpp
+++ b/src/plugins/cpptools/searchsymbols.cpp
@@ -37,7 +37,8 @@
 #include <QDebug>
 
 using namespace CPlusPlus;
-using namespace CppTools;
+
+namespace CppTools {
 
 typedef Utils::ScopedSwap<IndexItem::Ptr> ScopedIndexItemPtr;
 typedef Utils::ScopedSwap<QString> ScopedScope;
@@ -48,7 +49,7 @@ SearchSymbols::SymbolTypes SearchSymbols::AllTypes =
         | SymbolSearcher::Enums
         | SymbolSearcher::Declarations;
 
-SearchSymbols::SearchSymbols(CppTools::Internal::StringTable &stringTable)
+SearchSymbols::SearchSymbols(Internal::StringTable &stringTable)
     : strings(stringTable)
     , symbolsToSearchFor(SymbolSearcher::Classes | SymbolSearcher::Functions | SymbolSearcher::Enums)
 {
@@ -157,92 +158,92 @@ bool SearchSymbols::visit(Class *symbol)
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::UsingNamespaceDirective *)
+bool SearchSymbols::visit(UsingNamespaceDirective *)
 {
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::UsingDeclaration *)
+bool SearchSymbols::visit(UsingDeclaration *)
 {
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::NamespaceAlias *)
+bool SearchSymbols::visit(NamespaceAlias *)
 {
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::Argument *)
+bool SearchSymbols::visit(Argument *)
 {
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::TypenameArgument *)
+bool SearchSymbols::visit(TypenameArgument *)
 {
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::BaseClass *)
+bool SearchSymbols::visit(BaseClass *)
 {
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::Template *)
+bool SearchSymbols::visit(Template *)
 {
     return true;
 }
 
-bool SearchSymbols::visit(CPlusPlus::Block *)
+bool SearchSymbols::visit(Block *)
 {
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::ForwardClassDeclaration *)
+bool SearchSymbols::visit(ForwardClassDeclaration *)
 {
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::ObjCBaseClass *)
+bool SearchSymbols::visit(ObjCBaseClass *)
 {
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::ObjCBaseProtocol *)
+bool SearchSymbols::visit(ObjCBaseProtocol *)
 {
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::ObjCClass *symbol)
+bool SearchSymbols::visit(ObjCClass *symbol)
 {
     processClass(symbol);
 
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::ObjCForwardClassDeclaration *)
+bool SearchSymbols::visit(ObjCForwardClassDeclaration *)
 {
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::ObjCProtocol *symbol)
+bool SearchSymbols::visit(ObjCProtocol *symbol)
 {
     processClass(symbol);
 
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::ObjCForwardProtocolDeclaration *)
+bool SearchSymbols::visit(ObjCForwardProtocolDeclaration *)
 {
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::ObjCMethod *symbol)
+bool SearchSymbols::visit(ObjCMethod *symbol)
 {
     processFunction(symbol);
     return false;
 }
 
-bool SearchSymbols::visit(CPlusPlus::ObjCPropertyDeclaration *symbol)
+bool SearchSymbols::visit(ObjCPropertyDeclaration *symbol)
 {
     processFunction(symbol);
     return false;
@@ -336,3 +337,5 @@ void SearchSymbols::processFunction(T *func)
     QString type = overview.prettyType(func->type());
     addChildItem(name, type, _scope, IndexItem::Function, func);
 }
+
+} // namespace CppTools
diff --git a/src/plugins/cpptools/symbolsearcher_test.cpp b/src/plugins/cpptools/symbolsearcher_test.cpp
index 39d3aa86fe..062d859b1a 100644
--- a/src/plugins/cpptools/symbolsearcher_test.cpp
+++ b/src/plugins/cpptools/symbolsearcher_test.cpp
@@ -88,7 +88,7 @@ public:
 
 typedef ResultData::ResultDataList ResultDataList;
 
-class SymbolSearcherTestCase : public CppTools::Tests::TestCase
+class SymbolSearcherTestCase : public Tests::TestCase
 {
 public:
     /// Takes no ownership of indexingSupportToUse
diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp
index 6ad9bbc0c6..2bd87e81e4 100644
--- a/src/plugins/cpptools/symbolsfindfilter.cpp
+++ b/src/plugins/cpptools/symbolsfindfilter.cpp
@@ -85,32 +85,32 @@ bool SymbolsFindFilter::isEnabled() const
 
 void SymbolsFindFilter::cancel()
 {
-    Core::SearchResult *search = qobject_cast<Core::SearchResult *>(sender());
+    SearchResult *search = qobject_cast<SearchResult *>(sender());
     QTC_ASSERT(search, return);
-    QFutureWatcher<Core::SearchResultItem> *watcher = m_watchers.key(search);
+    QFutureWatcher<SearchResultItem> *watcher = m_watchers.key(search);
     QTC_ASSERT(watcher, return);
     watcher->cancel();
 }
 
 void SymbolsFindFilter::setPaused(bool paused)
 {
-    Core::SearchResult *search = qobject_cast<Core::SearchResult *>(sender());
+    SearchResult *search = qobject_cast<SearchResult *>(sender());
     QTC_ASSERT(search, return);
-    QFutureWatcher<Core::SearchResultItem> *watcher = m_watchers.key(search);
+    QFutureWatcher<SearchResultItem> *watcher = m_watchers.key(search);
     QTC_ASSERT(watcher, return);
     if (!paused || watcher->isRunning()) // guard against pausing when the search is finished
         watcher->setPaused(paused);
 }
 
-Core::FindFlags SymbolsFindFilter::supportedFindFlags() const
+FindFlags SymbolsFindFilter::supportedFindFlags() const
 {
-    return Core::FindCaseSensitively | Core::FindRegularExpression | Core::FindWholeWords;
+    return FindCaseSensitively | FindRegularExpression | FindWholeWords;
 }
 
-void SymbolsFindFilter::findAll(const QString &txt, Core::FindFlags findFlags)
+void SymbolsFindFilter::findAll(const QString &txt, FindFlags findFlags)
 {
-    Core::SearchResultWindow *window = Core::SearchResultWindow::instance();
-    Core::SearchResult *search = window->startNewSearch(label(), toolTip(findFlags), txt);
+    SearchResultWindow *window = SearchResultWindow::instance();
+    SearchResult *search = window->startNewSearch(label(), toolTip(findFlags), txt);
     search->setSearchAgainSupported(true);
     connect(search, SIGNAL(activated(Core::SearchResultItem)),
             this, SLOT(openEditor(Core::SearchResultItem)));
@@ -129,7 +129,7 @@ void SymbolsFindFilter::findAll(const QString &txt, Core::FindFlags findFlags)
     startSearch(search);
 }
 
-void SymbolsFindFilter::startSearch(Core::SearchResult *search)
+void SymbolsFindFilter::startSearch(SearchResult *search)
 {
     SymbolSearcher::Parameters parameters = search->userData().value<SymbolSearcher::Parameters>();
     QSet<QString> projectFileNames;
@@ -138,7 +138,7 @@ void SymbolsFindFilter::startSearch(Core::SearchResult *search)
             projectFileNames += project->files(ProjectExplorer::Project::AllFiles).toSet();
     }
 
-    QFutureWatcher<Core::SearchResultItem> *watcher = new QFutureWatcher<Core::SearchResultItem>();
+    QFutureWatcher<SearchResultItem> *watcher = new QFutureWatcher<SearchResultItem>();
     m_watchers.insert(watcher, search);
     connect(watcher, SIGNAL(finished()),
             this, SLOT(finish()));
@@ -155,32 +155,32 @@ void SymbolsFindFilter::startSearch(Core::SearchResult *search)
 
 void SymbolsFindFilter::addResults(int begin, int end)
 {
-    QFutureWatcher<Core::SearchResultItem> *watcher =
-            static_cast<QFutureWatcher<Core::SearchResultItem> *>(sender());
-    Core::SearchResult *search = m_watchers.value(watcher);
+    QFutureWatcher<SearchResultItem> *watcher =
+            static_cast<QFutureWatcher<SearchResultItem> *>(sender());
+    SearchResult *search = m_watchers.value(watcher);
     if (!search) {
         // search was removed from search history while the search is running
         watcher->cancel();
         return;
     }
-    QList<Core::SearchResultItem> items;
+    QList<SearchResultItem> items;
     for (int i = begin; i < end; ++i)
         items << watcher->resultAt(i);
-    search->addResults(items, Core::SearchResult::AddSorted);
+    search->addResults(items, SearchResult::AddSorted);
 }
 
 void SymbolsFindFilter::finish()
 {
-    QFutureWatcher<Core::SearchResultItem> *watcher =
-            static_cast<QFutureWatcher<Core::SearchResultItem> *>(sender());
-    Core::SearchResult *search = m_watchers.value(watcher);
+    QFutureWatcher<SearchResultItem> *watcher =
+            static_cast<QFutureWatcher<SearchResultItem> *>(sender());
+    SearchResult *search = m_watchers.value(watcher);
     if (search)
         search->finishSearch(watcher->isCanceled());
     m_watchers.remove(watcher);
     watcher->deleteLater();
 }
 
-void SymbolsFindFilter::openEditor(const Core::SearchResultItem &item)
+void SymbolsFindFilter::openEditor(const SearchResultItem &item)
 {
     if (!item.userData.canConvert<IndexItem::Ptr>())
         return;
@@ -220,7 +220,7 @@ void SymbolsFindFilter::onTaskStarted(Id type)
     }
 }
 
-void SymbolsFindFilter::onAllTasksFinished(Core::Id type)
+void SymbolsFindFilter::onAllTasksFinished(Id type)
 {
     if (type == CppTools::Constants::TASK_INDEX) {
         m_enabled = true;
@@ -230,7 +230,7 @@ void SymbolsFindFilter::onAllTasksFinished(Core::Id type)
 
 void SymbolsFindFilter::searchAgain()
 {
-    Core::SearchResult *search = qobject_cast<Core::SearchResult *>(sender());
+    SearchResult *search = qobject_cast<SearchResult *>(sender());
     QTC_ASSERT(search, return);
     search->restart();
     startSearch(search);
@@ -241,7 +241,7 @@ QString SymbolsFindFilter::label() const
     return tr("C++ Symbols:");
 }
 
-QString SymbolsFindFilter::toolTip(Core::FindFlags findFlags) const
+QString SymbolsFindFilter::toolTip(FindFlags findFlags) const
 {
     QStringList types;
     if (m_symbolsToSearch & SymbolSearcher::Classes)
@@ -255,7 +255,7 @@ QString SymbolsFindFilter::toolTip(Core::FindFlags findFlags) const
     return tr("Scope: %1\nTypes: %2\nFlags: %3")
             .arg(searchScope() == SymbolSearcher::SearchGlobal ? tr("All") : tr("Projects"))
             .arg(types.join(tr(", ")))
-            .arg(Core::IFindFilter::descriptionForFindFlags(findFlags));
+            .arg(IFindFilter::descriptionForFindFlags(findFlags));
 }
 
 // #pragma mark -- SymbolsFindFilterConfigWidget
diff --git a/src/plugins/cpptools/typehierarchybuilder_test.cpp b/src/plugins/cpptools/typehierarchybuilder_test.cpp
index 0db7e58b0a..eb3a235234 100644
--- a/src/plugins/cpptools/typehierarchybuilder_test.cpp
+++ b/src/plugins/cpptools/typehierarchybuilder_test.cpp
@@ -95,7 +95,7 @@ private:
     Class *m_clazz;
 };
 
-class TypeHierarchyBuilderTestCase : public CppTools::Tests::TestCase
+class TypeHierarchyBuilderTestCase : public Tests::TestCase
 {
 public:
     TypeHierarchyBuilderTestCase(const QList<Tests::TestDocument> &documents,
diff --git a/tests/auto/cplusplus/c99/tst_c99.cpp b/tests/auto/cplusplus/c99/tst_c99.cpp
index a82aa42af9..6c4e40bd02 100644
--- a/tests/auto/cplusplus/c99/tst_c99.cpp
+++ b/tests/auto/cplusplus/c99/tst_c99.cpp
@@ -70,7 +70,7 @@ class tst_c99: public QObject
         return result;
     }
 
-    struct Client: CPlusPlus::DiagnosticClient {
+    struct Client: DiagnosticClient {
         QByteArray *errors;
 
         Client(QByteArray *errors)
diff --git a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
index bc7163d038..0e1f92e673 100644
--- a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
+++ b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
@@ -47,16 +47,15 @@
     Tests CheckSymbols, the "data provider" of the semantic highlighter.
  */
 
-typedef QByteArray _;
-typedef CppTools::CheckSymbols::Result Use;
-typedef CppTools::CheckSymbols::Kind UseKind;
-typedef CppTools::SemanticHighlighter Highlighting;
-typedef QList<Use> UseList;
-Q_DECLARE_METATYPE(UseList)
-
 using namespace CPlusPlus;
 using namespace CppTools;
 
+typedef QByteArray _;
+typedef CheckSymbols::Result Use;
+typedef CheckSymbols::Kind UseKind;
+typedef SemanticHighlighter Highlighting;
+typedef QList<Use> UseList;
+Q_DECLARE_METATYPE(UseList)
 
 static QString useKindToString(UseKind useKind)
 {
@@ -117,7 +116,7 @@ public:
     {
         // Write source to temprorary file
         const QString filePath = QDir::tempPath() + QLatin1String("/file.h");
-        CppTools::Tests::TestCase::writeFile(filePath, source);
+        Tests::TestCase::writeFile(filePath, source);
 
         // Processs source
         const Document::Ptr document = createDocument(filePath, source);
@@ -1771,7 +1770,7 @@ void tst_CheckSymbols::test_checksymbols_infiniteLoop()
         "};\n"
         ;
     const QString filePath1 = QDir::tempPath() + QLatin1String("/file1.h");
-    CppTools::Tests::TestCase::writeFile(filePath1, source1);
+    Tests::TestCase::writeFile(filePath1, source1);
 
     const QByteArray source2 =
         "template<class _Elem, class _Traits>\n"
@@ -1787,7 +1786,7 @@ void tst_CheckSymbols::test_checksymbols_infiniteLoop()
         "};\n"
         ;
     const QString filePath2 = QDir::tempPath() + QLatin1String("/file2.h");
-    CppTools::Tests::TestCase::writeFile(filePath2, source2);
+    Tests::TestCase::writeFile(filePath2, source2);
 
     const Document::Ptr document1 = TestCase::createDocument(filePath1, source1);
     document1->addIncludeFile(Document::Include("file2.h", filePath2, 1, Client::IncludeLocal));
diff --git a/tests/auto/cplusplus/cxx11/tst_cxx11.cpp b/tests/auto/cplusplus/cxx11/tst_cxx11.cpp
index 6e8eb91aa3..b0c720743f 100644
--- a/tests/auto/cplusplus/cxx11/tst_cxx11.cpp
+++ b/tests/auto/cplusplus/cxx11/tst_cxx11.cpp
@@ -72,7 +72,7 @@ class tst_cxx11: public QObject
         return result;
     }
 
-    struct Client: CPlusPlus::DiagnosticClient {
+    struct Client: DiagnosticClient {
         QByteArray *errors;
 
         Client(QByteArray *errors)
@@ -106,7 +106,7 @@ class tst_cxx11: public QObject
     public:
         FindLambdaFunction() : m_function(0) {}
 
-        Function *operator()(const CPlusPlus::Document::Ptr &document)
+        Function *operator()(const Document::Ptr &document)
         {
             accept(document->globalNamespace());
             return m_function;