diff --git a/src/plugins/analyzerbase/analyzermanager.h b/src/plugins/analyzerbase/analyzermanager.h
index f8360061dd0..786589b0733 100644
--- a/src/plugins/analyzerbase/analyzermanager.h
+++ b/src/plugins/analyzerbase/analyzermanager.h
@@ -33,10 +33,8 @@
 #define ANALYZERMANAGER_H
 
 #include "analyzerbase_global.h"
-#include "analyzerconstants.h"
 
 #include <coreplugin/id.h>
-#include <projectexplorer/projectexplorerconstants.h>
 
 #include <QObject>
 
diff --git a/src/plugins/analyzerbase/analyzerplugin.cpp b/src/plugins/analyzerbase/analyzerplugin.cpp
index a396dc5056b..ef9b53edda4 100644
--- a/src/plugins/analyzerbase/analyzerplugin.cpp
+++ b/src/plugins/analyzerbase/analyzerplugin.cpp
@@ -30,6 +30,7 @@
 ****************************************************************************/
 
 #include "analyzerplugin.h"
+#include "analyzerconstants.h"
 #include "analyzermanager.h"
 
 #include <projectexplorer/projectexplorer.h>
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.h b/src/plugins/analyzerbase/analyzerruncontrol.h
index 066ea490835..82769b0768e 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.h
+++ b/src/plugins/analyzerbase/analyzerruncontrol.h
@@ -35,20 +35,14 @@
 #include "analyzerbase_global.h"
 
 #include <projectexplorer/runconfiguration.h>
-#include <projectexplorer/task.h>
 
-#include "analyzerbase_global.h"
 #include "analyzerstartparameters.h"
 
-#include <projectexplorer/task.h>
-#include <projectexplorer/runconfiguration.h>
 #include <utils/outputformat.h>
 
 #include <QObject>
 #include <QString>
 
-namespace ProjectExplorer { class RunConfiguration; }
-
 namespace Analyzer {
 
 /**
diff --git a/src/plugins/analyzerbase/ianalyzertool.h b/src/plugins/analyzerbase/ianalyzertool.h
index 171bb6c903c..31cec8cc712 100644
--- a/src/plugins/analyzerbase/ianalyzertool.h
+++ b/src/plugins/analyzerbase/ianalyzertool.h
@@ -33,7 +33,7 @@
 #define IANALYZERTOOL_H
 
 #include "analyzerbase_global.h"
-#include "analyzerstartparameters.h"
+#include "analyzerconstants.h"
 
 #include <coreplugin/id.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -47,6 +47,7 @@ namespace ProjectExplorer { class RunConfiguration; }
 
 namespace Analyzer {
 
+class AnalyzerStartParameters;
 class AnalyzerRunControl;
 
 /**