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>
author: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 2013-03-27 18:54:03 +0100
committer: Oswald Buddenhagen <oswald.buddenhagen@digia.com> 2013-04-03 13:40:39 +0200
commit: 792303202213b4c90fc670620658aa0551bfc1b3 (patch)
tree: 721156735347cac46c084d44c5e5e1d782c22d38 /src/plugins
parent: 4fc706d7e04abcbdd77d1687e9f4fc0971b8eb07 (diff)
download: qt-creator-792303202213b4c90fc670620658aa0551bfc1b3.tar.gz
100 files changed, 535 insertions, 459 deletions
diff --git a/src/plugins/analyzerbase/analyzerutils.cpp b/src/plugins/analyzerbase/analyzerutils.cpp
index fe3996de10..948864938d 100644
--- a/src/plugins/analyzerbase/analyzerutils.cpp
+++ b/src/plugins/analyzerbase/analyzerutils.cpp
@@ -31,11 +31,12 @@
 
 #include "analyzerconstants.h"
 
+#include <cpptools/ModelManagerInterface.h>
 #include <texteditor/basetexteditor.h>
+
 #include <utils/qtcassert.h>
 
 #include <cplusplus/ExpressionUnderCursor.h>
-#include <cpptools/ModelManagerInterface.h>
 #include <cplusplus/TypeOfExpression.h>
 
 #include <QTextCursor>
diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp
index 9023de9449..b0c32f62a3 100644
--- a/src/plugins/classview/classviewparser.cpp
+++ b/src/plugins/classview/classviewparser.cpp
@@ -32,10 +32,10 @@
 #include "classviewutils.h"
 
 // cplusplus shared library. the same folder (cplusplus)
-#include <Symbol.h>
-#include <Symbols.h>
-#include <Scope.h>
-#include <Name.h>
+#include <cplusplus/Symbol.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Name.h>
 
 // other
 #include <cpptools/ModelManagerInterface.h>
diff --git a/src/plugins/classview/classviewparser.h b/src/plugins/classview/classviewparser.h
index 2b233bc0cf..fbf12963e5 100644
--- a/src/plugins/classview/classviewparser.h
+++ b/src/plugins/classview/classviewparser.h
@@ -34,7 +34,7 @@
 
 #include "classviewparsertreeitem.h"
 
-#include <CPlusPlusForwardDeclarations.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
 #include <cpptools/ModelManagerInterface.h>
 #include <cplusplus/CppDocument.h>
 
diff --git a/src/plugins/cppeditor/cppautocompleter.cpp b/src/plugins/cppeditor/cppautocompleter.cpp
index 21111e5777..efc7fcfee1 100644
--- a/src/plugins/cppeditor/cppautocompleter.cpp
+++ b/src/plugins/cppeditor/cppautocompleter.cpp
@@ -29,8 +29,7 @@
 
 #include "cppautocompleter.h"
 
-#include <Token.h>
-
+#include <cplusplus/Token.h>
 #include <cplusplus/SimpleLexer.h>
 #include <cplusplus/MatchingText.h>
 #include <cplusplus/BackwardsScanner.h>
diff --git a/src/plugins/cppeditor/cppautocompleter.h b/src/plugins/cppeditor/cppautocompleter.h
index 5d81e61ccf..b0c0a387e6 100644
--- a/src/plugins/cppeditor/cppautocompleter.h
+++ b/src/plugins/cppeditor/cppautocompleter.h
@@ -31,7 +31,8 @@
 #define CPPAUTOCOMPLETER_H
 
 #include <texteditor/autocompleter.h>
