fix include style relating to cplusplus libraries

... and adjust INCLUDEPATH accordingly.

while i'm at messing with include statements, also re-order the include
blocks according to policy and sort them within bigger blocks.

Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

57 files changed, 207 insertions, 158 deletions

diff --git a/src/libs/cplusplus/ASTParent.cpp b/src/libs/cplusplus/ASTParent.cpp
index f31faa431b..37b470c10c 100644
--- a/src/libs/cplusplus/ASTParent.cpp
+++ b/src/libs/cplusplus/ASTParent.cpp
@@ -28,7 +28,8 @@
 ****************************************************************************/
 
 #include "ASTParent.h"
-#include "AST.h"
+
+#include <cplusplus/AST.h>
 
 using namespace CPlusPlus;
 
diff --git a/src/libs/cplusplus/ASTParent.h b/src/libs/cplusplus/ASTParent.h
index 4fa25aef40..efd7d322d9 100644
--- a/src/libs/cplusplus/ASTParent.h
+++ b/src/libs/cplusplus/ASTParent.h
@@ -30,7 +30,8 @@
 #ifndef CPLUSPLUS_ASTPARENT_H
 #define CPLUSPLUS_ASTPARENT_H
 
-#include <ASTVisitor.h>
+#include <cplusplus/ASTVisitor.h>
+
 #include <QHash>
 #include <QStack>
 
diff --git a/src/libs/cplusplus/ASTPath.cpp b/src/libs/cplusplus/ASTPath.cpp
index 6d4f46c344..0d3fcf726d 100644
--- a/src/libs/cplusplus/ASTPath.cpp
+++ b/src/libs/cplusplus/ASTPath.cpp
@@ -29,8 +29,8 @@
 
 #include "ASTPath.h"
 
-#include <AST.h>
-#include <TranslationUnit.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/TranslationUnit.h>
 
 #ifdef DEBUG_AST_PATH
 #  include <QDebug>
diff --git a/src/libs/cplusplus/ASTPath.h b/src/libs/cplusplus/ASTPath.h
index 00e0b4fc52..b74ec3f87c 100644
--- a/src/libs/cplusplus/ASTPath.h
+++ b/src/libs/cplusplus/ASTPath.h
@@ -30,8 +30,8 @@
 #ifndef CPLUSPLUS_ASTPATH_H
 #define CPLUSPLUS_ASTPATH_H
 
-#include <ASTfwd.h>
-#include <ASTVisitor.h>
+#include <cplusplus/ASTfwd.h>
+#include <cplusplus/ASTVisitor.h>
 
 #include "CppDocument.h"
 
diff --git a/src/libs/cplusplus/BackwardsScanner.cpp b/src/libs/cplusplus/BackwardsScanner.cpp
index f4e36ab572..2649e13215 100644
--- a/src/libs/cplusplus/BackwardsScanner.cpp
+++ b/src/libs/cplusplus/BackwardsScanner.cpp
@@ -26,8 +26,11 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+
 #include "BackwardsScanner.h"
-#include <Token.h>
+
+#include <cplusplus/Token.h>
+
 #include <QTextCursor>
 #include <QTextDocument>
 
diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index f35784a0ff..2385238b9c 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -31,22 +31,22 @@
 #include "FastPreprocessor.h"
 #include "LookupContext.h"
 #include "Overview.h"
-#include "Bind.h"
-
-#include <Control.h>
-#include <TranslationUnit.h>
-#include <DiagnosticClient.h>
-#include <Literals.h>
-#include <Symbols.h>
-#include <Names.h>
-#include <AST.h>
-#include <ASTPatternBuilder.h>
-#include <ASTMatcher.h>
-#include <Scope.h>
-#include <SymbolVisitor.h>
-#include <NameVisitor.h>
-#include <TypeVisitor.h>
-#include <CoreTypes.h>
+
+#include <cplusplus/Bind.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/TranslationUnit.h>
+#include <cplusplus/DiagnosticClient.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTPatternBuilder.h>
+#include <cplusplus/ASTMatcher.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/NameVisitor.h>
+#include <cplusplus/TypeVisitor.h>
+#include <cplusplus/CoreTypes.h>
 
 #include <QByteArray>
 #include <QBitArray>
diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h
index 6e770145a5..9d2cd128e2 100644
--- a/src/libs/cplusplus/CppDocument.h
+++ b/src/libs/cplusplus/CppDocument.h
@@ -30,9 +30,10 @@
 #ifndef CPLUSPLUS_CPPDOCUMENT_H
 #define CPLUSPLUS_CPPDOCUMENT_H
 
