Clean headers in CppTools.

Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ic8464ea084ca1ab401e9f4a7d0183b92b4038902
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

58 files changed, 5 insertions, 308 deletions

diff --git a/src/plugins/cppeditor/cppclasswizard.h b/src/plugins/cppeditor/cppclasswizard.h
index 02bcd1727f..0fe581e278 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 bb6ffaec9c..4a5d4ec41b 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 55812deece..354f107ee6 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 d900e4d8c6..aa25ab5d06 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 dd1e546f26..8fbce81509 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 2357487b0f..ccbd8ac830 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 6c493247c3..b1a149c13b 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 696ba8c301..c19aa6b910 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 6d0b2fc3f7..92b249fc45 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 8146131133..4e8bd9e3e5 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 823e805b9f..69ac7e2530 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 be5110a77c..1ad33ca026 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 c3fe6fd69a..fe0c3620a9 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 f79a694e6c..7a02a7a14d 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 f6d1d6af7b..70610c2471 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 88fc6ea4e1..742b562d57 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 9a5ba5c28e..141517baaa 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 d37d0a47d5..8203321355 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 3cc099ce8d..8f83f3ef18 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 a7cd6fa93a..5096262a3c 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 cef6bb1e6f..9a12884a72 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 47009488bd..0515ce0804 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 ae3d3a9744..eaf3aa358d 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 c5cb5701bf..c0ebe30a33 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 10f87b0afb..09e66d02ae 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 4fa992c8c2..9f7a96046c 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 a05c5afbeb..44fcbeb279 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 fe3ecb44a9..5bda43274d 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 7b71590e67..b37a7230b7 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 9e473b2146..92465bb4b1 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 08fda7477f..6bb5c8ef51 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 ee1728edc5..568df9a4a4 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 8fc6724235..44b4e34773 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 fbaaeb9a5a..4525b95a35 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 a0659c7f28..757f08f5a3 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 4c97242222..39660f78ef 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 4d85c08d6a..70d360e4e2 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 66393cd0e7..277e6320db 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 213d0091bf..1e2ea6108e 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 3c411b7707..11111f1c2f 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 81382fa770..d01637a607 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 e3ff599bf0..a6c0a7f416 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 a57a259e37..8f5fa3cd44 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 46dfc30012..b6e297abec 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 9f10ce1968..66e7c20e2d 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 c5be64e232..96d79de437 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 3c9e0e6367..ed4f694c0e 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 2133e70145..6cd780a96a 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 032c18ae09..2180653fbd 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 86053a70ea..0e07d86b07 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 3315ef5036..7321c1ce51 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 097346cfaa..8c9ed918a0 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 ed2d0cbd42..f811781bcb 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 d3ac42bb80..19c25a28dd 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 a925988fa2..7a756d0f06 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 97b9ae68aa..fe4fc332c9 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 4f5da51814..744323e623 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 79f2ec6f10..d504611e68 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>