diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp
index fe37ea008d2..919b5b2a10c 100644
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/analyzerbase/analyzermanager.cpp
@@ -30,12 +30,7 @@
 
 #include "analyzermanager.h"
 
-#include "analyzerconstants.h"
 #include "analyzerplugin.h"
-#include "analyzerruncontrol.h"
-#include "analyzeroptionspage.h"
-#include "analyzerstartparameters.h"
-#include "analyzerutils.h"
 #include "ianalyzertool.h"
 #include "analyzersettings.h"
 
@@ -43,34 +38,24 @@
 #include <coreplugin/findplaceholder.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/imode.h>
-#include <coreplugin/minisplitter.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/navigationwidget.h>
 #include <coreplugin/outputpane.h>
 #include <coreplugin/rightpane.h>
-#include <coreplugin/id.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
 
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/iprojectmanager.h>
 #include <projectexplorer/target.h>
-#include <projectexplorer/session.h>
-
-#include <extensionsystem/iplugin.h>
 
 #include <utils/fancymainwindow.h>
 #include <utils/styledbar.h>
 #include <utils/qtcassert.h>
 #include <utils/checkablemessagebox.h>
 #include <utils/statuslabel.h>
-#include <ssh/sshconnection.h>
 
 #include <QVariant>
 #include <QDebug>
@@ -78,15 +63,10 @@
 #include <QVBoxLayout>
 #include <QDockWidget>
 #include <QAction>
-#include <QMenu>
-#include <QMenuBar>
 #include <QToolButton>
 #include <QComboBox>
 #include <QStackedWidget>
 #include <QDialog>
-#include <QApplication>
-#include <QLabel>
-#include <QCheckBox>
 #include <QDialogButtonBox>
 #include <QPointer>
 #include <QPushButton>
diff --git a/src/plugins/analyzerbase/analyzermanager.h b/src/plugins/analyzerbase/analyzermanager.h
index d062bf3b7c8..7c34066febe 100644
--- a/src/plugins/analyzerbase/analyzermanager.h
+++ b/src/plugins/analyzerbase/analyzermanager.h
@@ -33,7 +33,7 @@
 
 #include "analyzerbase_global.h"
 #include "analyzerconstants.h"
-#include <coreplugin/id.h>
+
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <QObject>
diff --git a/src/plugins/analyzerbase/analyzeroptionspage.cpp b/src/plugins/analyzerbase/analyzeroptionspage.cpp
index 259898933a2..a38da98f38b 100644
--- a/src/plugins/analyzerbase/analyzeroptionspage.cpp
+++ b/src/plugins/analyzerbase/analyzeroptionspage.cpp
@@ -29,11 +29,8 @@
 ****************************************************************************/
 
 #include "analyzeroptionspage.h"
-#include "analyzerconstants.h"
 #include "analyzersettings.h"
 
-#include <coreplugin/icore.h>
-
 #include <QCoreApplication>
 #include <QDebug>
 #include <QWidget>
diff --git a/src/plugins/analyzerbase/analyzerplugin.cpp b/src/plugins/analyzerbase/analyzerplugin.cpp
index 3083f6d7c37..079c1f1af32 100644
--- a/src/plugins/analyzerbase/analyzerplugin.cpp
+++ b/src/plugins/analyzerbase/analyzerplugin.cpp
@@ -29,23 +29,13 @@
 ****************************************************************************/
 
 #include "analyzerplugin.h"
-#include "analyzerconstants.h"
 #include "analyzermanager.h"
-#include "ianalyzertool.h"
 #include "analyzerruncontrolfactory.h"
 
-#include <coreplugin/icore.h>
-#include <coreplugin/imode.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/editormanager/editormanager.h>
-
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/task.h>
 #include <projectexplorer/taskhub.h>
 
 #include <QtPlugin>
-#include <QMessageBox>
-#include <QApplication>
 
 using namespace Analyzer;
 using namespace Analyzer::Internal;
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.h b/src/plugins/analyzerbase/analyzerrunconfigwidget.h
index 27e559d9215..262ec7e9272 100644
--- a/src/plugins/analyzerbase/analyzerrunconfigwidget.h
+++ b/src/plugins/analyzerbase/analyzerrunconfigwidget.h
@@ -33,8 +33,6 @@
 
 #include "analyzersettings.h"
 
-#include <projectexplorer/runconfiguration.h>
-
 #include <utils/detailswidget.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/analyzerbase/analyzerruncontrol.cpp
index 7d695817d87..c13e06e7a7a 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.cpp
+++ b/src/plugins/analyzerbase/analyzerruncontrol.cpp
@@ -29,18 +29,13 @@
 ****************************************************************************/
 
 #include "analyzerruncontrol.h"
-#include "analyzerconstants.h"
 #include "ianalyzerengine.h"
 #include "ianalyzertool.h"
 #include "analyzermanager.h"
 #include "analyzerstartparameters.h"
 
-#include <projectexplorer/localapplicationrunconfiguration.h>
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/task.h>
 #include <projectexplorer/taskhub.h>