-#include <CPlusPlusForwardDeclarations.h>
 #include "Macro.h"
 
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
+
 #include <QSharedPointer>
 #include <QDateTime>
 #include <QHash>
diff --git a/src/libs/cplusplus/CppRewriter.cpp b/src/libs/cplusplus/CppRewriter.cpp
index 7a49fd2b41..0a18c7fb14 100644
--- a/src/libs/cplusplus/CppRewriter.cpp
+++ b/src/libs/cplusplus/CppRewriter.cpp
@@ -26,15 +26,18 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+
 #include "CppRewriter.h"
-#include <TypeVisitor.h>
-#include <NameVisitor.h>
-#include <CoreTypes.h>
-#include <Symbols.h>
-#include <Literals.h>
-#include <Names.h>
-#include <Scope.h>
-#include <Overview.h>
+
+#include "Overview.h"
+
+#include <cplusplus/TypeVisitor.h>
+#include <cplusplus/NameVisitor.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Scope.h>
 
 #include <QVarLengthArray>
 #include <QRegExp>
diff --git a/src/libs/cplusplus/DependencyTable.h b/src/libs/cplusplus/DependencyTable.h
index 6fff12c673..607f204190 100644
--- a/src/libs/cplusplus/DependencyTable.h
+++ b/src/libs/cplusplus/DependencyTable.h
@@ -30,7 +30,7 @@
 #ifndef CPLUSPLUS_DEPENDENCYTABLE_H
 #define CPLUSPLUS_DEPENDENCYTABLE_H
 
-#include <CPlusPlusForwardDeclarations.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
 
 #include <QBitArray>
 #include <QHash>
diff --git a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
index 2954fae24c..0f482141ae 100644
--- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
+++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
@@ -30,12 +30,12 @@
 #include "DeprecatedGenTemplateInstance.h"
 #include "Overview.h"
 
-#include <Control.h>
-#include <Scope.h>
-#include <Names.h>
-#include <Symbols.h>
-#include <CoreTypes.h>
-#include <Literals.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/Literals.h>
 
 #include <QVarLengthArray>
 #include <QDebug>
diff --git a/src/libs/cplusplus/DeprecatedGenTemplateInstance.h b/src/libs/cplusplus/DeprecatedGenTemplateInstance.h
index 01f393da66..ece0f66059 100644
--- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.h
+++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.h
@@ -30,9 +30,9 @@
 #ifndef CPLUSPLUS_DEPRECATEDGENTEMPLATEINSTANCE_H
 #define CPLUSPLUS_DEPRECATEDGENTEMPLATEINSTANCE_H
 
-#include <TypeVisitor.h>
-#include <NameVisitor.h>
-#include <FullySpecifiedType.h>
+#include <cplusplus/TypeVisitor.h>
+#include <cplusplus/NameVisitor.h>
+#include <cplusplus/FullySpecifiedType.h>
 
 #include <QList>
 #include <QPair>
diff --git a/src/libs/cplusplus/Dumpers.cpp b/src/libs/cplusplus/Dumpers.cpp
index 3b181d0d07..b3a4cc55cf 100644
--- a/src/libs/cplusplus/Dumpers.cpp
+++ b/src/libs/cplusplus/Dumpers.cpp
@@ -29,10 +29,12 @@
 
 #include "Dumpers.h"
 
-#include <Overview.h>
-#include <Literals.h>
-#include <Scope.h>
-#include <LookupContext.h>
+#include "Overview.h"
+#include "LookupContext.h"
+
+#include <cplusplus/Literals.h>
+#include <cplusplus/Scope.h>
+
 #include <QDebug>
 
 #include <typeinfo>
diff --git a/src/libs/cplusplus/Dumpers.h b/src/libs/cplusplus/Dumpers.h
index 0b558dd9b6..864894b65d 100644
--- a/src/libs/cplusplus/Dumpers.h
+++ b/src/libs/cplusplus/Dumpers.h
@@ -30,10 +30,11 @@
 #ifndef CPLUSPLUS_DUMPERS_H
 #define CPLUSPLUS_DUMPERS_H
 
-#include <CPlusPlusForwardDeclarations.h>
-#include <FullySpecifiedType.h>
-#include <Symbol.h>
-#include <LookupItem.h>
+#include "LookupItem.h"
+
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
+#include <cplusplus/FullySpecifiedType.h>
+#include <cplusplus/Symbol.h>
 
 #include <QString>
 
