diff --git a/src/plugins/cppeditor/cppautocompleter.cpp b/src/plugins/cppeditor/cppautocompleter.cpp
index efc7fcfee1b..169a3415701 100644
--- a/src/plugins/cppeditor/cppautocompleter.cpp
+++ b/src/plugins/cppeditor/cppautocompleter.cpp
@@ -29,8 +29,6 @@
 
 #include "cppautocompleter.h"
 
-#include <cplusplus/Token.h>
-#include <cplusplus/SimpleLexer.h>
 #include <cplusplus/MatchingText.h>
 #include <cplusplus/BackwardsScanner.h>
 
diff --git a/src/plugins/cppeditor/cppclasswizard.cpp b/src/plugins/cppeditor/cppclasswizard.cpp
index 764c143666a..70e22afd165 100644
--- a/src/plugins/cppeditor/cppclasswizard.cpp
+++ b/src/plugins/cppeditor/cppclasswizard.cpp
@@ -41,13 +41,8 @@
 #include <utils/qtcassert.h>
 
 #include <QDebug>
-#include <QDir>
 #include <QTextStream>
-#include <QSettings>
 #include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QToolButton>
 #include <QSpacerItem>
 #include <QWizard>
 
diff --git a/src/plugins/cppeditor/cppcompleteswitch.cpp b/src/plugins/cppeditor/cppcompleteswitch.cpp
index fed0543fa85..29fd4a1a2ae 100644
--- a/src/plugins/cppeditor/cppcompleteswitch.cpp
+++ b/src/plugins/cppeditor/cppcompleteswitch.cpp
@@ -33,13 +33,7 @@
 
 #include <cpptools/cpprefactoringchanges.h>
 
-#include <utils/changeset.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 d90477637f0..9abc1de09b5 100644
--- a/src/plugins/cppeditor/cppdoxygen_test.cpp
+++ b/src/plugins/cppeditor/cppdoxygen_test.cpp
@@ -30,18 +30,13 @@
 #include "cppeditor.h"
 #include "cppplugin.h"
 
-#include <coreplugin/editormanager/editormanager.h>
-#include <cpptools/ModelManagerInterface.h>
-
 #include <utils/fileutils.h>
-#include <cplusplus/CppDocument.h>
 
 #include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
 #include <QKeyEvent>
 #include <QString>
