diff --git a/src/plugins/analyzerbase/analyzermanager.h b/src/plugins/analyzerbase/analyzermanager.h
index 9db4e12238e..484c5736a92 100644
--- a/src/plugins/analyzerbase/analyzermanager.h
+++ b/src/plugins/analyzerbase/analyzermanager.h
@@ -37,12 +37,12 @@
 
 #include "analyzerbase_global.h"
 #include "analyzerconstants.h"
-#include "projectexplorer/runconfiguration.h"
 
 #include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 class QDockWidget;
+class QAction;
 QT_END_NAMESPACE
 
 namespace Utils {
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp b/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
index 1be2b4d5c79..18fd4703d2b 100644
--- a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
+++ b/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
@@ -41,6 +41,8 @@
 #include <QtGui/QApplication>
 #include <QtGui/QLabel>
 #include <QtGui/QVBoxLayout>
+#include <QtGui/QComboBox>
+#include <QtGui/QPushButton>
 
 namespace Analyzer {
 
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.h b/src/plugins/analyzerbase/analyzerrunconfigwidget.h
index c18762d3a08..a3a98404a0a 100644
--- a/src/plugins/analyzerbase/analyzerrunconfigwidget.h
+++ b/src/plugins/analyzerbase/analyzerrunconfigwidget.h
@@ -40,8 +40,10 @@
 
 #include <projectexplorer/runconfiguration.h>
 
-#include <QtGui/QComboBox>
-#include <QtGui/QPushButton>
+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QPushButton;
+QT_END_NAMESPACE
 
 namespace Utils {
 class DetailsWidget;
diff --git a/src/plugins/analyzerbase/analyzerruncontrol.h b/src/plugins/analyzerbase/analyzerruncontrol.h
index ff320a4e2b6..1e94088f675 100644
--- a/src/plugins/analyzerbase/analyzerruncontrol.h
+++ b/src/plugins/analyzerbase/analyzerruncontrol.h
@@ -37,8 +37,6 @@
 
 #include "analyzerbase_global.h"
 
-#include <utils/ssh/sshconnection.h>
-
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/task.h>
 
diff --git a/src/plugins/analyzerbase/ianalyzerengine.h b/src/plugins/analyzerbase/ianalyzerengine.h
index ae853d2eb2a..39e0ec172f6 100644
--- a/src/plugins/analyzerbase/ianalyzerengine.h
+++ b/src/plugins/analyzerbase/ianalyzerengine.h
@@ -39,7 +39,6 @@
 #include "analyzerstartparameters.h"
 
 #include <projectexplorer/task.h>
-#include <utils/ssh/sshconnection.h>
 #include <utils/outputformat.h>
 
 #include <QtCore/QObject>
diff --git a/src/plugins/analyzerbase/startremotedialog.cpp b/src/plugins/analyzerbase/startremotedialog.cpp
index 2fdec91bea1..f77cc0b35ba 100644
--- a/src/plugins/analyzerbase/startremotedialog.cpp
+++ b/src/plugins/analyzerbase/startremotedialog.cpp
@@ -34,9 +34,10 @@
 
 #include "ui_startremotedialog.h"
 
-#include <QtGui/QPushButton>
-
 #include <coreplugin/icore.h>
+#include <utils/ssh/sshconnection.h>
+
+#include <QtGui/QPushButton>
 
 namespace Analyzer {
 
diff --git a/src/plugins/analyzerbase/startremotedialog.h b/src/plugins/analyzerbase/startremotedialog.h
index 258d45554f5..5764da9b98c 100644
--- a/src/plugins/analyzerbase/startremotedialog.h
+++ b/src/plugins/analyzerbase/startremotedialog.h
@@ -35,10 +35,12 @@
 
 #include "analyzerbase_global.h"
 
-#include <utils/ssh/sshconnection.h>
-
 #include <QtGui/QDialog>
 
+namespace Utils {
+class SshConnectionParameters;
+}
+
 namespace Analyzer {
 
 namespace Ui {
diff --git a/src/plugins/vcsbase/commonvcssettings.h b/src/plugins/vcsbase/commonvcssettings.h
index fc4f8a69dc9..b6f2103f061 100644
--- a/src/plugins/vcsbase/commonvcssettings.h
+++ b/src/plugins/vcsbase/commonvcssettings.h
@@ -34,7 +34,6 @@
 #define COMMONVCSSETTINGS_H
 
 #include <QtCore/QString>
-#include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
 class QSettings;