diff --git a/src/libs/cplusplus/ExpressionUnderCursor.cpp b/src/libs/cplusplus/ExpressionUnderCursor.cpp
index 437fef0393..370a4d110e 100644
--- a/src/libs/cplusplus/ExpressionUnderCursor.cpp
+++ b/src/libs/cplusplus/ExpressionUnderCursor.cpp
@@ -28,9 +28,11 @@
 ****************************************************************************/
 
 #include "ExpressionUnderCursor.h"
+
 #include "SimpleLexer.h"
 #include "BackwardsScanner.h"
-#include <Token.h>
+
+#include <cplusplus/Token.h>
 
 #include <QTextCursor>
 #include <QTextBlock>
diff --git a/src/libs/cplusplus/ExpressionUnderCursor.h b/src/libs/cplusplus/ExpressionUnderCursor.h
index 8818e9465b..0d47ca5ae8 100644
--- a/src/libs/cplusplus/ExpressionUnderCursor.h
+++ b/src/libs/cplusplus/ExpressionUnderCursor.h
@@ -30,7 +30,8 @@
 #ifndef CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
 #define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
 
-#include "CPlusPlusForwardDeclarations.h"
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
+
 #include <QList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp
index b1d9f50b60..3e7e5d59b9 100644
--- a/src/libs/cplusplus/FastPreprocessor.cpp
+++ b/src/libs/cplusplus/FastPreprocessor.cpp
@@ -28,8 +28,10 @@
 ****************************************************************************/
 
 #include "FastPreprocessor.h"
-#include <Literals.h>
-#include <TranslationUnit.h>
+
+#include <cplusplus/Literals.h>
+#include <cplusplus/TranslationUnit.h>
+
 #include <QDir>
 
 using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/FastPreprocessor.h b/src/libs/cplusplus/FastPreprocessor.h
index 35f852151f..fb49d06645 100644
--- a/src/libs/cplusplus/FastPreprocessor.h
+++ b/src/libs/cplusplus/FastPreprocessor.h
@@ -34,7 +34,7 @@
 #include "CppDocument.h"
 #include "pp.h"
 
-#include <Control.h>
+#include <cplusplus/Control.h>
 
 #include <QSet>
 #include <QString>
diff --git a/src/libs/cplusplus/FindUsages.cpp b/src/libs/cplusplus/FindUsages.cpp
index 90c71bc8c6..2d4d5c5fc8 100644
--- a/src/libs/cplusplus/FindUsages.cpp
+++ b/src/libs/cplusplus/FindUsages.cpp
@@ -28,15 +28,18 @@
 ****************************************************************************/
 
 #include "FindUsages.h"
+
 #include "Overview.h"
-#include <AST.h>
-#include <TranslationUnit.h>
-#include <Control.h>
-#include <Names.h>
-#include <Symbols.h>
-#include <CoreTypes.h>
-#include <Literals.h>
-#include <Scope.h>
+
+#include <cplusplus/AST.h>
+#include <cplusplus/TranslationUnit.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Scope.h>
+
 #include <QDebug>
 
 using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/FindUsages.h b/src/libs/cplusplus/FindUsages.h
index 9a88cd4050..1a7fd90688 100644
--- a/src/libs/cplusplus/FindUsages.h
+++ b/src/libs/cplusplus/FindUsages.h
@@ -33,7 +33,9 @@
 #include "LookupContext.h"
 #include "CppDocument.h"
 #include "TypeOfExpression.h"
