Purge out include files in exported headers

src/libs/extensionsystem/plugindetailsview.cpp

@@ -29,6 +29,7 @@
 
 #include "plugindetailsview.h"
 #include "ui_plugindetailsview.h"
+#include "pluginspec.h"
 
 #include <QtCore/QDir>
 

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;

src/libs/extensionsystem/pluginerrorview.cpp

@@ -29,6 +29,7 @@
 
 #include "pluginerrorview.h"
 #include "ui_pluginerrorview.h"
+#include "pluginspec.h"
 
 #include <QtCore/QString>
 

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;

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

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;
 

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 {

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)

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

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>

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>

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 {
 

src/plugins/coreplugin/basemode.h

@@ -35,6 +35,7 @@
 
 #include <QtCore/QObject>
 #include <QtGui/QWidget>
+#include <QtGui/QIcon>
 
 namespace Core {
 

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 {
 

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>

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>

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>

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

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

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>