diff --git a/src/plugins/cppeditor/cppclasswizard.h b/src/plugins/cppeditor/cppclasswizard.h
index 02bcd1727fe266a313db0cb5cfc1b997bc38dcbe..0fe581e278aad78a426ae62c42d1ef2e7d85aa6c 100644
--- a/src/plugins/cppeditor/cppclasswizard.h
+++ b/src/plugins/cppeditor/cppclasswizard.h
@@ -34,7 +34,6 @@
 
 #include <utils/wizard.h>
 
-#include <QStringList>
 #include <QWizardPage>
 
 namespace Utils {
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index bb6ffaec9c95dfa8e1cd1b8a2f468130ec64d5fc..4a5d4ec41bda4b9a432ce1c2fd57198fbd1fa2b5 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -59,6 +59,7 @@
 #include <cpptools/cpptoolssettings.h>
 #include <cpptools/symbolfinder.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectexplorer.h>
 #include <texteditor/basetextdocument.h>
 #include <texteditor/basetextdocumentlayout.h>
 #include <texteditor/codeassist/basicproposalitem.h>
diff --git a/src/plugins/cppeditor/cppquickfixassistant.h b/src/plugins/cppeditor/cppquickfixassistant.h
index 55812deeceb0d88ba0bebb3cf0a1a5e1bf49780b..354f107ee6f193be6a6b52d621c105a6d8c4bebd 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.h
+++ b/src/plugins/cppeditor/cppquickfixassistant.h
@@ -37,6 +37,7 @@
 
 #include <cplusplus/ASTfwd.h>
 #include <cplusplus/CppDocument.h>
+#include <cplusplus/LookupContext.h>
 
 namespace CppTools {
 class CppRefactoringFile;
diff --git a/src/plugins/cpptools/ModelManagerInterface.h b/src/plugins/cpptools/ModelManagerInterface.h
index d900e4d8c6a580cdbfb5709708eae2a9a69e34ae..aa25ab5d061411eb933029ac0cc30d6312443235 100644
--- a/src/plugins/cpptools/ModelManagerInterface.h
+++ b/src/plugins/cpptools/ModelManagerInterface.h
@@ -34,7 +34,6 @@
 #include "cppprojectfile.h"
 
 #include <cplusplus/CppDocument.h>
-#include <languageutils/fakemetaobject.h>
 
 #include <QObject>
 #include <QHash>
diff --git a/src/plugins/cpptools/TypeHierarchyBuilder.cpp b/src/plugins/cpptools/TypeHierarchyBuilder.cpp
index dd1e546f26ea720b33ab3fdd813125acf02ad9a0..8fbce81509635aa612f43fec074991bef4a8f312 100644
--- a/src/plugins/cpptools/TypeHierarchyBuilder.cpp
+++ b/src/plugins/cpptools/TypeHierarchyBuilder.cpp
@@ -29,14 +29,8 @@
 
 #include "TypeHierarchyBuilder.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 CppTools;
 
diff --git a/src/plugins/cpptools/TypeHierarchyBuilder.h b/src/plugins/cpptools/TypeHierarchyBuilder.h
index 2357487b0f2592e3e9a151b938eeb7446f788b35..ccbd8ac8302be99a5120224366c65d60f89ee1bc 100644
--- a/src/plugins/cpptools/TypeHierarchyBuilder.h
+++ b/src/plugins/cpptools/TypeHierarchyBuilder.h
@@ -33,7 +33,6 @@
 #include "cpptools_global.h"
 #include "ModelManagerInterface.h"
 
-#include <cplusplus/CppDocument.h>
 #include <cplusplus/Overview.h>
 
 #include <QList>
diff --git a/src/plugins/cpptools/abstracteditorsupport.cpp b/src/plugins/cpptools/abstracteditorsupport.cpp
index 6c493247c3c68975eb188fbcb88d38f2257d4d8b..b1a149c13bedfc75ed56ef1d42d667df78f06c7f 100644
--- a/src/plugins/cpptools/abstracteditorsupport.cpp
+++ b/src/plugins/cpptools/abstracteditorsupport.cpp
@@ -29,19 +29,10 @@
 
 #include "abstracteditorsupport.h"
 
-#include "cpptoolsconstants.h"
 #include "cppfilesettingspage.h"
 #include "ModelManagerInterface.h"
 
-#include <coreplugin/icore.h>
-
-#include <cplusplus/CoreTypes.h>
-#include <cplusplus/CppDocument.h>
-#include <cplusplus/ExpressionUnderCursor.h>
-#include <cplusplus/Names.h>
 #include <cplusplus/Overview.h>
-#include <cplusplus/Scope.h>
-#include <cplusplus/Symbols.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp
index 696ba8c3014b401a842d6dcd9049fa7c80abe768..c19aa6b9107f99229fe5f5eb51d4dc1324056b30 100644
--- a/src/plugins/cpptools/builtinindexingsupport.cpp
+++ b/src/plugins/cpptools/builtinindexingsupport.cpp
@@ -4,7 +4,6 @@
 #include "searchsymbols.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
 #include <utils/runextensions.h>
diff --git a/src/plugins/cpptools/completionsettingspage.cpp b/src/plugins/cpptools/completionsettingspage.cpp
index 6d0b2fc3f7adb43e7a7b00ff45764c2131fe70db..92b249fc457e6a0e327e5427284b4f1962a2fb5d 100644
--- a/src/plugins/cpptools/completionsettingspage.cpp
+++ b/src/plugins/cpptools/completionsettingspage.cpp
@@ -35,10 +35,7 @@
 #include <coreplugin/icore.h>
 #include <texteditor/texteditorsettings.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <QTextStream>
-#include <QCoreApplication>
 
 using namespace CppTools;
 using namespace CppTools::Internal;
diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp
index 81461311333af1cf78f86bd26ad843ebdfe1b5b2..4e8bd9e3e5722ade485afd3c168015a881fd03d8 100644
--- a/src/plugins/cpptools/cppchecksymbols.cpp
+++ b/src/plugins/cpptools/cppchecksymbols.cpp
@@ -31,21 +31,9 @@
 
 #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 <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>
 
 // This is for experimeting highlighting ctors/dtors as functions (instead of types).
diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h
index 823e805b9f5c59a4218cf82ce40e8d18cc24cc86..69ac7e25304bab06431d41c35ff6be0141d4bb4e 100644
--- a/src/plugins/cpptools/cppchecksymbols.h
+++ b/src/plugins/cpptools/cppchecksymbols.h
@@ -33,11 +33,6 @@
 #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 <QSet>
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index be5110a77c82bf3406125044ad4cff14a9cbf65c..1ad33ca02659050bac123ea6ae537d5b82dd2fe1 100644
--- a/src/plugins/cpptools/cppcodeformatter.cpp
+++ b/src/plugins/cpptools/cppcodeformatter.cpp
@@ -29,12 +29,7 @@
 
 #include "cppcodeformatter.h"
 
-#include "cppcodestylesettingspage.h"
-
 #include <texteditor/basetextdocumentlayout.h>
-#include <texteditor/tabsettings.h>
-
-#include <cplusplus/Token.h>
 #include <cplusplus/Lexer.h>
 
 #include <utils/qtcassert.h>
@@ -42,7 +37,6 @@
 #include <QDebug>
 #include <QMetaEnum>
 #include <QTextDocument>
-#include <QTextCursor>
 #include <QTextBlock>
 
 using namespace CPlusPlus;
diff --git a/src/plugins/cpptools/cppcodeformatter.h b/src/plugins/cpptools/cppcodeformatter.h
index c3fe6fd69a10b6e4e75d35566ff55857f86cf623..fe0c3620a95a477a7dbda12f747086129b33c01b 100644
--- a/src/plugins/cpptools/cppcodeformatter.h
+++ b/src/plugins/cpptools/cppcodeformatter.h
@@ -38,11 +38,9 @@
 #include <cplusplus/Token.h>
 #include <cplusplus/SimpleLexer.h>
 
-#include <QChar>
 #include <QStack>
 #include <QList>
 #include <QVector>
-#include <QPointer>
 
 QT_BEGIN_NAMESPACE
 class QTextDocument;
diff --git a/src/plugins/cpptools/cppcodegen_test.cpp b/src/plugins/cpptools/cppcodegen_test.cpp
index f79a694e6c2afca1214a60e10acd0e00b7a08df8..7a02a7a14d220a2160793d46c16c22a507b3a02a 100644
--- a/src/plugins/cpptools/cppcodegen_test.cpp
+++ b/src/plugins/cpptools/cppcodegen_test.cpp
@@ -28,25 +28,12 @@
 ****************************************************************************/
 
 #include "insertionpointlocator.h"
-#include "cpprefactoringchanges.h"
 #include "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>
 
 #include <QtTest>
 #include <QDebug>
-#include <QTextDocument>
 #include <QDir>
 
 /*!
diff --git a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
index f6d1d6af7b2dff886db7f5acc30fe98d8932cdd4..70610c247191c5d35443146c86bf1d2245717cb4 100644
--- a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
+++ b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
@@ -29,7 +29,6 @@
 
 #include "cppcodestylepreferencesfactory.h"
 
-#include "cppcodestylesettings.h"
 #include "cppcodestylesettingspage.h"
 #include "cppcodestylepreferences.h"
 #include "cpptoolsconstants.h"
@@ -37,7 +36,6 @@
 
 #include <cppeditor/cppeditorconstants.h>
 #include <texteditor/snippets/isnippetprovider.h>
-#include <texteditor/tabsettings.h>
 
 #include <extensionsystem/pluginmanager.h>
 
diff --git a/src/plugins/cpptools/cppcodestylesettings.cpp b/src/plugins/cpptools/cppcodestylesettings.cpp
index 88fc6ea4e1cd72e5995d001d34a6f8177be6674c..742b562d5785555f5cfa2064c4251f731644b64c 100644
--- a/src/plugins/cpptools/cppcodestylesettings.cpp
+++ b/src/plugins/cpptools/cppcodestylesettings.cpp
@@ -29,7 +29,6 @@
 
 #include "cppcodestylesettings.h"
 
-#include "cppcodestylepreferencesfactory.h"
 #include "cppcodestylepreferences.h"
 #include "cpptoolsconstants.h"
 #include "cpptoolssettings.h"
diff --git a/src/plugins/cpptools/cppcodestylesettings.h b/src/plugins/cpptools/cppcodestylesettings.h
index 9a5ba5c28e0709cb45b9359cb9e315964ae03047..141517baaa191e87034f1e38626df6715be5e81a 100644
--- a/src/plugins/cpptools/cppcodestylesettings.h
+++ b/src/plugins/cpptools/cppcodestylesettings.h
@@ -34,7 +34,6 @@
 
 #include <cplusplus/Overview.h>
 
-#include <QMetaType>
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp
index d37d0a47d558436357afdbebb5669b320ef280c6..820332135587f30adb27b9b51cda94f30eab59b4 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.cpp
+++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp
@@ -40,12 +40,9 @@
 #include <cppeditor/cppeditorconstants.h>
 #include <texteditor/codestyleeditor.h>
 #include <texteditor/displaysettings.h>
-#include <texteditor/fontsettings.h>
 #include <texteditor/snippets/isnippetprovider.h>
-#include <texteditor/tabsettings.h>
 #include <texteditor/texteditorsettings.h>
 
-#include <cplusplus/Overview.h>
 #include <cplusplus/pp.h>
 
 #include <extensionsystem/pluginmanager.h>
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.h b/src/plugins/cpptools/cppcodestylesettingspage.h
index 3cc099ce8dbdd0bd31c92e234d0c2af13d30fc8f..8f83f3ef1830c3386981b64d4832b1d87e423f93 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.h
+++ b/src/plugins/cpptools/cppcodestylesettingspage.h
@@ -38,9 +38,6 @@
 
 #include <QWidget>
 #include <QPointer>
-#include <QSharedPointer>
-#include <QVariant>
-#include <QStringList>
 
 namespace TextEditor {
     class FontSettings;
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp
index a7cd6fa93a17bac8ab1c9a8ef848bade8316140c..5096262a3c13cdb4047be35b9cabe9a1f036357a 100644
--- a/src/plugins/cpptools/cppcompletion_test.cpp
+++ b/src/plugins/cpptools/cppcompletion_test.cpp
@@ -30,23 +30,9 @@
 #include "cpptoolsplugin.h"
 #include "cppcompletionassist.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 <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>
 
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index cef6bb1e6fbdc93371df298af3d5a2a5315154e5..9a12884a72b8fe41e5cb51b42bd03b68200c9c07 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -31,11 +31,8 @@
 
 #include "cppmodelmanager.h"
 #include "cppdoxygen.h"
-#include "cpptoolsconstants.h"
 
-#include <coreplugin/idocument.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <texteditor/codeassist/basicproposalitem.h>
 #include <texteditor/codeassist/genericproposal.h>
@@ -48,24 +45,12 @@
 
 #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>
diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h
index 47009488bdd0bdff3539b15b7fc502428a54ef69..0515ce0804d3753562beae63013f1b04b87b5832 100644
--- a/src/plugins/cpptools/cppcompletionassist.h
+++ b/src/plugins/cpptools/cppcompletionassist.h
@@ -32,18 +32,14 @@
 
 #include "cppcompletionassistprovider.h"
 
-#include <cplusplus/CppDocument.h>
 #include <cplusplus/Icons.h>
-#include <cplusplus/Overview.h>
 #include <cplusplus/TypeOfExpression.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>
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
index ae3d3a974423e53850474b5c2188e3c2dd4d6a5b..eaf3aa358d87168a4eca265ff2f5405735b225af 100644
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
@@ -31,10 +31,6 @@
 
 #include "cppmodelmanager.h"
 
-#include <coreplugin/editormanager/editormanager.h>
-
-#include <cplusplus/CppDocument.h>
-
 #include <QStringMatcher>
 
 using namespace CppTools::Internal;
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index c5cb5701bffb513bd5230bf9112ef6850c0e7be6..c0ebe30a330fa9be5db2d341e007c37a0200cd6e 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -37,9 +37,7 @@
 #include <coreplugin/mimedatabase.h>
 #include <cppeditor/cppeditorconstants.h>
 
-#include <extensionsystem/pluginmanager.h>
 #include <utils/environment.h>
-#include <utils/fileutils.h>
 
 #include <QSettings>
 #include <QDebug>
@@ -51,7 +49,6 @@
 #include <QTextCodec>
 #include <QTextStream>
 #include <QFileDialog>
-#include <QMessageBox>
 
 static const char headerSuffixKeyC[] = "HeaderSuffix";
 static const char sourceSuffixKeyC[] = "SourceSuffix";
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index 10f87b0afb638c5b4e478cb3d457501be4c30d98..09e66d02ae7551b096fa12fb15addc04fc031bfd 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -32,40 +32,19 @@
 #include "cpptoolsconstants.h"
 #include "ModelManagerInterface.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 <utils/runextensions.h>
 #include <utils/textfileformat.h>
 
-#include <cplusplus/AST.h>
-#include <cplusplus/ASTVisitor.h>
-#include <cplusplus/Control.h>
-#include <cplusplus/CppDocument.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>
-#include <QtConcurrentRun>
 #include <QtConcurrentMap>
 #include <QDir>
-#include <QApplication>
 
 #include <functional>
 
diff --git a/src/plugins/cpptools/cppfindreferences.h b/src/plugins/cpptools/cppfindreferences.h
index 4fa992c8c232c8fed739d4cd860df524610cab8b..9f7a96046c4e5f33a31e1a401f7342ac55d7bca7 100644
--- a/src/plugins/cpptools/cppfindreferences.h
+++ b/src/plugins/cpptools/cppfindreferences.h
@@ -30,9 +30,6 @@
 #ifndef CPPFINDREFERENCES_H
 #define CPPFINDREFERENCES_H
 
-#include <utils/filesearch.h>
-
-#include <cplusplus/CppDocument.h>
 #include <cplusplus/DependencyTable.h>
 #include <cplusplus/FindUsages.h>
 
@@ -41,7 +38,6 @@
 #include <QPointer>
 #include <QFuture>
 #include <QFutureWatcher>
-#include <QMetaType>
 
 QT_FORWARD_DECLARE_CLASS(QTimer)
 
diff --git a/src/plugins/cpptools/cpphighlightingsupportinternal.cpp b/src/plugins/cpptools/cpphighlightingsupportinternal.cpp
index a05c5afbeb0dc2ea94d0a52effc774eec619fc89..44fcbeb2793136a5818acf18a1c3b4405ca23b4b 100644
--- a/src/plugins/cpptools/cpphighlightingsupportinternal.cpp
+++ b/src/plugins/cpptools/cpphighlightingsupportinternal.cpp
@@ -34,9 +34,7 @@
 
 #include <texteditor/itexteditor.h>
 
-#include <cplusplus/LookupContext.h>
 #include <cplusplus/SimpleLexer.h>
-#include <cplusplus/Token.h>
 
 using namespace CPlusPlus;
 using namespace CppTools;
diff --git a/src/plugins/cpptools/cpphighlightingsupportinternal.h b/src/plugins/cpptools/cpphighlightingsupportinternal.h
index fe3ecb44a9e88d429e43c3c1eadb7adf746098e8..5bda43274dbe6450ef009a6a16fdf50bfc38d384 100644
--- a/src/plugins/cpptools/cpphighlightingsupportinternal.h
+++ b/src/plugins/cpptools/cpphighlightingsupportinternal.h
@@ -32,10 +32,6 @@
 
 #include "cpphighlightingsupport.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 7b71590e671c94996c3eaa3424cadcd2a08f9f5f..b37a7230b7dfd960fc5eae970616adb1600bca5b 100644
--- a/src/plugins/cpptools/cpplocalsymbols.cpp
+++ b/src/plugins/cpptools/cpplocalsymbols.cpp
@@ -31,15 +31,6 @@
 
 #include "cppsemanticinfo.h"
 
-#include <cplusplus/AST.h>
-#include <cplusplus/ASTVisitor.h>
-#include <cplusplus/CoreTypes.h>
-#include <cplusplus/CppDocument.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 9e473b214615f8e04177b420878fa98c296980fb..92465bb4b1c3a3cefedc9ed7fd3392720d420f26 100644
--- a/src/plugins/cpptools/cpplocalsymbols.h
+++ b/src/plugins/cpptools/cpplocalsymbols.h
@@ -33,9 +33,6 @@
 #include "cpptools_global.h"
 #include "cppsemanticinfo.h"
 
-#include <cplusplus/CppDocument.h>
-#include <cplusplus/ASTfwd.h>
-
 namespace CppTools {
 
 class CPPTOOLS_EXPORT LocalSymbols
diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
index 08fda7477f8a39355854ca4a6d52f5a5456cd6ff..6bb5c8ef5189c1c1d1a4fa35ac14fcd2c6aa0dba 100644
--- a/src/plugins/cpptools/cpplocatorfilter.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter.cpp
@@ -30,9 +30,6 @@
 #include "cpplocatorfilter.h"
 #include "cppmodelmanager.h"
 
-#include <texteditor/itexteditor.h>
-#include <texteditor/basetexteditor.h>
-
 #include <utils/fileutils.h>
 
 #include <QStringMatcher>
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index ee1728edc5f4c1df04951a105aa65a19f02faef4..568df9a4a43f3af2b488cf8c75a48b5d08be4c2a 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -35,52 +35,23 @@
 #include "cpphighlightingsupportinternal.h"
 #include "cppindexingsupport.h"
 #include "abstracteditorsupport.h"
-#include "cpptoolsconstants.h"
 #include "cpptoolseditorsupport.h"
 #include "cppfindreferences.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 <texteditor/basetexteditor.h>
-#include <texteditor/itexteditor.h>
 
 #include <extensionsystem/pluginmanager.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
-#include <utils/runextensions.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>
 #include <QMutexLocker>
-#include <QTime>
 #include <QTimer>
-#include <QtConcurrentMap>
 #include <QTextBlock>
-#include <QtConcurrentRun>
-#include <QFutureSynchronizer>
 
 #include <functional>
 #include <iostream>
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index 8fc672423571b5e1eeb4bdbbb4106f22cdcaac66..44b4e34773827ae68ac65bf3d118fc764b3a9472 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -37,14 +37,10 @@
 #include <projectexplorer/project.h>
 #include <texteditor/basetexteditor.h>
 
-#include <cplusplus/CppDocument.h>
-#include <cplusplus/PreprocessorClient.h>
 #include <cplusplus/PreprocessorEnvironment.h>
 #include <cplusplus/pp-engine.h>
 
 #include <QHash>
-#include <QFutureInterface>
-#include <QFutureSynchronizer>
 #include <QMutex>
 #include <QTimer>
 #include <QTextEdit> // for QTextEdit::ExtraSelection
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp
index fbaaeb9a5adf227132cfc9ab6bd7fd58d8c0fc94..4525b95a35f9dfa54b918981c5350ee3d14defcf 100644
--- a/src/plugins/cpptools/cppmodelmanager_test.cpp
+++ b/src/plugins/cpptools/cppmodelmanager_test.cpp
@@ -32,8 +32,6 @@
 #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 a0659c7f28eb9412d052615a13803aa4184e7e0f..757f08f5a330262c667b12d72895a0fdc8454582 100644
--- a/src/plugins/cpptools/cpppointerdeclarationformatter.cpp
+++ b/src/plugins/cpptools/cpppointerdeclarationformatter.cpp
@@ -30,9 +30,6 @@
 
 #include "cpppointerdeclarationformatter.h"
 
-#include <cplusplus/AST.h>
-
-#include <QtGlobal>
 #include <QTextCursor>
 
 #define DEBUG_OUTPUT 0
diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter.h b/src/plugins/cpptools/cpppointerdeclarationformatter.h
index 4c97242222a4f503561ec376ca04399b0f57560f..39660f78ef5e9007aaf36bd7af3ff704b4ea7593 100644
--- a/src/plugins/cpptools/cpppointerdeclarationformatter.h
+++ b/src/plugins/cpptools/cpppointerdeclarationformatter.h
@@ -33,12 +33,7 @@
 #include "cpptools_global.h"
 #include "cpprefactoringchanges.h"
 
-#include <cplusplus/AST.h>
-#include <cplusplus/ASTVisitor.h>
 #include <cplusplus/Overview.h>
-#include <cplusplus/Symbols.h>
-
-#include <utils/changeset.h>
 
 namespace CppTools {
 
diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
index 4d85c08d6a9fce8e39a7e2282e9f8c011944356d..70d360e4e22fc1d30f5b9dfa1a7478951eee3ee9 100644
--- a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
+++ b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp
@@ -29,18 +29,12 @@
 
 #include "cpptoolsplugin.h"
 #include "cpppointerdeclarationformatter.h"
-#include "cpprefactoringchanges.h"
 #include "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>
diff --git a/src/plugins/cpptools/cppprojectfile.h b/src/plugins/cpptools/cppprojectfile.h
index 66393cd0e70e959f3ebcabfc1687b9b9f127b024..277e6320dbee7a69707b9369642a81db4c52d4fd 100644
--- a/src/plugins/cpptools/cppprojectfile.h
+++ b/src/plugins/cpptools/cppprojectfile.h
@@ -35,7 +35,6 @@
 #include <coreplugin/mimedatabase.h>
 
 #include <QString>
-#include <QMap>
 
 namespace CppTools {
 
diff --git a/src/plugins/cpptools/cppqtstyleindenter.cpp b/src/plugins/cpptools/cppqtstyleindenter.cpp
index 213d0091bfdfa3c806fb9012cc694ec80ed83eb9..1e2ea6108e1c851a7c121405ab1417c0d88a2720 100644
--- a/src/plugins/cpptools/cppqtstyleindenter.cpp
+++ b/src/plugins/cpptools/cppqtstyleindenter.cpp
@@ -32,10 +32,6 @@
 #include "cppcodeformatter.h"
 #include "cpptoolssettings.h"
 #include "cppcodestylepreferences.h"
-#include "cpptoolsconstants.h"
-
-#include <texteditor/tabsettings.h>
-#include <texteditor/texteditorsettings.h>
 
 #include <QChar>
 #include <QTextDocument>
diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp
index 3c411b77079305887853ebef1302bf1cfd786eb9..11111f1c2fa683b9368bd3002ec0b2b2fd585eef 100644
--- a/src/plugins/cpptools/cpprefactoringchanges.cpp
+++ b/src/plugins/cpptools/cpprefactoringchanges.cpp
@@ -29,24 +29,13 @@
 
 #include "cpprefactoringchanges.h"
 
-#include "cppcodestylepreferences.h"
 #include "cppqtstyleindenter.h"
 #include "cppcodeformatter.h"
 #include "cppmodelmanager.h"
-#include "cpptoolssettings.h"
-#include "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>
-
 using namespace CPlusPlus;
 using namespace CppTools;
 using namespace Utils;
diff --git a/src/plugins/cpptools/cpprefactoringchanges.h b/src/plugins/cpptools/cpprefactoringchanges.h
index 81382fa770e9162ae812aada384037363b4d09b7..d01637a6073773103e21e304f847d345eba12739 100644
--- a/src/plugins/cpptools/cpprefactoringchanges.h
+++ b/src/plugins/cpptools/cpprefactoringchanges.h
@@ -35,8 +35,6 @@
 
 #include <texteditor/refactoringchanges.h>
 
-#include <cplusplus/ASTfwd.h>
-#include <cplusplus/CppDocument.h>
 #include <cplusplus/LookupContext.h>
 
 namespace CppTools {
diff --git a/src/plugins/cpptools/cppsemanticinfo.h b/src/plugins/cpptools/cppsemanticinfo.h
index e3ff599bf0fd618b10fbefcce26f7ffa44fccf32..a6c0a7f416c9a9b080963e661625c7d069b69571 100644
--- a/src/plugins/cpptools/cppsemanticinfo.h
+++ b/src/plugins/cpptools/cppsemanticinfo.h
@@ -35,7 +35,6 @@
 #include <texteditor/semantichighlighter.h>
 
 #include <cplusplus/CppDocument.h>
-#include <cplusplus/LookupContext.h>
 
 #include <QHash>
 
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp
index a57a259e3780035150a4502400aae22a45af77be..8f5fa3cd440cb05f8f25ac08a18e86d7a8fb3a09 100644
--- a/src/plugins/cpptools/cpptoolseditorsupport.cpp
+++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp
@@ -29,18 +29,8 @@
 
 #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 <cplusplus/AST.h>
-#include <cplusplus/ASTVisitor.h>
-#include <cplusplus/TranslationUnit.h>
-
 #include <QTimer>
 
 using namespace CppTools;
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.h b/src/plugins/cpptools/cpptoolseditorsupport.h
index 46dfc300126cc689a7d8679bb46f42652204d23a..b6e297abec1291d670e381458d700a12405a1328 100644
--- a/src/plugins/cpptools/cpptoolseditorsupport.h
+++ b/src/plugins/cpptools/cpptoolseditorsupport.h
@@ -30,14 +30,9 @@
 #ifndef CPPTOOLSEDITORSUPPORT_H
 #define CPPTOOLSEDITORSUPPORT_H
 
-#include <cplusplus/CppDocument.h>
-
 #include <QObject>
 #include <QPointer>
 #include <QFuture>
-#include <QScopedPointer>
-#include <QSharedPointer>
-#include <QTextCursor>
 
 QT_BEGIN_NAMESPACE
 class QTimer;
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index 9f10ce1968ea7c1ef1f7d60485ce83f375b89dab..66e7c20e2d81d44a826392b0b9a9fc373e904fae 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -29,14 +29,12 @@
 
 #include "cpptoolsplugin.h"
 
-#include "completionsettingspage.h"
 #include "cppfilesettingspage.h"
 #include "cppcodestylesettingspage.h"
 #include "cppclassesfilter.h"
 #include "cppfunctionsfilter.h"
 #include "cppcurrentdocumentfilter.h"
 #include "cppmodelmanager.h"
-#include "cpptoolsconstants.h"
 #include "cpplocatorfilter.h"
 #include "symbolsfindfilter.h"
 #include "cpptoolssettings.h"
@@ -44,36 +42,20 @@
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.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 <cppeditor/cppeditorconstants.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>
 #include <QDir>
 #include <QDebug>
-#include <QSettings>
 #include <QMenu>
 #include <QAction>
-#include <QtConcurrentRun>
-#include <QFutureSynchronizer>
-
-#include <sstream>
 
 using namespace CPlusPlus;
 
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index c5be64e232e57577ef625ccf83bc182a95a2d365..96d79de4377b305f726a4e65ec3f238a89eca80c 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -32,19 +32,9 @@
 
 #include "cpptools_global.h"
 
-#include <find/ifindfilter.h>
 #include <projectexplorer/projectexplorer.h>
 
-#include <extensionsystem/iplugin.h>
-#include <utils/filesearch.h>
-
-#include <QTextDocument>
-#include <QKeySequence>
 #include <QSharedPointer>
-#include <QFutureInterface>
-#include <QPointer>
-#include <QFutureWatcher>
-#include <QHash>
 
 QT_BEGIN_NAMESPACE
 class QFileInfo;
diff --git a/src/plugins/cpptools/cpptoolsreuse.cpp b/src/plugins/cpptools/cpptoolsreuse.cpp
index 3c9e0e63675db3e468aa2ab7b6fa1f15c730c162..ed4f694c0ea1bc3412a882c4c5239048e9429437 100644
--- a/src/plugins/cpptools/cpptoolsreuse.cpp
+++ b/src/plugins/cpptools/cpptoolsreuse.cpp
@@ -29,8 +29,6 @@
 
 #include "cpptoolsreuse.h"
 
-#include <cplusplus/Symbols.h>
-#include <cplusplus/CoreTypes.h>
 #include <cplusplus/Overview.h>
 #include <cplusplus/LookupContext.h>
 
diff --git a/src/plugins/cpptools/doxygengenerator.cpp b/src/plugins/cpptools/doxygengenerator.cpp
index 2133e701452a4458c1e4e23e78fa7db0255a546b..6cd780a96a03f73f117edab0d4f0c14f097ff8b6 100644
--- a/src/plugins/cpptools/doxygengenerator.cpp
+++ b/src/plugins/cpptools/doxygengenerator.cpp
@@ -29,15 +29,8 @@
 
 #include "doxygengenerator.h"
 
-#include <cplusplus/AST.h>
 #include <cplusplus/BackwardsScanner.h>
 #include <cplusplus/CppDocument.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/doxygengenerator.h b/src/plugins/cpptools/doxygengenerator.h
index 032c18ae0939cfbb14c7ea7a73574989302683e9..2180653fbd4bb60e42abdfad397e1cf63ccd8d2b 100644
--- a/src/plugins/cpptools/doxygengenerator.h
+++ b/src/plugins/cpptools/doxygengenerator.h
@@ -34,7 +34,6 @@
 
 #include <cplusplus/Overview.h>
 
-#include <QLatin1String>
 #include <QTextCursor>
 
 namespace CPlusPlus { class DeclarationAST; }
diff --git a/src/plugins/cpptools/insertionpointlocator.cpp b/src/plugins/cpptools/insertionpointlocator.cpp
index 86053a70eaf9795ba1dedfea84e3715a5a606e87..0e07d86b072e4c496bc6657b9db80134701468f7 100644
--- a/src/plugins/cpptools/insertionpointlocator.cpp
+++ b/src/plugins/cpptools/insertionpointlocator.cpp
@@ -30,17 +30,9 @@
 #include "insertionpointlocator.h"
 
 #include "cpptoolsreuse.h"
-#include "cpprefactoringchanges.h"
 #include "symbolfinder.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>
 
diff --git a/src/plugins/cpptools/insertionpointlocator.h b/src/plugins/cpptools/insertionpointlocator.h
index 3315ef5036ffe0ed56a6323f09b1a64453fc4e38..7321c1ce5176a64a1b8aca6c917f07bd8dc8bc3f 100644
--- a/src/plugins/cpptools/insertionpointlocator.h
+++ b/src/plugins/cpptools/insertionpointlocator.h
@@ -33,10 +33,6 @@
 #include "cpptools_global.h"
 #include "cpprefactoringchanges.h"
 
-#include <cplusplus/ASTfwd.h>
-#include <cplusplus/CPlusPlusForwardDeclarations.h>
-#include <cplusplus/CppDocument.h>
-
 namespace CppTools {
 
 class CPPTOOLS_EXPORT InsertionLocation
diff --git a/src/plugins/cpptools/searchsymbols.cpp b/src/plugins/cpptools/searchsymbols.cpp
index 097346cfaae073ed22c9023a3ceb8d7418965d61..8c9ed918a03ea025994358d4bc031ff33840d294 100644
--- a/src/plugins/cpptools/searchsymbols.cpp
+++ b/src/plugins/cpptools/searchsymbols.cpp
@@ -29,10 +29,7 @@
 
 #include "searchsymbols.h"
 
-#include <cplusplus/Literals.h>
 #include <cplusplus/LookupContext.h>
-#include <cplusplus/Names.h>
-#include <cplusplus/Scope.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/cpptools/searchsymbols.h b/src/plugins/cpptools/searchsymbols.h
index ed2d0cbd4263c2f10353411ef22148d10e9e257b..f811781bcb85aed690b0143643073d85b1382817 100644
--- a/src/plugins/cpptools/searchsymbols.h
+++ b/src/plugins/cpptools/searchsymbols.h
@@ -36,11 +36,8 @@
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/Icons.h>
 #include <cplusplus/Overview.h>
-#include <cplusplus/SymbolVisitor.h>
-#include <cplusplus/Symbols.h>
 
 #include <QIcon>
-#include <QMetaType>
 #include <QString>
 #include <QSet>
 #include <QHash>
diff --git a/src/plugins/cpptools/symbolfinder.cpp b/src/plugins/cpptools/symbolfinder.cpp
index d3ac42bb8058d3524342971371b5d70658fc339a..19c25a28dd15ed532ac3b1135acaf666229f9563 100644
--- a/src/plugins/cpptools/symbolfinder.cpp
+++ b/src/plugins/cpptools/symbolfinder.cpp
@@ -33,12 +33,7 @@
 
 #include "symbolfinder.h"
 
-#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>
 
diff --git a/src/plugins/cpptools/symbolfinder.h b/src/plugins/cpptools/symbolfinder.h
index a925988fa219e41f880413cda81db88d9cbfb039..7a756d0f061cf10c08eba595337dd7a6af528f01 100644
--- a/src/plugins/cpptools/symbolfinder.h
+++ b/src/plugins/cpptools/symbolfinder.h
@@ -33,7 +33,6 @@
 #include "cpptools_global.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 97b9ae68aaf1cde65c5f9fac6dac8e6f7aae5b2a..fe4fc332c98657a445793322e105504cbd89f4cb 100644
--- a/src/plugins/cpptools/symbolsfindfilter.cpp
+++ b/src/plugins/cpptools/symbolsfindfilter.cpp
@@ -30,13 +30,10 @@
 #include "symbolsfindfilter.h"
 
 #include "cppmodelmanager.h"
-#include "cpptoolsconstants.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <coreplugin/progressmanager/progressmanager.h>
-#include <find/textfindconstants.h>
-#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 
@@ -44,7 +41,6 @@
 #include <utils/qtcassert.h>
 
 #include <QSet>
-#include <QRegExp>
 #include <QGridLayout>
 #include <QLabel>
 #include <QButtonGroup>
diff --git a/src/plugins/cpptools/symbolsfindfilter.h b/src/plugins/cpptools/symbolsfindfilter.h
index 4f5da51814fff74c574fc64393715004d1d4aa2f..744323e62333f6497f4d071d2b322b9bdf80e104 100644
--- a/src/plugins/cpptools/symbolsfindfilter.h
+++ b/src/plugins/cpptools/symbolsfindfilter.h
@@ -33,9 +33,7 @@
 #include "searchsymbols.h"
 
 #include <find/ifindfilter.h>
-#include <find/searchresultwindow.h>
 
-#include <QFutureInterface>
 #include <QFutureWatcher>
 #include <QPointer>
 #include <QWidget>
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 79f2ec6f10517a407a1dc8db51a337b6afe8e9fa..d504611e685199adade4e66cf63546d4bbf10911 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -51,6 +51,8 @@
 #include <qtsupport/profilereader.h>
 #include <qtsupport/qtkitinformation.h>
 
+#include <cpptools/ModelManagerInterface.h>
+
 #include <utils/hostosinfo.h>
 #include <utils/stringutils.h>
 #include <proparser/prowriter.h>