-#include <ASTVisitor.h>
+
+#include <cplusplus/ASTVisitor.h>
+
 #include <QSet>
 
 namespace CPlusPlus {
diff --git a/src/libs/cplusplus/Icons.cpp b/src/libs/cplusplus/Icons.cpp
index 39ec346e16..3b3e3e1fb0 100644
--- a/src/libs/cplusplus/Icons.cpp
+++ b/src/libs/cplusplus/Icons.cpp
@@ -29,10 +29,10 @@
 
 #include "Icons.h"
 
-#include <FullySpecifiedType.h>
-#include <Scope.h>
-#include <Symbols.h>
-#include <Type.h>
+#include <cplusplus/FullySpecifiedType.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Type.h>
 
 using namespace CPlusPlus;
 using CPlusPlus::Icons;
diff --git a/src/libs/cplusplus/Icons.h b/src/libs/cplusplus/Icons.h
index a42452b2ca..7396744c71 100644
--- a/src/libs/cplusplus/Icons.h
+++ b/src/libs/cplusplus/Icons.h
@@ -30,7 +30,7 @@
 #ifndef CPLUSPLUS_ICONS_H
 #define CPLUSPLUS_ICONS_H
 
-#include "CPlusPlusForwardDeclarations.h"
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
 
 #include <QIcon>
 
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 9fb17e85f3..a4791aff77 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -28,17 +28,18 @@
 ****************************************************************************/
 
 #include "LookupContext.h"
+
 #include "ResolveExpression.h"
 #include "Overview.h"
 #include "DeprecatedGenTemplateInstance.h"
 #include "CppRewriter.h"
 
-#include <CoreTypes.h>
-#include <Symbols.h>
-#include <Literals.h>
-#include <Names.h>
-#include <Scope.h>
-#include <Control.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Control.h>
 
 #include <QStack>
 #include <QHash>
diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h
index d7f3b54285..09b1691512 100644
--- a/src/libs/cplusplus/LookupContext.h
+++ b/src/libs/cplusplus/LookupContext.h
@@ -33,15 +33,18 @@
 #include "CppDocument.h"
 #include "LookupItem.h"
 #include "AlreadyConsideredClassContainer.h"
-#include <FullySpecifiedType.h>
-#include <Type.h>
-#include <SymbolVisitor.h>
-#include <Control.h>
-#include <Name.h>
+
+#include <cplusplus/FullySpecifiedType.h>
+#include <cplusplus/Type.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/Name.h>
+
 #include <QSet>
+#include <QMap>
+
 #include <map>
 #include <functional>
-#include <QMap>
 
 namespace CPlusPlus {
 
diff --git a/src/libs/cplusplus/LookupItem.cpp b/src/libs/cplusplus/LookupItem.cpp
index 0cb7d4a91a..a3608292d1 100644
--- a/src/libs/cplusplus/LookupItem.cpp
+++ b/src/libs/cplusplus/LookupItem.cpp
@@ -28,9 +28,10 @@
 ****************************************************************************/
 
 #include "LookupItem.h"
-#include <FullySpecifiedType.h>
-#include <Symbol.h>
-#include <Control.h>
+
+#include <cplusplus/FullySpecifiedType.h>
+#include <cplusplus/Symbol.h>
+#include <cplusplus/Control.h>
 
 #include <QDebug>
 
diff --git a/src/libs/cplusplus/LookupItem.h b/src/libs/cplusplus/LookupItem.h
index dc229fc762..e3161249c2 100644
--- a/src/libs/cplusplus/LookupItem.h
+++ b/src/libs/cplusplus/LookupItem.h
@@ -30,7 +30,8 @@
 #ifndef CPLUSPLUS_LOOKUPITEM_H
 #define CPLUSPLUS_LOOKUPITEM_H
 
-#include <FullySpecifiedType.h>
+#include <cplusplus/FullySpecifiedType.h>
+
 #include <QHash>
 
 namespace CPlusPlus {
diff --git a/src/libs/cplusplus/Macro.h b/src/libs/cplusplus/Macro.h
index aad4f9209c..a3d83b1f00 100644
--- a/src/libs/cplusplus/Macro.h
+++ b/src/libs/cplusplus/Macro.h
@@ -51,7 +51,7 @@
 
 #include "PPToken.h"
 
-#include <CPlusPlusForwardDeclarations.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
 
 #include <QByteArray>
 #include <QVector>
diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp
index 3b9e231f44..b6fb54011a 100644
--- a/src/libs/cplusplus/MatchingText.cpp
+++ b/src/libs/cplusplus/MatchingText.cpp
@@ -26,14 +26,15 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+
 #include "MatchingText.h"
+
 #include "BackwardsScanner.h"
 
-#include <Token.h>
+#include <cplusplus/Token.h>
 
 #include <QTextDocument>
 #include <QTextCursor>
-
 #include <QChar>
 #include <QDebug>
 
diff --git a/src/libs/cplusplus/MatchingText.h b/src/libs/cplusplus/MatchingText.h
index 4437ed604d..5b12d5cc78 100644
--- a/src/libs/cplusplus/MatchingText.h
+++ b/src/libs/cplusplus/MatchingText.h
@@ -29,7 +29,7 @@
 #ifndef CPLUSPLUS_MATCHINGTEXT_H
 #define CPLUSPLUS_MATCHINGTEXT_H
 
-#include <CPlusPlusForwardDeclarations.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
 
 QT_FORWARD_DECLARE_CLASS(QTextCursor)
 QT_FORWARD_DECLARE_CLASS(QChar)
diff --git a/src/libs/cplusplus/NamePrettyPrinter.cpp b/src/libs/cplusplus/NamePrettyPrinter.cpp
index 51f3f9c543..a638135d46 100644
--- a/src/libs/cplusplus/NamePrettyPrinter.cpp
+++ b/src/libs/cplusplus/NamePrettyPrinter.cpp
@@ -29,10 +29,11 @@
 
 #include "NamePrettyPrinter.h"
 
-#include <Names.h>
-#include <Overview.h>
-#include <NameVisitor.h>
-#include <Literals.h>
+#include "Overview.h"
+
+#include <cplusplus/Names.h>
+#include <cplusplus/NameVisitor.h>
+#include <cplusplus/Literals.h>
 
 using namespace CPlusPlus;
 
diff --git a/src/libs/cplusplus/NamePrettyPrinter.h b/src/libs/cplusplus/NamePrettyPrinter.h
index 10b86de057..348ba84b10 100644
--- a/src/libs/cplusplus/NamePrettyPrinter.h
+++ b/src/libs/cplusplus/NamePrettyPrinter.h
@@ -30,7 +30,8 @@
 #ifndef CPLUSPLUS_NAMEPRETTYPRINTER_H
 #define CPLUSPLUS_NAMEPRETTYPRINTER_H
 
-#include <NameVisitor.h>
+#include <cplusplus/NameVisitor.h>
+
 #include <QString>
 
 namespace CPlusPlus {
diff --git a/src/libs/cplusplus/Overview.cpp b/src/libs/cplusplus/Overview.cpp
index 6b633d83e0..24838576a9 100644
--- a/src/libs/cplusplus/Overview.cpp
+++ b/src/libs/cplusplus/Overview.cpp
@@ -28,12 +28,13 @@
 ****************************************************************************/
 
 #include "Overview.h"
+
 #include "NamePrettyPrinter.h"
 #include "TypePrettyPrinter.h"
 
-#include <Control.h>
-#include <CoreTypes.h>
-#include <FullySpecifiedType.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/FullySpecifiedType.h>
 
 using namespace CPlusPlus;
 
diff --git a/src/libs/cplusplus/Overview.h b/src/libs/cplusplus/Overview.h
index 95d0aa33c4..cd342e3d55 100644
--- a/src/libs/cplusplus/Overview.h
+++ b/src/libs/cplusplus/Overview.h
@@ -30,7 +30,7 @@
 #ifndef CPLUSPLUS_OVERVIEW_H
 #define CPLUSPLUS_OVERVIEW_H
 
-#include <CPlusPlusForwardDeclarations.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
 
 #include <QList>
 #include <QString>
diff --git a/src/libs/cplusplus/OverviewModel.cpp b/src/libs/cplusplus/OverviewModel.cpp
index b9454c9d61..41dee2a19a 100644
--- a/src/libs/cplusplus/OverviewModel.cpp
+++ b/src/libs/cplusplus/OverviewModel.cpp
@@ -28,11 +28,12 @@
 ****************************************************************************/
 
 #include "OverviewModel.h"
+
 #include "Overview.h"
 
-#include <Scope.h>
-#include <Literals.h>
-#include <Symbols.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Symbols.h>
 
 using namespace CPlusPlus;
 
diff --git a/src/libs/cplusplus/PPToken.h b/src/libs/cplusplus/PPToken.h
index 6a194cc6a7..56df98b079 100644
--- a/src/libs/cplusplus/PPToken.h
+++ b/src/libs/cplusplus/PPToken.h
@@ -30,8 +30,8 @@
 #ifndef CPLUSPLUS_INTERNAL_PPTOKEN_H
 #define CPLUSPLUS_INTERNAL_PPTOKEN_H
 
-#include <CPlusPlus.h>
-#include <Token.h>
+#include <cplusplus/CPlusPlus.h>
+#include <cplusplus/Token.h>
 
 #include <QByteArray>
 
diff --git a/src/libs/cplusplus/PreprocessorClient.h b/src/libs/cplusplus/PreprocessorClient.h
index ae04fd47af..a4a364bd6f 100644
--- a/src/libs/cplusplus/PreprocessorClient.h
+++ b/src/libs/cplusplus/PreprocessorClient.h
@@ -30,7 +30,8 @@
 #ifndef PREPROCESSORCLIENT_H
 #define PREPROCESSORCLIENT_H
 
-#include <CPlusPlusForwardDeclarations.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
+
 #include <QVector>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/libs/cplusplus/PreprocessorEnvironment.cpp b/src/libs/cplusplus/PreprocessorEnvironment.cpp
index e3f9575115..be736b8569 100644
--- a/src/libs/cplusplus/PreprocessorEnvironment.cpp
+++ b/src/libs/cplusplus/PreprocessorEnvironment.cpp
@@ -47,8 +47,11 @@
 */
 
 #include "PreprocessorEnvironment.h"
+
 #include "Macro.h"
+
 #include <QDebug>
+
 #include <cstring>
 
 using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/PreprocessorEnvironment.h b/src/libs/cplusplus/PreprocessorEnvironment.h
index 90be60f004..f7da9cb3d5 100644
--- a/src/libs/cplusplus/PreprocessorEnvironment.h
+++ b/src/libs/cplusplus/PreprocessorEnvironment.h
@@ -49,9 +49,10 @@
 #ifndef PREPROCESSORENVIRONMENT_H
 #define PREPROCESSORENVIRONMENT_H
 
-#include "CPlusPlusForwardDeclarations.h"
 #include "PPToken.h"
 
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
+
 #include <QList>
 #include <QByteArray>
 #include <QString>
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index f21e6ff864..029bcee00d 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -28,26 +28,28 @@
 ****************************************************************************/
 
 #include "ResolveExpression.h"
+
 #include "LookupContext.h"
 #include "Overview.h"
 #include "DeprecatedGenTemplateInstance.h"
 #include "CppRewriter.h"
 #include "TypeOfExpression.h"
 
-#include <Control.h>
-#include <AST.h>
-#include <Scope.h>
-#include <Names.h>
-#include <Symbols.h>
-#include <Literals.h>
-#include <CoreTypes.h>
-#include <TypeVisitor.h>
-#include <NameVisitor.h>
-#include <Templates.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/TypeVisitor.h>
+#include <cplusplus/NameVisitor.h>
+#include <cplusplus/Templates.h>
 
 #include <QList>
 #include <QDebug>
 #include <QSet>
+
 #include <map>
 
 using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/ResolveExpression.h b/src/libs/cplusplus/ResolveExpression.h
index 764268ab91..95268e6953 100644
--- a/src/libs/cplusplus/ResolveExpression.h
+++ b/src/libs/cplusplus/ResolveExpression.h
@@ -32,9 +32,10 @@
 
 #include "LookupContext.h"
 
-#include <ASTVisitor.h>
-#include <FullySpecifiedType.h>
-#include <Bind.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/FullySpecifiedType.h>
+#include <cplusplus/Bind.h>
+
 #include <set>
 
 namespace CPlusPlus {
diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp
index 7f5692da97..243dd7e91c 100644
--- a/src/libs/cplusplus/SimpleLexer.cpp
+++ b/src/libs/cplusplus/SimpleLexer.cpp
@@ -29,10 +29,10 @@
 
 #include "SimpleLexer.h"
 
-#include "ObjectiveCTypeQualifiers.h"
+#include <cplusplus/ObjectiveCTypeQualifiers.h>
+#include <cplusplus/Lexer.h>
+#include <cplusplus/Token.h>
 
-#include <Lexer.h>
-#include <Token.h>
 #include <QDebug>
 
 using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/SimpleLexer.h b/src/libs/cplusplus/SimpleLexer.h
index 107b6f6c44..dac658f01f 100644
--- a/src/libs/cplusplus/SimpleLexer.h
+++ b/src/libs/cplusplus/SimpleLexer.h
@@ -29,7 +29,7 @@
 #ifndef CPLUSPLUS_SIMPLELEXER_H
 #define CPLUSPLUS_SIMPLELEXER_H
 
-#include <CPlusPlusForwardDeclarations.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
 
 #include <QString>
 #include <QList>
diff --git a/src/libs/cplusplus/SnapshotSymbolVisitor.cpp b/src/libs/cplusplus/SnapshotSymbolVisitor.cpp
index 08d2d92cf6..2f9a93fabb 100644
--- a/src/libs/cplusplus/SnapshotSymbolVisitor.cpp
+++ b/src/libs/cplusplus/SnapshotSymbolVisitor.cpp
@@ -28,7 +28,8 @@
 ****************************************************************************/
 
 #include "SnapshotSymbolVisitor.h"
-#include <Symbols.h>
+
+#include <cplusplus/Symbols.h>
 
 using namespace CPlusPlus;
 
diff --git a/src/libs/cplusplus/SnapshotSymbolVisitor.h b/src/libs/cplusplus/SnapshotSymbolVisitor.h
index 3efb7d0354..3f2e1d162f 100644
--- a/src/libs/cplusplus/SnapshotSymbolVisitor.h
+++ b/src/libs/cplusplus/SnapshotSymbolVisitor.h
@@ -31,7 +31,9 @@
 #define CPLUSPLUS_SNAPSHOTSYMBOLVISITOR_H
 
 #include "CppDocument.h"
-#include <SymbolVisitor.h>
+
+#include <cplusplus/SymbolVisitor.h>
+
 #include <QSet>
 
 namespace CPlusPlus {
diff --git a/src/libs/cplusplus/SymbolNameVisitor.cpp b/src/libs/cplusplus/SymbolNameVisitor.cpp
index 3ebc66600d..cacbb69ea9 100644
--- a/src/libs/cplusplus/SymbolNameVisitor.cpp
+++ b/src/libs/cplusplus/SymbolNameVisitor.cpp
@@ -28,8 +28,9 @@
 ****************************************************************************/
 
 #include "SymbolNameVisitor.h"
-#include <Symbols.h>
-#include <Names.h>
+
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Names.h>
 
 using namespace CPlusPlus;
 
diff --git a/src/libs/cplusplus/SymbolNameVisitor.h b/src/libs/cplusplus/SymbolNameVisitor.h
index 2142903325..57e8997583 100644
--- a/src/libs/cplusplus/SymbolNameVisitor.h
+++ b/src/libs/cplusplus/SymbolNameVisitor.h
@@ -30,7 +30,7 @@
 #ifndef CPLUSPLUS_SYMBOLNAMEVISITOR_H
 #define CPLUSPLUS_SYMBOLNAMEVISITOR_H
 
-#include <NameVisitor.h>
+#include <cplusplus/NameVisitor.h>
 
 namespace CPlusPlus {
 
diff --git a/src/libs/cplusplus/TypeOfExpression.cpp b/src/libs/cplusplus/TypeOfExpression.cpp
index ac813fa873..b62b417190 100644
--- a/src/libs/cplusplus/TypeOfExpression.cpp
+++ b/src/libs/cplusplus/TypeOfExpression.cpp
@@ -28,13 +28,15 @@
 ****************************************************************************/
 
 #include "TypeOfExpression.h"
-#include <TranslationUnit.h>
+
 #include "LookupContext.h"
 #include "ResolveExpression.h"
 #include "pp.h"
 
-#include <AST.h>
-#include <Symbol.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/Symbol.h>
+#include <cplusplus/TranslationUnit.h>
+
 #include <QSet>
 
 using namespace CPlusPlus;
diff --git a/src/libs/cplusplus/TypeOfExpression.h b/src/libs/cplusplus/TypeOfExpression.h
index 848999f7d0..0842bb09c1 100644
--- a/src/libs/cplusplus/TypeOfExpression.h
+++ b/src/libs/cplusplus/TypeOfExpression.h
@@ -33,7 +33,8 @@
 #include "LookupContext.h"
 #include "PreprocessorEnvironment.h"
 
-#include <ASTfwd.h>
+#include <cplusplus/ASTfwd.h>
+
 #include <QMap>
 #include <QObject>
 #include <QString>
diff --git a/src/libs/cplusplus/TypePrettyPrinter.cpp b/src/libs/cplusplus/TypePrettyPrinter.cpp
index e26602dccf..2d70b9d789 100644
--- a/src/libs/cplusplus/TypePrettyPrinter.cpp
+++ b/src/libs/cplusplus/TypePrettyPrinter.cpp
@@ -30,11 +30,13 @@
 #include "TypePrettyPrinter.h"
 
 #include "Overview.h"
-#include <FullySpecifiedType.h>
-#include <Literals.h>
-#include <CoreTypes.h>
-#include <Symbols.h>
-#include <Scope.h>
+
+#include <cplusplus/FullySpecifiedType.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Scope.h>
+
 #include <QStringList>
 #include <QDebug>
 
diff --git a/src/libs/cplusplus/TypePrettyPrinter.h b/src/libs/cplusplus/TypePrettyPrinter.h
index 8ee02528a9..09b87aa6a7 100644
--- a/src/libs/cplusplus/TypePrettyPrinter.h
+++ b/src/libs/cplusplus/TypePrettyPrinter.h
@@ -29,8 +29,9 @@
 #ifndef CPLUSPLUS_TYPEPRETTYPRINTER_H
 #define CPLUSPLUS_TYPEPRETTYPRINTER_H
 
-#include <TypeVisitor.h>
-#include <FullySpecifiedType.h>
+#include <cplusplus/TypeVisitor.h>
+#include <cplusplus/FullySpecifiedType.h>
+
 #include <QString>
 #include <QList>
 
diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index a2ccabdfb4..bd77b940bf 100644
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -4,7 +4,7 @@ contains(CONFIG, dll) {
     DEFINES += CPLUSPLUS_BUILD_STATIC_LIB
 }
 
-INCLUDEPATH += $$PWD
+INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty
 
 include(../3rdparty/cplusplus/cplusplus.pri)
 
diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri
index 702e15eb64..396b585c65 100644
--- a/src/libs/cplusplus/cplusplus.pri
+++ b/src/libs/cplusplus/cplusplus.pri
@@ -1,4 +1,2 @@
 INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty
-INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty/cplusplus
-INCLUDEPATH *= $$PWD
 LIBS *= -l$$qtLibraryName(CPlusPlus)
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 08213f11d6..20041d8634 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -4,7 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
     name: "CPlusPlus"
 
-    cpp.includePaths: base.concat("../3rdparty/cplusplus")
+    cpp.includePaths: base.concat("../3rdparty")
     cpp.defines: base.concat([
         "NDEBUG",
         "CPLUSPLUS_BUILD_LIB"
@@ -171,9 +171,7 @@ QtcLibrary {
     ProductModule {
         Depends { name: "cpp" }
         cpp.includePaths: [
-            ".",
-            "../3rdparty",
-            "../3rdparty/cplusplus"
+            "../3rdparty"
         ]
     }
 }
diff --git a/src/libs/cplusplus/findcdbbreakpoint.cpp b/src/libs/cplusplus/findcdbbreakpoint.cpp
index 7ede4b71b7..a5a7b1f37f 100644
--- a/src/libs/cplusplus/findcdbbreakpoint.cpp
+++ b/src/libs/cplusplus/findcdbbreakpoint.cpp
@@ -29,12 +29,13 @@
 
 #include "findcdbbreakpoint.h"
 
-#include <AST.h>
-#include <TranslationUnit.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/TranslationUnit.h>
 
-#include <typeinfo>
 #include <QDebug>
 
+#include <typeinfo>
+
 using namespace CPlusPlus;
 
 FindCdbBreakpoint::FindCdbBreakpoint(TranslationUnit *unit)
diff --git a/src/libs/cplusplus/findcdbbreakpoint.h b/src/libs/cplusplus/findcdbbreakpoint.h
index f4327c2b8b..7cc9ac6bda 100644
--- a/src/libs/cplusplus/findcdbbreakpoint.h
+++ b/src/libs/cplusplus/findcdbbreakpoint.h
@@ -30,8 +30,8 @@
 #ifndef FINDCDBBREAKPOINT_H
 #define FINDCDBBREAKPOINT_H
 
-#include <CPlusPlusForwardDeclarations.h>
-#include <ASTVisitor.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
+#include <cplusplus/ASTVisitor.h>
 
 namespace CPlusPlus {
 
diff --git a/src/libs/cplusplus/pp-cctype.h b/src/libs/cplusplus/pp-cctype.h
index 73b41f8ccd..c9c8043b85 100644
--- a/src/libs/cplusplus/pp-cctype.h
+++ b/src/libs/cplusplus/pp-cctype.h
@@ -49,7 +49,7 @@
 #ifndef CPLUSPLUS_PP_CCTYPE_H
 #define CPLUSPLUS_PP_CCTYPE_H
 
-#include <CPlusPlusForwardDeclarations.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
 
 #include <cctype>
 
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 1c45e61e2a..4abe88b492 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -49,11 +49,10 @@
 #include "pp.h"
 #include "pp-cctype.h"
 
-#include <Control.h>
-#include <Lexer.h>
-#include <Token.h>
-#include <Literals.h>
-#include <cctype>
+#include <cplusplus/Control.h>
+#include <cplusplus/Lexer.h>
+#include <cplusplus/Token.h>
+#include <cplusplus/Literals.h>
 
 #include <QDebug>
 #include <QList>
@@ -61,6 +60,7 @@
 #include <QTime>
 #include <QPair>
 
+#include <cctype>
 #include <list>
 #include <algorithm>
 
diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h
index 1b318c74c8..d95effba9c 100644
--- a/src/libs/cplusplus/pp-engine.h
+++ b/src/libs/cplusplus/pp-engine.h
@@ -52,8 +52,9 @@
 #include "PPToken.h"
 #include "PreprocessorClient.h"
 
-#include <Lexer.h>
-#include <Token.h>
+#include <cplusplus/Lexer.h>
+#include <cplusplus/Token.h>
+
 #include <QVector>
 #include <QBitArray>
 #include <QByteArray>