diff --git a/src/plugins/analyzerbase/analyzermanager.h b/src/plugins/analyzerbase/analyzermanager.h
index 9db4e12238e659acf254941bb4d8502eed6f7a4e..484c5736a92cf1c44969c71400d4d6d8d9a498f0 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 1be2b4d5c79b7185d861da96553a1d78aefd58f1..18fd4703d2bb5e2f34ae8fdf1912ace45cec0f40 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 c18762d3a08d62419cdd928dbf6c39f2c84add3d..a3a98404a0aea0d62d8c96498d0f92c5888704e5 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 ff320a4e2b6a36f6e28915868149cbecbfbcf3f9..1e94088f67562a8d150bb8b2b32226d399a80bf4 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 ae853d2eb2a7af27dc9df007d5dfffb97f89b7ec..39e0ec172f6adf4c366c2bb986028ba1f0943d2f 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 2fdec91bea109dc2e30769e107f6037ea81e01a5..f77cc0b35ba98d32398f200648752b13e6c1549f 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 258d45554f5f64a92f7b036660482a77bbb79fcf..5764da9b98c7844c3c22221a9ab3645e618a6b9b 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 fc4f8a69dc923c7609d79c0cec2139127db65427..b6f2103f0616151f2f5e09f868dbe341791ae1b3 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;