19 files changed, 36 insertions, 16 deletions
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index 75de80ea9d..70f94c7bdb 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -30,6 +30,8 @@
 #include "bazaarclient.h"
 #include "constants.h"
 
+#include <coreplugin/id.h>
+
 #include <vcsbase/vcsbaseplugin.h>
 #include <vcsbase/vcsoutputwindow.h>
 #include <vcsbase/vcsbaseeditorparameterwidget.h>
diff --git a/src/plugins/bazaar/bazaarcommitwidget.cpp b/src/plugins/bazaar/bazaarcommitwidget.cpp
index 99d4f12c63..ad2084be0a 100644
--- a/src/plugins/bazaar/bazaarcommitwidget.cpp
+++ b/src/plugins/bazaar/bazaarcommitwidget.cpp
@@ -32,6 +32,7 @@
 
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/fontsettings.h>
+#include <utils/completingtextedit.h>
 #include <utils/qtcassert.h>
 
 #include <QSyntaxHighlighter>
diff --git a/src/plugins/bazaar/bazaarcontrol.cpp b/src/plugins/bazaar/bazaarcontrol.cpp
index aff54e5814..c74ba8f0f9 100644
--- a/src/plugins/bazaar/bazaarcontrol.cpp
+++ b/src/plugins/bazaar/bazaarcontrol.cpp
@@ -32,6 +32,8 @@
 
 #include <vcsbase/vcsbaseconstants.h>
 
+#include <utils/fileutils.h>
+
 #include <QFileInfo>
 #include <QVariant>
 #include <QStringList>
diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp
index 2aa38aeaea..ff274a1390 100644
--- a/src/plugins/cvs/cvscontrol.cpp
+++ b/src/plugins/cvs/cvscontrol.cpp
@@ -34,6 +34,8 @@
 
 #include <vcsbase/vcsbaseconstants.h>
 
+#include <utils/fileutils.h>
+
 #include <QFileInfo>
 
 using namespace Cvs;
diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp
index aa15743340..89cc06ed9c 100644
--- a/src/plugins/git/gitsettings.cpp
+++ b/src/plugins/git/gitsettings.cpp
@@ -30,6 +30,7 @@
 
 #include "gitsettings.h"
 
+#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <QCoreApplication>
 
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index 582dea38c7..f66991d388 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -33,6 +33,8 @@
 #include "githighlighters.h"
 #include "logchangedialog.h"
 
+#include <utils/completingtextedit.h>
+
 #include <QRegExpValidator>
 #include <QTextEdit>
 
diff --git a/src/plugins/mercurial/mercurialcommitwidget.cpp b/src/plugins/mercurial/mercurialcommitwidget.cpp
index 320e773afd..cfcbf759d0 100644
--- a/src/plugins/mercurial/mercurialcommitwidget.cpp
+++ b/src/plugins/mercurial/mercurialcommitwidget.cpp
@@ -34,6 +34,7 @@
 #include <texteditor/fontsettings.h>
 #include <texteditor/syntaxhighlighter.h>
 #include <texteditor/texteditorconstants.h>
+#include <utils/completingtextedit.h>
 #include <utils/qtcassert.h>
 
 #include <QRegExp>
diff --git a/src/plugins/mercurial/mercurialcontrol.cpp b/src/plugins/mercurial/mercurialcontrol.cpp
index fbbfe20246..8482d70353 100644
--- a/src/plugins/mercurial/mercurialcontrol.cpp
+++ b/src/plugins/mercurial/mercurialcontrol.cpp
@@ -36,6 +36,8 @@
 
 #include <coreplugin/vcsmanager.h>
 
+#include <utils/fileutils.h>
+
 #include <QFileInfo>
 #include <QVariant>
 #include <QStringList>
diff --git a/src/plugins/subversion/subversioncontrol.cpp b/src/plugins/subversion/subversioncontrol.cpp
index 928dcb9bcc..052abac0eb 100644
--- a/src/plugins/subversion/subversioncontrol.cpp
+++ b/src/plugins/subversion/subversioncontrol.cpp
@@ -34,6 +34,8 @@
 
 #include <vcsbase/vcsbaseconstants.h>
 
