Remove #include <extensionsystem/pluginmanager.h> from icore.h, a

forward declaration is sufficient.

src/plugins/bineditor/bineditorplugin.cpp

@@ -35,12 +35,12 @@
 #include "bineditor.h"
 #include "bineditorconstants.h"
 
+#include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 #include <QtGui/QMenu>
 #include <QtGui/QAction>
 #include <QtGui/QMainWindow>
 #include <QtGui/QHBoxLayout>
-#include <QtCore/QFile>
 
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
@@ -48,6 +48,7 @@
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/fontsettings.h>
 #include <find/ifindsupport.h>

src/plugins/bookmarks/bookmarkmanager.cpp

@@ -37,9 +37,10 @@
 #include "bookmarksplugin.h"
 #include "bookmarks_global.h"
 
-#include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/icore.h>
 #include <coreplugin/uniqueidmanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <texteditor/basetexteditor.h>
 #include <utils/qtcassert.h>

src/plugins/bookmarks/bookmarksplugin.cpp

@@ -35,16 +35,17 @@
 #include "bookmarkmanager.h"
 #include "bookmarks_global.h"
 
-#include <texteditor/texteditorconstants.h>
-#include <texteditor/itexteditor.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <extensionsystem/pluginmanager.h>
+#include <texteditor/itexteditor.h>
+#include <texteditor/texteditorconstants.h>
 
-#include <QtCore/qplugin.h>
+#include <QtCore/QtPlugin>
 #include <QtCore/QDebug>
 
 #include <QtGui/QMenu>

src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp

@@ -39,8 +39,9 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
+#include <extensionsystem/pluginmanager.h>
 
-#include <QtCore/qplugin.h>
+#include <QtCore/QtPlugin>
 #include <QtCore/QDebug>
 
 

src/plugins/coreplugin/basefilewizard.cpp

@@ -38,6 +38,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/ifilewizardextension.h>
+#include <extensionsystem/pluginmanager.h>
 #include <utils/filewizarddialog.h>
 
 #include <QtCore/QDir>

src/plugins/coreplugin/coreplugin.cpp

@@ -39,7 +39,9 @@
 #include "modemanager.h"
 #include "fileiconprovider.h"
 
-#include <QtCore/qplugin.h>
+#include <extensionsystem/pluginmanager.h>
+
+#include <QtCore/QtPlugin>
 #if !defined(QT_NO_WEBKIT)
 #include <QtGui/QApplication>
 #include <QtWebKit/QWebSettings>

src/plugins/coreplugin/dialogs/settingsdialog.cpp

@@ -34,6 +34,8 @@
 #include "settingsdialog.h"
 #include "coreimpl.h"
 
+#include <extensionsystem/pluginmanager.h>
+
 #include <QtGui/QHeaderView>
 #include <QtGui/QPushButton>
 

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -53,6 +53,8 @@
 #include <coreplugin/baseview.h>
 #include <coreplugin/imode.h>
 
+#include <extensionsystem/pluginmanager.h>
+
 #include <utils/qtcassert.h>
 
 #include <QtCore/QDebug>

src/plugins/coreplugin/icore.h

@@ -35,36 +35,36 @@
 #define ICORE_H
 
 #include "core_global.h"
-#include <extensionsystem/pluginmanager.h>
 #include <QtCore/QObject>
-#include <QtCore/QList>
 
 QT_BEGIN_NAMESPACE
-class QSettings;
-class QStatusBar;
-class QFocusEvent;
 class QMainWindow;
 class QPrinter;
+class QSettings;
+template <class T> class QList;
 QT_END_NAMESPACE
 