-#include <QTextDocument>
 #include <QtTest>
 
 /*!
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 4a5d4ec41bd..4056ddbd752 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -37,13 +37,7 @@
 
 #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 <cpptools/cpptoolsplugin.h>
 #include <cpptools/cpptoolsconstants.h>
 #include <cpptools/cppchecksymbols.h>
@@ -52,14 +46,10 @@
 #include <cpptools/cpphighlightingsupport.h>
 #include <cpptools/cpplocalsymbols.h>
 #include <cpptools/cppqtstyleindenter.h>
-#include <cpptools/cppcodestylesettings.h>
-#include <cpptools/cpprefactoringchanges.h>
 #include <cpptools/cpptoolsreuse.h>
 #include <cpptools/doxygengenerator.h>
 #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>
@@ -67,55 +57,26 @@
 #include <texteditor/codeassist/genericproposal.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/refactoroverlay.h>
-#include <texteditor/semantichighlighter.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>
 #include <QTimer>
 #include <QPointer>
-#include <QStack>
-#include <QSettings>
 #include <QSignalMapper>
 #include <QAction>
-#include <QApplication>
 #include <QHeaderView>
-#include <QLayout>
 #include <QMenu>
-#include <QShortcut>
 #include <QTextEdit>
 #include <QComboBox>
-#include <QToolBar>
 #include <QTreeView>
 #include <QSortFilterProxyModel>
 
-#include <sstream>
-
 enum {
     UPDATE_OUTLINE_INTERVAL = 500,
     UPDATE_USES_INTERVAL = 500,
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 039bdc92b55..634d3d4538a 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -30,18 +30,13 @@
 #ifndef CPPEDITOR_H
 #define CPPEDITOR_H
 
-#include "cppeditorenums.h"
 #include "cppfunctiondecldeflink.h"
 
-#include <cpptools/ModelManagerInterface.h>
 #include <cpptools/commentssettings.h>
 #include <cpptools/cppsemanticinfo.h>
 #include <texteditor/basetexteditor.h>
-#include <texteditor/quickfix.h>
 #include <texteditor/texteditorconstants.h>
 
-#include <cplusplus/CppDocument.h>
-#include <cplusplus/LookupContext.h>
 #include <utils/uncommentselection.h>
 
 #include <QThread>
diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp
index 204b4b1e192..ce4473f1067 100644
--- a/src/plugins/cppeditor/cppelementevaluator.cpp
+++ b/src/plugins/cppeditor/cppelementevaluator.cpp
@@ -29,23 +29,11 @@
 
 #include "cppelementevaluator.h"
 
-#include <coreplugin/idocument.h>
 #include <cpptools/cpptoolsreuse.h>
-#include <cpptools/ModelManagerInterface.h>
 #include <cpptools/TypeHierarchyBuilder.h>
 
-#include <cplusplus/CoreTypes.h>
 #include <cplusplus/ExpressionUnderCursor.h>
-#include <cplusplus/FullySpecifiedType.h>
 #include <cplusplus/Icons.h>
-#include <cplusplus/Literals.h>
-#include <cplusplus/LookupContext.h>
-#include <cplusplus/LookupItem.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>
diff --git a/src/plugins/cppeditor/cppelementevaluator.h b/src/plugins/cppeditor/cppelementevaluator.h
index 1037c15ba90..0c3876945f7 100644
--- a/src/plugins/cppeditor/cppelementevaluator.h
+++ b/src/plugins/cppeditor/cppelementevaluator.h
@@ -35,9 +35,6 @@
 #include <cpptools/symbolfinder.h>
 #include <texteditor/helpitem.h>
 
-#include <cplusplus/CppDocument.h>
-#include <cplusplus/Overview.h>
-
 #include <QString>
 #include <QStringList>
 #include <QSharedPointer>
diff --git a/src/plugins/cppeditor/cppfilewizard.cpp b/src/plugins/cppeditor/cppfilewizard.cpp
index 836a536c7f5..6fa07c58b25 100644
--- a/src/plugins/cppeditor/cppfilewizard.cpp
+++ b/src/plugins/cppeditor/cppfilewizard.cpp
@@ -29,7 +29,6 @@
 
 #include "cppfilewizard.h"
 
-#include "cppeditor.h"
 #include "cppeditorconstants.h"
 
 #include <cpptools/abstracteditorsupport.h>
@@ -37,7 +36,6 @@
 #include <utils/codegeneration.h>
 
 #include <QTextStream>
-#include <QFileInfo>
 #include <QDebug>
 
 using namespace CppEditor;
diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
index 6fd5b9c2cc9..41c575c6001 100644
--- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
+++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
@@ -33,21 +33,13 @@
 #include "cppquickfixassistant.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 <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>
diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.h b/src/plugins/cppeditor/cppfunctiondecldeflink.h
index b28469becfe..1d23260f475 100644
--- a/src/plugins/cppeditor/cppfunctiondecldeflink.h
+++ b/src/plugins/cppeditor/cppfunctiondecldeflink.h
@@ -34,11 +34,6 @@
 
 #include <cpptools/cpprefactoringchanges.h>
 
-#include <cplusplus/CppDocument.h>
-#include <cplusplus/ASTfwd.h>
-
-#include <utils/changeset.h>
-
 #include <QString>
 #include <QCoreApplication>
 #include <QSharedPointer>
diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp
index 7507988bee1..5b02d92502b 100644
--- a/src/plugins/cppeditor/cpphighlighter.cpp
+++ b/src/plugins/cppeditor/cpphighlighter.cpp
@@ -33,7 +33,6 @@
 #include <cpptools/cpptoolsreuse.h>
 #include <texteditor/basetextdocumentlayout.h>
 
-#include <cplusplus/Token.h>
 #include <cplusplus/SimpleLexer.h>
 #include <cplusplus/Lexer.h>
 
diff --git a/src/plugins/cppeditor/cpphighlighter.h b/src/plugins/cppeditor/cpphighlighter.h
index 890dc0757b7..9e38897c296 100644
--- a/src/plugins/cppeditor/cpphighlighter.h
+++ b/src/plugins/cppeditor/cpphighlighter.h
@@ -35,7 +35,6 @@
 #include <texteditor/syntaxhighlighter.h>
 
 #include <QTextCharFormat>
-#include <QtAlgorithms>
 
 namespace CppEditor {
 
diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index c8a6b9bccbc..086595b9570 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -32,15 +32,7 @@
 #include "cppeditor.h"
 #include "cppelementevaluator.h"
 
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/helpmanager.h>
-#include <cpptools/ModelManagerInterface.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 8f51351086a..cd63871dd96 100644
--- a/src/plugins/cppeditor/cppinsertdecldef.cpp
+++ b/src/plugins/cppeditor/cppinsertdecldef.cpp
@@ -31,16 +31,10 @@
 #include "cppquickfixassistant.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 <utils/qtcassert.h>
 
@@ -49,7 +43,6 @@
 #include <QHash>
 #include <QStringBuilder>
 #include <QTextDocument>
-#include <QTextBlock>
 #include <QInputDialog>
 #include <QMessageBox>
 
diff --git a/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp b/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp
index dfd01903b82..a4f1e47e466 100644
--- a/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp
+++ b/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp
@@ -29,17 +29,11 @@
 
 #include "cppinsertqtpropertymembers.h"
 
-#include "cppquickfix.h"
 #include "cppquickfixassistant.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 <cplusplus/Token.h>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/cppeditor/cppoutline.cpp b/src/plugins/cppeditor/cppoutline.cpp
index d07df22c31f..ff0bbd997c0 100644
--- a/src/plugins/cppeditor/cppoutline.cpp
+++ b/src/plugins/cppeditor/cppoutline.cpp
@@ -29,17 +29,11 @@
 
 #include "cppoutline.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>
-#include <QTimer>
 #include <QVBoxLayout>
 #include <QMenu>
 
diff --git a/src/plugins/cppeditor/cppoutline.h b/src/plugins/cppeditor/cppoutline.h
index a91378f5d6f..7fcc3cf396d 100644
--- a/src/plugins/cppeditor/cppoutline.h
+++ b/src/plugins/cppeditor/cppoutline.h
@@ -37,7 +37,6 @@
 #include <utils/navigationtreeview.h>
 
 #include <QSortFilterProxyModel>
-#include <QTreeView>
 
 namespace CppEditor {
 namespace Internal {
diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp
index 69075635d35..1850da91aa8 100644
--- a/src/plugins/cppeditor/cppplugin.cpp
+++ b/src/plugins/cppeditor/cppplugin.cpp
@@ -32,7 +32,6 @@
 #include "cppclasswizard.h"
 #include "cppeditor.h"
 #include "cppeditorconstants.h"
-#include "cppeditorenums.h"
 #include "cppfilewizard.h"
 #include "cpphoverhandler.h"
 #include "cppoutline.h"
@@ -43,31 +42,19 @@
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/editormanager/editormanager.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 <utils/hostosinfo.h>
 
-#include <QFileInfo>
-#include <QSettings>
-#include <QTimer>
 #include <QCoreApplication>
 #include <QStringList>
-#include <QMenu>
 
 using namespace CppEditor;
 using namespace CppEditor::Internal;
diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp
index b5a835f0da6..c099a707211 100644
--- a/src/plugins/cppeditor/cppquickfix.cpp
+++ b/src/plugins/cppeditor/cppquickfix.cpp
@@ -29,25 +29,10 @@
 
 #include "cppquickfix.h"
 
-#include "cppeditor.h"
 #include "cppquickfixassistant.h"
 
 #include <cpptools/cpprefactoringchanges.h>
 
-#include <cplusplus/AST.h>
-#include <cplusplus/ASTPath.h>
-#include <cplusplus/CppDocument.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 <QTextBlock>
-#include <QFileInfo>
-
 using namespace CppEditor;
 using namespace CppEditor::Internal;
 using namespace CppTools;
diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp
index 4b1f069d308..57113bb10e3 100644
--- a/src/plugins/cppeditor/cppquickfix_test.cpp
+++ b/src/plugins/cppeditor/cppquickfix_test.cpp
@@ -31,35 +31,15 @@
 #include "cppinsertdecldef.h"
 #include "cppplugin.h"
 #include "cppquickfixassistant.h"
-#include "cppquickfix.h"
 #include "cppquickfixes.h"
 
-#include <coreplugin/editormanager/editormanager.h>
 #include <cpptools/cppcodestylepreferences.h>
 #include <cpptools/cpptoolssettings.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>
 #include <QtTest>
 
 
diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/cppquickfixassistant.cpp
index 3503e80bf02..1157f45d65c 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.cpp
+++ b/src/plugins/cppeditor/cppquickfixassistant.cpp
@@ -31,28 +31,12 @@
 
 #include "cppeditorconstants.h"
 #include "cppeditor.h"
-// @TODO: temp
-#include "cppquickfix.h"
 
-#include <cpptools/cpprefactoringchanges.h>
-
-#include <cplusplus/AST.h>
 #include <cplusplus/ASTPath.h>
-#include <cplusplus/CppDocument.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 <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 
-#include <QFileInfo>
-#include <QTextBlock>
-
 using namespace CppEditor;
 using namespace CppEditor::Internal;
 using namespace TextEditor;
diff --git a/src/plugins/cppeditor/cppquickfixassistant.h b/src/plugins/cppeditor/cppquickfixassistant.h
index 354f107ee6f..fbdea6d1de1 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.h
+++ b/src/plugins/cppeditor/cppquickfixassistant.h
@@ -35,8 +35,6 @@
 #include <texteditor/codeassist/quickfixassistprovider.h>
 #include <texteditor/codeassist/quickfixassistprocessor.h>
 
-#include <cplusplus/ASTfwd.h>
-#include <cplusplus/CppDocument.h>
 #include <cplusplus/LookupContext.h>
 
 namespace CppTools {
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 4e8cd326863..bf9fa326c8e 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -35,7 +35,6 @@
 #include "cppinsertqtpropertymembers.h"
 #include "cppquickfixassistant.h"
 
-#include <cpptools/ModelManagerInterface.h>
 #include <cpptools/cppclassesfilter.h>
 #include <cpptools/cppcodestylesettings.h>
 #include <cpptools/cpppointerdeclarationformatter.h>
@@ -44,18 +43,9 @@
 
 #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>
 
 #include <QApplication>
diff --git a/src/plugins/cppeditor/cppquickfixes.h b/src/plugins/cppeditor/cppquickfixes.h
index e3230c6eec7..66950f98ac3 100644
--- a/src/plugins/cppeditor/cppquickfixes.h
+++ b/src/plugins/cppeditor/cppquickfixes.h
@@ -36,9 +36,6 @@
 
 #include <extensionsystem/iplugin.h>
 
-#include <cplusplus/AST.h>
-#include <cplusplus/ASTMatcher.h>
-
 QT_BEGIN_NAMESPACE
 class QByteArray;
 class QString;
diff --git a/src/plugins/cppeditor/cppsnippetprovider.cpp b/src/plugins/cppeditor/cppsnippetprovider.cpp
index 568ba66e8d3..6586ae67aed 100644
--- a/src/plugins/cppeditor/cppsnippetprovider.cpp
+++ b/src/plugins/cppeditor/cppsnippetprovider.cpp
@@ -38,7 +38,6 @@
 
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/fontsettings.h>
-#include <texteditor/texteditorconstants.h>
 #include <texteditor/snippets/snippeteditor.h>
 
 #include <QLatin1String>
diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp
index 051590fae6e..04acf937d6a 100644
--- a/src/plugins/cppeditor/cpptypehierarchy.cpp
+++ b/src/plugins/cppeditor/cpptypehierarchy.cpp
@@ -34,16 +34,11 @@
 #include "cppelementevaluator.h"
 #include "cppplugin.h"
 
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/editormanager/editormanager.h>
-
 #include <utils/navigationtreeview.h>
 #include <utils/annotateditemdelegate.h>
 
-#include <QLatin1Char>
 #include <QLatin1String>
 #include <QModelIndex>
-#include <QVector>
 #include <QVBoxLayout>
 #include <QStandardItemModel>
 #include <QLabel>