diff --git a/src/shared/cplusplus/AST.cpp b/src/libs/3rdparty/cplusplus/AST.cpp
similarity index 100%
rename from src/shared/cplusplus/AST.cpp
rename to src/libs/3rdparty/cplusplus/AST.cpp
diff --git a/src/shared/cplusplus/AST.h b/src/libs/3rdparty/cplusplus/AST.h
similarity index 100%
rename from src/shared/cplusplus/AST.h
rename to src/libs/3rdparty/cplusplus/AST.h
diff --git a/src/shared/cplusplus/ASTClone.cpp b/src/libs/3rdparty/cplusplus/ASTClone.cpp
similarity index 100%
rename from src/shared/cplusplus/ASTClone.cpp
rename to src/libs/3rdparty/cplusplus/ASTClone.cpp
diff --git a/src/shared/cplusplus/ASTMatch0.cpp b/src/libs/3rdparty/cplusplus/ASTMatch0.cpp
similarity index 100%
rename from src/shared/cplusplus/ASTMatch0.cpp
rename to src/libs/3rdparty/cplusplus/ASTMatch0.cpp
diff --git a/src/shared/cplusplus/ASTMatcher.cpp b/src/libs/3rdparty/cplusplus/ASTMatcher.cpp
similarity index 100%
rename from src/shared/cplusplus/ASTMatcher.cpp
rename to src/libs/3rdparty/cplusplus/ASTMatcher.cpp
diff --git a/src/shared/cplusplus/ASTMatcher.h b/src/libs/3rdparty/cplusplus/ASTMatcher.h
similarity index 100%
rename from src/shared/cplusplus/ASTMatcher.h
rename to src/libs/3rdparty/cplusplus/ASTMatcher.h
diff --git a/src/shared/cplusplus/ASTPatternBuilder.cpp b/src/libs/3rdparty/cplusplus/ASTPatternBuilder.cpp
similarity index 100%
rename from src/shared/cplusplus/ASTPatternBuilder.cpp
rename to src/libs/3rdparty/cplusplus/ASTPatternBuilder.cpp
diff --git a/src/shared/cplusplus/ASTPatternBuilder.h b/src/libs/3rdparty/cplusplus/ASTPatternBuilder.h
similarity index 100%
rename from src/shared/cplusplus/ASTPatternBuilder.h
rename to src/libs/3rdparty/cplusplus/ASTPatternBuilder.h
diff --git a/src/shared/cplusplus/ASTVisit.cpp b/src/libs/3rdparty/cplusplus/ASTVisit.cpp
similarity index 100%
rename from src/shared/cplusplus/ASTVisit.cpp
rename to src/libs/3rdparty/cplusplus/ASTVisit.cpp
diff --git a/src/shared/cplusplus/ASTVisitor.cpp b/src/libs/3rdparty/cplusplus/ASTVisitor.cpp
similarity index 100%
rename from src/shared/cplusplus/ASTVisitor.cpp
rename to src/libs/3rdparty/cplusplus/ASTVisitor.cpp
diff --git a/src/shared/cplusplus/ASTVisitor.h b/src/libs/3rdparty/cplusplus/ASTVisitor.h
similarity index 100%
rename from src/shared/cplusplus/ASTVisitor.h
rename to src/libs/3rdparty/cplusplus/ASTVisitor.h
diff --git a/src/shared/cplusplus/ASTfwd.h b/src/libs/3rdparty/cplusplus/ASTfwd.h
similarity index 100%
rename from src/shared/cplusplus/ASTfwd.h
rename to src/libs/3rdparty/cplusplus/ASTfwd.h
diff --git a/src/shared/cplusplus/Bind.cpp b/src/libs/3rdparty/cplusplus/Bind.cpp
similarity index 100%
rename from src/shared/cplusplus/Bind.cpp
rename to src/libs/3rdparty/cplusplus/Bind.cpp
diff --git a/src/shared/cplusplus/Bind.h b/src/libs/3rdparty/cplusplus/Bind.h
similarity index 100%
rename from src/shared/cplusplus/Bind.h
rename to src/libs/3rdparty/cplusplus/Bind.h
diff --git a/src/shared/cplusplus/CPlusPlus.h b/src/libs/3rdparty/cplusplus/CPlusPlus.h
similarity index 100%
rename from src/shared/cplusplus/CPlusPlus.h
rename to src/libs/3rdparty/cplusplus/CPlusPlus.h
diff --git a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h b/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h
similarity index 100%
rename from src/shared/cplusplus/CPlusPlusForwardDeclarations.h
rename to src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h
diff --git a/src/shared/cplusplus/Control.cpp b/src/libs/3rdparty/cplusplus/Control.cpp
similarity index 100%
rename from src/shared/cplusplus/Control.cpp
rename to src/libs/3rdparty/cplusplus/Control.cpp
diff --git a/src/shared/cplusplus/Control.h b/src/libs/3rdparty/cplusplus/Control.h
similarity index 100%
rename from src/shared/cplusplus/Control.h
rename to src/libs/3rdparty/cplusplus/Control.h
diff --git a/src/shared/cplusplus/CoreTypes.cpp b/src/libs/3rdparty/cplusplus/CoreTypes.cpp
similarity index 100%
rename from src/shared/cplusplus/CoreTypes.cpp
rename to src/libs/3rdparty/cplusplus/CoreTypes.cpp
diff --git a/src/shared/cplusplus/CoreTypes.h b/src/libs/3rdparty/cplusplus/CoreTypes.h
similarity index 100%
rename from src/shared/cplusplus/CoreTypes.h
rename to src/libs/3rdparty/cplusplus/CoreTypes.h
diff --git a/src/shared/cplusplus/DiagnosticClient.cpp b/src/libs/3rdparty/cplusplus/DiagnosticClient.cpp
similarity index 100%
rename from src/shared/cplusplus/DiagnosticClient.cpp
rename to src/libs/3rdparty/cplusplus/DiagnosticClient.cpp
diff --git a/src/shared/cplusplus/DiagnosticClient.h b/src/libs/3rdparty/cplusplus/DiagnosticClient.h
similarity index 100%
rename from src/shared/cplusplus/DiagnosticClient.h
rename to src/libs/3rdparty/cplusplus/DiagnosticClient.h
diff --git a/src/shared/cplusplus/FullySpecifiedType.cpp b/src/libs/3rdparty/cplusplus/FullySpecifiedType.cpp
similarity index 100%
rename from src/shared/cplusplus/FullySpecifiedType.cpp
rename to src/libs/3rdparty/cplusplus/FullySpecifiedType.cpp
diff --git a/src/shared/cplusplus/FullySpecifiedType.h b/src/libs/3rdparty/cplusplus/FullySpecifiedType.h
similarity index 100%
rename from src/shared/cplusplus/FullySpecifiedType.h
rename to src/libs/3rdparty/cplusplus/FullySpecifiedType.h
diff --git a/src/shared/cplusplus/Keywords.cpp b/src/libs/3rdparty/cplusplus/Keywords.cpp
similarity index 100%
rename from src/shared/cplusplus/Keywords.cpp
rename to src/libs/3rdparty/cplusplus/Keywords.cpp
diff --git a/src/shared/cplusplus/Keywords.kwgen b/src/libs/3rdparty/cplusplus/Keywords.kwgen
similarity index 100%
rename from src/shared/cplusplus/Keywords.kwgen
rename to src/libs/3rdparty/cplusplus/Keywords.kwgen
diff --git a/src/shared/cplusplus/Lexer.cpp b/src/libs/3rdparty/cplusplus/Lexer.cpp
similarity index 100%
rename from src/shared/cplusplus/Lexer.cpp
rename to src/libs/3rdparty/cplusplus/Lexer.cpp
diff --git a/src/shared/cplusplus/Lexer.h b/src/libs/3rdparty/cplusplus/Lexer.h
similarity index 100%
rename from src/shared/cplusplus/Lexer.h
rename to src/libs/3rdparty/cplusplus/Lexer.h
diff --git a/src/shared/cplusplus/LiteralTable.cpp b/src/libs/3rdparty/cplusplus/LiteralTable.cpp
similarity index 100%
rename from src/shared/cplusplus/LiteralTable.cpp
rename to src/libs/3rdparty/cplusplus/LiteralTable.cpp
diff --git a/src/shared/cplusplus/LiteralTable.h b/src/libs/3rdparty/cplusplus/LiteralTable.h
similarity index 100%
rename from src/shared/cplusplus/LiteralTable.h
rename to src/libs/3rdparty/cplusplus/LiteralTable.h
diff --git a/src/shared/cplusplus/Literals.cpp b/src/libs/3rdparty/cplusplus/Literals.cpp
similarity index 100%
rename from src/shared/cplusplus/Literals.cpp
rename to src/libs/3rdparty/cplusplus/Literals.cpp
diff --git a/src/shared/cplusplus/Literals.h b/src/libs/3rdparty/cplusplus/Literals.h
similarity index 100%
rename from src/shared/cplusplus/Literals.h
rename to src/libs/3rdparty/cplusplus/Literals.h
diff --git a/src/shared/cplusplus/MemoryPool.cpp b/src/libs/3rdparty/cplusplus/MemoryPool.cpp
similarity index 100%
rename from src/shared/cplusplus/MemoryPool.cpp
rename to src/libs/3rdparty/cplusplus/MemoryPool.cpp
diff --git a/src/shared/cplusplus/MemoryPool.h b/src/libs/3rdparty/cplusplus/MemoryPool.h
similarity index 100%
rename from src/shared/cplusplus/MemoryPool.h
rename to src/libs/3rdparty/cplusplus/MemoryPool.h
diff --git a/src/shared/cplusplus/Name.cpp b/src/libs/3rdparty/cplusplus/Name.cpp
similarity index 100%
rename from src/shared/cplusplus/Name.cpp
rename to src/libs/3rdparty/cplusplus/Name.cpp
diff --git a/src/shared/cplusplus/Name.h b/src/libs/3rdparty/cplusplus/Name.h
similarity index 100%
rename from src/shared/cplusplus/Name.h
rename to src/libs/3rdparty/cplusplus/Name.h
diff --git a/src/shared/cplusplus/NameVisitor.cpp b/src/libs/3rdparty/cplusplus/NameVisitor.cpp
similarity index 100%
rename from src/shared/cplusplus/NameVisitor.cpp
rename to src/libs/3rdparty/cplusplus/NameVisitor.cpp
diff --git a/src/shared/cplusplus/NameVisitor.h b/src/libs/3rdparty/cplusplus/NameVisitor.h
similarity index 100%
rename from src/shared/cplusplus/NameVisitor.h
rename to src/libs/3rdparty/cplusplus/NameVisitor.h
diff --git a/src/shared/cplusplus/Names.cpp b/src/libs/3rdparty/cplusplus/Names.cpp
similarity index 100%
rename from src/shared/cplusplus/Names.cpp
rename to src/libs/3rdparty/cplusplus/Names.cpp
diff --git a/src/shared/cplusplus/Names.h b/src/libs/3rdparty/cplusplus/Names.h
similarity index 100%
rename from src/shared/cplusplus/Names.h
rename to src/libs/3rdparty/cplusplus/Names.h
diff --git a/src/shared/cplusplus/ObjectiveCAtKeywords.cpp b/src/libs/3rdparty/cplusplus/ObjectiveCAtKeywords.cpp
similarity index 100%
rename from src/shared/cplusplus/ObjectiveCAtKeywords.cpp
rename to src/libs/3rdparty/cplusplus/ObjectiveCAtKeywords.cpp
diff --git a/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp b/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.cpp
similarity index 100%
rename from src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
rename to src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.cpp
diff --git a/src/shared/cplusplus/ObjectiveCTypeQualifiers.h b/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.h
similarity index 100%
rename from src/shared/cplusplus/ObjectiveCTypeQualifiers.h
rename to src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.h
diff --git a/src/shared/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp
similarity index 100%
rename from src/shared/cplusplus/Parser.cpp
rename to src/libs/3rdparty/cplusplus/Parser.cpp
diff --git a/src/shared/cplusplus/Parser.h b/src/libs/3rdparty/cplusplus/Parser.h
similarity index 100%
rename from src/shared/cplusplus/Parser.h
rename to src/libs/3rdparty/cplusplus/Parser.h
diff --git a/src/shared/cplusplus/QtContextKeywords.cpp b/src/libs/3rdparty/cplusplus/QtContextKeywords.cpp
similarity index 100%
rename from src/shared/cplusplus/QtContextKeywords.cpp
rename to src/libs/3rdparty/cplusplus/QtContextKeywords.cpp
diff --git a/src/shared/cplusplus/QtContextKeywords.h b/src/libs/3rdparty/cplusplus/QtContextKeywords.h
similarity index 100%
rename from src/shared/cplusplus/QtContextKeywords.h
rename to src/libs/3rdparty/cplusplus/QtContextKeywords.h
diff --git a/src/shared/cplusplus/Scope.cpp b/src/libs/3rdparty/cplusplus/Scope.cpp
similarity index 100%
rename from src/shared/cplusplus/Scope.cpp
rename to src/libs/3rdparty/cplusplus/Scope.cpp
diff --git a/src/shared/cplusplus/Scope.h b/src/libs/3rdparty/cplusplus/Scope.h
similarity index 100%
rename from src/shared/cplusplus/Scope.h
rename to src/libs/3rdparty/cplusplus/Scope.h
diff --git a/src/shared/cplusplus/Symbol.cpp b/src/libs/3rdparty/cplusplus/Symbol.cpp
similarity index 100%
rename from src/shared/cplusplus/Symbol.cpp
rename to src/libs/3rdparty/cplusplus/Symbol.cpp
diff --git a/src/shared/cplusplus/Symbol.h b/src/libs/3rdparty/cplusplus/Symbol.h
similarity index 100%
rename from src/shared/cplusplus/Symbol.h
rename to src/libs/3rdparty/cplusplus/Symbol.h
diff --git a/src/shared/cplusplus/SymbolVisitor.cpp b/src/libs/3rdparty/cplusplus/SymbolVisitor.cpp
similarity index 100%
rename from src/shared/cplusplus/SymbolVisitor.cpp
rename to src/libs/3rdparty/cplusplus/SymbolVisitor.cpp
diff --git a/src/shared/cplusplus/SymbolVisitor.h b/src/libs/3rdparty/cplusplus/SymbolVisitor.h
similarity index 100%
rename from src/shared/cplusplus/SymbolVisitor.h
rename to src/libs/3rdparty/cplusplus/SymbolVisitor.h
diff --git a/src/shared/cplusplus/Symbols.cpp b/src/libs/3rdparty/cplusplus/Symbols.cpp
similarity index 100%
rename from src/shared/cplusplus/Symbols.cpp
rename to src/libs/3rdparty/cplusplus/Symbols.cpp
diff --git a/src/shared/cplusplus/Symbols.h b/src/libs/3rdparty/cplusplus/Symbols.h
similarity index 100%
rename from src/shared/cplusplus/Symbols.h
rename to src/libs/3rdparty/cplusplus/Symbols.h
diff --git a/src/shared/cplusplus/Token.cpp b/src/libs/3rdparty/cplusplus/Token.cpp
similarity index 100%
rename from src/shared/cplusplus/Token.cpp
rename to src/libs/3rdparty/cplusplus/Token.cpp
diff --git a/src/shared/cplusplus/Token.h b/src/libs/3rdparty/cplusplus/Token.h
similarity index 100%
rename from src/shared/cplusplus/Token.h
rename to src/libs/3rdparty/cplusplus/Token.h
diff --git a/src/shared/cplusplus/TranslationUnit.cpp b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp
similarity index 100%
rename from src/shared/cplusplus/TranslationUnit.cpp
rename to src/libs/3rdparty/cplusplus/TranslationUnit.cpp
diff --git a/src/shared/cplusplus/TranslationUnit.h b/src/libs/3rdparty/cplusplus/TranslationUnit.h
similarity index 100%
rename from src/shared/cplusplus/TranslationUnit.h
rename to src/libs/3rdparty/cplusplus/TranslationUnit.h
diff --git a/src/shared/cplusplus/Type.cpp b/src/libs/3rdparty/cplusplus/Type.cpp
similarity index 100%
rename from src/shared/cplusplus/Type.cpp
rename to src/libs/3rdparty/cplusplus/Type.cpp
diff --git a/src/shared/cplusplus/Type.h b/src/libs/3rdparty/cplusplus/Type.h
similarity index 100%
rename from src/shared/cplusplus/Type.h
rename to src/libs/3rdparty/cplusplus/Type.h
diff --git a/src/shared/cplusplus/TypeMatcher.cpp b/src/libs/3rdparty/cplusplus/TypeMatcher.cpp
similarity index 100%
rename from src/shared/cplusplus/TypeMatcher.cpp
rename to src/libs/3rdparty/cplusplus/TypeMatcher.cpp
diff --git a/src/shared/cplusplus/TypeMatcher.h b/src/libs/3rdparty/cplusplus/TypeMatcher.h
similarity index 100%
rename from src/shared/cplusplus/TypeMatcher.h
rename to src/libs/3rdparty/cplusplus/TypeMatcher.h
diff --git a/src/shared/cplusplus/TypeVisitor.cpp b/src/libs/3rdparty/cplusplus/TypeVisitor.cpp
similarity index 100%
rename from src/shared/cplusplus/TypeVisitor.cpp
rename to src/libs/3rdparty/cplusplus/TypeVisitor.cpp
diff --git a/src/shared/cplusplus/TypeVisitor.h b/src/libs/3rdparty/cplusplus/TypeVisitor.h
similarity index 100%
rename from src/shared/cplusplus/TypeVisitor.h
rename to src/libs/3rdparty/cplusplus/TypeVisitor.h
diff --git a/src/shared/cplusplus/cplusplus.pri b/src/libs/3rdparty/cplusplus/cplusplus.pri
similarity index 100%
rename from src/shared/cplusplus/cplusplus.pri
rename to src/libs/3rdparty/cplusplus/cplusplus.pri
diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index f08d5d19254..f2683c7dace 100644
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -6,7 +6,7 @@ contains(CONFIG, dll) {
 
 INCLUDEPATH += $$PWD
 
-include(../../shared/cplusplus/cplusplus.pri)
+include(../3rdparty/cplusplus/cplusplus.pri)
 
 contains(QT, gui) {
 HEADERS += \
diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri
index 8b49cd3d0e2..7fdbdb05a8f 100644
--- a/src/libs/cplusplus/cplusplus.pri
+++ b/src/libs/cplusplus/cplusplus.pri
@@ -1,3 +1,3 @@
-INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
-INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
+INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/3rdparty/cplusplus
+INCLUDEPATH += $$PWD
 LIBS *= -l$$qtLibraryName(CPlusPlus)
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index ae551666c63..311cd56ff53 100644
--- a/tests/auto/cplusplus/shared/shared.pri
+++ b/tests/auto/cplusplus/shared/shared.pri
@@ -1,6 +1,6 @@
 DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
 INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
-INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
+INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/3rdparty/cplusplus
 include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
 include($$IDE_SOURCE_TREE/src/rpath.pri)
 
diff --git a/tests/manual/plain-cplusplus/plain-cplusplus.pro b/tests/manual/plain-cplusplus/plain-cplusplus.pro
index b2c5dc6e180..f6b206854dc 100644
--- a/tests/manual/plain-cplusplus/plain-cplusplus.pro
+++ b/tests/manual/plain-cplusplus/plain-cplusplus.pro
@@ -7,7 +7,7 @@ macx {
     release:LIBS += -Wl,-exported_symbol -Wl,_main
 }
 
-include(../../../src/shared/cplusplus/cplusplus.pri)
+include(../../../src/libs/3rdparty/cplusplus/cplusplus.pri)
 
 # Input
 HEADERS += Preprocessor.h