-#include <coreplugin/ioutputpane.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/analyzerbase/analyzerruncontrolfactory.cpp b/src/plugins/analyzerbase/analyzerruncontrolfactory.cpp
index 6cfce7bc9f1..c3e30dcc3e7 100644
--- a/src/plugins/analyzerbase/analyzerruncontrolfactory.cpp
+++ b/src/plugins/analyzerbase/analyzerruncontrolfactory.cpp
@@ -35,9 +35,6 @@
 #include "ianalyzertool.h"
 #include "analyzerstartparameters.h"
 
-#include <projectexplorer/localapplicationrunconfiguration.h>
-#include <projectexplorer/projectexplorer.h>
-
 #include <utils/qtcassert.h>
 
 #include <QAction>
diff --git a/src/plugins/analyzerbase/analyzerruncontrolfactory.h b/src/plugins/analyzerbase/analyzerruncontrolfactory.h
index fb4293e43d1..d3c7081041d 100644
--- a/src/plugins/analyzerbase/analyzerruncontrolfactory.h
+++ b/src/plugins/analyzerbase/analyzerruncontrolfactory.h
@@ -31,7 +31,6 @@
 #define ANALYZERRUNCONTROLFACTORY_H
 
 #include <analyzerbase/analyzerruncontrol.h>
-#include <projectexplorer/runconfiguration.h>
 
 namespace Analyzer {
 namespace Internal {
diff --git a/src/plugins/analyzerbase/analyzersettings.h b/src/plugins/analyzerbase/analyzersettings.h
index 910743dcaec..dbb6434f5cf 100644
--- a/src/plugins/analyzerbase/analyzersettings.h
+++ b/src/plugins/analyzerbase/analyzersettings.h
@@ -32,11 +32,9 @@
 #define ANALYZER_INTERNAL_ANALYZERSETTINGS_H
 
 #include <QObject>
-#include <QVariant>
 
 #include "analyzerbase_global.h"
 
-#include <coreplugin/id.h>
 #include <projectexplorer/runconfiguration.h>
 
 namespace Analyzer {
diff --git a/src/plugins/analyzerbase/analyzerutils.cpp b/src/plugins/analyzerbase/analyzerutils.cpp
index 161e9dfb13e..fe3996de106 100644
--- a/src/plugins/analyzerbase/analyzerutils.cpp
+++ b/src/plugins/analyzerbase/analyzerutils.cpp
@@ -31,24 +31,14 @@
 
 #include "analyzerconstants.h"
 
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/icore.h>
 #include <texteditor/basetexteditor.h>
-#include <texteditor/itexteditor.h>
 #include <utils/qtcassert.h>
 
 #include <cplusplus/ExpressionUnderCursor.h>
 #include <cpptools/ModelManagerInterface.h>
-#include <cplusplus/LookupItem.h>
 #include <cplusplus/TypeOfExpression.h>
 
-// shared/cplusplus includes
-#include <Scope.h>
-#include <Symbol.h>
-
-#include <QTextDocumentFragment>
 #include <QTextCursor>
-#include <QWidget>
 
 using namespace Analyzer;
 using namespace Core;
diff --git a/src/plugins/analyzerbase/ianalyzertool.cpp b/src/plugins/analyzerbase/ianalyzertool.cpp
index 218eec88cfc..cfcf3ebec97 100644
--- a/src/plugins/analyzerbase/ianalyzertool.cpp
+++ b/src/plugins/analyzerbase/ianalyzertool.cpp
@@ -29,7 +29,6 @@
 ****************************************************************************/
 
 #include "ianalyzertool.h"
-#include "analyzermanager.h"
 
 using namespace Core;
 
diff --git a/src/plugins/analyzerbase/ianalyzertool.h b/src/plugins/analyzerbase/ianalyzertool.h
index b8a8d0835a9..3c1a46df52a 100644
--- a/src/plugins/analyzerbase/ianalyzertool.h
+++ b/src/plugins/analyzerbase/ianalyzertool.h
@@ -32,10 +32,8 @@
 #define IANALYZERTOOL_H
 
 #include "analyzerbase_global.h"
-#include "analyzerconstants.h"
 #include "analyzerstartparameters.h"
 
-#include <coreplugin/id.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <QObject>
diff --git a/src/plugins/analyzerbase/startremotedialog.cpp b/src/plugins/analyzerbase/startremotedialog.cpp
index 5afa333b580..a22af6ac26f 100644
--- a/src/plugins/analyzerbase/startremotedialog.cpp
+++ b/src/plugins/analyzerbase/startremotedialog.cpp
@@ -30,18 +30,14 @@
 #include "startremotedialog.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <projectexplorer/kitchooser.h>
 #include <projectexplorer/kitinformation.h>
 #include <ssh/sshconnection.h>
-#include <utils/pathchooser.h>
 
 #include <QDialogButtonBox>
 #include <QFormLayout>
-#include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
-#include <QSpinBox>
 
 using namespace ProjectExplorer;
 using namespace Utils;