Purge out include files in exported headers

83 files changed, 213 insertions, 98 deletions

diff --git a/src/libs/extensionsystem/plugindetailsview.cpp b/src/libs/extensionsystem/plugindetailsview.cpp
index 2324198dd8..9d4f88489c 100644
--- a/src/libs/extensionsystem/plugindetailsview.cpp
+++ b/src/libs/extensionsystem/plugindetailsview.cpp
@@ -29,6 +29,7 @@
 
 #include "plugindetailsview.h"
 #include "ui_plugindetailsview.h"
+#include "pluginspec.h"
 
 #include <QtCore/QDir>
 
diff --git a/src/libs/extensionsystem/plugindetailsview.h b/src/libs/extensionsystem/plugindetailsview.h
index e1d422178a..b8d36ebd49 100644
--- a/src/libs/extensionsystem/plugindetailsview.h
+++ b/src/libs/extensionsystem/plugindetailsview.h
@@ -31,12 +31,13 @@
 #define PLUGINDETAILSVIEW_H_
 
 #include "extensionsystem_global.h"
-#include "pluginspec.h"
 
 #include <QtGui/QWidget>
 
 namespace ExtensionSystem {
 
+class PluginSpec;
+
 namespace Internal {
 namespace Ui {
     class PluginDetailsView;
diff --git a/src/libs/extensionsystem/pluginerrorview.cpp b/src/libs/extensionsystem/pluginerrorview.cpp
index 1dd1854dbc..983f8b17cb 100644
--- a/src/libs/extensionsystem/pluginerrorview.cpp
+++ b/src/libs/extensionsystem/pluginerrorview.cpp
@@ -29,6 +29,7 @@
 
 #include "pluginerrorview.h"
 #include "ui_pluginerrorview.h"
+#include "pluginspec.h"
 
 #include <QtCore/QString>
 
diff --git a/src/libs/extensionsystem/pluginerrorview.h b/src/libs/extensionsystem/pluginerrorview.h
index fed0b63f82..305d1e2b52 100644
--- a/src/libs/extensionsystem/pluginerrorview.h
+++ b/src/libs/extensionsystem/pluginerrorview.h
@@ -31,12 +31,12 @@
 #define PLUGINERRORVIEW_H
 
 #include "extensionsystem_global.h"
-#include "pluginspec.h"
 
 #include <QtGui/QWidget>
 
 namespace ExtensionSystem {
 
+class PluginSpec;
 namespace Internal {
 namespace Ui {
     class PluginErrorView;
diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h
index 1f4aefc77c..79c0b68356 100644
--- a/src/libs/extensionsystem/pluginmanager.h
+++ b/src/libs/extensionsystem/pluginmanager.h
@@ -34,10 +34,7 @@
 #include <aggregation/aggregate.h>
 
 #include <QtCore/QObject>
-#include <QtCore/QList>
-#include <QtCore/QSet>
 #include <QtCore/QStringList>
-#include <QtCore/QWriteLocker>
 #include <QtCore/QReadWriteLock>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index 728b476e8a..eadb7f2ae2 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -30,6 +30,10 @@
 #include "fancymainwindow.h"
 
 #include <QtGui/QAction>
+#include <QtCore/QSettings>
+#include <QtGui/QDockWidget>
+#include <QtCore/QSettings>
+
 
 using namespace Core::Utils;
 
diff --git a/src/libs/utils/fancymainwindow.h b/src/libs/utils/fancymainwindow.h
index 0339f1236b..6f4f866897 100644
--- a/src/libs/utils/fancymainwindow.h
+++ b/src/libs/utils/fancymainwindow.h
@@ -34,10 +34,12 @@
 
 #include <QtCore/QList>
 #include <QtCore/QHash>
-#include <QtCore/QSettings>
+
 #include <QtGui/QMainWindow>
-#include <QtGui/QDockWidget>
-#include <QtCore/QSettings>
+
+QT_BEGIN_NAMESPACE
+class QSettings;
+QT_END_NAMESPACE
 
 namespace Core {
 namespace Utils {
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index 22ffa7e248..0544bd2569 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -31,6 +31,10 @@
 
 #include <QtGui/QPixmapCache>
 #include <QtGui/QWidget>
+#include <QtCore/QRect>
+#include <QtGui/QPainter>
+#include <QtGui/QApplication>
+#include <QtGui/QPalette>
 
 // Clamps float color values within (0, 255)
 static int clamp(float x)
diff --git a/src/libs/utils/stylehelper.h b/src/libs/utils/stylehelper.h
index b2ccaf1746..b2be66f748 100644
--- a/src/libs/utils/stylehelper.h
+++ b/src/libs/utils/stylehelper.h
@@ -32,12 +32,14 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QRect>
-#include <QtGui/QPainter>
-#include <QtGui/QApplication>
-#include <QtGui/QPalette>
 #include <QtGui/QColor>
 
+QT_BEGIN_NAMESPACE
+class QPalette;
+class QPainter;
+class QRect;
+QT_END_NAMESPACE
+
 // Helper class holding all custom color values
 
 class QTCREATOR_UTILS_EXPORT StyleHelper
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 9b79165e3a..5175f4b6a9 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -43,6 +43,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/uniqueidmanager.h>
diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h
index d320651544..69d47912f8 100644
--- a/src/plugins/bineditor/bineditorplugin.h
+++ b/src/plugins/bineditor/bineditorplugin.h
@@ -32,6 +32,7 @@
 
 #include <extensionsystem/iplugin.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
+#include <coreplugin/icontext.h>
 
 #include <QtCore/QtPlugin>
 #include <QtCore/QPointer>
diff --git a/src/plugins/coreplugin/actionmanager/command.h b/src/plugins/coreplugin/actionmanager/command.h
index c1ad4dd1d6..418e85e64d 100644
--- a/src/plugins/coreplugin/actionmanager/command.h
+++ b/src/plugins/coreplugin/actionmanager/command.h
@@ -32,9 +32,14 @@
 
 #include <coreplugin/core_global.h>
 
-#include <QtGui/QAction>
-#include <QtGui/QShortcut>
-#include <QtGui/QKeySequence>
+#include <QtCore/QObject>
+
+QT_BEGIN_NAMESPACE
+class QAction;
+class QShortcut;
+class QKeySequence;
+QT_END_NAMESPACE
+
 
 namespace Core {
 
diff --git a/src/plugins/coreplugin/basemode.h b/src/plugins/coreplugin/basemode.h
index aa23c72a87..9f701b7c33 100644
--- a/src/plugins/coreplugin/basemode.h
+++ b/src/plugins/coreplugin/basemode.h
@@ -35,6 +35,7 @@
 
 #include <QtCore/QObject>
 #include <QtGui/QWidget>
+#include <QtGui/QIcon>
 
 namespace Core {
 
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h
index 03125bb46c..0a1ebfc21c 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.h
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.h
@@ -33,8 +33,10 @@
 #include <coreplugin/core_global.h>
 
 #include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+class QWidget;
+QT_END_NAMESPACE
 
 namespace Core {
 
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index 0bcd6747e3..a02c434cd6 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -37,6 +37,8 @@
 #include "outputpane.h"
 #include "navigationwidget.h"
 #include "rightpane.h"
+#include "ieditor.h"
+#include "ifile.h"
 
 #include <QtCore/QLatin1String>
 #include <QtGui/QHBoxLayout>
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index fdd9b62b0d..06e88b8bf9 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -33,6 +33,7 @@
 #include "../core_global.h"
 
 #include <coreplugin/icorelistener.h>
+#include <coreplugin/ifile.h>
 
 #include <QtGui/QWidget>
 #include <QtCore/QList>
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 6a69fc2420..240905a325 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -34,6 +34,7 @@
 #include "openeditorsmodel.h"
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/editormanager/ieditor.h>
 
 #include <coreplugin/findplaceholder.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h
index 5248b298a7..d4440f0077 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.h
+++ b/src/plugins/coreplugin/editormanager/ieditor.h
@@ -32,10 +32,11 @@
 
 #include <coreplugin/core_global.h>
 #include <coreplugin/icontext.h>
-#include <coreplugin/ifile.h>
 
 namespace Core {
 
+class IFile;
+
 class CORE_EXPORT IEditor : public IContext
 {
     Q_OBJECT
diff --git a/src/plugins/coreplugin/editormanager/ieditorfactory.h b/src/plugins/coreplugin/editormanager/ieditorfactory.h
index ad859cc5b0..9897e96e71 100644
--- a/src/plugins/coreplugin/editormanager/ieditorfactory.h
+++ b/src/plugins/coreplugin/editormanager/ieditorfactory.h
@@ -31,16 +31,11 @@
 #define IEDITORFACTORY_H
 
 #include <coreplugin/ifilefactory.h>
-#include <coreplugin/editormanager/ieditor.h>
-
-#include <QtCore/QObject>
-
-QT_BEGIN_NAMESPACE
-class QWidget;
-QT_END_NAMESPACE
 
 namespace Core {
 
+class IEditor;
+
 class CORE_EXPORT IEditorFactory : public Core::IFileFactory
 {
     Q_OBJECT
diff --git a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
index 7d7de8db4c..70b631ab6f 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
@@ -29,6 +29,7 @@
 
 #include "openeditorsmodel.h"
 #include "ieditor.h"
+#include "ifile.h"
 
 #include <QtCore/QDir>
 #include <QtGui/QIcon>
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index 45851126ab..ebd5c91333 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -30,6 +30,7 @@
 #include "filemanager.h"
 
 #include "editormanager.h"
+#include "ieditor.h"
 #include "icore.h"
 #include "ifile.h"
 #include "iversioncontrol.h"
diff --git a/src/plugins/coreplugin/icorelistener.h b/src/plugins/coreplugin/icorelistener.h
index e54158c36f..08d77fd7e5 100644
--- a/src/plugins/coreplugin/icorelistener.h
+++ b/src/plugins/coreplugin/icorelistener.h
@@ -31,11 +31,10 @@
 #define ICORELISTENER_H
 
 #include "core_global.h"
-#include <coreplugin/editormanager/ieditor.h>
 #include <QtCore/QObject>
 
 namespace Core {
-
+class IEditor;
 /*!
   \class Core::ICoreListener
 
diff --git a/src/plugins/coreplugin/imode.h b/src/plugins/coreplugin/imode.h
index 0b431bcdcd..441db8f520 100644
--- a/src/plugins/coreplugin/imode.h
+++ b/src/plugins/coreplugin/imode.h
@@ -34,10 +34,9 @@
 
 #include <coreplugin/core_global.h>
 
-#include <QtCore/QObject>
-#include <QtGui/QIcon>
-#include <QtGui/QKeySequence>
-#include <QtGui/QLayout>
+QT_BEGIN_NAMESPACE
+class QIcon;
+QT_END_NAMESPACE
 
 namespace Core {
 
diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h
index 42d1909bd0..a4321bd7b2 100644
--- a/src/plugins/coreplugin/ioutputpane.h
+++ b/src/plugins/coreplugin/ioutputpane.h
@@ -35,7 +35,10 @@
 #include <QtCore/QObject>
 #include <QtCore/QList>
 #include <QtCore/QString>
-#include <QtGui/QWidget>
+
+QT_BEGIN_NAMESPACE
+class QWidget;
+QT_END_NAMESPACE
 
 namespace Core {
 
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index af8576b8ac..0a82ef2369 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -85,6 +85,8 @@
 #include <QtGui/QShortcut>
 #include <QtGui/QStatusBar>
 #include <QtGui/QWizard>
+#include <QtGui/QPrinter>
+#include <QtGui/QToolButton>
 
 /*
 #ifdef Q_OS_UNIX
diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index 19ef983951..7c2721deeb 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -44,6 +44,8 @@
 QT_BEGIN_NAMESPACE
 class QSettings;
 class QShortcut;
+class QPrinter;
+class QToolButton;
 QT_END_NAMESPACE
 
 namespace Core {
diff --git a/src/plugins/coreplugin/manhattanstyle.h b/src/plugins/coreplugin/manhattanstyle.h
index 46ed339e12..2d8f5a7b57 100644
--- a/src/plugins/coreplugin/manhattanstyle.h
+++ b/src/plugins/coreplugin/manhattanstyle.h
@@ -32,8 +32,7 @@
 
 #include "core_global.h"
 
-#include <QStyle>
-#include <QWindowsStyle>
+#include <QtGui/QWindowsStyle>
 
 QT_BEGIN_NAMESPACE
 class QLinearGradient;
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp
index bcc4f32e4d..66b36678db 100644
--- a/src/plugins/coreplugin/modemanager.cpp
+++ b/src/plugins/coreplugin/modemanager.cpp
@@ -49,6 +49,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QDebug>
 #include <QtCore/QSignalMapper>
+#include <QtGui/QShortcut>
 
 #include <QtGui/QAction>
 #include <QtGui/QTabWidget>
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 08305d151e..78750c49d1 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -38,6 +38,8 @@
 
 #include <extensionsystem/pluginmanager.h>
 
+#include <utils/styledbar.h>
+
 #include <QtCore/QDebug>
 #include <QtCore/QSettings>
 
@@ -45,6 +47,7 @@
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QResizeEvent>
 #include <QtGui/QToolButton>
+#include <QtGui/QShortcut>
 
 Q_DECLARE_METATYPE(Core::INavigationWidgetFactory *)
 
diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h
index 6d3bc8670d..a4a6753ab3 100644
--- a/src/plugins/coreplugin/navigationwidget.h
+++ b/src/plugins/coreplugin/navigationwidget.h
@@ -31,20 +31,19 @@
 #define NAVIGATIONWIDGET_H
 
 #include <coreplugin/minisplitter.h>
-#include <utils/styledbar.h>
 
-#include <QtGui/QWidget>
 #include <QtGui/QComboBox>
-#include <QtGui/QSplitter>
-#include <QtGui/QToolButton>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
 class QShortcut;
+class QToolButton;
 QT_END_NAMESPACE
 
 namespace Core {
-
+namespace Utils {
+class StyledBar;
+}
 class INavigationWidgetFactory;
 class IMode;
 class Command;
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 9c21672ddb..0b56545156 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -38,6 +38,7 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/findplaceholder.h>
+#include <coreplugin/editormanager/ieditor.h>
 
 #include <extensionsystem/pluginmanager.h>
 
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
index 4143cd8cbd..6638b3f7f5 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
@@ -33,6 +33,9 @@
 #include <QtGui/QColor>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QMenu>
+#include <QtGui/QProgressBar>
+#include <QtGui/QHBoxLayout>
+
 
 using namespace Core;
 
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h
index ae9d58fb34..64408220d3 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.h
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.h
@@ -36,11 +36,11 @@
 #include <QtCore/QFuture>
 #include <QtCore/QFutureWatcher>
 #include <QtGui/QWidget>
-#include <QtGui/QIcon>
-#include <QtGui/QAction>
-#include <QtGui/QProgressBar>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QHBoxLayout>
+
+QT_BEGIN_NAMESPACE
+class QProgressBar;
+class QHBoxLayout;
+QT_END_NAMESPACE
 
 class ProgressBar;
 
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h
index 6a931f1dd2..944b329385 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.h
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.h
@@ -35,7 +35,6 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QFuture>
-#include <QtGui/QIcon>
 
 namespace Core {
 
diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp
index 10a23b9bf3..78f21dc7dd 100644
--- a/src/plugins/coreplugin/rightpane.cpp
+++ b/src/plugins/coreplugin/rightpane.cpp
@@ -29,12 +29,16 @@
 
 #include "rightpane.h"
 
+#include <coreplugin/modemanager.h>
+#include <extensionsystem/pluginmanager.h>
+
+#include <QtCore/QSettings>
+
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QSplitter>
 #include <QtGui/QResizeEvent>
 #include <QtGui/QTextEdit>
-#include <coreplugin/modemanager.h>
-#include <extensionsystem/pluginmanager.h>
+
 
 using namespace Core;
 using namespace Core::Internal;
diff --git a/src/plugins/coreplugin/rightpane.h b/src/plugins/coreplugin/rightpane.h
index d55c0bec5c..06b28ff13f 100644
--- a/src/plugins/coreplugin/rightpane.h
+++ b/src/plugins/coreplugin/rightpane.h
@@ -33,7 +33,10 @@
 #include "core_global.h"
 
 #include <QtGui/QWidget>
-#include <QtCore/QSettings>
+
+QT_BEGIN_HEADER
+class QSettings;
+QT_END_HEADER
 
 namespace Core {
 
diff --git a/src/plugins/coreplugin/settingsdatabase.cpp b/src/plugins/coreplugin/settingsdatabase.cpp
index 88aaf608ae..87d3a70e63 100644
--- a/src/plugins/coreplugin/settingsdatabase.cpp
+++ b/src/plugins/coreplugin/settingsdatabase.cpp
@@ -31,6 +31,10 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+
 #include <QtSql/QSqlDatabase>
 #include <QtSql/QSqlError>
 #include <QtSql/QSqlQuery>
diff --git a/src/plugins/coreplugin/sidebar.h b/src/plugins/coreplugin/sidebar.h
index 2526f40118..c4276e3e6e 100644
--- a/src/plugins/coreplugin/sidebar.h
+++ b/src/plugins/coreplugin/sidebar.h
@@ -39,7 +39,6 @@
 
 QT_BEGIN_NAMESPACE
 class QSettings;
-class QComboBox;
 class QToolBar;
 class QAction;
 class QToolButton;
diff --git a/src/plugins/coreplugin/variablemanager.cpp b/src/plugins/coreplugin/variablemanager.cpp
index 2cdde2d71e..f21a280cf5 100644
--- a/src/plugins/coreplugin/variablemanager.cpp
+++ b/src/plugins/coreplugin/variablemanager.cpp
@@ -28,6 +28,9 @@
 **************************************************************************/
 
 #include "variablemanager.h"
+#include "ifile.h"
+
+#include <QtCore/QFileInfo>
 
 using namespace Core;
 
diff --git a/src/plugins/coreplugin/variablemanager.h b/src/plugins/coreplugin/variablemanager.h
index d560072dc2..1bd73712cb 100644
--- a/src/plugins/coreplugin/variablemanager.h
+++ b/src/plugins/coreplugin/variablemanager.h
@@ -36,7 +36,10 @@
 #include <QtCore/QObject>
 #include <QtCore/QMap>
 #include <QtCore/QString>
-#include <QtCore/QFileInfo>
+
+QT_BEGIN_NAMESPACE
+class QFileInfo;
+QT_END_NAMESPACE
 
 namespace Core {
 
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp
index 1214882025..db9e984b1a 100644
--- a/src/plugins/cpptools/cpptoolseditorsupport.cpp
+++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp
@@ -30,6 +30,8 @@
 #include "cpptoolseditorsupport.h"
 #include "cppmodelmanager.h"
 
+#include <coreplugin/ifile.h>
+
 #include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index 6761dfb321..3a86d8eb61 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -36,6 +36,7 @@
 #include <utils/filesearch.h>
 
 #include <QtGui/QTextDocument>
+#include <QtGui/QKeySequence>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QFutureInterface>
 #include <QtCore/QPointer>
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d7e024b02e..9ec44d8970 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -88,6 +88,7 @@
 #include <QtGui/QPlainTextEdit>
 #include <QtGui/QTextBlock>
 #include <QtGui/QTextCursor>
+#include <QtGui/QToolButton>
 #include <QtGui/QMessageBox>
 
 #include <climits>
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index d09544fcab..8208cb4fcf 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -32,6 +32,8 @@
 #include "gdb/gdbmi.h"
 #include <utils/qtcassert.h>
 
+#include <coreplugin/ifile.h>
+
 #include <texteditor/basetexteditor.h>
 #include <texteditor/basetextmark.h>
 #include <texteditor/itexteditor.h>
diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp
index 1b9f9b3eb4..0be5ec28a1 100644
--- a/src/plugins/designer/formwindoweditor.cpp
+++ b/src/plugins/designer/formwindoweditor.cpp
@@ -58,6 +58,7 @@
 #include <QtCore/QTemporaryFile>
 #include <QtCore/QDebug>
 #include <QtGui/QToolBar>
+#include <QtGui/QDockWidget>
 
 using namespace Designer::Internal;
 using namespace Designer::Constants;
@@ -384,3 +385,18 @@ QString FormWindowEditor::contents() const
 */
     return m_formWindow->contents();
 }
+
+QDockWidget* const* FormWindowEditor::dockWidgets() const
+{
+    return m_editorWidget->dockWidgets();
+}
+
+bool FormWindowEditor::isLocked() const
+{
+    return m_editorWidget->isLocked();
+}
+
+void FormWindowEditor::setLocked(bool locked)
+{
+    m_editorWidget->setLocked(locked);
+}
diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h
index 0b40d7cf35..cc49605ac3 100644
--- a/src/plugins/designer/formwindoweditor.h
+++ b/src/plugins/designer/formwindoweditor.h
@@ -30,21 +30,18 @@
 #ifndef FORMWINDOWEDITOR_H
 #define FORMWINDOWEDITOR_H
 
-#include "editorwidget.h"
+#include "designer_export.h"
 
 #include <coreplugin/editormanager/ieditor.h>
 
-#include <QtCore/QByteArray>
 #include <QtCore/QStringList>
-#include <QtGui/QDockWidget>
-
-#include "designer_export.h"
 
 QT_BEGIN_NAMESPACE
 class QDesignerFormWindowInterface;
 class QDesignerFormWindowManagerInterface;
 class QFile;
 class QToolBar;
+class QDockWidget;
 QT_END_NAMESPACE
 
 namespace ProjectExplorer {
@@ -57,6 +54,7 @@ namespace Internal {
 
 class FormWindowFile;
 class FormWindowHost;
+class EditorWidget;
 
 // Master class maintaining a form window editor,
 // containing file and widget host
@@ -93,9 +91,9 @@ public:
     QWidget *integrationContainer();
     void updateFormWindowSelectionHandles(bool state);
     void setSuggestedFileName(const QString &fileName);
-    QDockWidget* const* dockWidgets() const { return m_editorWidget->dockWidgets(); }
-    bool isLocked() const { return m_editorWidget->isLocked(); }
-    void setLocked(bool locked) { m_editorWidget->setLocked(locked); }
+    QDockWidget* const* dockWidgets() const;
+    bool isLocked() const;
+    void setLocked(bool locked);
 
     QString contents() const;
 
diff --git a/src/plugins/find/basetextfind.cpp b/src/plugins/find/basetextfind.cpp
index 5fb4a33d56..5c7d9be20c 100644
--- a/src/plugins/find/basetextfind.cpp
+++ b/src/plugins/find/basetextfind.cpp
@@ -32,6 +32,7 @@
 #include <utils/qtcassert.h>
 
 #include <QtGui/QTextBlock>
+#include <QtGui/QPlainTextEdit>
 
 using namespace Find;
 
diff --git a/src/plugins/find/basetextfind.h b/src/plugins/find/basetextfind.h
index 97aca8f4f6..75e0e4c97f 100644
--- a/src/plugins/find/basetextfind.h
+++ b/src/plugins/find/basetextfind.h
@@ -34,7 +34,12 @@
 #include "ifindsupport.h"
 
 #include <QtCore/QPointer>
-#include <QtGui/QPlainTextEdit>
+#include <QtGui/QTextCursor>
+
+QT_BEGIN_NAMESPACE
+class QPlainTextEdit;
+class QTextEdit;
+QT_END_NAMESPACE
 
 namespace Find {
 
diff --git a/src/plugins/find/findtoolwindow.cpp b/src/plugins/find/findtoolwindow.cpp
index d03c8f8fd6..e687b21227 100644
--- a/src/plugins/find/findtoolwindow.cpp
+++ b/src/plugins/find/findtoolwindow.cpp
@@ -32,6 +32,7 @@
 
 #include <coreplugin/icore.h>
 
+#include <QtCore/QSettings>
 #include <QtGui/QMainWindow>
 
 using namespace Find;
diff --git a/src/plugins/find/ifindfilter.h b/src/plugins/find/ifindfilter.h
index f08ea62f3e..9878835b89 100644
--- a/src/plugins/find/ifindfilter.h
+++ b/src/plugins/find/ifindfilter.h
@@ -32,12 +32,14 @@
 
 #include "find_global.h"
 
-#include <QtCore/QSettings>
-#include <QtGui/QIcon>
-#include <QtGui/QKeySequence>
-#include <QtGui/QWidget>
 #include <QtGui/QTextDocument>
 
+QT_BEGIN_NAMESPACE
+class QKeySequence;
+class QWidget;
+class QSettings;
+QT_END_NAMESPACE
+
 namespace Find {
 
 class FIND_EXPORT IFindFilter : public QObject
diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp
index 1fe0b1c7e3..1503eb270c 100644
--- a/src/plugins/find/searchresultwindow.cpp
+++ b/src/plugins/find/searchresultwindow.cpp
@@ -39,6 +39,8 @@
 #include <QtGui/QListWidget>
 #include <QtGui/QToolButton>
 #include <QtGui/QLineEdit>
+#include <QtGui/QStackedWidget>
+#include <QtGui/QLabel>
 
 using namespace Find;
 using namespace Find::Internal;
diff --git a/src/plugins/find/searchresultwindow.h b/src/plugins/find/searchresultwindow.h
index 7f92ef0237..d806bf67bf 100644
--- a/src/plugins/find/searchresultwindow.h
+++ b/src/plugins/find/searchresultwindow.h
@@ -35,12 +35,13 @@
 
 #include <coreplugin/ioutputpane.h>
 
-#include <QtCore/QThread>
-#include <QtCore/QStringList>
-#include <QtGui/QStackedWidget>
-#include <QtGui/QListWidget>
-#include <QtGui/QToolButton>
-#include <QtGui/QLabel>
+
+QT_BEGIN_NAMESPACE
+class QStackedWidget;
+class QListWidget;
+class QToolButton;
+class QLabel;
+QT_END_NAMESPACE
 
 namespace Find {
 
diff --git a/src/plugins/help/helpmode.cpp b/src/plugins/help/helpmode.cpp
index bccafe53ab..964b0eb17c 100644
--- a/src/plugins/help/helpmode.cpp
+++ b/src/plugins/help/helpmode.cpp
@@ -30,9 +30,12 @@
 #include "helpmode.h"
 #include "helpplugin.h"
 
+#include <coreplugin/findplaceholder.h>
+
 #include <QtCore/QLatin1String>
+
 #include <QtGui/QWidget>
-#include <coreplugin/findplaceholder.h>
+#include <QtGui/QLayout>
 
 using namespace Help;
 using namespace Help::Internal;
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 8e2c3752fd..63375b7ef0 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -47,6 +47,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/findplaceholder.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/minisplitter.h>
diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp
index 7e1ee9d8da..032077db9a 100644
--- a/src/plugins/projectexplorer/allprojectsfind.cpp
+++ b/src/plugins/projectexplorer/allprojectsfind.cpp
@@ -36,8 +36,10 @@
 #include <utils/qtcassert.h>
 
 #include <QtCore/QDebug>
+#include <QtCore/QSettings>
 #include <QtCore/QRegExp>
 #include <QtGui/QGridLayout>
+#include <QtGui/QLabel>
 
 using namespace Find;
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/currentprojectfind.cpp b/src/plugins/projectexplorer/currentprojectfind.cpp
index d21b02652f..41bb2f5490 100644
--- a/src/plugins/projectexplorer/currentprojectfind.cpp
+++ b/src/plugins/projectexplorer/currentprojectfind.cpp
@@ -35,8 +35,10 @@
 #include <utils/qtcassert.h>
 
 #include <QtCore/QDebug>
+#include <QtCore/QSettings>
 #include <QtCore/QRegExp>
 #include <QtGui/QGridLayout>
+#include <QtGui/QLabel>
 
 using namespace Find;
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index 55b27d0a86..b2a8bfbb62 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -36,6 +36,7 @@
 #include <coreplugin/icore.h>
 #include <projectexplorer/debugginghelper.h>
 #include <utils/detailsbutton.h>
+#include <utils/detailswidget.h>
 #include <utils/pathchooser.h>
 
 #include <QtGui/QCheckBox>
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.h b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
index 8a7d4d1b49..2387f9ca72 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.h
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
@@ -31,7 +31,6 @@
 #define CUSTOMEXECUTABLERUNCONFIGURATION_H
 
 #include "applicationrunconfiguration.h"
-#include <utils/detailswidget.h>
 #include <QtGui/QWidget>
 
 
@@ -43,6 +42,9 @@ class QLabel;
 class QAbstractButton;
 QT_END_NAMESPACE
 
+namespace Utils {
+class DetailsWidget;
+}
 namespace Core {
 namespace Utils {
 class PathChooser;
diff --git a/src/plugins/projectexplorer/environmenteditmodel.cpp b/src/plugins/projectexplorer/environmenteditmodel.cpp
index c77c1f0de6..96e74dd63d 100644
--- a/src/plugins/projectexplorer/environmenteditmodel.cpp
+++ b/src/plugins/projectexplorer/environmenteditmodel.cpp
@@ -30,6 +30,7 @@
 #include "environmenteditmodel.h"
 
 #include <utils/detailsbutton.h>
+#include <utils/detailswidget.h>
 
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QHeaderView>
diff --git a/src/plugins/projectexplorer/environmenteditmodel.h b/src/plugins/projectexplorer/environmenteditmodel.h
index 1df7aacb9a..cc681cc867 100644
--- a/src/plugins/projectexplorer/environmenteditmodel.h
+++ b/src/plugins/projectexplorer/environmenteditmodel.h
@@ -35,7 +35,7 @@
 #include <QtCore/QString>
 #include <QtCore/QAbstractItemModel>
 #include <QtGui/QWidget>
-#include <utils/detailswidget.h>
+
 
 QT_BEGIN_NAMESPACE
 class QCheckBox;
@@ -45,6 +45,10 @@ class QLabel;
 class QStackedWidget;
 QT_END_NAMESPACE
 
+namespace Utils {
+class DetailsWidget;
+}
+
 namespace ProjectExplorer {
 
 class EnvironmentModel : public QAbstractItemModel
diff --git a/src/plugins/qmleditor/qmlcodeformatter.cpp b/src/plugins/qmleditor/qmlcodeformatter.cpp
index 9e14d9ed04..5920447eca 100644
--- a/src/plugins/qmleditor/qmlcodeformatter.cpp
+++ b/src/plugins/qmleditor/qmlcodeformatter.cpp
@@ -25,7 +25,7 @@ bool QmlCodeFormatter::visit(QmlJS::AST::UiProgram *ast)
     return false;
 }
 
-QString QmlCodeFormatter::operator()(QmlJS::AST::UiProgram *ast, const QString &originalSource, const QList<QmlJS::AST::SourceLocation> &comments, int start, int end)
+QString QmlCodeFormatter::operator()(QmlJS::AST::UiProgram *ast, const QString &originalSource, const QList<QmlJS::AST::SourceLocation> & /* comments */, int start, int end)
 {
     m_result.clear();
     m_result.reserve(originalSource.length() * 2);
diff --git a/src/plugins/qmleditor/qmllookupcontext.cpp b/src/plugins/qmleditor/qmllookupcontext.cpp
index e3fb7757c9..6e2ca83ea8 100644
--- a/src/plugins/qmleditor/qmllookupcontext.cpp
+++ b/src/plugins/qmleditor/qmllookupcontext.cpp
@@ -169,7 +169,7 @@ QString QmlLookupContext::toString(UiQualifiedId *id)
     return str;
 }
 
-QList<QmlSymbol*> QmlLookupContext::visibleSymbols(QmlJS::AST::Node *scope)
+QList<QmlSymbol*> QmlLookupContext::visibleSymbols(QmlJS::AST::Node * /* scope */)
 {
     // FIXME
     return QList<QmlSymbol*>();
diff --git a/src/plugins/qmleditor/qmlmodelmanager.cpp b/src/plugins/qmleditor/qmlmodelmanager.cpp
index 4a229e4744..b7b09adecb 100644
--- a/src/plugins/qmleditor/qmlmodelmanager.cpp
+++ b/src/plugins/qmleditor/qmlmodelmanager.cpp
@@ -41,6 +41,8 @@
 #include "qmleditorconstants.h"
 #include "qmlmodelmanager.h"
 
+#include <QtCore/QMetaType>
+
 using namespace QmlEditor;
 using namespace QmlEditor::Internal;
 
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index c237698667..e68e8d9730 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -39,6 +39,7 @@
 #include <utils/qtcassert.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
 
 #include <qmleditor/qmlmodelmanagerinterface.h>
 
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 2444c6d9eb..660d46961d 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -40,6 +40,7 @@
 #include <projectexplorer/filewatcher.h>
 
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/filemanager.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/quickopen/filesystemfilter.cpp b/src/plugins/quickopen/filesystemfilter.cpp
index bc3c46698e..d62d5279bb 100644
--- a/src/plugins/quickopen/filesystemfilter.cpp
+++ b/src/plugins/quickopen/filesystemfilter.cpp
@@ -29,6 +29,7 @@
 
 #include "filesystemfilter.h"
 #include "quickopentoolwindow.h"
+#include <coreplugin/editormanager/ieditor.h>
 
 #include <QtCore/QDir>
 
diff --git a/src/plugins/quickopen/quickopenmanager.h b/src/plugins/quickopen/quickopenmanager.h
index ae50ddd9ca..e4b0d8ab00 100644
--- a/src/plugins/quickopen/quickopenmanager.h
+++ b/src/plugins/quickopen/quickopenmanager.h
@@ -33,7 +33,6 @@
 #include "quickopen_global.h"
 
 #include <QtCore/QObject>
-#include <QtCore/QString>
 
 namespace QuickOpen {
 
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index 85a705d85b..c0e7996fef 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -33,12 +33,17 @@
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <find/textfindconstants.h>
+#include <find/searchresultwindow.h>
 #include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 #include <utils/stylehelper.h>
 
 #include <QtCore/QDebug>
 #include <QtCore/QDirIterator>
+#include <QtCore/QSettings>
+#include <QtGui/QLabel>
+#include <QtGui/QComboBox>
+#include <QtGui/QCheckBox>
 #include <QtGui/QPushButton>
 #include <QtGui/QFileDialog>
 
diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h
index 4068412b8d..64c45580c4 100644
--- a/src/plugins/texteditor/basefilefind.h
+++ b/src/plugins/texteditor/basefilefind.h
@@ -33,15 +33,23 @@
 #include "texteditor_global.h"
 
 #include <find/ifindfilter.h>
-#include <find/searchresultwindow.h>
 #include <utils/filesearch.h>
 
 #include <QtCore/QFutureWatcher>
 #include <QtCore/QPointer>
-#include <QtGui/QLabel>
-#include <QtGui/QComboBox>
+
 #include <QtGui/QStringListModel>
-#include <QtGui/QCheckBox>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QComboBox;
+class QCheckBox;
+class QStringListModel;
+QT_END_NAMESPACE
+
+namespace Find {
+class SearchResultWindow;
+}
 
 namespace TextEditor {
 
diff --git a/src/plugins/texteditor/basetextdocument.h b/src/plugins/texteditor/basetextdocument.h
index eaf37c91ca..cadd9d0a53 100644
--- a/src/plugins/texteditor/basetextdocument.h
+++ b/src/plugins/texteditor/basetextdocument.h
@@ -35,13 +35,14 @@
 #include "itexteditor.h"
 #include "tabsettings.h"
 
+#include <coreplugin/ifile.h>
+
 QT_BEGIN_NAMESPACE
 class QTextCursor;
 class QTextDocument;
 class QSyntaxHighlighter;
 QT_END_NAMESPACE
 
-
 namespace TextEditor {
 
 class DocumentMarker : public ITextMarkable
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index c388175230..90ce04e5d7 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -56,6 +56,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QDebug>
 #include <QtCore/QTimer>
+#include <QtCore/QTimeLine>
 #include <QtGui/QAbstractTextDocumentLayout>
 #include <QtGui/QApplication>
 #include <QtGui/QKeyEvent>
@@ -77,6 +78,7 @@
 #include <QtGui/QToolTip>
 #include <QtGui/QInputDialog>
 #include <QtGui/QMenu>
+#include <QtGui/QKeyEvent>
 
 using namespace TextEditor;
 using namespace TextEditor::Internal;
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index 462706b5bb..f899072c39 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -37,14 +37,11 @@
 #include <find/ifindsupport.h>
 
 #include <QtGui/QPlainTextEdit>
-#include <QtGui/QLabel>
-#include <QtGui/QKeyEvent>
-#include <QtCore/QTimeLine>
-#include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
-class QLabel;
+class QKeyEvent;
 class QToolBar;
+class QTimeLine;
 QT_END_NAMESPACE
 
 namespace Core {
diff --git a/src/plugins/texteditor/basetextmark.h b/src/plugins/texteditor/basetextmark.h
index 1b0d49741a..89f7daabb1 100644
--- a/src/plugins/texteditor/basetextmark.h
+++ b/src/plugins/texteditor/basetextmark.h
@@ -31,6 +31,7 @@
 #define BASETEXTMARK_H
 
 #include "itexteditor.h"
+#include <QtGui/QIcon>
 
 namespace TextEditor {
 
diff --git a/src/plugins/texteditor/colorscheme.h b/src/plugins/texteditor/colorscheme.h
index 44566e8ac8..7ccd9f70fd 100644
--- a/src/plugins/texteditor/colorscheme.h
+++ b/src/plugins/texteditor/colorscheme.h
@@ -35,7 +35,6 @@
 #include <QtCore/QMap>
 #include <QtCore/QString>
 #include <QtGui/QColor>
-#include <QtGui/QTextCharFormat>
 
 namespace TextEditor {
 
diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp
index 1cdf9fce17..269d0ffd82 100644
--- a/src/plugins/texteditor/findincurrentfile.cpp
+++ b/src/plugins/texteditor/findincurrentfile.cpp
@@ -32,7 +32,8 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
 
-#include <QtDebug>
+#include <QtCore/QtDebug>
+#include <QtCore/QSettings>
 #include <QtCore/QDirIterator>
 #include <QtGui/QPushButton>
 #include <QtGui/QFileDialog>
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index ed4d65c104..8875b57383 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -29,7 +29,8 @@
 
 #include "findinfiles.h"
 
-#include <QtDebug>
+#include <QtCore/QtDebug>
+#include <QtCore/QSettings>
 #include <QtCore/QDirIterator>
 #include <QtGui/QPushButton>
 #include <QtGui/QFileDialog>
diff --git a/src/plugins/texteditor/fontsettings.h b/src/plugins/texteditor/fontsettings.h
index c401d52e6b..38ffa2d66e 100644
--- a/src/plugins/texteditor/fontsettings.h
+++ b/src/plugins/texteditor/fontsettings.h
@@ -38,11 +38,12 @@
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtCore/QVector>
-#include <QtGui/QColor>
+#include <QtGui/QFont>
 
 QT_BEGIN_NAMESPACE
 class QTextCharFormat;
 class QSettings;
+
 QT_END_NAMESPACE
 
 namespace TextEditor {
diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h
index a51cd2de3e..e2095a3fce 100644
--- a/src/plugins/texteditor/fontsettingspage.h
+++ b/src/plugins/texteditor/fontsettingspage.h
@@ -36,13 +36,11 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include <QtGui/QColor>
-#include <QtGui/QTextCharFormat>
 #include <QtCore/QString>
-#include <QtCore/QVector>
 
 QT_BEGIN_NAMESPACE
 class QWidget;
+class QColor;
 QT_END_NAMESPACE
 
 namespace TextEditor {
diff --git a/src/plugins/texteditor/icompletioncollector.h b/src/plugins/texteditor/icompletioncollector.h
index 94ecc7ae72..18cba3e619 100644
--- a/src/plugins/texteditor/icompletioncollector.h
+++ b/src/plugins/texteditor/icompletioncollector.h
@@ -35,7 +35,6 @@
 #include <QtCore/QObject>
 #include <QtCore/QVariant>
 #include <QtGui/QIcon>
-#include <QtGui/QKeyEvent>
 
 namespace TextEditor {
 
diff --git a/src/plugins/texteditor/itexteditor.h b/src/plugins/texteditor/itexteditor.h
index 0f4886949b..4750fcf3d3 100644
--- a/src/plugins/texteditor/itexteditor.h
+++ b/src/plugins/texteditor/itexteditor.h
@@ -37,12 +37,13 @@
 #include <QtCore/QObject>
 #include <QtCore/QList>
 #include <QtCore/QMap>
-#include <QtGui/QColor>
-#include <QtGui/QIcon>
 
 QT_BEGIN_NAMESPACE
 class QMenu;
 class QTextBlock;
+class QIcon;
+class QRect;
+class QPoint;
 QT_END_NAMESPACE
 
 namespace TextEditor {
diff --git a/src/plugins/vcsbase/vcsbaseoutputwindow.h b/src/plugins/vcsbase/vcsbaseoutputwindow.h
index d0bfaf3013..b7baf202f7 100644
--- a/src/plugins/vcsbase/vcsbaseoutputwindow.h
+++ b/src/plugins/vcsbase/vcsbaseoutputwindow.h
@@ -50,7 +50,7 @@ public:
     virtual ~VCSBaseOutputWindow();
 
     virtual QWidget *outputWidget(QWidget *parent);
-    virtual QWidgetList toolBarWidgets() const;
+    virtual QList<QWidget*> toolBarWidgets() const;
     virtual QString name() const;
 
     virtual int priorityInStatusBar() const;
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 2951ba1d58..93cbf344ff 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -66,6 +66,7 @@
 #include <QtGui/QMainWindow>
 #include <QtGui/QCompleter>
 #include <QtGui/QLineEdit>
+#include <QtGui/QTextEdit>
 
 enum { debug = 0 };
 enum { wantToolBar = 0 };
diff --git a/src/plugins/welcome/welcomemode.h b/src/plugins/welcome/welcomemode.h
index c53b3a0d32..eee3f687bf 100644
--- a/src/plugins/welcome/welcomemode.h
+++ b/src/plugins/welcome/welcomemode.h
@@ -34,8 +34,6 @@
 
 #include <coreplugin/imode.h>
 
-#include <QtCore/QObject>
-#include <QtCore/QPair>
 
 QT_BEGIN_NAMESPACE
 class QWidget;