-#include <Token.h>
+
+#include <cplusplus/Token.h>
 
 namespace CppEditor {
 namespace Internal {
diff --git a/src/plugins/cppeditor/cppclasswizard.cpp b/src/plugins/cppeditor/cppclasswizard.cpp
index 0893ed4595..764c143666 100644
--- a/src/plugins/cppeditor/cppclasswizard.cpp
+++ b/src/plugins/cppeditor/cppclasswizard.cpp
@@ -28,12 +28,13 @@
 ****************************************************************************/
 
 #include "cppclasswizard.h"
+
 #include "cppeditorconstants.h"
 
-#include <cpptools/cpptoolsconstants.h>
-#include <cpptools/abstracteditorsupport.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
+#include <cpptools/abstracteditorsupport.h>
+#include <cpptools/cpptoolsconstants.h>
 
 #include <utils/codegeneration.h>
 #include <utils/newclasswidget.h>
@@ -43,7 +44,6 @@
 #include <QDir>
 #include <QTextStream>
 #include <QSettings>
-
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QPushButton>
diff --git a/src/plugins/cppeditor/cppclasswizard.h b/src/plugins/cppeditor/cppclasswizard.h
index 62ae4091c4..02bcd1727f 100644
--- a/src/plugins/cppeditor/cppclasswizard.h
+++ b/src/plugins/cppeditor/cppclasswizard.h
@@ -31,6 +31,7 @@
 #define CPPCLASSWIZARD_H
 
 #include <coreplugin/basefilewizard.h>
+
 #include <utils/wizard.h>
 
 #include <QStringList>
diff --git a/src/plugins/cppeditor/cppcompleteswitch.cpp b/src/plugins/cppeditor/cppcompleteswitch.cpp
index c2d1ca1310..fed0543fa8 100644
--- a/src/plugins/cppeditor/cppcompleteswitch.cpp
+++ b/src/plugins/cppeditor/cppcompleteswitch.cpp
@@ -28,17 +28,19 @@
 ****************************************************************************/
 
 #include "cppcompleteswitch.h"
+
 #include "cppquickfixassistant.h"
 
-#include <cplusplus/Overview.h>
-#include <cplusplus/TypeOfExpression.h>
 #include <cpptools/cpprefactoringchanges.h>
+
 #include <utils/changeset.h>
 
-#include <AST.h>
-#include <ASTVisitor.h>
-#include <CoreTypes.h>
-#include <Symbols.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TypeOfExpression.h>
 
 #include <QApplication>
 
diff --git a/src/plugins/cppeditor/cppdoxygen_test.cpp b/src/plugins/cppeditor/cppdoxygen_test.cpp
index 5543a3aa64..a491b177c9 100644
--- a/src/plugins/cppeditor/cppdoxygen_test.cpp
+++ b/src/plugins/cppeditor/cppdoxygen_test.cpp
@@ -27,12 +27,14 @@
 **
 ****************************************************************************/
 
+#include "cppeditor.h"
+#include "cppplugin.h"
+
 #include <coreplugin/editormanager/editormanager.h>
-#include <cplusplus/CppDocument.h>
-#include <cppeditor/cppeditor.h>
-#include <cppeditor/cppplugin.h>
 #include <cpptools/ModelManagerInterface.h>
+
 #include <utils/fileutils.h>
+#include <cplusplus/CppDocument.h>
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 462c8075ab..f30b0448a5 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -28,34 +28,22 @@
 ****************************************************************************/
 
 #include "cppeditor.h"
+
 #include "cppeditorconstants.h"
 #include "cppplugin.h"
 #include "cpphighlighter.h"
 #include "cppautocompleter.h"
 #include "cppquickfixassistant.h"
 
-#include <AST.h>
-#include <Control.h>
-#include <Token.h>
-#include <Scope.h>
-#include <Symbols.h>
-#include <Names.h>
-#include <CoreTypes.h>
-#include <Literals.h>
-#include <ASTVisitor.h>
-#include <SymbolVisitor.h>
-#include <TranslationUnit.h>
-#include <cplusplus/ASTPath.h>
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/id.h>
+#include <coreplugin/mimedatabase.h>
 #include <cpptools/ModelManagerInterface.h>
-#include <cplusplus/ExpressionUnderCursor.h>
-#include <cplusplus/TypeOfExpression.h>
-#include <cplusplus/Overview.h>
-#include <cplusplus/OverviewModel.h>
-#include <cplusplus/SimpleLexer.h>
-#include <cplusplus/MatchingText.h>
-#include <cplusplus/BackwardsScanner.h>
-#include <cplusplus/FastPreprocessor.h>
-
 #include <cpptools/cpptoolsplugin.h>
 #include <cpptools/cpptoolsconstants.h>
 #include <cpptools/cppchecksymbols.h>
@@ -70,28 +58,41 @@
 #include <cpptools/doxygengenerator.h>
 #include <cpptools/cpptoolssettings.h>
 #include <cpptools/symbolfinder.h>
-
-#include <coreplugin/icore.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/mimedatabase.h>
-#include <utils/qtcassert.h>
-#include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <texteditor/basetextdocument.h>
 #include <texteditor/basetextdocumentlayout.h>
+#include <texteditor/codeassist/basicproposalitem.h>
+#include <texteditor/codeassist/basicproposalitemlistmodel.h>
+#include <texteditor/codeassist/genericproposal.h>
 #include <texteditor/fontsettings.h>
-#include <texteditor/tabsettings.h>
-#include <texteditor/texteditorconstants.h>
 #include <texteditor/refactoroverlay.h>
 #include <texteditor/semantichighlighter.h>
-#include <texteditor/codeassist/basicproposalitemlistmodel.h>
-#include <texteditor/codeassist/basicproposalitem.h>
-#include <texteditor/codeassist/genericproposal.h>
+#include <texteditor/tabsettings.h>
+#include <texteditor/texteditorconstants.h>
+
+#include <utils/qtcassert.h>
+#include <extensionsystem/pluginmanager.h>
+
+#include <cplusplus/AST.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/Token.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/TranslationUnit.h>
+#include <cplusplus/ASTPath.h>
+#include <cplusplus/ExpressionUnderCursor.h>
+#include <cplusplus/TypeOfExpression.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/OverviewModel.h>
+#include <cplusplus/SimpleLexer.h>
+#include <cplusplus/MatchingText.h>
+#include <cplusplus/BackwardsScanner.h>
+#include <cplusplus/FastPreprocessor.h>
 
 #include <QDebug>
 #include <QTime>
@@ -2650,4 +2651,4 @@ void CPPEditorWidget::onCommentsSettingsChanged(const CppTools::CommentsSettings
     m_commentsSettings = settings;
 }
 
-#include "cppeditor.moc"
+#include <cppeditor.moc>
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 24bfab0dc9..05a4be7783 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -34,14 +34,15 @@
 #include "cppfunctiondecldeflink.h"
 
 #include <cpptools/ModelManagerInterface.h>
-#include <cplusplus/CppDocument.h>
-#include <cplusplus/LookupContext.h>
-#include <utils/uncommentselection.h>
+#include <cpptools/commentssettings.h>
+#include <cpptools/cppsemanticinfo.h>
 #include <texteditor/basetexteditor.h>
 #include <texteditor/quickfix.h>
 #include <texteditor/texteditorconstants.h>
-#include <cpptools/commentssettings.h>
-#include <cpptools/cppsemanticinfo.h>
+
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/LookupContext.h>
+#include <utils/uncommentselection.h>
 
 #include <QThread>
 #include <QMutex>
diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp
index 0d715584b1..e8b7b363f9 100644
--- a/src/plugins/cppeditor/cppelementevaluator.cpp
+++ b/src/plugins/cppeditor/cppelementevaluator.cpp
@@ -31,22 +31,22 @@
 
 #include <coreplugin/idocument.h>
 #include <cpptools/cpptoolsreuse.h>
-
-#include <FullySpecifiedType.h>
-#include <Literals.h>
-#include <Names.h>
-#include <CoreTypes.h>
-#include <Scope.h>
-#include <Symbol.h>
-#include <Symbols.h>
-#include <cpptools/TypeHierarchyBuilder.h>
 #include <cpptools/ModelManagerInterface.h>
+#include <cpptools/TypeHierarchyBuilder.h>
+
+#include <cplusplus/CoreTypes.h>
 #include <cplusplus/ExpressionUnderCursor.h>
-#include <cplusplus/Overview.h>
-#include <cplusplus/TypeOfExpression.h>
+#include <cplusplus/FullySpecifiedType.h>
+#include <cplusplus/Icons.h>
+#include <cplusplus/Literals.h>
 #include <cplusplus/LookupContext.h>
 #include <cplusplus/LookupItem.h>
-#include <cplusplus/Icons.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbol.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TypeOfExpression.h>
 
 #include <QDir>
 #include <QFileInfo>
diff --git a/src/plugins/cppeditor/cppelementevaluator.h b/src/plugins/cppeditor/cppelementevaluator.h
index d636d6cf92..59510b0b8f 100644
--- a/src/plugins/cppeditor/cppelementevaluator.h
+++ b/src/plugins/cppeditor/cppelementevaluator.h
@@ -32,8 +32,9 @@
 
 #include "cppeditor.h"
 
-#include <texteditor/helpitem.h>
 #include <cpptools/symbolfinder.h>
+#include <texteditor/helpitem.h>
+
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/Overview.h>
 
diff --git a/src/plugins/cppeditor/cppfilewizard.cpp b/src/plugins/cppeditor/cppfilewizard.cpp
index 9f86a2a804..836a536c7f 100644
--- a/src/plugins/cppeditor/cppfilewizard.cpp
+++ b/src/plugins/cppeditor/cppfilewizard.cpp
@@ -28,10 +28,12 @@
 ****************************************************************************/
 
 #include "cppfilewizard.h"
+
 #include "cppeditor.h"
 #include "cppeditorconstants.h"
 
 #include <cpptools/abstracteditorsupport.h>
+
 #include <utils/codegeneration.h>
 
 #include <QTextStream>
diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
index 94dd93a758..6fd5b9c2cc 100644
--- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
+++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
@@ -32,27 +32,29 @@
 #include "cppeditor.h"
 #include "cppquickfixassistant.h"
 
-#include <cplusplus/CppRewriter.h>
-#include <cplusplus/ASTPath.h>
-#include <cplusplus/AST.h>
-#include <cplusplus/Symbols.h>
-#include <cplusplus/TypeOfExpression.h>
-#include <cplusplus/TranslationUnit.h>
-#include <cplusplus/LookupContext.h>
-#include <cplusplus/Overview.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/icore.h>
 #include <cpptools/cppcodestylesettings.h>
 #include <cpptools/cpplocalsymbols.h>
 #include <cpptools/cpprefactoringchanges.h>
 #include <cpptools/symbolfinder.h>
 #include <texteditor/refactoroverlay.h>
-#include <utils/tooltip/tooltip.h>
-#include <utils/tooltip/tipcontents.h>
-#include <utils/qtcassert.h>
-#include <utils/proxyaction.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/icore.h>
 #include <texteditor/texteditorconstants.h>
 
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTPath.h>
+#include <cplusplus/CppRewriter.h>
+#include <cplusplus/LookupContext.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
+#include <cplusplus/TypeOfExpression.h>
+
+#include <utils/proxyaction.h>
+#include <utils/qtcassert.h>
+#include <utils/tooltip/tipcontents.h>
+#include <utils/tooltip/tooltip.h>
+
 #include <QtConcurrentRun>
 #include <QVarLengthArray>
 
diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.h b/src/plugins/cppeditor/cppfunctiondecldeflink.h
index 9db9ba2ca3..b28469becf 100644
--- a/src/plugins/cppeditor/cppfunctiondecldeflink.h
+++ b/src/plugins/cppeditor/cppfunctiondecldeflink.h
@@ -32,10 +32,11 @@
 
 #include "cppquickfix.h"
 
+#include <cpptools/cpprefactoringchanges.h>
+
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/ASTfwd.h>
 
-#include <cpptools/cpprefactoringchanges.h>
 #include <utils/changeset.h>
 
 #include <QString>
diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp
index 8ebd0dcd06..7507988bee 100644
--- a/src/plugins/cppeditor/cpphighlighter.cpp
+++ b/src/plugins/cppeditor/cpphighlighter.cpp
@@ -29,13 +29,14 @@
 
 #include "cpphighlighter.h"
 
-#include <Token.h>
-#include <cplusplus/SimpleLexer.h>
-#include <cplusplus/Lexer.h>
 #include <cpptools/cppdoxygen.h>
 #include <cpptools/cpptoolsreuse.h>
 #include <texteditor/basetextdocumentlayout.h>
 
+#include <cplusplus/Token.h>
+#include <cplusplus/SimpleLexer.h>
+#include <cplusplus/Lexer.h>
+
 #include <QTextDocument>
 #include <QDebug>
 
diff --git a/src/plugins/cppeditor/cpphighlighter.h b/src/plugins/cppeditor/cpphighlighter.h
index 526f422e17..890dc0757b 100644
--- a/src/plugins/cppeditor/cpphighlighter.h
+++ b/src/plugins/cppeditor/cpphighlighter.h
@@ -31,7 +31,9 @@
 #define CPPHIGHLIGHTER_H
 
 #include "cppeditorenums.h"
+
 #include <texteditor/syntaxhighlighter.h>
+
 #include <QTextCharFormat>
 #include <QtAlgorithms>
 
diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index a99254fb12..c8a6b9bccb 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -28,17 +28,19 @@
 ****************************************************************************/
 
 #include "cpphoverhandler.h"
+
 #include "cppeditor.h"
 #include "cppelementevaluator.h"
 
-#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/helpmanager.h>
 #include <cpptools/ModelManagerInterface.h>
-#include <extensionsystem/pluginmanager.h>
-#include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 #include <texteditor/helpitem.h>
+#include <texteditor/itexteditor.h>
+
+#include <extensionsystem/pluginmanager.h>
 
 #include <QTextCursor>
 #include <QUrl>
diff --git a/src/plugins/cppeditor/cppinsertdecldef.cpp b/src/plugins/cppeditor/cppinsertdecldef.cpp
index 51d4558fb9..636a388b6f 100644
--- a/src/plugins/cppeditor/cppinsertdecldef.cpp
+++ b/src/plugins/cppeditor/cppinsertdecldef.cpp
@@ -30,16 +30,17 @@
 #include "cppinsertdecldef.h"
 #include "cppquickfixassistant.h"
 
-#include <CPlusPlus.h>
+#include <cpptools/cppcodestylesettings.h>
+#include <cpptools/cpprefactoringchanges.h>
+#include <cpptools/cpptoolsreuse.h>
+#include <cpptools/insertionpointlocator.h>
+
 #include <cplusplus/ASTPath.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/CPlusPlus.h>
 #include <cplusplus/CppRewriter.h>
 #include <cplusplus/LookupContext.h>
 #include <cplusplus/Overview.h>
-#include <cplusplus/ASTVisitor.h>
-#include <cpptools/insertionpointlocator.h>
-#include <cpptools/cppcodestylesettings.h>
-#include <cpptools/cpprefactoringchanges.h>
-#include <cpptools/cpptoolsreuse.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp b/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp
index 230f6ef2e4..dfd01903b8 100644
--- a/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp
+++ b/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp
@@ -28,16 +28,18 @@
 ****************************************************************************/
 
 #include "cppinsertqtpropertymembers.h"
+
+#include "cppquickfix.h"
 #include "cppquickfixassistant.h"
 
-#include <AST.h>
-#include <Token.h>
+#include <coreplugin/idocument.h>
+#include <cpptools/cpprefactoringchanges.h>
+#include <cpptools/insertionpointlocator.h>
+
+#include <cplusplus/AST.h>
 #include <cplusplus/Overview.h>
 #include <cplusplus/Symbols.h>
-#include <cpptools/insertionpointlocator.h>
-#include <cpptools/cpprefactoringchanges.h>
-#include <cppeditor/cppquickfix.h>
-#include <coreplugin/idocument.h>
+#include <cplusplus/Token.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/cppeditor/cppinsertqtpropertymembers.h b/src/plugins/cppeditor/cppinsertqtpropertymembers.h
index d7890e6e85..90cb271239 100644
--- a/src/plugins/cppeditor/cppinsertqtpropertymembers.h
+++ b/src/plugins/cppeditor/cppinsertqtpropertymembers.h
@@ -30,7 +30,7 @@
 #ifndef CPPINSERTQTPROPERTYMEMBERS_H
 #define CPPINSERTQTPROPERTYMEMBERS_H
 
-#include <cppeditor/cppquickfix.h>
+#include "cppquickfix.h"
 
 #include <QString>
 
diff --git a/src/plugins/cppeditor/cppoutline.cpp b/src/plugins/cppeditor/cppoutline.cpp
index 7e9e75cb4f..d07df22c31 100644
--- a/src/plugins/cppeditor/cppoutline.cpp
+++ b/src/plugins/cppeditor/cppoutline.cpp
@@ -29,12 +29,13 @@
 
 #include "cppoutline.h"
 
-#include <TranslationUnit.h>
-#include <Symbol.h>
-
-#include <coreplugin/idocument.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/idocument.h>
+
 #include <cplusplus/OverviewModel.h>
+#include <cplusplus/Symbol.h>
+#include <cplusplus/TranslationUnit.h>
+
 #include <utils/qtcassert.h>
 
 #include <QDebug>
diff --git a/src/plugins/cppeditor/cppoutline.h b/src/plugins/cppeditor/cppoutline.h
index 873f4b6932..a91378f5d6 100644
--- a/src/plugins/cppeditor/cppoutline.h
+++ b/src/plugins/cppeditor/cppoutline.h
@@ -32,9 +32,10 @@
 
 #include "cppeditor.h"
 
-#include <utils/navigationtreeview.h>
 #include <texteditor/ioutlinewidget.h>
 
+#include <utils/navigationtreeview.h>
+
 #include <QSortFilterProxyModel>
 #include <QTreeView>
 
diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp
index 3f399a4fea..bece6003a3 100644
--- a/src/plugins/cppeditor/cppplugin.cpp
+++ b/src/plugins/cppeditor/cppplugin.cpp
@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "cppplugin.h"
+
 #include "cppclasswizard.h"
 #include "cppeditor.h"
 #include "cppeditorconstants.h"
@@ -40,32 +41,32 @@
 #include "cppquickfixassistant.h"
 #include "cppquickfixes.h"
 
-#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/mimedatabase.h>
-#include <coreplugin/fileiconprovider.h>
-#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/progressmanager/progressmanager.h>
+#include <coreplugin/fileiconprovider.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/id.h>
+#include <coreplugin/mimedatabase.h>
 #include <coreplugin/navigationwidget.h>
+#include <coreplugin/progressmanager/progressmanager.h>
+#include <cpptools/ModelManagerInterface.h>
+#include <cpptools/cpptoolsconstants.h>
+#include <cpptools/cpptoolssettings.h>
 #include <texteditor/texteditoractionhandler.h>
+#include <texteditor/texteditorconstants.h>
 #include <texteditor/texteditorplugin.h>
 #include <texteditor/texteditorsettings.h>
-#include <texteditor/texteditorconstants.h>
+
 #include <utils/hostosinfo.h>
-#include <cpptools/ModelManagerInterface.h>
-#include <cpptools/cpptoolsconstants.h>
-#include <cpptools/cpptoolssettings.h>
 
 #include <QFileInfo>
 #include <QSettings>
 #include <QTimer>
 #include <QCoreApplication>
 #include <QStringList>
-
 #include <QMenu>
 
 using namespace CppEditor;
diff --git a/src/plugins/cppeditor/cppplugin.h b/src/plugins/cppeditor/cppplugin.h
index 06e623a1fd..5dac683e45 100644
--- a/src/plugins/cppeditor/cppplugin.h
+++ b/src/plugins/cppeditor/cppplugin.h
@@ -30,9 +30,10 @@
 #ifndef CPPPLUGIN_H
 #define CPPPLUGIN_H
 
-#include <extensionsystem/iplugin.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
 
+#include <extensionsystem/iplugin.h>
+
 #include <QtPlugin>
 #include <QStringList>
 #include <QAction>
diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp
index 4557a96aaa..b5a835f0da 100644
--- a/src/plugins/cppeditor/cppquickfix.cpp
+++ b/src/plugins/cppeditor/cppquickfix.cpp
@@ -28,22 +28,22 @@
 ****************************************************************************/
 
 #include "cppquickfix.h"
+
 #include "cppeditor.h"
 #include "cppquickfixassistant.h"
 
-#include <AST.h>
-#include <TranslationUnit.h>
-#include <Token.h>
+#include <cpptools/cpprefactoringchanges.h>
 
+#include <cplusplus/AST.h>
 #include <cplusplus/ASTPath.h>
 #include <cplusplus/CppDocument.h>
-#include <cplusplus/ResolveExpression.h>
+#include <cplusplus/CppRewriter.h>
+#include <cplusplus/DependencyTable.h>
 #include <cplusplus/Overview.h>
+#include <cplusplus/ResolveExpression.h>
+#include <cplusplus/Token.h>
+#include <cplusplus/TranslationUnit.h>
 #include <cplusplus/TypeOfExpression.h>
-#include <cplusplus/DependencyTable.h>
-#include <cplusplus/CppRewriter.h>
-
-#include <cpptools/cpprefactoringchanges.h>
 
 #include <QTextBlock>
 #include <QFileInfo>
diff --git a/src/plugins/cppeditor/cppquickfix.h b/src/plugins/cppeditor/cppquickfix.h
index beb893dd20..d75cbdeb69 100644
--- a/src/plugins/cppeditor/cppquickfix.h
+++ b/src/plugins/cppeditor/cppquickfix.h
@@ -31,6 +31,7 @@
 #define CPPQUICKFIX_H
 
 #include "cppeditor_global.h"
+
 #include <texteditor/quickfix.h>
 
 namespace CPlusPlus {
diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp
index 8c91cb5f15..6aec512b86 100644
--- a/src/plugins/cppeditor/cppquickfix_test.cpp
+++ b/src/plugins/cppeditor/cppquickfix_test.cpp
@@ -27,34 +27,36 @@
 **
 ****************************************************************************/
 
-#include <AST.h>
-#include <Bind.h>
-#include <Control.h>
-#include <CppDocument.h>
-#include <DiagnosticClient.h>
-#include <Literals.h>
-#include <Scope.h>
-#include <Symbols.h>
-#include <TranslationUnit.h>
+#include "cppeditor.h"
+#include "cppinsertdecldef.h"
+#include "cppplugin.h"
+#include "cppquickfixassistant.h"
+#include "cppquickfix.h"
+#include "cppquickfixes.h"
 
 #include <coreplugin/editormanager/editormanager.h>
-#include <cppeditor/cppeditor.h>
-#include <cppeditor/cppinsertdecldef.h>
-#include <cppeditor/cppplugin.h>
-#include <cppeditor/cppquickfixassistant.h>
-#include <cppeditor/cppquickfix.h>
-#include <cppeditor/cppquickfixes.h>
 #include <cpptools/cppcodestylepreferences.h>
 #include <cpptools/cpptoolssettings.h>
-#include <extensionsystem/pluginmanager.h>
 #include <texteditor/basetextdocument.h>
 #include <texteditor/codeassist/basicproposalitemlistmodel.h>
 #include <texteditor/codeassist/iassistproposal.h>
 #include <texteditor/codeassist/iassistproposalmodel.h>
 #include <texteditor/plaintexteditor.h>
+
+#include <extensionsystem/pluginmanager.h>
 #include <utils/changeset.h>
 #include <utils/fileutils.h>
 
+#include <cplusplus/AST.h>
+#include <cplusplus/Bind.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/DiagnosticClient.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
+
 #include <QDebug>
 #include <QDir>
 #include <QTextDocument>
diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/cppquickfixassistant.cpp
index 1644938e66..05c477cbde 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.cpp
+++ b/src/plugins/cppeditor/cppquickfixassistant.cpp
@@ -28,28 +28,26 @@
 ****************************************************************************/
 
 #include "cppquickfixassistant.h"
+
 #include "cppeditorconstants.h"
 #include "cppeditor.h"
-
 // @TODO: temp
 #include "cppquickfix.h"
 
-#include <AST.h>
-#include <TranslationUnit.h>
-#include <Token.h>
+#include <cpptools/cpprefactoringchanges.h>
 
+#include <cplusplus/AST.h>
 #include <cplusplus/ASTPath.h>
 #include <cplusplus/CppDocument.h>
-#include <cplusplus/ResolveExpression.h>
+#include <cplusplus/CppRewriter.h>
+#include <cplusplus/DependencyTable.h>
 #include <cplusplus/Overview.h>
+#include <cplusplus/ResolveExpression.h>
+#include <cplusplus/Token.h>
+#include <cplusplus/TranslationUnit.h>
 #include <cplusplus/TypeOfExpression.h>
-#include <cplusplus/DependencyTable.h>
-#include <cplusplus/CppRewriter.h>
-
-#include <cpptools/cpprefactoringchanges.h>
 
 #include <extensionsystem/pluginmanager.h>
-
 #include <utils/qtcassert.h>
 
 #include <QFileInfo>
diff --git a/src/plugins/cppeditor/cppquickfixassistant.h b/src/plugins/cppeditor/cppquickfixassistant.h
index 4ab46e01c0..55812deece 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.h
+++ b/src/plugins/cppeditor/cppquickfixassistant.h
@@ -31,14 +31,13 @@
 #define CPPQUICKFIXASSISTANT_H
 
 #include <cpptools/cppsemanticinfo.h>
-
-#include <ASTfwd.h>
-#include <cplusplus/CppDocument.h>
-
 #include <texteditor/codeassist/defaultassistinterface.h>
 #include <texteditor/codeassist/quickfixassistprovider.h>
 #include <texteditor/codeassist/quickfixassistprocessor.h>
 
+#include <cplusplus/ASTfwd.h>
+#include <cplusplus/CppDocument.h>
+
 namespace CppTools {
 class CppRefactoringFile;
 typedef QSharedPointer<CppRefactoringFile> CppRefactoringFilePtr;
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 1182a19269..4e8cd32686 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -35,24 +35,25 @@
 #include "cppinsertqtpropertymembers.h"
 #include "cppquickfixassistant.h"
 
-#include <Literals.h>
-#include <Name.h>
-#include <Names.h>
-#include <Symbol.h>
-#include <Symbols.h>
-#include <Token.h>
-#include <TranslationUnit.h>
-
-#include <cplusplus/CppRewriter.h>
-#include <cplusplus/DependencyTable.h>
-#include <cplusplus/Overview.h>
-#include <cplusplus/TypeOfExpression.h>
+#include <cpptools/ModelManagerInterface.h>
 #include <cpptools/cppclassesfilter.h>
 #include <cpptools/cppcodestylesettings.h>
 #include <cpptools/cpppointerdeclarationformatter.h>
 #include <cpptools/cpptoolsconstants.h>
-#include <cpptools/ModelManagerInterface.h>
 #include <cpptools/symbolfinder.h>
+
+#include <cplusplus/CppRewriter.h>
+#include <cplusplus/DependencyTable.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Name.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Symbol.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Token.h>
+#include <cplusplus/TranslationUnit.h>
+#include <cplusplus/TypeOfExpression.h>
+
 #include <extensionsystem/pluginmanager.h>
 #include <utils/changeset.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/cppeditor/cppquickfixes.h b/src/plugins/cppeditor/cppquickfixes.h
index 967f8a83bf..1a73c6b677 100644
--- a/src/plugins/cppeditor/cppquickfixes.h
+++ b/src/plugins/cppeditor/cppquickfixes.h
@@ -33,10 +33,11 @@
 #include "cppquickfix.h"
 
 #include <cpptools/cpprefactoringchanges.h>
+
 #include <extensionsystem/iplugin.h>
 
-#include <AST.h>
-#include <ASTMatcher.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTMatcher.h>
 
 QT_BEGIN_NAMESPACE
 class QByteArray;
diff --git a/src/plugins/cppeditor/cppsnippetprovider.cpp b/src/plugins/cppeditor/cppsnippetprovider.cpp
index f428e32a48..568ba66e8d 100644
--- a/src/plugins/cppeditor/cppsnippetprovider.cpp
+++ b/src/plugins/cppeditor/cppsnippetprovider.cpp
@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "cppsnippetprovider.h"
+
 #include "cpphighlighter.h"
 #include "cppeditor.h"
 #include "cppautocompleter.h"
diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp
index 20da48fa29..051590fae6 100644
--- a/src/plugins/cppeditor/cpptypehierarchy.cpp
+++ b/src/plugins/cppeditor/cpptypehierarchy.cpp
@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "cpptypehierarchy.h"
+
 #include "cppeditorconstants.h"
 #include "cppeditor.h"
 #include "cppelementevaluator.h"
@@ -35,6 +36,7 @@
 
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
+
 #include <utils/navigationtreeview.h>
 #include <utils/annotateditemdelegate.h>
 
diff --git a/src/plugins/cpptools/ModelManagerInterface.cpp b/src/plugins/cpptools/ModelManagerInterface.cpp
index 8f877f0cbe..e9548f185d 100644
--- a/src/plugins/cpptools/ModelManagerInterface.cpp
+++ b/src/plugins/cpptools/ModelManagerInterface.cpp
@@ -28,7 +28,8 @@
 ****************************************************************************/
 
 #include "ModelManagerInterface.h"
-#include "pp-engine.h"
+
+#include <cplusplus/pp-engine.h>
 
 #include <QtCore/QSet>
 
diff --git a/src/plugins/cpptools/ModelManagerInterface.h b/src/plugins/cpptools/ModelManagerInterface.h
index 5f4895598f..ceb82e6f86 100644
--- a/src/plugins/cpptools/ModelManagerInterface.h
+++ b/src/plugins/cpptools/ModelManagerInterface.h
@@ -30,11 +30,12 @@
 #ifndef CPPMODELMANAGERINTERFACE_H
 #define CPPMODELMANAGERINTERFACE_H
 
-#include <cplusplus/CppDocument.h>
-#include <languageutils/fakemetaobject.h>
 #include "cpptools_global.h"
 #include "cppprojectfile.h"
 
+#include <cplusplus/CppDocument.h>
+#include <languageutils/fakemetaobject.h>
+
 #include <QObject>
 #include <QHash>
 #include <QPointer>
diff --git a/src/plugins/cpptools/TypeHierarchyBuilder.cpp b/src/plugins/cpptools/TypeHierarchyBuilder.cpp
index e740122852..d1bb186964 100644
--- a/src/plugins/cpptools/TypeHierarchyBuilder.cpp
+++ b/src/plugins/cpptools/TypeHierarchyBuilder.cpp
@@ -28,14 +28,15 @@
 ****************************************************************************/
 
 #include "TypeHierarchyBuilder.h"
-#include "FindUsages.h"
-#include "Symbols.h"
-#include "SymbolVisitor.h"
-#include "DependencyTable.h"
-#include "CppDocument.h"
-#include "Literals.h"
-#include "TranslationUnit.h"
-#include "CoreTypes.h"
+
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/DependencyTable.h>
+#include <cplusplus/FindUsages.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
 
 using namespace CPlusPlus;
 
diff --git a/src/plugins/cpptools/TypeHierarchyBuilder.h b/src/plugins/cpptools/TypeHierarchyBuilder.h
index 205d7ee165..8f44e049c9 100644
--- a/src/plugins/cpptools/TypeHierarchyBuilder.h
+++ b/src/plugins/cpptools/TypeHierarchyBuilder.h
@@ -30,10 +30,11 @@
 #ifndef TYPEHIERARCHYBUILDER_H
 #define TYPEHIERARCHYBUILDER_H
 
-#include "CppDocument.h"
-#include "ModelManagerInterface.h"
-#include "Overview.h"
 #include "cpptools_global.h"
+#include "ModelManagerInterface.h"
+
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/Overview.h>
 
 #include <QList>
 #include <QStringList>
diff --git a/src/plugins/cpptools/abstracteditorsupport.cpp b/src/plugins/cpptools/abstracteditorsupport.cpp
index 7aad3d71e1..a1e910b802 100644
--- a/src/plugins/cpptools/abstracteditorsupport.cpp
+++ b/src/plugins/cpptools/abstracteditorsupport.cpp
@@ -28,19 +28,21 @@
 ****************************************************************************/
 
 #include "abstracteditorsupport.h"
+
 #include "cpptoolsconstants.h"
 #include "cppfilesettingspage.h"
+#include "ModelManagerInterface.h"
 
-#include <cplusplus/Overview.h>
+#include <coreplugin/icore.h>
+
+#include <cplusplus/CoreTypes.h>
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/ExpressionUnderCursor.h>
-#include "ModelManagerInterface.h"
-#include <CoreTypes.h>
-#include <Names.h>
-#include <Symbols.h>
-#include <Scope.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
 
-#include <coreplugin/icore.h>
 #include <QDebug>
 
 using namespace CPlusPlus;
diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp
index 9cbaff5eeb..5f8659c210 100644
--- a/src/plugins/cpptools/builtinindexingsupport.cpp
+++ b/src/plugins/cpptools/builtinindexingsupport.cpp
@@ -1,10 +1,12 @@
 #include "builtinindexingsupport.h"
+
 #include "cppmodelmanager.h"
 #include "searchsymbols.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/progressmanager/progressmanager.h>
+
 #include <utils/runextensions.h>
 
 #include <QCoreApplication>
diff --git a/src/plugins/cpptools/completionsettingspage.cpp b/src/plugins/cpptools/completionsettingspage.cpp
index a1f787f4f6..6d0b2fc3f7 100644
--- a/src/plugins/cpptools/completionsettingspage.cpp
+++ b/src/plugins/cpptools/completionsettingspage.cpp
@@ -28,13 +28,15 @@
 ****************************************************************************/
 
 #include "completionsettingspage.h"
-#include "ui_completionsettingspage.h"
+
+#include <ui_completionsettingspage.h>
 #include "cpptoolsconstants.h"
 
 #include <coreplugin/icore.h>
-#include <extensionsystem/pluginmanager.h>
 #include <texteditor/texteditorsettings.h>
 
+#include <extensionsystem/pluginmanager.h>
+
 #include <QTextStream>
 #include <QCoreApplication>
 
diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp
index fbf2766606..8146131133 100644
--- a/src/plugins/cpptools/cppchecksymbols.cpp
+++ b/src/plugins/cpptools/cppchecksymbols.cpp
@@ -28,27 +28,26 @@
 ****************************************************************************/
 
 #include "cppchecksymbols.h"
+
 #include "cpplocalsymbols.h"
 
+#include <cplusplus/AST.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Scope.h>
 #include <cplusplus/SimpleLexer.h>
-
-#include <Names.h>
-#include <Literals.h>
-#include <Symbols.h>
-#include <TranslationUnit.h>
-#include <Scope.h>
-#include <AST.h>
-#include <SymbolVisitor.h>
-#include <Overview.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
 
 #include <utils/qtcassert.h>
+#include <utils/runextensions.h>
 
 #include <QCoreApplication>
 #include <QThreadPool>
 #include <QDebug>
 
-#include <utils/runextensions.h>
-
 // This is for experimeting highlighting ctors/dtors as functions (instead of types).
 // Whenever this feature is considered "accepted" the switch below should be permanently
 // removed, unless we decide to actually make this a user setting - that is why it's
diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h
index a1b87f2b7b..b1af819730 100644
--- a/src/plugins/cpptools/cppchecksymbols.h
+++ b/src/plugins/cpptools/cppchecksymbols.h
@@ -31,16 +31,15 @@
 #define CPLUSPLUSCHECKSYMBOLS_H
 
 #include "cpptools_global.h"
-
 #include "cppsemanticinfo.h"
 
+#include <texteditor/semantichighlighter.h>
+
+#include <cplusplus/ASTVisitor.h>
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/LookupContext.h>
 #include <cplusplus/TypeOfExpression.h>
 
-#include <texteditor/semantichighlighter.h>
-
-#include <ASTVisitor.h>
 #include <QSet>
 #include <QFuture>
 #include <QtConcurrentRun>
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index 342b426fef..be5110a77c 100644
--- a/src/plugins/cpptools/cppcodeformatter.cpp
+++ b/src/plugins/cpptools/cppcodeformatter.cpp
@@ -29,11 +29,14 @@
 
 #include "cppcodeformatter.h"
 
-#include <Token.h>
-#include <Lexer.h>
+#include "cppcodestylesettingspage.h"
 
 #include <texteditor/basetextdocumentlayout.h>
 #include <texteditor/tabsettings.h>
+
+#include <cplusplus/Token.h>
+#include <cplusplus/Lexer.h>
+
 #include <utils/qtcassert.h>
 
 #include <QDebug>
@@ -42,8 +45,6 @@
 #include <QTextCursor>
 #include <QTextBlock>
 
-#include "cppcodestylesettingspage.h"
-
 using namespace CPlusPlus;
 using namespace CppTools;
 using namespace TextEditor;
diff --git a/src/plugins/cpptools/cppcodeformatter.h b/src/plugins/cpptools/cppcodeformatter.h
index c175734f2b..c3fe6fd69a 100644
--- a/src/plugins/cpptools/cppcodeformatter.h
+++ b/src/plugins/cpptools/cppcodeformatter.h
@@ -31,11 +31,12 @@
 #define CPPCODEFORMATTER_H
 
 #include "cpptools_global.h"
+#include "cppcodestylesettings.h"
 
-#include <Token.h>
-#include <cplusplus/SimpleLexer.h>
 #include <texteditor/tabsettings.h>
-#include <cpptools/cppcodestylesettings.h>
+
+#include <cplusplus/Token.h>
+#include <cplusplus/SimpleLexer.h>
 
 #include <QChar>
 #include <QStack>
diff --git a/src/plugins/cpptools/cppcodegen_test.cpp b/src/plugins/cpptools/cppcodegen_test.cpp
index 6bc8fb89e5..f79a694e6c 100644
--- a/src/plugins/cpptools/cppcodegen_test.cpp
+++ b/src/plugins/cpptools/cppcodegen_test.cpp
@@ -27,20 +27,20 @@
 **
 ****************************************************************************/
 
+#include "insertionpointlocator.h"
+#include "cpprefactoringchanges.h"
 #include "cpptoolsplugin.h"
 
-#include <AST.h>
-#include <Control.h>
-#include <CppDocument.h>
-#include <DiagnosticClient.h>
-#include <Scope.h>
-#include <TranslationUnit.h>
-#include <Literals.h>
-#include <Bind.h>
-#include <Symbols.h>
-#include <cpptools/insertionpointlocator.h>
-#include <cpptools/cpprefactoringchanges.h>
-#include <cpptools/cpptoolsplugin.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/Bind.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/DiagnosticClient.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
+
 #include <extensionsystem/pluginmanager.h>
 #include <utils/fileutils.h>
 
diff --git a/src/plugins/cpptools/cppcodestylepreferences.h b/src/plugins/cpptools/cppcodestylepreferences.h
index 4100945b74..d3ef94e1a2 100644
--- a/src/plugins/cpptools/cppcodestylepreferences.h
+++ b/src/plugins/cpptools/cppcodestylepreferences.h
@@ -32,6 +32,7 @@
 
 #include "cpptools_global.h"
 #include "cppcodestylesettings.h"
+
 #include <texteditor/icodestylepreferences.h>
 
 namespace CppTools {
diff --git a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
index 50936a2f34..f6d1d6af7b 100644
--- a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
+++ b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
@@ -28,15 +28,19 @@
 ****************************************************************************/
 
 #include "cppcodestylepreferencesfactory.h"
+
 #include "cppcodestylesettings.h"
 #include "cppcodestylesettingspage.h"
 #include "cppcodestylepreferences.h"
 #include "cpptoolsconstants.h"
 #include "cppqtstyleindenter.h"
-#include <extensionsystem/pluginmanager.h>
-#include <texteditor/tabsettings.h>
-#include <texteditor/snippets/isnippetprovider.h>
+
 #include <cppeditor/cppeditorconstants.h>
+#include <texteditor/snippets/isnippetprovider.h>
+#include <texteditor/tabsettings.h>
+
+#include <extensionsystem/pluginmanager.h>
+
 #include <QLayout>
 
 using namespace CppTools;
diff --git a/src/plugins/cpptools/cppcodestylesettings.cpp b/src/plugins/cpptools/cppcodestylesettings.cpp
index a4f67e7623..88fc6ea4e1 100644
--- a/src/plugins/cpptools/cppcodestylesettings.cpp
+++ b/src/plugins/cpptools/cppcodestylesettings.cpp
@@ -28,18 +28,17 @@
 ****************************************************************************/
 
 #include "cppcodestylesettings.h"
-#include "cppcodestylepreferencesfactory.h"
 
-#include <cpptools/cppcodestylepreferences.h>
-#include <cpptools/cpptoolsconstants.h>
-#include <cpptools/cpptoolssettings.h>
+#include "cppcodestylepreferencesfactory.h"
+#include "cppcodestylepreferences.h"
+#include "cpptoolsconstants.h"
+#include "cpptoolssettings.h"
 
 #include <projectexplorer/editorconfiguration.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 
 #include <utils/qtcassert.h>
-
 #include <utils/settingsutils.h>
 
 static const char groupPostfix[] = "IndentSettings";
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp
index a9cdadd1bd..d37d0a47d5 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.cpp
+++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp
@@ -28,19 +28,16 @@
 ****************************************************************************/
 
 #include "cppcodestylesettingspage.h"
+
 #include "cppcodestylepreferences.h"
 #include "cpppointerdeclarationformatter.h"
 #include "cppqtstyleindenter.h"
 #include "cpptoolsconstants.h"
 #include "cpptoolssettings.h"
-#include "ui_cppcodestylesettingspage.h"
-
-#include <Overview.h>
-#include <pp.h>
+#include <ui_cppcodestylesettingspage.h>
 
 #include <coreplugin/icore.h>
 #include <cppeditor/cppeditorconstants.h>
-#include <extensionsystem/pluginmanager.h>
 #include <texteditor/codestyleeditor.h>
 #include <texteditor/displaysettings.h>
 #include <texteditor/fontsettings.h>
@@ -48,6 +45,11 @@
 #include <texteditor/tabsettings.h>
 #include <texteditor/texteditorsettings.h>
 
+#include <cplusplus/Overview.h>
+#include <cplusplus/pp.h>
+
+#include <extensionsystem/pluginmanager.h>
+
 #include <QTextBlock>
 #include <QTextStream>
 
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.h b/src/plugins/cpptools/cppcodestylesettingspage.h
index ec00940b6e..3cc099ce8d 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.h
+++ b/src/plugins/cpptools/cppcodestylesettingspage.h
@@ -31,17 +31,17 @@
 #define CPPCODESTYLESETTINGSPAGE_H
 
 #include "cpptools_global.h"
+#include "cppcodestylesettings.h"
+#include "cppcodeformatter.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
+
 #include <QWidget>
 #include <QPointer>
 #include <QSharedPointer>
 #include <QVariant>
 #include <QStringList>
 
-#include "cppcodestylesettings.h"
-#include "cppcodeformatter.h"
-
 namespace TextEditor {
     class FontSettings;
     class TabSettings;
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp
index 823a478fe4..a7cd6fa93a 100644
--- a/src/plugins/cpptools/cppcompletion_test.cpp
+++ b/src/plugins/cpptools/cppcompletion_test.cpp
@@ -28,25 +28,26 @@
 ****************************************************************************/
 
 #include "cpptoolsplugin.h"
+#include "cppcompletionassist.h"
 
-#include <AST.h>
-#include <Control.h>
-#include <CppDocument.h>
-#include <DiagnosticClient.h>
-#include <Scope.h>
-#include <TranslationUnit.h>
-#include <Literals.h>
-#include <Bind.h>
-#include <Symbols.h>
-#include <utils/changeset.h>
 #include <texteditor/basetextdocument.h>
 #include <texteditor/plaintexteditor.h>
 #include <texteditor/codeassist/iassistproposal.h>
 #include <texteditor/codeassist/iassistproposalmodel.h>
 #include <texteditor/codeassist/basicproposalitemlistmodel.h>
-#include <cpptools/cpptoolsplugin.h>
-#include <cpptools/cppcompletionassist.h>
+
+#include <cplusplus/AST.h>
+#include <cplusplus/Bind.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/DiagnosticClient.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
+
 #include <extensionsystem/pluginmanager.h>
+#include <utils/changeset.h>
 #include <utils/fileutils.h>
 
 #include <QtTest>
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index f4e2d91c38..cef6bb1e6f 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -28,30 +28,11 @@
 ****************************************************************************/
 
 #include "cppcompletionassist.h"
+
 #include "cppmodelmanager.h"
 #include "cppdoxygen.h"
 #include "cpptoolsconstants.h"
 
-#include <Control.h>
-#include <AST.h>
-#include <ASTVisitor.h>
-#include <CoreTypes.h>
-#include <Literals.h>
-#include <Names.h>
-#include <NameVisitor.h>
-#include <Symbols.h>
-#include <SymbolVisitor.h>
-#include <Scope.h>
-#include <TranslationUnit.h>
-#include <CppRewriter.h>
-
-#include <cplusplus/ResolveExpression.h>
-#include <cplusplus/MatchingText.h>
-#include <cplusplus/Overview.h>
-#include <cplusplus/ExpressionUnderCursor.h>
-#include <cplusplus/BackwardsScanner.h>
-#include <cplusplus/LookupContext.h>
-
 #include <coreplugin/idocument.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
@@ -64,8 +45,28 @@
 #include <texteditor/snippets/snippet.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/completionsettings.h>
+
 #include <utils/qtcassert.h>
 
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/BackwardsScanner.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/CppRewriter.h>
+#include <cplusplus/ExpressionUnderCursor.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/LookupContext.h>
+#include <cplusplus/MatchingText.h>
+#include <cplusplus/NameVisitor.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/ResolveExpression.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
+
 #include <QLatin1String>
 #include <QTextCursor>
 #include <QTextDocument>
diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h
index 23d7b387bb..428c5e6ebd 100644
--- a/src/plugins/cpptools/cppcompletionassist.h
+++ b/src/plugins/cpptools/cppcompletionassist.h
@@ -32,21 +32,21 @@
 
 #include "cppcompletionassistprovider.h"
 
+#include <cplusplus/CppDocument.h>
 #include <cplusplus/Icons.h>
 #include <cplusplus/Overview.h>
 #include <cplusplus/TypeOfExpression.h>
-#include <cplusplus/CppDocument.h>
 #if QT_VERSION >= 0x050000
 // Qt 5 requires the types to be defined for Q_DECLARE_METATYPE
 #  include <cplusplus/Symbol.h>
 #endif
 
+#include <texteditor/codeassist/basicproposalitem.h>
 #include <texteditor/codeassist/basicproposalitemlistmodel.h>
 #include <texteditor/codeassist/completionassistprovider.h>
+#include <texteditor/codeassist/defaultassistinterface.h>
 #include <texteditor/codeassist/iassistprocessor.h>
 #include <texteditor/snippets/snippetassistcollector.h>
-#include <texteditor/codeassist/defaultassistinterface.h>
-#include <texteditor/codeassist/basicproposalitem.h>
 
 #include <QStringList>
 #include <QVariant>
diff --git a/src/plugins/cpptools/cppcompletionassistprovider.cpp b/src/plugins/cpptools/cppcompletionassistprovider.cpp
index 679842361b..c746f0bf28 100644
--- a/src/plugins/cpptools/cppcompletionassistprovider.cpp
+++ b/src/plugins/cpptools/cppcompletionassistprovider.cpp
@@ -31,7 +31,7 @@
 
 #include <cppeditor/cppeditorconstants.h>
 
-#include <Token.h>
+#include <cplusplus/Token.h>
 
 using namespace CPlusPlus;
 using namespace CppTools;
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
index ee859b1396..ae3d3a9744 100644
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
@@ -26,10 +26,13 @@
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
+
 #include "cppcurrentdocumentfilter.h"
+
 #include "cppmodelmanager.h"
 
 #include <coreplugin/editormanager/editormanager.h>
+
 #include <cplusplus/CppDocument.h>
 
 #include <QStringMatcher>
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.h b/src/plugins/cpptools/cppcurrentdocumentfilter.h
index 4f4fd08272..3466f0e0c1 100644
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.h
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.h
@@ -30,6 +30,7 @@
 #define CPPCURRENTDOCUMENTFILTER_H
 
 #include "searchsymbols.h"
+
 #include <locator/ilocatorfilter.h>
 
 namespace Core {
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 66eff6cbce..c5cb5701bf 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -28,8 +28,9 @@
 ****************************************************************************/
 
 #include "cppfilesettingspage.h"
+
 #include "cpptoolsconstants.h"
-#include "ui_cppfilesettingspage.h"
+#include <ui_cppfilesettingspage.h>
 
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
@@ -37,7 +38,6 @@
 #include <cppeditor/cppeditorconstants.h>
 
 #include <extensionsystem/pluginmanager.h>
-
 #include <utils/environment.h>
 #include <utils/fileutils.h>
 
@@ -50,7 +50,6 @@
 #include <QLocale>
 #include <QTextCodec>
 #include <QTextStream>
-
 #include <QFileDialog>
 #include <QMessageBox>
 
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index dfa6978b7e..a175d207a7 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -28,34 +28,37 @@
 ****************************************************************************/
 
 #include "cppfindreferences.h"
+
 #include "cpptoolsconstants.h"
+#include "ModelManagerInterface.h"
 
-#include <texteditor/basetexteditor.h>
-#include <texteditor/basefilefind.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/infobar.h>
+#include <coreplugin/progressmanager/futureprogress.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 #include <find/searchresultwindow.h>
+#include <texteditor/basefilefind.h>
+#include <texteditor/basetexteditor.h>
+
 #include <extensionsystem/pluginmanager.h>
 #include <utils/filesearch.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
-#include <coreplugin/progressmanager/progressmanager.h>
-#include <coreplugin/progressmanager/futureprogress.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/infobar.h>
-
-#include <ASTVisitor.h>
-#include <AST.h>
-#include <Control.h>
-#include <Literals.h>
-#include <TranslationUnit.h>
-#include <Symbols.h>
-#include <Names.h>
-#include <Scope.h>
+#include <utils/runextensions.h>
+#include <utils/textfileformat.h>
 
-#include <cpptools/ModelManagerInterface.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/Control.h>
 #include <cplusplus/CppDocument.h>
-#include <cplusplus/Overview.h>
 #include <cplusplus/FindUsages.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
 
 #include <QTime>
 #include <QTimer>
@@ -63,8 +66,6 @@
 #include <QtConcurrentMap>
 #include <QDir>
 #include <QApplication>
-#include <utils/runextensions.h>
-#include <utils/textfileformat.h>
 
 #include <functional>
 
diff --git a/src/plugins/cpptools/cppfindreferences.h b/src/plugins/cpptools/cppfindreferences.h
index 13b1b6f3fb..200dc616bd 100644
--- a/src/plugins/cpptools/cppfindreferences.h
+++ b/src/plugins/cpptools/cppfindreferences.h
@@ -31,6 +31,7 @@
 #define CPPFINDREFERENCES_H
 
 #include <utils/filesearch.h>
+
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/DependencyTable.h>
 #include <cplusplus/FindUsages.h>
diff --git a/src/plugins/cpptools/cpphighlightingsupport.h b/src/plugins/cpptools/cpphighlightingsupport.h
index 9ca5151513..1e92651405 100644
--- a/src/plugins/cpptools/cpphighlightingsupport.h
+++ b/src/plugins/cpptools/cpphighlightingsupport.h
@@ -32,9 +32,10 @@
 
 #include "cpptools_global.h"
 
-#include <cplusplus/CppDocument.h>
 #include <texteditor/semantichighlighter.h>
 
+#include <cplusplus/CppDocument.h>
+
 #include <QFuture>
 
 namespace TextEditor {
diff --git a/src/plugins/cpptools/cpphighlightingsupportinternal.cpp b/src/plugins/cpptools/cpphighlightingsupportinternal.cpp
index 5d17c3f3de..a05c5afbeb 100644
--- a/src/plugins/cpptools/cpphighlightingsupportinternal.cpp
+++ b/src/plugins/cpptools/cpphighlightingsupportinternal.cpp
@@ -28,13 +28,15 @@
 ****************************************************************************/
 
 #include "cpphighlightingsupportinternal.h"
+
 #include "cppchecksymbols.h"
+#include "cpptoolsreuse.h"
+
+#include <texteditor/itexteditor.h>
 
 #include <cplusplus/LookupContext.h>
 #include <cplusplus/SimpleLexer.h>
 #include <cplusplus/Token.h>
-#include <cpptools/cpptoolsreuse.h>
-#include <texteditor/itexteditor.h>
 
 using namespace CPlusPlus;
 using namespace CppTools;
diff --git a/src/plugins/cpptools/cpphighlightingsupportinternal.h b/src/plugins/cpptools/cpphighlightingsupportinternal.h
index 2389c317ce..fe3ecb44a9 100644
--- a/src/plugins/cpptools/cpphighlightingsupportinternal.h
+++ b/src/plugins/cpptools/cpphighlightingsupportinternal.h
@@ -32,9 +32,10 @@
 
 #include "cpphighlightingsupport.h"
 
-#include <cplusplus/CppDocument.h>
 #include <texteditor/semantichighlighter.h>
 
+#include <cplusplus/CppDocument.h>
+
 #include <QFuture>
 
 namespace CppTools {
diff --git a/src/plugins/cpptools/cpplocalsymbols.cpp b/src/plugins/cpptools/cpplocalsymbols.cpp
index 8b682b382e..7b71590e67 100644
--- a/src/plugins/cpptools/cpplocalsymbols.cpp
+++ b/src/plugins/cpptools/cpplocalsymbols.cpp
@@ -28,16 +28,17 @@
 ****************************************************************************/
 
 #include "cpplocalsymbols.h"
+
 #include "cppsemanticinfo.h"
 
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/CoreTypes.h>
 #include <cplusplus/CppDocument.h>
-#include <ASTVisitor.h>
-#include <AST.h>
-#include <Scope.h>
-#include <Symbols.h>
-#include <CoreTypes.h>
-#include <Names.h>
-#include <Literals.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
 
 using namespace CPlusPlus;
 using namespace CppTools;
diff --git a/src/plugins/cpptools/cpplocalsymbols.h b/src/plugins/cpptools/cpplocalsymbols.h
index 80e4f73fa6..9e473b2146 100644
--- a/src/plugins/cpptools/cpplocalsymbols.h
+++ b/src/plugins/cpptools/cpplocalsymbols.h
@@ -34,7 +34,7 @@
 #include "cppsemanticinfo.h"
 
 #include <cplusplus/CppDocument.h>
-#include <ASTfwd.h>
+#include <cplusplus/ASTfwd.h>
 
 namespace CppTools {
 
diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
index 03b55718d9..08fda7477f 100644
--- a/src/plugins/cpptools/cpplocatorfilter.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter.cpp
@@ -32,6 +32,7 @@
 
 #include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
+
 #include <utils/fileutils.h>
 
 #include <QStringMatcher>
diff --git a/src/plugins/cpptools/cpplocatorfilter.h b/src/plugins/cpptools/cpplocatorfilter.h
index 92eda5dbdb..e4cfbaca75 100644
--- a/src/plugins/cpptools/cpplocatorfilter.h
+++ b/src/plugins/cpptools/cpplocatorfilter.h
@@ -31,6 +31,7 @@
 #define CPPLOCATORFILTER_H
 
 #include "searchsymbols.h"
+
 #include <locator/ilocatorfilter.h>
 
 namespace CppTools {
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index c0fc6cca14..5176c95069 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "cppmodelmanager.h"
+
 #include "builtinindexingsupport.h"
 #include "cppcompletionassist.h"
 #include "cpphighlightingsupport.h"
@@ -38,42 +39,38 @@
 #include "cpptoolseditorsupport.h"
 #include "cppfindreferences.h"
 
-#include <cplusplus/pp.h>
-#include <cplusplus/Overview.h>
-
-#include <functional>
-#include <QtConcurrentRun>
-#include <QFutureSynchronizer>
-#include <utils/runextensions.h>
-#include <texteditor/itexteditor.h>
-#include <texteditor/basetexteditor.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/mimedatabase.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/session.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/progressmanager/progressmanager.h>
-#include <extensionsystem/pluginmanager.h>
+#include <texteditor/basetexteditor.h>
+#include <texteditor/itexteditor.h>
 
+#include <extensionsystem/pluginmanager.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/runextensions.h>
 
-#include <TranslationUnit.h>
-#include <AST.h>
-#include <Scope.h>
-#include <Literals.h>
-#include <Symbols.h>
-#include <Names.h>
-#include <NameVisitor.h>
-#include <TypeVisitor.h>
-#include <ASTVisitor.h>
-#include <Lexer.h>
-#include <Token.h>
-#include <Parser.h>
-#include <Control.h>
-#include <CoreTypes.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/Control.h>
+#include <cplusplus/CoreTypes.h>
+#include <cplusplus/Lexer.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/NameVisitor.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Parser.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Token.h>
+#include <cplusplus/TranslationUnit.h>
+#include <cplusplus/TypeVisitor.h>
+#include <cplusplus/pp.h>
 
 #include <QCoreApplication>
 #include <QDebug>
@@ -81,9 +78,11 @@
 #include <QTime>
 #include <QTimer>
 #include <QtConcurrentMap>
-
 #include <QTextBlock>
+#include <QtConcurrentRun>
+#include <QFutureSynchronizer>
 
+#include <functional>
 #include <iostream>
 #include <sstream>
 
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index 503c3c5258..1e811c912e 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -33,10 +33,12 @@
 #include "cpptools_global.h"
 #include "cpptoolsconstants.h"
 #include "ModelManagerInterface.h"
+
 #include <projectexplorer/project.h>
+#include <texteditor/basetexteditor.h>
+
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/PreprocessorClient.h>
-#include <texteditor/basetexteditor.h>
 #include <cplusplus/PreprocessorEnvironment.h>
 #include <cplusplus/pp-engine.h>
 
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp
index a5eb79914b..34cfd7dd86 100644
--- a/src/plugins/cpptools/cppmodelmanager_test.cpp
+++ b/src/plugins/cpptools/cppmodelmanager_test.cpp
@@ -28,10 +28,12 @@
 ****************************************************************************/
 
 #include "cpptoolsplugin.h"
-#include "CppDocument.h"
+
 #include "cppmodelmanager.h"
 #include "modelmanagertesthelper.h"
 
+#include <cplusplus/CppDocument.h>
+
 #include <QtTest>
 #include <QDebug>
 
diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter.cpp b/src/plugins/cpptools/cpppointerdeclarationformatter.cpp
index a40316f290..a0659c7f28 100644
--- a/src/plugins/cpptools/cpppointerdeclarationformatter.cpp
+++ b/src/plugins/cpptools/cpppointerdeclarationformatter.cpp
@@ -30,7 +30,7 @@
 
 #include "cpppointerdeclarationformatter.h"
 
-#include <AST.h>
+#include <cplusplus/AST.h>
 
 #include <QtGlobal>
 #include <QTextCursor>
diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter.h b/src/plugins/cpptools/cpppointerdeclarationformatter.h
index a2d25c559e..4c97242222 100644
--- a/src/plugins/cpptools/cpppointerdeclarationformatter.h
+++ b/src/plugins/cpptools/cpppointerdeclarationformatter.h
@@ -31,13 +31,13 @@
 #define CPPPOINTERDECLARATIONFORMATTER_H
 
 #include "cpptools_global.h"
+#include "cpprefactoringchanges.h"
 
-#include <AST.h>
-#include <ASTVisitor.h>
-#include <Overview.h>
-#include <Symbols.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/Overview.h>
+#include <cplusplus/Symbols.h>
 
-#include <cpptools/cpprefactoringchanges.h>
 #include <utils/changeset.h>
 
 namespace CppTools {
diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
index 092a2efdd2..4d85c08d6a 100644
--- a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
+++ b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
@@ -28,20 +28,21 @@
 ****************************************************************************/
 
 #include "cpptoolsplugin.h"
+#include "cpppointerdeclarationformatter.h"
+#include "cpprefactoringchanges.h"
+#include "cpptoolsplugin.h"
 
-#include <AST.h>
-#include <CppDocument.h>
-#include <Symbols.h>
-#include <TranslationUnit.h>
-#include <pp.h>
-
-#include <cpptools/cpppointerdeclarationformatter.h>
-#include <cpptools/cpprefactoringchanges.h>
-#include <cpptools/cpptoolsplugin.h>
 #include <texteditor/plaintexteditor.h>
+
 #include <utils/changeset.h>
 #include <utils/fileutils.h>
 
+#include <cplusplus/AST.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
+#include <cplusplus/pp.h>
+
 #include <QDebug>
 #include <QDir>
 #include <QTextCursor>
diff --git a/src/plugins/cpptools/cppprojectfile.cpp b/src/plugins/cpptools/cppprojectfile.cpp
index c6749355b7..ed4a29a6f7 100644
--- a/src/plugins/cpptools/cppprojectfile.cpp
+++ b/src/plugins/cpptools/cppprojectfile.cpp
@@ -28,8 +28,11 @@
 ****************************************************************************/
 
 #include "cppprojectfile.h"
-#include <coreplugin/icore.h>
+
 #include "cpptoolsconstants.h"
+
+#include <coreplugin/icore.h>
+
 #include <QDebug>
 
 namespace CPlusPlus {
diff --git a/src/plugins/cpptools/cppprojectfile.h b/src/plugins/cpptools/cppprojectfile.h
index dff2ddcb93..b03db499d2 100644
--- a/src/plugins/cpptools/cppprojectfile.h
+++ b/src/plugins/cpptools/cppprojectfile.h
@@ -30,10 +30,12 @@
 #ifndef CPLUSPLUS_CPPPROJECTFILE_H
 #define CPLUSPLUS_CPPPROJECTFILE_H
 
+#include "cpptools_global.h"
+
+#include <coreplugin/mimedatabase.h>
+
 #include <QString>
 #include <QMap>
-#include <coreplugin/mimedatabase.h>
-#include "cpptools_global.h"
 
 namespace CPlusPlus {
 
diff --git a/src/plugins/cpptools/cppqtstyleindenter.cpp b/src/plugins/cpptools/cppqtstyleindenter.cpp
index 1a28f48511..213d0091bf 100644
--- a/src/plugins/cpptools/cppqtstyleindenter.cpp
+++ b/src/plugins/cpptools/cppqtstyleindenter.cpp
@@ -33,6 +33,7 @@
 #include "cpptoolssettings.h"
 #include "cppcodestylepreferences.h"
 #include "cpptoolsconstants.h"
+
 #include <texteditor/tabsettings.h>
 #include <texteditor/texteditorsettings.h>
 
diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp
index 2034ddc105..9a51703695 100644
--- a/src/plugins/cpptools/cpprefactoringchanges.cpp
+++ b/src/plugins/cpptools/cpprefactoringchanges.cpp
@@ -28,18 +28,21 @@
 ****************************************************************************/
 
 #include "cpprefactoringchanges.h"
+
 #include "cppcodestylepreferences.h"
 #include "cppqtstyleindenter.h"
+#include "cppcodeformatter.h"
+#include "cppmodelmanager.h"
+#include "cpptoolssettings.h"
+#include "cpptoolsconstants.h"
 
-#include <TranslationUnit.h>
-#include <AST.h>
-#include <cpptools/cppcodeformatter.h>
-#include <cpptools/cppmodelmanager.h>
-#include <cpptools/cpptoolssettings.h>
-#include <cpptools/cpptoolsconstants.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/tabsettings.h>
 #include <projectexplorer/editorconfiguration.h>
+
+#include <cplusplus/TranslationUnit.h>
+#include <cplusplus/AST.h>
+
 #include <utils/qtcassert.h>
 
 #include <QTextBlock>
diff --git a/src/plugins/cpptools/cpprefactoringchanges.h b/src/plugins/cpptools/cpprefactoringchanges.h
index c1b0e10b7e..81382fa770 100644
--- a/src/plugins/cpptools/cpprefactoringchanges.h
+++ b/src/plugins/cpptools/cpprefactoringchanges.h
@@ -30,15 +30,15 @@
 #ifndef CPPREFACTORINGCHANGES_H
 #define CPPREFACTORINGCHANGES_H
 
-#include <ASTfwd.h>
+#include "cpptools_global.h"
 #include "ModelManagerInterface.h"
-#include <cplusplus/CppDocument.h>
-#include <cplusplus/LookupContext.h>
-
-#include <cpptools/cpptools_global.h>
 
 #include <texteditor/refactoringchanges.h>
 
+#include <cplusplus/ASTfwd.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/LookupContext.h>
+
 namespace CppTools {
 
 class CppRefactoringChanges;
diff --git a/src/plugins/cpptools/cppsemanticinfo.h b/src/plugins/cpptools/cppsemanticinfo.h
index 69a32e578c..e3ff599bf0 100644
--- a/src/plugins/cpptools/cppsemanticinfo.h
+++ b/src/plugins/cpptools/cppsemanticinfo.h
@@ -32,9 +32,11 @@
 
 #include "cpptools_global.h"
 
+#include <texteditor/semantichighlighter.h>
+
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/LookupContext.h>
-#include <texteditor/semantichighlighter.h>
+
 #include <QHash>
 
 namespace CppTools {
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index 448b72326e..361fb45ad0 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -1,7 +1,6 @@
 TARGET = CppTools
 include(../../qtcreatorplugin.pri)
 
-INCLUDEPATH += .
 DEFINES += CPPTOOLS_LIBRARY
 HEADERS += completionsettingspage.h \
     cppclassesfilter.h \
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp
index 0d2d72be40..a57a259e37 100644
--- a/src/plugins/cpptools/cpptoolseditorsupport.cpp
+++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp
@@ -28,18 +28,18 @@
 ****************************************************************************/
 
 #include "cpptoolseditorsupport.h"
+
 #include "cppcompletionsupport.h"
 #include "cpphighlightingsupport.h"
 #include "cppmodelmanager.h"
 
 #include <coreplugin/idocument.h>
-
 #include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 
-#include <AST.h>
-#include <ASTVisitor.h>
-#include <TranslationUnit.h>
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/TranslationUnit.h>
 
 #include <QTimer>
 
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.h b/src/plugins/cpptools/cpptoolseditorsupport.h
index 26b2829798..5d7e157e42 100644
--- a/src/plugins/cpptools/cpptoolseditorsupport.h
+++ b/src/plugins/cpptools/cpptoolseditorsupport.h
@@ -30,16 +30,15 @@
 #ifndef CPPTOOLSEDITORSUPPORT_H
 #define CPPTOOLSEDITORSUPPORT_H
 
+#include <cplusplus/CppDocument.h>
+
 #include <QObject>
 #include <QPointer>
 #include <QFuture>
 #include <QScopedPointer>
 #include <QSharedPointer>
-
 #include <QTextCursor>
 
-#include <cplusplus/CppDocument.h>
-
 QT_BEGIN_NAMESPACE
 class QTimer;
 QT_END_NAMESPACE
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index 144c2caebe..9f10ce1968 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "cpptoolsplugin.h"
+
 #include "completionsettingspage.h"
 #include "cppfilesettingspage.h"
 #include "cppcodestylesettingspage.h"
@@ -41,30 +42,26 @@
 #include "cpptoolssettings.h"
 #include "cpptoolsreuse.h"
 
-#include <extensionsystem/pluginmanager.h>
-
-#include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/id.h>
+#include <coreplugin/mimedatabase.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/vcsmanager.h>
-#include <coreplugin/documentmanager.h>
 #include <cppeditor/cppeditorconstants.h>
-#include <texteditor/basetexteditor.h>
-
-#include <QtConcurrentRun>
-#include <QFutureSynchronizer>
-#include <utils/runextensions.h>
-
 #include <find/ifindfilter.h>
 #include <find/searchresultwindow.h>
+#include <texteditor/basetexteditor.h>
+
+#include <extensionsystem/pluginmanager.h>
 #include <utils/filesearch.h>
 #include <utils/qtcassert.h>
+#include <utils/runextensions.h>
 
 #include <QtPlugin>
 #include <QFileInfo>
@@ -73,6 +70,8 @@
 #include <QSettings>
 #include <QMenu>
 #include <QAction>
+#include <QtConcurrentRun>
+#include <QFutureSynchronizer>
 
 #include <sstream>
 
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index d8490f2a14..c5be64e232 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -32,9 +32,10 @@
 
 #include "cpptools_global.h"
 
-#include <extensionsystem/iplugin.h>
-#include <projectexplorer/projectexplorer.h>
 #include <find/ifindfilter.h>
+#include <projectexplorer/projectexplorer.h>
+
+#include <extensionsystem/iplugin.h>
 #include <utils/filesearch.h>
 
 #include <QTextDocument>
diff --git a/src/plugins/cpptools/cpptoolsreuse.cpp b/src/plugins/cpptools/cpptoolsreuse.cpp
index a375c3eb46..3c9e0e6367 100644
--- a/src/plugins/cpptools/cpptoolsreuse.cpp
+++ b/src/plugins/cpptools/cpptoolsreuse.cpp
@@ -29,8 +29,8 @@
 
 #include "cpptoolsreuse.h"
 
-#include <Symbols.h>
-#include <CoreTypes.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/CoreTypes.h>
 #include <cplusplus/Overview.h>
 #include <cplusplus/LookupContext.h>
 
diff --git a/src/plugins/cpptools/cpptoolssettings.cpp b/src/plugins/cpptools/cpptoolssettings.cpp
index df432831d1..605487ffcb 100644
--- a/src/plugins/cpptools/cpptoolssettings.cpp
+++ b/src/plugins/cpptools/cpptoolssettings.cpp
@@ -28,20 +28,22 @@
 ****************************************************************************/
 
 #include "cpptoolssettings.h"
+
 #include "cpptoolsconstants.h"
 #include "cppcodestylepreferences.h"
 #include "cppcodestylepreferencesfactory.h"
 #include "commentssettings.h"
 #include "completionsettingspage.h"
 
-#include <texteditor/texteditorsettings.h>
-#include <texteditor/tabsettings.h>
+#include <coreplugin/icore.h>
 #include <texteditor/codestylepool.h>
-#include <extensionsystem/pluginmanager.h>
+#include <texteditor/tabsettings.h>
+#include <texteditor/texteditorsettings.h>
 
-#include <utils/settingsutils.h>
+#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
-#include <coreplugin/icore.h>
+#include <utils/settingsutils.h>
+
 #include <QSettings>
 
 static const char idKey[] = "CppGlobal";
diff --git a/src/plugins/cpptools/doxygengenerator.cpp b/src/plugins/cpptools/doxygengenerator.cpp
index c0526ea732..2133e70145 100644
--- a/src/plugins/cpptools/doxygengenerator.cpp
+++ b/src/plugins/cpptools/doxygengenerator.cpp
@@ -29,15 +29,15 @@
 
 #include "doxygengenerator.h"
 
-#include <cplusplus/SimpleLexer.h>
-#include <cplusplus/BackwardsScanner.h>
-#include <cplusplus/Token.h>
-#include <cplusplus/TranslationUnit.h>
 #include <cplusplus/AST.h>
-#include <cplusplus/Symbols.h>
+#include <cplusplus/BackwardsScanner.h>
 #include <cplusplus/CppDocument.h>
-#include <cplusplus/Scope.h>
 #include <cplusplus/LookupContext.h>
+#include <cplusplus/Scope.h>
+#include <cplusplus/SimpleLexer.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/Token.h>
+#include <cplusplus/TranslationUnit.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/cpptools/insertionpointlocator.cpp b/src/plugins/cpptools/insertionpointlocator.cpp
index 4c9cc88401..86053a70ea 100644
--- a/src/plugins/cpptools/insertionpointlocator.cpp
+++ b/src/plugins/cpptools/insertionpointlocator.cpp
@@ -28,19 +28,20 @@
 ****************************************************************************/
 
 #include "insertionpointlocator.h"
+
 #include "cpptoolsreuse.h"
 #include "cpprefactoringchanges.h"
 #include "symbolfinder.h"
 
-#include <AST.h>
-#include <ASTVisitor.h>
-#include <TranslationUnit.h>
-#include <Literals.h>
-#include <Symbols.h>
-
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
 
+#include <cplusplus/AST.h>
+#include <cplusplus/ASTVisitor.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/Symbols.h>
+#include <cplusplus/TranslationUnit.h>
+
 #include <utils/qtcassert.h>
 
 using namespace CPlusPlus;
diff --git a/src/plugins/cpptools/insertionpointlocator.h b/src/plugins/cpptools/insertionpointlocator.h
index 25ce9c0351..3315ef5036 100644
--- a/src/plugins/cpptools/insertionpointlocator.h
+++ b/src/plugins/cpptools/insertionpointlocator.h
@@ -31,12 +31,11 @@
 #define INSERTIONPOINTLOCATOR_H
 
 #include "cpptools_global.h"
+#include "cpprefactoringchanges.h"
 
-#include <ASTfwd.h>
-#include <CPlusPlusForwardDeclarations.h>
-
+#include <cplusplus/ASTfwd.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
 #include <cplusplus/CppDocument.h>
-#include <cpptools/cpprefactoringchanges.h>
 
 namespace CppTools {
 
diff --git a/src/plugins/cpptools/searchsymbols.cpp b/src/plugins/cpptools/searchsymbols.cpp
index fe2851c370..097346cfaa 100644
--- a/src/plugins/cpptools/searchsymbols.cpp
+++ b/src/plugins/cpptools/searchsymbols.cpp
@@ -29,10 +29,11 @@
 
 #include "searchsymbols.h"
 
-#include <Literals.h>
-#include <Scope.h>
-#include <Names.h>
+#include <cplusplus/Literals.h>
 #include <cplusplus/LookupContext.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/Scope.h>
+
 #include <QDebug>
 
 using namespace CPlusPlus;
diff --git a/src/plugins/cpptools/searchsymbols.h b/src/plugins/cpptools/searchsymbols.h
index fe019b8dbc..ed2d0cbd42 100644
--- a/src/plugins/cpptools/searchsymbols.h
+++ b/src/plugins/cpptools/searchsymbols.h
@@ -31,14 +31,13 @@
 #define SEARCHSYMBOLS_H
 
 #include "cpptools_global.h"
-
 #include "cppindexingsupport.h"
 
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/Icons.h>
 #include <cplusplus/Overview.h>
-#include <Symbols.h>
-#include <SymbolVisitor.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/Symbols.h>
 
 #include <QIcon>
 #include <QMetaType>
diff --git a/src/plugins/cpptools/symbolfinder.cpp b/src/plugins/cpptools/symbolfinder.cpp
index 8ac16e40a7..d3ac42bb80 100644
--- a/src/plugins/cpptools/symbolfinder.cpp
+++ b/src/plugins/cpptools/symbolfinder.cpp
@@ -33,17 +33,17 @@
 
 #include "symbolfinder.h"
 
-#include <Symbols.h>
-#include <Names.h>
-#include <Literals.h>
-#include <SymbolVisitor.h>
-#include <Control.h>
-#include <LookupContext.h>
-
-#include <QDebug>
+#include <cplusplus/Control.h>
+#include <cplusplus/Literals.h>
+#include <cplusplus/LookupContext.h>
+#include <cplusplus/Names.h>
+#include <cplusplus/SymbolVisitor.h>
+#include <cplusplus/Symbols.h>
 
 #include <utils/qtcassert.h>
 
+#include <QDebug>
+
 #include <algorithm>
 #include <utility>
 
diff --git a/src/plugins/cpptools/symbolfinder.h b/src/plugins/cpptools/symbolfinder.h
index 655c1a65cb..a925988fa2 100644
--- a/src/plugins/cpptools/symbolfinder.h
+++ b/src/plugins/cpptools/symbolfinder.h
@@ -32,8 +32,8 @@
 
 #include "cpptools_global.h"
 
-#include <CppDocument.h>
-#include <CPlusPlusForwardDeclarations.h>
+#include <cplusplus/CppDocument.h>
+#include <cplusplus/CPlusPlusForwardDeclarations.h>
 
 #include <QHash>
 #include <QStringList>
diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp
index bc352a30f3..97b9ae68aa 100644
--- a/src/plugins/cpptools/symbolsfindfilter.cpp
+++ b/src/plugins/cpptools/symbolsfindfilter.cpp
@@ -32,14 +32,15 @@
 #include "cppmodelmanager.h"
 #include "cpptoolsconstants.h"
 
-#include <coreplugin/progressmanager/progressmanager.h>
-#include <coreplugin/progressmanager/futureprogress.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/progressmanager/futureprogress.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 #include <find/textfindconstants.h>
-#include <utils/runextensions.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
-#include <projectexplorer/project.h>
+
+#include <utils/runextensions.h>
 #include <utils/qtcassert.h>
 
 #include <QSet>
diff --git a/src/plugins/cpptools/uicodecompletionsupport.h b/src/plugins/cpptools/uicodecompletionsupport.h
index 5a1d8883de..10e0752b42 100644
--- a/src/plugins/cpptools/uicodecompletionsupport.h
+++ b/src/plugins/cpptools/uicodecompletionsupport.h
@@ -33,7 +33,6 @@
 
 #include "cpptools_global.h"
 #include "abstracteditorsupport.h"
-
 #include "ModelManagerInterface.h"
 
 #include <QDateTime>
diff --git a/src/plugins/designer/codemodelhelpers.cpp b/src/plugins/designer/codemodelhelpers.cpp
index 87f46ae957..19ec99ad97 100644
--- a/src/plugins/designer/codemodelhelpers.cpp
+++ b/src/plugins/designer/codemodelhelpers.cpp
@@ -37,7 +37,7 @@
 #include <cplusplus/Literals.h>
 #include <cplusplus/Scope.h>
 #include <cplusplus/Control.h>
-#include <SymbolVisitor.h>
+#include <cplusplus/SymbolVisitor.h>
 
 #include <coreplugin/icore.h>
 #include <projectexplorer/projectexplorer.h>
diff --git a/src/plugins/glsleditor/glslautocompleter.cpp b/src/plugins/glsleditor/glslautocompleter.cpp
index 2289e66bc0..22e2cb0cda 100644
--- a/src/plugins/glsleditor/glslautocompleter.cpp
+++ b/src/plugins/glsleditor/glslautocompleter.cpp
@@ -29,7 +29,7 @@
 
 #include "glslautocompleter.h"
 
-#include <Token.h>
+#include <cplusplus/Token.h>
 #include <cplusplus/SimpleLexer.h>
 #include <cplusplus/MatchingText.h>
 #include <cplusplus/BackwardsScanner.h>
diff --git a/src/plugins/todo/cpptodoitemsscanner.cpp b/src/plugins/todo/cpptodoitemsscanner.cpp
index aea03a54a3..7329055ecc 100644
--- a/src/plugins/todo/cpptodoitemsscanner.cpp
+++ b/src/plugins/todo/cpptodoitemsscanner.cpp
@@ -31,7 +31,7 @@
 #include "cpptodoitemsscanner.h"
 
 #include <projectexplorer/project.h>
-#include <TranslationUnit.h>
+#include <cplusplus/TranslationUnit.h>
 
 namespace Todo {
 namespace Internal {
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index c7790a997b..48f5f1d7f5 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -90,7 +90,7 @@
 #include <QVBoxLayout>
 
 // shared/cplusplus includes
-#include <Symbols.h>
+#include <cplusplus/Symbols.h>
 
 using namespace Analyzer;
 using namespace Core;
author	Oswald Buddenhagen <oswald.buddenhagen@digia.com>	2013-03-27 18:54:03 +0100
committer	Oswald Buddenhagen <oswald.buddenhagen@digia.com>	2013-04-03 13:40:39 +0200
commit	792303202213b4c90fc670620658aa0551bfc1b3 (patch)
tree	721156735347cac46c084d44c5e5e1d782c22d38 /src/plugins
parent	4fc706d7e04abcbdd77d1687e9f4fc0971b8eb07 (diff)
download	qt-creator-792303202213b4c90fc670620658aa0551bfc1b3.tar.gz