Exported header cleanup.

56 files changed, 154 insertions, 125 deletions

diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp
index cac143aae3..5b633d39fb 100644
--- a/src/plugins/cppeditor/cppquickfix.cpp
+++ b/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;
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 5901607458..5549b723f1 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/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>
diff --git a/src/plugins/cpptools/uicodecompletionsupport.cpp b/src/plugins/cpptools/uicodecompletionsupport.cpp
index 129861fde3..829ddbaefb 100644
--- a/src/plugins/cpptools/uicodecompletionsupport.cpp
+++ b/src/plugins/cpptools/uicodecompletionsupport.cpp
@@ -32,7 +32,10 @@
 **************************************************************************/
 
 #include "uicodecompletionsupport.h"
+
 #include <QtCore/QProcess>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
 
 enum { debug = 0 };
 
diff --git a/src/plugins/cvs/cvseditor.cpp b/src/plugins/cvs/cvseditor.cpp
index f119d47437..16f05befa6 100644
--- a/src/plugins/cvs/cvseditor.cpp
+++ b/src/plugins/cvs/cvseditor.cpp
@@ -42,6 +42,7 @@
 
 #include <QtCore/QDebug>
 #include <QtGui/QTextCursor>
+#include <QtGui/QTextBlock>
 
 namespace CVS {
 namespace Internal {
diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp
index 612bb8f3f5..c9ee9d3310 100644
--- a/src/plugins/find/findplugin.cpp
+++ b/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
diff --git a/src/plugins/find/ifindfilter.h b/src/plugins/find/ifindfilter.h
index 6d0f4b7bc9..85faaa5366 100644
--- a/src/plugins/find/ifindfilter.h
+++ b/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;
 
diff --git a/src/plugins/find/ifindsupport.h b/src/plugins/find/ifindsupport.h
index 5ca361a8d3..49cc5df7ed 100644
--- a/src/plugins/find/ifindsupport.h
+++ b/src/plugins/find/ifindsupport.h
@@ -39,7 +39,6 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include <QtGui/QTextDocument>
 
 namespace Find {
 
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index 69221f2204..f9882bd4f8 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/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}"
diff --git a/src/plugins/locator/ilocatorfilter.h b/src/plugins/locator/ilocatorfilter.h
index a581845635..0a8b2b152b 100644
--- a/src/plugins/locator/ilocatorfilter.h
+++ b/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>
diff --git a/src/plugins/locator/opendocumentsfilter.cpp b/src/plugins/locator/opendocumentsfilter.cpp
index 64045ff136..d90bc3f395 100644
--- a/src/plugins/locator/opendocumentsfilter.cpp
+++ b/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;
diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp
index 3f8d8c6b2a..82f1e3de16 100644
--- a/src/plugins/macros/actionmacrohandler.cpp
+++ b/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;
 
diff --git a/src/plugins/macros/imacrohandler.h b/src/plugins/macros/imacrohandler.h
index da84f68e26..409b66c235 100644
--- a/src/plugins/macros/imacrohandler.h
+++ b/src/plugins/macros/imacrohandler.h
@@ -35,7 +35,7 @@
 #define MACROSPLUGIN_IMACROHANDLER_H
 
 #include "macros_global.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 namespace Macros {
 
diff --git a/src/plugins/macros/macro.cpp b/src/plugins/macros/macro.cpp
index e21e9e4ff4..8e132df711 100644
--- a/src/plugins/macros/macro.cpp
+++ b/src/plugins/macros/macro.cpp
@@ -35,7 +35,8 @@
 
 #include <coreplugin/coreconstants.h>
 
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDataStream>
 
 using namespace Macros;
 
diff --git a/src/plugins/macros/macro.h b/src/plugins/macros/macro.h
index 17a951d89c..dc8fa0d9c5 100644
--- a/src/plugins/macros/macro.h
+++ b/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 {
 
diff --git a/src/plugins/macros/macroevent.cpp b/src/plugins/macros/macroevent.cpp
index 67a03ea5be..2ef2b93018 100644
--- a/src/plugins/macros/macroevent.cpp
+++ b/src/plugins/macros/macroevent.cpp
@@ -33,6 +33,10 @@
 
 #include "macroevent.h"
 
+#include <QtCore/QString>
+#include <QtCore/QVariant>
+#include <QtCore/QDataStream>
+
 using namespace Macros;
 
 /*!
diff --git a/src/plugins/macros/macroevent.h b/src/plugins/macros/macroevent.h
index a1e31dcdf7..de32570e42 100644
--- a/src/plugins/macros/macroevent.h
+++ b/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 {
 
diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp
index 8e914e562d..f65b5fa1d5 100644
--- a/src/plugins/macros/macrolocatorfilter.cpp
+++ b/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()
diff --git a/src/plugins/macros/macrolocatorfilter.h b/src/plugins/macros/macrolocatorfilter.h
index dc95370746..561a1fc309 100644
--- a/src/plugins/macros/macrolocatorfilter.h
+++ b/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
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index 6e6c9bce15..f97ce1b063 100644
--- a/src/plugins/macros/macromanager.cpp
+++ b/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;
diff --git a/src/plugins/macros/macrooptionspage.cpp b/src/plugins/macros/macrooptionspage.cpp
index 6dde17ea0d..52a3007084 100644
--- a/src/plugins/macros/macrooptionspage.cpp
+++ b/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;
diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp
index 665f5cd780..703c82d8c1 100644
--- a/src/plugins/macros/macrooptionswidget.cpp
+++ b/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;
diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h
index 16e17f4383..c3d84d5c37 100644
--- a/src/plugins/macros/macrooptionswidget.h
+++ b/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;
diff --git a/src/plugins/macros/macrosettings.cpp b/src/plugins/macros/macrosettings.cpp
index f27b219172..a3185b3ea8 100644
--- a/src/plugins/macros/macrosettings.cpp
+++ b/src/plugins/macros/macrosettings.cpp
@@ -33,7 +33,7 @@
 
 #include "macrosettings.h"
 
-#include <QSettings>
+#include <QtCore/QSettings>
 
 using namespace Macros::Internal;
 
diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp
index 351b7d22d5..61f849c067 100644
--- a/src/plugins/macros/macrosplugin.cpp
+++ b/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()
 {
 }
diff --git a/src/plugins/macros/macrotextfind.h b/src/plugins/macros/macrotextfind.h
index 0a935ef3b6..3fc63aa8b7 100644
--- a/src/plugins/macros/macrotextfind.h
+++ b/src/plugins/macros/macrotextfind.h
@@ -36,7 +36,7 @@
 
 #include <find/ifindsupport.h>
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 namespace Macros {
 namespace Internal {
diff --git a/src/plugins/macros/savedialog.cpp b/src/plugins/macros/savedialog.cpp
index 2021925d81..ef42e88b65 100644
--- a/src/plugins/macros/savedialog.cpp
+++ b/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;
 
diff --git a/src/plugins/macros/savedialog.h b/src/plugins/macros/savedialog.h
index cd44d76a27..d1d1e0c408 100644
--- a/src/plugins/macros/savedialog.h
+++ b/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 {
diff --git a/src/plugins/perforce/perforceeditor.cpp b/src/plugins/perforce/perforceeditor.cpp
index a86db992f2..a42d066091 100644
--- a/src/plugins/perforce/perforceeditor.cpp
+++ b/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 {
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 24a4d040b2..780304cc56 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/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
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index b334ce7fc1..dcfc7c9cf9 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/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();
 }
 
diff --git a/src/plugins/projectexplorer/debugginghelper.cpp b/src/plugins/projectexplorer/debugginghelper.cpp
index af98003dff..35024087bd 100644
--- a/src/plugins/projectexplorer/debugginghelper.cpp
+++ b/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>
 
diff --git a/src/plugins/projectexplorer/debugginghelper.h b/src/plugins/projectexplorer/debugginghelper.h
index 8cbc366833..931c46f3d6 100644
--- a/src/plugins/projectexplorer/debugginghelper.h
+++ b/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 {
 
diff --git a/src/plugins/projectexplorer/deployconfiguration.cpp b/src/plugins/projectexplorer/deployconfiguration.cpp
index 8585124942..4a050c108e 100644
--- a/src/plugins/projectexplorer/deployconfiguration.cpp
+++ b/src/plugins/projectexplorer/deployconfiguration.cpp
@@ -40,6 +40,8 @@
 #include "projectexplorerconstants.h"
 #include "target.h"
 
+#include <QtCore/QStringList>
+
 using namespace ProjectExplorer;
 
 namespace {
diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h
index b40c722196..14c86d6e3e 100644
--- a/src/plugins/projectexplorer/deployconfiguration.h
+++ b/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 {
 
diff --git a/src/plugins/projectexplorer/outputformatter.h b/src/plugins/projectexplorer/outputformatter.h
index 863141b06d..0c5d81e4b3 100644
--- a/src/plugins/projectexplorer/outputformatter.h
+++ b/src/plugins/projectexplorer/outputformatter.h
@@ -40,7 +40,6 @@
 #include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
-class QMouseEvent;
 class QPlainTextEdit;
 class QTextCharFormat;
 class QColor;
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 4b8c90f5bb..bfe666920f 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/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;
 }
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 806150559d..bfca377b87 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/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
 
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.h b/src/plugins/qmljstools/qmljsmodelmanager.h
index 9acebfee2f..b669767693 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.h
+++ b/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)
 
diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index 46f67c7fe1..0b13dcadf1 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/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
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index f39d5f9fbd..a30696ef35 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/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>
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 712d44d2c4..06e95fe195 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/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>
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
index c9f89d3829..9ac9c0cce1 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
+++ b/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)
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
index c6ef5b6360..cf843ab5ed 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
+++ b/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;
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
index dae643ee6b..d5e0257b3e 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
+++ b/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 =
diff --git a/src/plugins/subversion/subversioneditor.cpp b/src/plugins/subversion/subversioneditor.cpp
index 5eeadc17fa..b699f57e28 100644
--- a/src/plugins/subversion/subversioneditor.cpp
+++ b/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;
diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h
index 7b14c65204..9a084c9150 100644
--- a/src/plugins/texteditor/basefilefind.h
+++ b/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 {
diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp
index 8d850b930d..c551167a40 100644
--- a/src/plugins/texteditor/fontsettings.cpp
+++ b/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.
  */
diff --git a/src/plugins/texteditor/fontsettings.h b/src/plugins/texteditor/fontsettings.h
index 51ff040116..3695281fb4 100644
--- a/src/plugins/texteditor/fontsettings.h
+++ b/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);
diff --git a/src/plugins/texteditor/indenter.h b/src/plugins/texteditor/indenter.h
index d472906c9f..8e29c3d865 100644
--- a/src/plugins/texteditor/indenter.h
+++ b/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 {
diff --git a/src/plugins/texteditor/quickfix.h b/src/plugins/texteditor/quickfix.h
index 5bbcb62cdd..6e38ec3154 100644
--- a/src/plugins/texteditor/quickfix.h
+++ b/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 {
 
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index 911f90e6e4..66900174c4 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/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;
diff --git a/src/plugins/texteditor/refactoringchanges.h b/src/plugins/texteditor/refactoringchanges.h
index 4af97d8ed2..87e8a355dc 100644
--- a/src/plugins/texteditor/refactoringchanges.h
+++ b/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
diff --git a/src/plugins/texteditor/syntaxhighlighter.h b/src/plugins/texteditor/syntaxhighlighter.h
index 1c7a3a8e88..25c8b35b14 100644
--- a/src/plugins/texteditor/syntaxhighlighter.h
+++ b/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
diff --git a/src/plugins/vcsbase/baseannotationhighlighter.h b/src/plugins/vcsbase/baseannotationhighlighter.h
index 97021c63a6..188dbe7dfb 100644
--- a/src/plugins/vcsbase/baseannotationhighlighter.h
+++ b/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 {
 
diff --git a/src/plugins/vcsbase/diffhighlighter.h b/src/plugins/vcsbase/diffhighlighter.h
index d714283f3e..26e599c7c3 100644
--- a/src/plugins/vcsbase/diffhighlighter.h
+++ b/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 {
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index a1853857ff..2f8fa77cbb 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/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>