Exported header cleanup.

src/libs/cplusplus/BackwardsScanner.h

@@ -35,9 +35,10 @@
 
 #include "SimpleLexer.h"
 
-#include <QtGui/QTextCursor>
 #include <QtGui/QTextBlock>
 
+QT_FORWARD_DECLARE_CLASS(QTextCursor)
+
 namespace CPlusPlus {
 
 class CPLUSPLUS_EXPORT BackwardsScanner

src/libs/cplusplus/ExpressionUnderCursor.h

@@ -35,7 +35,7 @@
 #define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
 
 #include "CPlusPlusForwardDeclarations.h"
-#include <QList>
+#include <QtCore/QList>
 
 QT_BEGIN_NAMESPACE
 class QString;

src/libs/cplusplus/Icons.h

@@ -36,7 +36,7 @@
 
 #include "CPlusPlusForwardDeclarations.h"
 
-#include <QIcon>
+#include <QtGui/QIcon>
 
 namespace CPlusPlus {
 

src/libs/cplusplus/Macro.h

@@ -55,9 +55,9 @@
 
 #include <CPlusPlusForwardDeclarations.h>
 
-#include <QByteArray>
-#include <QVector>
-#include <QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QVector>
+#include <QtCore/QString>
 
 namespace CPlusPlus {
 

src/libs/cplusplus/MatchingText.cpp

@@ -36,6 +36,9 @@
 #include <Token.h>
 
 #include <QtGui/QTextDocument>
+#include <QtGui/QTextCursor>
+
+#include <QtCore/QChar>
 #include <QtCore/QtDebug>
 
 using namespace CPlusPlus;

src/libs/cplusplus/MatchingText.h

@@ -34,7 +34,9 @@
 #define CPLUSPLUS_MATCHINGTEXT_H
 
 #include <CPlusPlusForwardDeclarations.h>
-#include <QtGui/QTextCursor>
+
+QT_FORWARD_DECLARE_CLASS(QTextCursor)
+QT_FORWARD_DECLARE_CLASS(QChar)
 
 namespace CPlusPlus {
 

src/libs/cplusplus/NamePrettyPrinter.h

@@ -35,7 +35,7 @@
 #define CPLUSPLUS_NAMEPRETTYPRINTER_H
 
 #include <NameVisitor.h>
-#include <QString>
+#include <QtCore/QString>
 
 namespace CPlusPlus {
 

src/libs/cplusplus/Overview.h

@@ -35,7 +35,9 @@
 #define CPLUSPLUS_OVERVIEW_H
 
 #include <CPlusPlusForwardDeclarations.h>
-#include <QString>
+
+#include <QtCore/QList>
+#include <QtCore/QString>
 
 namespace CPlusPlus {
 

src/libs/cplusplus/OverviewModel.h

@@ -38,8 +38,7 @@
 #include "Overview.h"
 #include "Icons.h"
 
-#include <QAbstractItemModel>
-#include <QIcon>
+#include <QtCore/QAbstractItemModel>
 
 namespace CPlusPlus {
 

src/libs/extensionsystem/pluginmanager.cpp

@@ -39,6 +39,7 @@
 #include "iplugin.h"
 #include "plugincollection.h"
 
+#include <QtCore/QEventLoop>
 #include <QtCore/QDateTime>
 #include <QtCore/QDir>
 #include <QtCore/QMetaProperty>

src/libs/extensionsystem/pluginmanager_p.h

@@ -36,16 +36,15 @@
 
 #include "pluginspec.h"
 
-#include <QtCore/QList>
 #include <QtCore/QSet>
 #include <QtCore/QStringList>
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
-#include <QtCore/QEventLoop>
 
 QT_BEGIN_NAMESPACE
 class QTime;
 class QSettings;
+class QEventLoop;
 QT_END_NAMESPACE
 
 namespace ExtensionSystem {

src/libs/qmleditorwidgets/colorbox.h

@@ -36,8 +36,7 @@
 
 #include <qmleditorwidgets_global.h>
 #include <QtGui/QWidget>
-#include <QToolButton>
-#include <qdeclarative.h>
+#include <QtDeclarative/qdeclarative.h>
 
 namespace QmlEditorWidgets {
 

src/libs/qmleditorwidgets/colorbutton.h

@@ -35,9 +35,8 @@
 #define COLORBUTTON_H
 
 #include <qmleditorwidgets_global.h>
-#include <QtGui/QWidget>
-#include <QToolButton>
-#include <qdeclarative.h>
+#include <QtGui/QToolButton>
+#include <QtDeclarative/qdeclarative.h>
 
 namespace QmlEditorWidgets {
 

src/libs/qmleditorwidgets/colorwidgets.h

@@ -35,16 +35,6 @@
 #define COLORWIDGET_H
 
 #include <qmleditorwidgets_global.h>
-#include <QWeakPointer>
-#include <QtGui/QWidget>
-#include <QLabel>
-#include <QToolButton>
-#include <QMouseEvent>
-
-
-QT_BEGIN_NAMESPACE
-class QToolButton;
-QT_END_NAMESPACE
 
 namespace QmlEditorWidgets {
 
@@ -52,11 +42,8 @@ class QMLEDITORWIDGETS_EXPORT ColorWidgets {
 
 public:
     static void registerDeclarativeTypes();
-
-
 };
 
-
-} //QmlDesigner
+} // namespace QmlEditorWidgets
 
 #endif //COLORWIDGET_H

src/libs/qmleditorwidgets/contextpanetextwidget.cpp

@@ -36,8 +36,8 @@
 #include "customcolordialog.h"
 #include "ui_contextpanetext.h"
 #include <qmljs/qmljspropertyreader.h>
-#include <QTimerEvent>
-
+#include <QtCore/QTimerEvent>
+#include <QtCore/QVariant>
 namespace QmlEditorWidgets {
 
 ContextPaneTextWidget::ContextPaneTextWidget(QWidget *parent) :

src/libs/qmleditorwidgets/contextpanetextwidget.h

@@ -35,10 +35,10 @@
 #define CONTEXTPANETEXTWIDGET_H
 
 #include <qmleditorwidgets_global.h>
-#include <QWidget>
-#include <QVariant>
+#include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
+class QVariant;
 namespace Ui {
     class ContextPaneTextWidget;
 }

src/libs/qmleditorwidgets/contextpanewidget.cpp

@@ -32,17 +32,19 @@
 **************************************************************************/
 
 #include "contextpanewidget.h"
-#include <QFontComboBox>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QToolButton>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QMouseEvent>
-#include <QGridLayout>
-#include <QToolButton>
-#include <QAction>
+#include <QtGui/QToolButton>
+#include <QtGui/QFontComboBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QSpinBox>
+#include <QtGui/QToolButton>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QGridLayout>
+#include <QtGui/QToolButton>
+#include <QtGui/QGraphicsEffect>
+#include <QtGui/QAction>
 #include "contextpanetextwidget.h"
 #include "easingcontextpane.h"
 #include "contextpanewidgetimage.h"

src/libs/qmleditorwidgets/contextpanewidget.h

@@ -35,11 +35,15 @@
 #define CONTEXTPANEWIDGET_H
 
 #include <qmleditorwidgets_global.h>
-#include <QFrame>
-#include <QVariant>
-#include <QGraphicsEffect>
-#include <QWeakPointer>
-#include <QToolButton>
+#include <QtGui/QFrame>
+#include <QtCore/QWeakPointer>
+
+QT_BEGIN_NAMESPACE
+class QToolButton;
+class QVariant;
+class QGraphicsDropShadowEffect;
+class QGraphicsOpacityEffect;
+QT_END_NAMESPACE
 
 namespace QmlJS {
     class PropertyReader;

src/libs/qmleditorwidgets/contextpanewidgetimage.cpp

@@ -35,16 +35,17 @@
 #include "ui_contextpanewidgetimage.h"
 #include "ui_contextpanewidgetborderimage.h"
 #include <qmljs/qmljspropertyreader.h>
-#include <QFile>
-#include <QFileInfo>
-#include <QDir>
-#include <QPixmap>
-#include <QPainter>
-#include <QGraphicsEffect>
-#include <QMouseEvent>
-#include <QScrollArea>
-#include <QSlider>
-#include <QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
+#include <QtGui/QGraphicsEffect>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QScrollArea>
+#include <QtGui/QSlider>
+#include <QtGui/QToolButton>
+#include <QtCore/QDebug>
 
 namespace QmlEditorWidgets {
 

src/libs/qmleditorwidgets/contextpanewidgetimage.h

@@ -35,11 +35,9 @@
 #define CONTEXTPANEWIDGETIMAGE_H
 
 #include <qmleditorwidgets_global.h>
-#include <QWidget>
-#include <QFrame>
-#include <QLabel>
-#include <qdrawutil.h>
+#include <QtGui/QLabel>
 #include <contextpanewidget.h>
+#include <qdrawutil.h>
 
 QT_BEGIN_NAMESPACE
 namespace Ui {

src/libs/qmleditorwidgets/contextpanewidgetrectangle.h

@@ -35,7 +35,7 @@
 #define CONTEXTPANEWIDGETRECTANGLE_H
 
 #include <qmleditorwidgets_global.h>
-#include <QWidget>
+#include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
 namespace Ui {

src/libs/qmleditorwidgets/customcolordialog.h

@@ -35,8 +35,7 @@
 #define CUSTOMCOLORDIALOG_H
 
 #include <qmleditorwidgets_global.h>
-#include <QFrame>
-#include <QDialog>
+#include <QtGui/QFrame>
 
 QT_BEGIN_NAMESPACE
 class QDoubleSpinBox;

src/libs/qmleditorwidgets/filewidget.cpp

@@ -32,12 +32,17 @@
 **************************************************************************/
 
 #include "filewidget.h"
-#include <QHBoxLayout>
-#include <QFont>
-#include <QFileDialog>
-#include <QDirIterator>
-#include <QDebug>
 
+#include <QtGui/QLabel>
+#include <QtGui/QToolButton>
+#include <QtGui/QLineEdit>
+#include <QtGui/QComboBox>
+
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QFont>
+#include <QtGui/QFileDialog>
+#include <QtCore/QDirIterator>
+#include <QtCore/QDebug>
 
 namespace QmlEditorWidgets {
 

src/libs/qmleditorwidgets/filewidget.h

@@ -36,12 +36,17 @@
 #define FILEWIDGET_H
 
 #include <qmleditorwidgets_global.h>
+
 #include <QtGui/QWidget>
-#include <QLabel>
-#include <QToolButton>
-#include <QLineEdit>
-#include <QComboBox>
-#include <QUrl>
+
+#include <QtCore/QUrl>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QToolButton;
+class QLineEdit;
+class QComboBox;
+QT_END_NAMESPACE
 
 namespace QmlEditorWidgets {
 

src/libs/qmleditorwidgets/fontsizespinbox.h

@@ -35,7 +35,7 @@
 #define FONTSIZESPINBOX_H
 
 #include <qmleditorwidgets_global.h>
-#include <QAbstractSpinBox>
+#include <QtGui/QAbstractSpinBox>
 
 namespace QmlEditorWidgets {
 

src/libs/qmleditorwidgets/gradientline.h

@@ -36,8 +36,7 @@
 
 #include <qmleditorwidgets_global.h>
 #include <QtGui/QWidget>
-#include <QToolButton>
-#include <QLinearGradient>
+#include <QtGui/QLinearGradient>
 
 namespace QmlEditorWidgets {
 

src/libs/qmleditorwidgets/huecontrol.h

@@ -36,8 +36,7 @@
 
 #include <qmleditorwidgets_global.h>
 #include <QtGui/QWidget>
-#include <QToolButton>
-#include <qdeclarative.h>
+#include <QtDeclarative/qdeclarative.h>
 
 namespace QmlEditorWidgets {
 

src/libs/qmljs/qmljscodeformatter.h

@@ -38,11 +38,9 @@
 
 #include "qmljsscanner.h"
 
-#include <QtCore/QChar>
 #include <QtCore/QStack>
 #include <QtCore/QList>
 #include <QtCore/QVector>
-#include <QtCore/QPointer>
 
 QT_BEGIN_NAMESPACE
 class QTextDocument;

src/libs/qmljs/qmljsicontextpane.h

@@ -34,21 +34,19 @@
 #ifndef QMLJSICONTEXTPANE_H
 #define QMLJSICONTEXTPANE_H
 
-#include <QObject>
+#include <QtCore/QObject>
+
 #include "qmljs_global.h"
+
 #include <qmljs/parser/qmljsastfwd_p.h>
 #include <qmljs/qmljslookupcontext.h>
 
-
 namespace TextEditor {
-
 class BaseTextEditorEditable;
-
 } //TextEditor
 
 namespace QmlJS {
 
-
 class QMLJS_EXPORT IContextPane : public QObject
 {
      Q_OBJECT

src/libs/qmljs/qmljsindenter.cpp

@@ -72,7 +72,8 @@
 #include <qmljs/qmljsindenter.h>
 #include <qmljs/qmljsscanner.h>
 
-#include <QtDebug>
+#include <QtCore/QtDebug>
+#include <QtGui/QTextBlock>
 
 using namespace QmlJS;
 

src/libs/qmljs/qmljsindenter.h

@@ -35,12 +35,11 @@
 #define QMLJSINDENTER_H
 
 #include <qmljs/qmljs_global.h>
-#include <qmljs/qmljsscanner.h>
 #include <qmljs/qmljslineinfo.h>
 
 #include <QtCore/QRegExp>
-#include <QtCore/QStringList>
-#include <QtGui/QTextBlock>
+
+QT_FORWARD_DECLARE_CLASS(QTextBlock)
 
 namespace QmlJS {
 

src/libs/qmljs/qmljslineinfo.h

@@ -38,9 +38,7 @@
 #include <qmljs/qmljsscanner.h>
 
 #include <QtCore/QRegExp>
-#include <QtCore/QStringList>
 #include <QtGui/QTextBlock>
-#include <QtGui/QTextCursor>
 
 namespace QmlJS {
 

src/libs/qmljs/qmljslink.h

@@ -38,9 +38,6 @@
 #include <qmljs/qmljsinterpreter.h>
 #include <qmljs/parser/qmljsastfwd_p.h>
 
-#include <QtCore/QList>
-#include <QtCore/QHash>
-#include <QtCore/QStringList>
 #include <QtCore/QCoreApplication>
 
 namespace QmlJS {

src/libs/qmljs/qmljsmodelmanagerinterface.h

@@ -39,10 +39,9 @@
 
 #include <utils/environment.h>
 
-#include <QObject>
-#include <QStringList>
-#include <QSharedPointer>
-#include <QPointer>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+#include <QtCore/QPointer>
 
 namespace ProjectExplorer {
     class Project;

src/libs/qmljs/qmljspropertyreader.cpp

@@ -36,6 +36,8 @@
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljscheck.h>
 
+#include <QtGui/QLinearGradient>
+
 namespace QmlJS {
 
 using namespace AST;

src/libs/qmljs/qmljspropertyreader.h

@@ -38,12 +38,11 @@
 #include <qmljs/parser/qmljsastfwd_p.h>
 #include <qmljs/qmljsdocument.h>
 
-#include <QHash>
-#include <QList>
-#include <QVariant>
-#include <QString>
-#include <QStringList>
-#include <QLinearGradient>
+#include <QtCore/QHash>
+#include <QtCore/QVariant>
+#include <QtCore/QStringList>
+
+QT_FORWARD_DECLARE_CLASS(QLinearGradient)
 
 namespace QmlJS {
 

src/libs/qmljs/qmljsscanner.h

@@ -36,9 +36,7 @@
 
 #include <qmljs/qmljs_global.h>
 
-#include <QtCore/QList>
-#include <QtCore/QSet>
-#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 namespace QmlJS {
 

src/libs/utils/annotateditemdelegate.h

@@ -37,7 +37,6 @@
 #include "utils_global.h"
 
 #include <QtCore/QString>
-#include <QtCore/QSize>
 #include <QtGui/QStyledItemDelegate>
 
 namespace Utils {

src/libs/utils/buildablehelperlibrary.h

@@ -3,7 +3,7 @@
 
 #include "utils_global.h"
 
-#include <QString>
+#include <QtCore/QString>
 
 QT_FORWARD_DECLARE_CLASS(QFileInfo)
 

src/libs/utils/changeset.cpp

@@ -41,6 +41,8 @@
 
 #include "changeset.h"
 
+#include <QtGui/QTextCursor>
+
 namespace Utils {
 
 ChangeSet::ChangeSet()

src/libs/utils/changeset.h

@@ -46,8 +46,8 @@
 
 #include <QtCore/QString>
 #include <QtCore/QList>
-#include <QtCore/QSharedPointer>
-#include <QtGui/QTextCursor>
+
+QT_FORWARD_DECLARE_CLASS(QTextCursor)
 
 namespace Utils {
 

src/libs/utils/wizard.cpp

@@ -32,13 +32,15 @@
 **************************************************************************/
 
 #include "wizard.h"
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QMap>
-#include <QHash>
-#include <QVariant>
-#include <QStyle>
+
+#include <QtCore/QMap>
+#include <QtCore/QHash>
+#include <QtCore/QVariant>
+
+#include <QtGui/QLabel>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QStyle>
 
 namespace Utils {
 

src/libs/utils/wizard.h

@@ -34,8 +34,6 @@
 #ifndef WIZARD_H
 #define WIZARD_H
 
-#include <QWizard>
-
 #include "utils_global.h"
 
 #include <QtGui/QWizard>
@@ -65,7 +63,7 @@ public:
 
 signals:
     void nextClicked(); /* workaround for QWizard behavior where page->initialize is
-                           called before currentIdChanged */
+                         * called before currentIdChanged */
 
 private slots:
     void _q_currentPageChanged(int pageId);

src/plugins/cppeditor/cppquickfix.cpp

@@ -50,6 +50,7 @@
 #include <cpptools/cpprefactoringchanges.h>
 
 #include <QtGui/QTextBlock>
+#include <QtCore/QFileInfo>
 
 using namespace CppEditor;
 using namespace CppEditor::Internal;

src/plugins/cppeditor/cppquickfixes.cpp

@@ -61,6 +61,7 @@
 #include <cpptools/insertionpointlocator.h>
 #include <extensionsystem/iplugin.h>
 
+#include <QtCore/QFileInfo>
 #include <QtGui/QApplication>
 #include <QtGui/QTextBlock>
 #include <QtGui/QTextCursor>

src/plugins/cpptools/uicodecompletionsupport.cpp

@@ -32,7 +32,10 @@
 **************************************************************************/
 
 #include "uicodecompletionsupport.h"
+
 #include <QtCore/QProcess>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
 
 enum { debug = 0 };
 

src/plugins/cvs/cvseditor.cpp

@@ -42,6 +42,7 @@
 
 #include <QtCore/QDebug>
 #include <QtGui/QTextCursor>
+#include <QtGui/QTextBlock>
 
 namespace CVS {
 namespace Internal {

src/plugins/find/findplugin.cpp

@@ -373,6 +373,11 @@ QStringListModel *FindPlugin::replaceCompletionModel() const
     return d->m_replaceCompletionModel;
 }
 
+QKeySequence IFindFilter::defaultShortcut() const
+{
+    return QKeySequence();
+}
+
 } // namespace Find
 
 // declared in textfindconstants.h

src/plugins/find/ifindfilter.h

@@ -37,12 +37,10 @@
 #include "find_global.h"
 #include "textfindconstants.h"
 
-#include <QtGui/QTextDocument>
-#include <QtGui/QKeySequence>
-
 QT_BEGIN_NAMESPACE
 class QWidget;
 class QSettings;
+class QKeySequence;
 QT_END_NAMESPACE
 
 namespace Find {
@@ -60,7 +58,7 @@ public:
     virtual bool isEnabled() const = 0;
     virtual bool canCancel() const = 0;
     virtual void cancel() = 0;
-    virtual QKeySequence defaultShortcut() const { return QKeySequence(); }
+    virtual QKeySequence defaultShortcut() const;
     virtual bool isReplaceSupported() const { return false; }
     virtual FindFlags supportedFindFlags() const;
 

src/plugins/find/ifindsupport.h

@@ -39,7 +39,6 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include <QtGui/QTextDocument>
 
 namespace Find {
 

src/plugins/git/giteditor.cpp

@@ -53,6 +53,7 @@
 
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextEdit>
+#include <QtGui/QTextBlock>
 
 #define CHANGE_PATTERN_8C "[a-f0-9]{7,8}"
 #define CHANGE_PATTERN_40C "[a-f0-9]{40,40}"

src/plugins/locator/ilocatorfilter.h

@@ -36,7 +36,6 @@
 
 #include "locator_global.h"
 
-#include <QtCore/QDir>
 #include <QtCore/QVariant>
 #include <QtCore/QFutureInterface>
 #include <QtGui/QIcon>

src/plugins/locator/opendocumentsfilter.cpp

@@ -36,6 +36,9 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+
 using namespace Core;
 using namespace Locator;
 using namespace Locator::Internal;

src/plugins/macros/actionmacrohandler.cpp

@@ -44,18 +44,18 @@
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/icontext.h>
 
-#include <QObject>
-#include <QEvent>
-#include <QAction>
-#include <QSignalMapper>
-#include <QShortcut>
-#include <QtAlgorithms>
-#include <QStringList>
+#include <QtCore/QObject>
+#include <QtCore/QEvent>
+#include <QtCore/QSignalMapper>
+#include <QtCore/QtAlgorithms>
+#include <QtCore/QStringList>
+
+#include <QtGui/QAction>
+#include <QtGui/QShortcut>
 
 using namespace Macros;
 using namespace Macros::Internal;
 
-
 static const char EVENTNAME[] = "Action";
 static quint8 ACTIONNAME = 0;
 

src/plugins/macros/imacrohandler.h

@@ -35,7 +35,7 @@
 #define MACROSPLUGIN_IMACROHANDLER_H
 
 #include "macros_global.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace Macros {
 

src/plugins/macros/macro.cpp

@@ -35,7 +35,8 @@
 
 #include <coreplugin/coreconstants.h>
 
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDataStream>
 
 using namespace Macros;
 

src/plugins/macros/macro.h

@@ -34,11 +34,11 @@
 #ifndef MACROSPLUGIN_MACRO_H
 #define MACROSPLUGIN_MACRO_H
 
-#include <QList>
-#include <QString>
-
-#include "macroevent.h"
 #include "macros_global.h"
+#include "macroevent.h"
+
+#include <QtCore/QList>
+#include <QtCore/QString>
 
 namespace Macros {
 

src/plugins/macros/macroevent.cpp

@@ -33,6 +33,10 @@
 
 #include "macroevent.h"
 
+#include <QtCore/QString>
+#include <QtCore/QVariant>
+#include <QtCore/QDataStream>
+
 using namespace Macros;
 
 /*!

src/plugins/macros/macroevent.h

@@ -36,9 +36,13 @@
 
 #include "macros_global.h"
 
-#include <QString>
-#include <QVariant>
-#include <QDataStream>
+#include <QtCore/QMap>
+
+QT_BEGIN_NAMESPACE
+class QByteArray;
+class QVariant;
+class QDataStream;
+QT_END_NAMESPACE
 
 namespace Macros {
 

src/plugins/macros/macrolocatorfilter.cpp

@@ -39,15 +39,15 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
-#include <QPixmap>
+#include <QtGui/QPixmap>
 
 using namespace Macros;
 using namespace Macros::Internal;
 
 MacroLocatorFilter::MacroLocatorFilter():
-    m_icon(QPixmap(":/macros/images/macro.png"))
+    m_icon(QPixmap(QLatin1String(":/macros/images/macro.png")))
 {
-    setShortcutString("rm");
+    setShortcutString(QLatin1String("rm"));
 }
 
 MacroLocatorFilter::~MacroLocatorFilter()

src/plugins/macros/macrolocatorfilter.h

@@ -36,7 +36,7 @@
 
 #include <locator/ilocatorfilter.h>
 
-#include <QIcon>
+#include <QtGui/QIcon>
 
 namespace Macros {
 
@@ -61,7 +61,7 @@ public:
     void refresh(QFutureInterface<void> &future);
 
 private:
-    QIcon m_icon;
+    const QIcon m_icon;
 };
 
 } // namespace Internal

src/plugins/macros/macromanager.cpp

@@ -54,18 +54,19 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QShortcut>
-#include <QKeySequence>
-#include <QMainWindow>
-#include <QSettings>
-#include <QAction>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QSignalMapper>
-#include <QList>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QSettings>
+#include <QtCore/QSignalMapper>
+#include <QtCore/QList>
+
+#include <QtGui/QShortcut>
+#include <QtGui/QKeySequence>
+#include <QtGui/QMainWindow>
+#include <QtGui/QAction>
+#include <QtGui/QFileDialog>
+#include <QtGui/QMessageBox>
 
 using namespace Macros;
 using namespace Macros::Internal;

src/plugins/macros/macrooptionspage.cpp

@@ -39,9 +39,9 @@
 
 #include <texteditor/texteditorconstants.h>
 
-#include <QCoreApplication>
-#include <QWidget>
-#include <QIcon>
+#include <QtCore/QCoreApplication>
+#include <QtGui/QWidget>
+#include <QtGui/QIcon>
 
 using namespace Macros;
 using namespace Macros::Internal;

src/plugins/macros/macrooptionswidget.cpp

@@ -44,16 +44,17 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/uniqueidmanager.h>
 
-#include <QButtonGroup>
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QCheckBox>
-#include <QDir>
-#include <QGroupBox>
-#include <QHeaderView>
-#include <QFileInfo>
-#include <QRegExpValidator>
-#include <QLineEdit>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+
+#include <QtGui/QButtonGroup>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QTreeWidgetItem>
+#include <QtGui/QCheckBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHeaderView>
+#include <QtGui/QRegExpValidator>
+#include <QtGui/QLineEdit>
 
 namespace {
     int DIRECTORY = 1;

src/plugins/macros/macrooptionswidget.h

@@ -34,10 +34,10 @@
 #ifndef MACROSPLUGIN_MACROOPTIONSWIDGET_H
 #define MACROSPLUGIN_MACROOPTIONSWIDGET_H
 
-#include <QWidget>
-#include <QPixmap>
-#include <QMap>
-#include <QStringList>
+#include <QtGui/QWidget>
+
+#include <QtCore/QStringList>
+#include <QtCore/QMap>
 
 QT_BEGIN_NAMESPACE
 class QTreeWidgetItem;

src/plugins/macros/macrosettings.cpp

@@ -33,7 +33,7 @@
 
 #include "macrosettings.h"
 
-#include <QSettings>
+#include <QtCore/QSettings>
 
 using namespace Macros::Internal;
 

src/plugins/macros/macrosplugin.cpp

@@ -48,16 +48,15 @@
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/icontext.h>
 
-#include <QtPlugin>
-#include <QAction>
-#include <QKeySequence>
-#include <QSettings>
-#include <QMenu>
+#include <QtCore/QtPlugin>
+#include <QtCore/QSettings>
+#include <QtGui/QAction>
+#include <QtGui/QKeySequence>
+#include <QtGui/QMenu>
 
 using namespace Macros;
 using namespace Macros::Internal;
 
-
 MacrosPlugin::MacrosPlugin()
 {
 }

src/plugins/macros/macrotextfind.h

@@ -36,7 +36,7 @@
 
 #include <find/ifindsupport.h>
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 namespace Macros {
 namespace Internal {

src/plugins/macros/savedialog.cpp

@@ -34,9 +34,9 @@
 #include "savedialog.h"
 #include "ui_savedialog.h"
 
-#include <QLineEdit>
-#include <QCheckBox>
-#include <QRegExpValidator>
+#include <QtGui/QLineEdit>
+#include <QtGui/QCheckBox>
+#include <QtGui/QRegExpValidator>
 
 using namespace Macros::Internal;
 

src/plugins/macros/savedialog.h

@@ -34,7 +34,7 @@
 #ifndef MACROSPLUGIN_SAVEDIALOG_H
 #define MACROSPLUGIN_SAVEDIALOG_H
 
-#include <QDialog>
+#include <QtGui/QDialog>
 
 namespace Macros {
 namespace Internal {

src/plugins/perforce/perforceeditor.cpp

@@ -54,6 +54,7 @@
 #include <QtGui/QMenu>
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextEdit>
+#include <QtGui/QTextBlock>
 
 namespace Perforce {
 namespace Internal {

src/plugins/projectexplorer/buildconfiguration.h

@@ -147,7 +147,4 @@ signals:
 
 Q_DECLARE_METATYPE(ProjectExplorer::BuildConfiguration *)
 
-// Default directory to run custom (build) commands in.
-#define DEFAULT_WORKING_DIR "%{buildDir}"
-
 #endif // BUILDCONFIGURATION_H

src/plugins/projectexplorer/customexecutablerunconfiguration.cpp

@@ -34,11 +34,12 @@
 #include "customexecutablerunconfiguration.h"
 #include "customexecutableconfigurationwidget.h"
 #include "toolchaintype.h"
+#include "buildconfiguration.h"
+#include "debugginghelper.h"
+#include "target.h"
+#include "projectexplorerconstants.h"
 
 #include <coreplugin/icore.h>
-#include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/debugginghelper.h>
-#include <projectexplorer/target.h>
 
 #include <utils/qtcprocess.h>
 
@@ -81,10 +82,10 @@ void CustomExecutableRunConfiguration::ctor()
 
 CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *parent) :
     LocalApplicationRunConfiguration(parent, QLatin1String(CUSTOM_EXECUTABLE_ID)),
+    m_workingDirectory(QLatin1String(ProjectExplorer::Constants::DEFAULT_WORKING_DIR)),
     m_runMode(Gui),
     m_baseEnvironmentBase(CustomExecutableRunConfiguration::BuildEnvironmentBase)
 {
-    m_workingDirectory = QLatin1String(DEFAULT_WORKING_DIR);
     ctor();
 }
 

src/plugins/projectexplorer/debugginghelper.cpp

@@ -34,14 +34,16 @@
 #include "debugginghelper.h"
 
 #include <coreplugin/icore.h>
+
+#include <utils/synchronousprocess.h>
+
 #include <QtCore/QFileInfo>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QHash>
 #include <QtCore/QProcess>
 #include <QtCore/QDir>
 #include <QtCore/QDateTime>
-
-#include <utils/synchronousprocess.h>
+#include <QtCore/QStringList>
 
 #include <QtGui/QDesktopServices>
 

src/plugins/projectexplorer/debugginghelper.h

@@ -39,7 +39,8 @@
 #include <utils/buildablehelperlibrary.h>
 
 #include <QtCore/QString>
-#include <QtCore/QStringList>
+
+QT_FORWARD_DECLARE_CLASS(QStringList)
 
 namespace ProjectExplorer {
 

src/plugins/projectexplorer/deployconfiguration.cpp

@@ -40,6 +40,8 @@
 #include "projectexplorerconstants.h"
 #include "target.h"
 
+#include <QtCore/QStringList>
+
 using namespace ProjectExplorer;
 
 namespace {

src/plugins/projectexplorer/deployconfiguration.h

@@ -40,7 +40,8 @@
 #include "namedwidget.h"
 
 #include <QtCore/QString>
-#include <QtCore/QStringList>
+
+QT_FORWARD_DECLARE_CLASS(QStringList)
 
 namespace ProjectExplorer {
 

src/plugins/projectexplorer/outputformatter.h

@@ -40,7 +40,6 @@
 #include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
-class QMouseEvent;
 class QPlainTextEdit;
 class QTextCharFormat;
 class QColor;

src/plugins/projectexplorer/processstep.cpp

@@ -35,6 +35,7 @@
 #include "buildstep.h"
 #include "project.h"
 #include "buildconfiguration.h"
+#include "projectexplorerconstants.h"
 
 #include <coreplugin/ifile.h>
 #include <utils/qtcprocess.h>
@@ -83,7 +84,7 @@ void ProcessStep::ctor()
     //: Default ProcessStep display name
     setDefaultDisplayName(tr("Custom Process Step"));
     if (m_workingDirectory.isEmpty())
-        m_workingDirectory = QLatin1String(DEFAULT_WORKING_DIR);
+        m_workingDirectory = QLatin1String(ProjectExplorer::Constants::DEFAULT_WORKING_DIR);
 }
 
 ProcessStep::~ProcessStep()
@@ -157,7 +158,7 @@ void ProcessStep::setEnabled(bool enabled)
 void ProcessStep::setWorkingDirectory(const QString &workingDirectory)
 {
     if (workingDirectory.isEmpty())
-        m_workingDirectory = QLatin1String(DEFAULT_WORKING_DIR);
+        m_workingDirectory = QLatin1String(ProjectExplorer::Constants::DEFAULT_WORKING_DIR);
     else
         m_workingDirectory = workingDirectory;
 }

src/plugins/projectexplorer/projectexplorerconstants.h

@@ -225,6 +225,9 @@ const char * const DEFAULT_DEPLOYCONFIGURATION_ID = "ProjectExplorer.DefaultDepl
 // Run Configuration defaults:
 const int QML_DEFAULT_DEBUG_SERVER_PORT = 3768;
 
+// Default directory to run custom (build) commands in.
+const char * const DEFAULT_WORKING_DIR = "%{buildDir}";
+
 } // namespace Constants
 } // namespace ProjectExplorer
 

src/plugins/qmljstools/qmljsmodelmanager.h

@@ -37,14 +37,12 @@
 #include "qmljstools_global.h"
 
 #include <qmljs/qmljsmodelmanagerinterface.h>
-#include <qmljs/qmljsdocument.h>
-#include <cplusplus/CppDocument.h>
+
 #include <cplusplus/ModelManagerInterface.h>
 
-#include <QFuture>
-#include <QFutureSynchronizer>
-#include <QMutex>
-#include <QProcess>
+#include <QtCore/QFuture>
+#include <QtCore/QFutureSynchronizer>
+#include <QtCore/QMutex>
 
 QT_FORWARD_DECLARE_CLASS(QTimer)
 

src/plugins/qmlprojectmanager/qmlproject.h

@@ -34,10 +34,9 @@
 #ifndef QMLPROJECT_H
 #define QMLPROJECT_H
 
-#include "qmlprojectmanager.h"
 #include "qmlprojectmanager_global.h"
 #include "qmlprojectnodes.h"
-#include "qmlprojecttarget.h"
+#include "qmlprojectmanager.h"
 
 #include <projectexplorer/project.h>
 
@@ -58,8 +57,7 @@ class QmlProjectItem;
 namespace Internal {
 
 class QmlProjectFile;
-class QmlProjectNode;
-
+class QmlProjectTarget;
 } // namespace Internal
 
 class QMLPROJECTMANAGER_EXPORT QmlProject : public ProjectExplorer::Project

src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

@@ -38,6 +38,7 @@
 #include "qmlproject.h"
 #include "qmlprojectrunconfigurationfactory.h"
 #include "qmlprojectruncontrol.h"
+#include "qmlprojecttarget.h"
 #include "fileformat/qmlprojectfileformat.h"
 
 #include <extensionsystem/pluginmanager.h>

src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

@@ -34,6 +34,7 @@
 #include "qmlprojectrunconfiguration.h"
 #include "qmlproject.h"
 #include "qmlprojectmanagerconstants.h"
+#include "qmlprojecttarget.h"
 #include "qmlprojectrunconfigurationwidget.h"
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/editormanager/editormanager.h>

src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h

@@ -35,10 +35,10 @@
 #define QMLPROJECTRUNCONFIGURATION_H
 
 #include "qmlprojectmanager_global.h"
+
 #include <projectexplorer/runconfiguration.h>
-#include <QWeakPointer>
-#include <QComboBox>
-#include <QLabel>
+
+#include <QtCore/QWeakPointer>
 
 QT_FORWARD_DECLARE_CLASS(QStringListModel)
 

src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp

@@ -45,10 +45,12 @@
 #include <qt4projectmanager/qt4projectmanagerconstants.h>
 #include <qt4projectmanager/qtversionmanager.h>
 
-#include <QLineEdit>
-#include <QFormLayout>
-#include <QPushButton>
-#include <QStandardItemModel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QComboBox>
+#include <QtGui/QFormLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QStandardItemModel>
 
 using Core::ICore;
 using Utils::DebuggerLanguageChooser;

src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp

@@ -39,7 +39,7 @@
 #include <cpptools/abstracteditorsupport.h>
 
 #include <QtGui/QIcon>
-
+#include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
 
 static const char *mainCppC =

src/plugins/subversion/subversioneditor.cpp

@@ -43,6 +43,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QFileInfo>
 #include <QtGui/QTextCursor>
+#include <QtGui/QTextBlock>
 
 using namespace Subversion;
 using namespace Subversion::Internal;

src/plugins/texteditor/basefilefind.h

@@ -47,8 +47,6 @@
 QT_BEGIN_NAMESPACE
 class QLabel;
 class QComboBox;
-class QCheckBox;
-class QStringListModel;
 QT_END_NAMESPACE
 
 namespace Find {

src/plugins/texteditor/fontsettings.cpp

@@ -42,6 +42,7 @@
 #include <QtCore/QSettings>
 #include <QtCore/QCoreApplication>
 #include <QtGui/QTextCharFormat>
+#include <QtGui/QFont>
 
 static const char *fontFamilyKey = "FontFamily";
 static const char *fontSizeKey = "FontSize";
@@ -242,6 +243,11 @@ void FontSettings::setFontZoom(int zoom)
     m_fontZoom = zoom;
 }
 
+QFont FontSettings::font() const
+{
+    return QFont(family(), fontSize());
+}
+
 /**
  * Returns the configured antialiasing behavior.
  */

src/plugins/texteditor/fontsettings.h

@@ -40,14 +40,12 @@
 
 #include <QtCore/QString>
 #include <QtCore/QList>
-#include <QtCore/QMap>
 #include <QtCore/QVector>
-#include <QtGui/QFont>
 
 QT_BEGIN_NAMESPACE
 class QTextCharFormat;
 class QSettings;
-
+class QFont;
 QT_END_NAMESPACE
 
 namespace TextEditor {
@@ -85,8 +83,7 @@ public:
     int fontZoom() const;
     void setFontZoom(int zoom);
 
-    QFont font() const
-    { return QFont(family(), fontSize()); }
+    QFont font() const;
 
     bool antialias() const;
     void setAntialias(bool antialias);

src/plugins/texteditor/indenter.h

@@ -36,12 +36,13 @@
 
 #include "texteditor_global.h"
 
-#include <QtCore/QChar>
-#include <QtGui/QTextBlock>
+#include <QtCore/QtGlobal>
 
 QT_BEGIN_NAMESPACE
 class QTextDocument;
 class QTextCursor;
+class QTextBlock;
+class QChar;
 QT_END_NAMESPACE
 
 namespace TextEditor {

src/plugins/texteditor/quickfix.h

@@ -37,10 +37,7 @@
 #include "texteditor_global.h"
 #include "icompletioncollector.h"
 
-#include <utils/changeset.h>
-
 #include <QtCore/QSharedPointer>
-#include <QtGui/QTextCursor>
 
 namespace TextEditor {
 

src/plugins/texteditor/refactoringchanges.cpp

@@ -32,6 +32,7 @@
 **************************************************************************/
 
 #include "refactoringchanges.h"
+#include "basetexteditor.h"
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <extensionsystem/pluginmanager.h>
@@ -39,6 +40,8 @@
 #include <QtCore/QFile>
 #include <QtCore/QSet>
 #include <QtGui/QTextBlock>
+#include <QtGui/QTextCursor>
+#include <QtGui/QTextDocument>
 #include <QtCore/QDebug>
 
 using namespace TextEditor;

src/plugins/texteditor/refactoringchanges.h

@@ -35,15 +35,15 @@
 #define REFACTORINGCHANGES_H
 
 #include <utils/changeset.h>
-#include <texteditor/basetexteditor.h>
 #include <texteditor/texteditor_global.h>
 
 #include <QtCore/QList>
-#include <QtCore/QMap>
 #include <QtCore/QString>
 
-namespace TextEditor {
+QT_FORWARD_DECLARE_CLASS(QTextDocument)
 
+namespace TextEditor {
+class BaseTextEditor;
 class RefactoringChanges;
 
 class TEXTEDITOR_EXPORT RefactoringFile

src/plugins/texteditor/syntaxhighlighter.h

@@ -43,9 +43,8 @@
 #define TEXTEDITOR_SYNTAXHIGHLIGHTER_H
 
 #include "texteditor_global.h"
-#include <QtCore/qglobal.h>
-#include <QtCore/qobject.h>
-#include <QtGui/qtextobject.h>
+
+#include <QtCore/QObject>
 #include <QtGui/QTextLayout>
 
 QT_BEGIN_NAMESPACE

src/plugins/vcsbase/baseannotationhighlighter.h

@@ -35,11 +35,8 @@
 #define BASEANNOTATIONHIGHLIGHTER_H
 
 #include "vcsbase_global.h"
+
 #include <texteditor/syntaxhighlighter.h>
-#include <QtCore/QMap>
-#include <QtCore/QSet>
-#include <QtGui/QSyntaxHighlighter>
-#include <QtGui/QTextCharFormat>
 
 namespace VCSBase {
 

src/plugins/vcsbase/diffhighlighter.h

@@ -35,12 +35,12 @@
 #define DIFFHIGHLIGHTER_H
 
 #include "vcsbase_global.h"
+
 #include <texteditor/syntaxhighlighter.h>
-#include <QtGui/QTextCharFormat>
-#include <QtCore/QVector>
 
 QT_BEGIN_NAMESPACE
 class QRegExp;
+class QTextCharFormat;
 QT_END_NAMESPACE
 
 namespace Core {

src/plugins/vcsbase/vcsbaseeditor.cpp

@@ -58,6 +58,7 @@
 #include <QtCore/QSet>
 #include <QtCore/QTextCodec>
 #include <QtCore/QTextStream>
+#include <QtGui/QTextBlock>
 #include <QtGui/QAction>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QLayout>