+namespace ExtensionSystem {
+
+class PluginManager;
+
+} // namespace ExtensionSystem
+
 namespace Core {
 
-// forward declarations
 class ActionManager;
-class IFile;
+class EditorManager;
 class FileManager;
+class IContext;
+class IWizard;
 class MessageManager;
-class IEditor;
-class UniqueIDManager;
-class EditorManager;
+class MimeDatabase;
+class ModeManager;
 class ProgressManager;
 class ScriptManager;
+class UniqueIDManager;
 class VariableManager;
-class IContext;
 class VCSManager;
-class ModeManager;
-class IWizard;
-class MimeDatabase;
 
 class CORE_EXPORT ICore : public QObject
 {

src/plugins/coreplugin/mainwindow.cpp

@@ -70,22 +70,23 @@
 #include "basefilewizard.h"
 
 #include <coreplugin/findplaceholder.h>
+#include <extensionsystem/pluginmanager.h>
 
-#include <QtCore/qplugin.h>
 #include <QtCore/QDebug>
+#include <QtCore/QFileInfo>
 #include <QtCore/QSettings>
 #include <QtCore/QTimer>
-#include <QtCore/QFileInfo>
+#include <QtCore/QtPlugin>
 
-#include <QtGui/QMenu>
-#include <QtGui/QToolBar>
 #include <QtGui/QApplication>
-#include <QtGui/QPixmap>
 #include <QtGui/QCloseEvent>
-#include <QtGui/QShortcut>
+#include <QtGui/QMenu>
+#include <QtGui/QPixmap>
 #include <QtGui/QPrinter>
-#include <QtGui/QWizard>
+#include <QtGui/QShortcut>
 #include <QtGui/QStatusBar>
+#include <QtGui/QToolBar>
+#include <QtGui/QWizard>
 
 /*
 #ifdef Q_OS_UNIX

src/plugins/coreplugin/modemanager.cpp

@@ -46,6 +46,8 @@
 #include <coreplugin/imode.h>
 #include <coreplugin/uniqueidmanager.h>
 
+#include <extensionsystem/pluginmanager.h>
+
 #include <utils/qtcassert.h>
 
 #include <QtCore/QObject>

src/plugins/coreplugin/navigationwidget.cpp

@@ -39,14 +39,16 @@
 #include <coreplugin/modemanager.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <extensionsystem/pluginmanager.h>
+
+#include <QtCore/QDebug>
+#include <QtCore/QSettings>
 
 #include <QtGui/QAction>
 #include <QtGui/QHBoxLayout>
-#include <QtGui/QToolButton>
-#include <QtGui/QToolBar>
 #include <QtGui/QResizeEvent>
-#include <QtCore/QDebug>
-#include <QtCore/QSettings>
+#include <QtGui/QToolBar>
+#include <QtGui/QToolButton>
 
 Q_DECLARE_METATYPE(Core::INavigationWidgetFactory *)
 

src/plugins/coreplugin/outputpane.cpp

@@ -42,12 +42,13 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/editorgroup.h>
 
+#include <extensionsystem/pluginmanager.h>
+
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QComboBox>
 #include <QtGui/QFocusEvent>
 #include <QtGui/QHBoxLayout>
-#include <QtGui/QLineEdit>
 #include <QtGui/QMenu>
 #include <QtGui/QPainter>
 #include <QtGui/QPushButton>

src/plugins/coreplugin/viewmanager.cpp

@@ -41,19 +41,12 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
 #include <aggregation/aggregate.h>
+#include <extensionsystem/pluginmanager.h>
 
 #include <QtCore/QSettings>
-#include <QtGui/QAction>
-#include <QtGui/QActionGroup>
-#include <QtGui/QComboBox>
-#include <QtGui/QDockWidget>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QLabel>
-#include <QtGui/QMenu>
-#include <QtGui/QStackedWidget>
 #include <QtGui/QStatusBar>
-#include <QtGui/QToolButton>
-#include <QtGui/QVBoxLayout>
 
 using namespace Core;
 using namespace Core::Internal;

src/plugins/cpaster/cpasterplugin.cpp

@@ -45,10 +45,11 @@
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <texteditor/itexteditor.h>
 #include <coreplugin/messageoutputwindow.h>
 
-#include <QtCore/qplugin.h>
+#include <QtCore/QtPlugin>
 #include <QtCore/QDebug>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>

src/plugins/cppeditor/cppeditor.cpp

@@ -58,6 +58,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <texteditor/basetextdocument.h>
 #include <texteditor/fontsettings.h>
@@ -65,21 +66,17 @@
 #include <texteditor/textblockiterator.h>
 #include <indenter.h>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
 #include <QtCore/QDebug>
 #include <QtCore/QTime>
 #include <QtCore/QTimer>
 #include <QtGui/QAction>
-#include <QtGui/QKeyEvent>
+#include <QtGui/QHeaderView>
 #include <QtGui/QLayout>
 #include <QtGui/QMenu>
 #include <QtGui/QShortcut>
 #include <QtGui/QTextEdit>
 #include <QtGui/QComboBox>
 #include <QtGui/QTreeView>
-#include <QtGui/QHeaderView>
-#include <QtGui/QStringListModel>
 
 using namespace CPlusPlus;
 using namespace CppEditor::Internal;

src/plugins/cppeditor/cpphoverhandler.cpp

@@ -39,6 +39,7 @@
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <cpptools/cppmodelmanagerinterface.h>
+#include <extensionsystem/pluginmanager.h>
 #include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 #include <debugger/debuggerconstants.h>
@@ -55,11 +56,14 @@
 #include <cplusplus/TypeOfExpression.h>
 #include <cplusplus/SimpleLexer.h>
 
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QSettings>
 #include <QtGui/QToolTip>
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextBlock>
 #include <QtHelp/QHelpEngineCore>
-#include <QtCore/QtCore>
 
 using namespace CppEditor::Internal;
 using namespace CPlusPlus;

src/plugins/cppeditor/cppplugin.cpp

@@ -47,6 +47,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <texteditor/completionsupport.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/storagesettings.h>
@@ -63,7 +64,7 @@ static const char *sourceSuffixKeyC = "CppEditor/SourceSuffix";
 
 using namespace CppEditor::Internal;
 
-///////////////////////////////// CppPluginEditorFactory //////////////////////////////////
+//////////////////////////// CppPluginEditorFactory /////////////////////////////
 
 CppPluginEditorFactory::CppPluginEditorFactory(CppPlugin *owner) :
     m_kind(QLatin1String(CppEditor::Constants::CPPEDITOR_KIND)),

src/plugins/cpptools/cppmodelmanager.cpp

@@ -51,6 +51,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
+#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 
 #include <TranslationUnit.h>
@@ -69,8 +70,6 @@
 #include <QtCore/QMutexLocker>
 #include <QtCore/QTime>
 
-//#include <QtGui/QPlainTextEdit>
-
 using namespace CppTools;
 using namespace CppTools::Internal;
 using namespace CPlusPlus;

src/plugins/cpptools/cpptoolsplugin.cpp

@@ -48,8 +48,9 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <cppeditor/cppeditorconstants.h>
+#include <extensionsystem/pluginmanager.h>
 
-#include <QtCore/qplugin.h>
+#include <QtCore/QtPlugin>
 #include <QtCore/QFileInfo>
 #include <QtCore/QDir>
 #include <QtCore/QDebug>

src/plugins/designer/cpp/formclasswizardpage.cpp

@@ -37,13 +37,14 @@
 
 #include <coreplugin/icore.h>
 #include <cppeditor/cppeditorconstants.h>
+#include <extensionsystem/pluginmanager.h>
 
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QSettings>
 
-#include <QtGui/QMessageBox>
 #include <QtGui/QAbstractButton>
+#include <QtGui/QMessageBox>
 
 static const char *formClassWizardPageGroupC = "FormClassWizardPage";
 static const char *translationKeyC = "RetranslationSupport";

src/plugins/designer/formeditorplugin.cpp

@@ -50,8 +50,9 @@
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
+#include <extensionsystem/pluginmanager.h>
 
-#include <QtCore/qplugin.h>
+#include <QtCore/QtPlugin>
 #include <QtCore/QDebug>
 
 #ifdef CPP_ENABLED

src/plugins/designer/formeditorw.cpp

@@ -43,6 +43,7 @@
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 
 #include <QtDesigner/QDesignerFormEditorPluginInterface>

src/plugins/designer/workbenchintegration.cpp

@@ -48,6 +48,7 @@
 #include <cplusplus/LookupContext.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <texteditor/basetexteditor.h>
 #include <texteditor/itexteditable.h>
 

src/plugins/fakevim/fakevimplugin.cpp

@@ -45,6 +45,7 @@
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/uniqueidmanager.h>
+#include <extensionsystem/pluginmanager.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/session.h>

src/plugins/find/findplugin.cpp

@@ -43,9 +43,11 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 
+#include <extensionsystem/pluginmanager.h>
+
 #include <utils/qtcassert.h>
 
-#include <QtCore/qplugin.h>
+#include <QtCore/QtPlugin>
 #include <QtCore/QSettings>
 
 Q_DECLARE_METATYPE(Find::IFindFilter*)

src/plugins/find/findtoolbar.cpp

@@ -41,16 +41,19 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
 
+#include <extensionsystem/pluginmanager.h>
+
+#include <QtCore/QDebug>
 #include <QtCore/QSettings>
-#include <QtGui/QPushButton>
-#include <QtGui/QMenu>
-#include <QtGui/QToolButton>
-#include <QtGui/QLineEdit>
-#include <QtGui/QKeyEvent>
+
 #include <QtGui/QClipboard>
-#include <QtGui/QPainter>
 #include <QtGui/QCompleter>
-#include <QDebug>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QLineEdit>
+#include <QtGui/QMenu>
+#include <QtGui/QPainter>
+#include <QtGui/QPushButton>
+#include <QtGui/QToolButton>
 
 Q_DECLARE_METATYPE(QStringList)
 Q_DECLARE_METATYPE(Find::IFindFilter*)

src/plugins/git/gitcommand.cpp

@@ -36,6 +36,7 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
+#include <extensionsystem/pluginmanager.h>
 
 #include <QtCore/QDebug>
 #include <QtCore/QProcess>

src/plugins/git/gitplugin.cpp

@@ -49,6 +49,7 @@
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <extensionsystem/pluginmanager.h>
 
 #include <utils/qtcassert.h>
 
@@ -56,11 +57,11 @@
 #include <vcsbase/vcsbaseeditor.h>
 #include <vcsbase/basevcssubmiteditorfactory.h>
 
-#include <QtCore/qplugin.h>
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 #include <QtCore/QTemporaryFile>
+#include <QtCore/QtPlugin>
 
 #include <QtGui/QAction>
 #include <QtGui/QFileDialog>

src/plugins/perforce/perforceplugin.cpp

@@ -51,6 +51,7 @@
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/uniqueidmanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 #include <utils/synchronousprocess.h>
 #include <vcsbase/basevcseditorfactory.h>

src/plugins/projectexplorer/projectexplorer.cpp

@@ -78,25 +78,20 @@
 #include <coreplugin/vcsmanager.h>
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/vcsmanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <utils/listutils.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/qplugin.h>
+#include <QtCore/QtPlugin>
 #include <QtCore/QDateTime>
 #include <QtCore/QDebug>
 #include <QtCore/QSettings>
 
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
-#include <QtGui/QContextMenuEvent>
 #include <QtGui/QFileDialog>
-#include <QtGui/QFileSystemModel>
-#include <QtGui/QHeaderView>
-#include <QtGui/QInputDialog>
-#include <QtGui/QMainWindow>
 #include <QtGui/QMenu>
 #include <QtGui/QMessageBox>
-#include <QtGui/QToolBar>
 
 Q_DECLARE_METATYPE(QSharedPointer<ProjectExplorer::RunConfiguration>);
 Q_DECLARE_METATYPE(Core::IEditorFactory *);

src/plugins/projectexplorer/projectwindow.cpp

@@ -43,6 +43,7 @@
 #include <coreplugin/minisplitter.h>
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/icore.h>
+#include <extensionsystem/pluginmanager.h>
 
 #include <QtCore/QDebug>
 #include <QtGui/QApplication>
@@ -60,8 +61,7 @@ namespace {
 bool debug = false;
 }
 
-ProjectWindow::ProjectWindow(Core::ICore *core,
-                             QWidget *parent) :
+ProjectWindow::ProjectWindow(Core::ICore *core, QWidget *parent) :
     QWidget(parent),
     m_core(core)
 {

src/plugins/projectexplorer/taskwindow.cpp

@@ -38,6 +38,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/uniqueidmanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 #include <projectexplorerconstants.h>

src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp

@@ -38,6 +38,7 @@
 #include "qt4project.h"
 #include "qt4projectmanagerconstants.h"
 
+#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 
 using namespace Qt4ProjectManager;

src/plugins/qt4projectmanager/profileeditor.cpp

@@ -42,15 +42,16 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/uniqueidmanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
 #include <texteditor/texteditorsettings.h>
 
+#include <QtCore/QDebug>
 #include <QtCore/QFileInfo>
-#include <QtGui/QTextEdit>
 #include <QtGui/QHeaderView>
-#include <QtCore/QDebug>
+#include <QtGui/QTextEdit>
 
 using namespace ExtensionSystem;
 using namespace Core;

src/plugins/qt4projectmanager/profileeditorfactory.cpp

@@ -40,6 +40,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <texteditor/texteditoractionhandler.h>
 
 #include <QtCore/QFileInfo>

src/plugins/qt4projectmanager/qt4nodes.cpp

@@ -50,6 +50,7 @@
 
 #include <cpptools/cppmodelmanagerinterface.h>
 #include <cplusplus/CppDocument.h>
+#include <extensionsystem/pluginmanager.h>