+#include <utils/fileutils.h>
+
 #include <QFileInfo>
 
 namespace Subversion {
diff --git a/src/plugins/vcsbase/basecheckoutwizardfactory.h b/src/plugins/vcsbase/basecheckoutwizardfactory.h
index deeab0b47d..46dcb74563 100644
--- a/src/plugins/vcsbase/basecheckoutwizardfactory.h
+++ b/src/plugins/vcsbase/basecheckoutwizardfactory.h
@@ -34,10 +34,9 @@
 #include "vcsbase_global.h"
 #include <coreplugin/iwizardfactory.h>
 
-#include <utils/fileutils.h>
-
 #include <functional>
 
+namespace Utils { class FileName; }
 namespace VcsBase {
 class BaseCheckoutWizard;
 class VcsCommand;
diff --git a/src/plugins/vcsbase/basevcseditorfactory.h b/src/plugins/vcsbase/basevcseditorfactory.h
index f166799a23..8abba89621 100644
--- a/src/plugins/vcsbase/basevcseditorfactory.h
+++ b/src/plugins/vcsbase/basevcseditorfactory.h
@@ -32,11 +32,12 @@
 #define BASEVCSEDITORFACTORY_H
 
 #include "vcsbase_global.h"
-#include "vcsbaseeditor.h"
 
 #include <texteditor/texteditor.h>
 
 namespace VcsBase {
+class VcsBaseEditor;
+class VcsBaseEditorParameters;
 
 class VCSBASE_EXPORT VcsEditorFactory : public TextEditor::TextEditorFactory
 {
diff --git a/src/plugins/vcsbase/submiteditorwidget.h b/src/plugins/vcsbase/submiteditorwidget.h
index 7f784b2613..e44082345b 100644
--- a/src/plugins/vcsbase/submiteditorwidget.h
+++ b/src/plugins/vcsbase/submiteditorwidget.h
@@ -33,9 +33,6 @@
 
 #include "vcsbase_global.h"
 
-#include <utils/completingtextedit.h>
-
-#include <QWidget>
 #include <QAbstractItemView>
 
 QT_BEGIN_NAMESPACE
@@ -43,6 +40,7 @@ class QAction;
 class QModelIndex;
 QT_END_NAMESPACE
 
+namespace Utils { class CompletingTextEdit; }
 namespace VcsBase {
 
 class SubmitFieldWidget;
diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h
index dacc51ac94..37f355e2ae 100644
--- a/src/plugins/vcsbase/vcsbaseclient.h
+++ b/src/plugins/vcsbase/vcsbaseclient.h
@@ -32,7 +32,6 @@
 #define VCSBASECLIENT_H
 
 #include "vcsbase_global.h"
-#include <coreplugin/id.h>
 
 #include <QObject>
 #include <QStringList>
@@ -45,6 +44,8 @@ class QVariant;
 class QProcessEnvironment;
 QT_END_NAMESPACE
 
+namespace Core { class Id; }
+
 namespace Utils {
 struct SynchronousProcessResponse;
 class ExitCodeInterpreter;
diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.h b/src/plugins/vcsbase/vcsbaseclientsettings.h
index b999b4d3fc..7255fb261f 100644
--- a/src/plugins/vcsbase/vcsbaseclientsettings.h
+++ b/src/plugins/vcsbase/vcsbaseclientsettings.h
@@ -33,8 +33,6 @@
 
 #include "vcsbase_global.h"
 
-#include <utils/fileutils.h>
-
 #include <QStringList>
 #include <QVariant>
 #include <QSharedDataPointer>
@@ -43,6 +41,7 @@ QT_BEGIN_NAMESPACE
 class QSettings;
 QT_END_NAMESPACE
 
+namespace Utils { class FileName; }
 namespace VcsBase {
 
 namespace Internal { class VcsBaseClientSettingsPrivate; }
diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h
index 10dbea73d0..3b92423518 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.h
+++ b/src/plugins/vcsbase/vcsbaseplugin.h
@@ -34,7 +34,6 @@
 #include "vcsbase_global.h"
 
 #include <extensionsystem/iplugin.h>
-#include <utils/fileutils.h>
 
 #include <QSharedDataPointer>
 #include <QList>
@@ -45,7 +44,11 @@ class QAction;
 class QTextCodec;
 QT_END_NAMESPACE
 
-namespace Utils { struct SynchronousProcessResponse; }
+namespace Utils
+{
+class FileName;
+struct SynchronousProcessResponse;
+}
 
 namespace Core {
 class Context;
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index c383b0d648..c6cc51479d 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -44,6 +44,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <utils/checkablemessagebox.h>
+#include <utils/completingtextedit.h>
 #include <utils/synchronousprocess.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/vcsbase/vcscommand.cpp b/src/plugins/vcsbase/vcscommand.cpp
index 0cc6bbc6fb..1f6c3de533 100644
--- a/src/plugins/vcsbase/vcscommand.cpp
+++ b/src/plugins/vcsbase/vcscommand.cpp
@@ -35,6 +35,7 @@
 #include <coreplugin/vcsmanager.h>
 #include <coreplugin/icore.h>
 #include <vcsbase/vcsoutputwindow.h>
+#include <utils/fileutils.h>
 #include <utils/synchronousprocess.h>
 #include <utils/runextensions.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/vcsbase/vcscommand.h b/src/plugins/vcsbase/vcscommand.h
index acf34d6ed0..f2eea82553 100644
--- a/src/plugins/vcsbase/vcscommand.h
+++ b/src/plugins/vcsbase/vcscommand.h
@@ -33,9 +33,6 @@
 
 #include "vcsbase_global.h"
 
-#include <utils/fileutils.h>
-#include <utils/synchronousprocess.h>
-
 #include <QObject>
 
 QT_BEGIN_NAMESPACE
@@ -47,6 +44,12 @@ template <typename T>
 class QFutureInterface;
 QT_END_NAMESPACE
 
+namespace Utils {
+struct SynchronousProcessResponse;
+class ExitCodeInterpreter;
+class FileName;
+}
+
 namespace VcsBase {
 
 namespace Internal { class VcsCommandPrivate; }
diff --git a/src/plugins/vcsbase/vcsoutputwindow.h b/src/plugins/vcsbase/vcsoutputwindow.h
index 9ed45c6ae6..9d481492e4 100644
--- a/src/plugins/vcsbase/vcsoutputwindow.h
+++ b/src/plugins/vcsbase/vcsoutputwindow.h
@@ -35,8 +35,7 @@
 
 #include  <coreplugin/ioutputpane.h>
 
-#include <utils/fileutils.h>
-
+namespace Utils { class FileName; }
 namespace VcsBase {
 
 class VCSBASE_EXPORT VcsOutputWindow : public Core::IOutputPane