diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp
index 781520e3275..e902223734e 100644
--- a/src/plugins/git/branchdialog.cpp
+++ b/src/plugins/git/branchdialog.cpp
@@ -37,12 +37,10 @@
 #include "ui_branchdialog.h"
 #include "stashdialog.h" // Label helpers
 
-#include <utils/checkablemessagebox.h>
 #include <utils/qtcassert.h>
 #include <vcsbase/vcsbaseoutputwindow.h>
 
 #include <QItemSelectionModel>
-#include <QPushButton>
 #include <QMessageBox>
 #include <QList>
 
diff --git a/src/plugins/git/branchdialog.h b/src/plugins/git/branchdialog.h
index b5a673ec04e..0725d00dfc5 100644
--- a/src/plugins/git/branchdialog.h
+++ b/src/plugins/git/branchdialog.h
@@ -31,7 +31,6 @@
 #define BRANCHDIALOG_H
 
 #include <QDialog>
-#include <QItemSelection>
 
 QT_BEGIN_NAMESPACE
 class QPushButton;
diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp
index 58077831790..4cb59ae8af7 100644
--- a/src/plugins/git/branchmodel.cpp
+++ b/src/plugins/git/branchmodel.cpp
@@ -34,8 +34,6 @@
 #include <vcsbase/vcsbaseoutputwindow.h>
 
 #include <QFont>
-#include <QRegExp>
-#include <QTimer>
 
 namespace Git {
 namespace Internal {
diff --git a/src/plugins/git/branchmodel.h b/src/plugins/git/branchmodel.h
index 109262a48fc..2383478a780 100644
--- a/src/plugins/git/branchmodel.h
+++ b/src/plugins/git/branchmodel.h
@@ -31,7 +31,6 @@
 #define BRANCHMODEL_H
 
 #include <QAbstractListModel>
-#include <QList>
 #include <QVariant>
 
 namespace Git {
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index edf49194ab1..e344096772a 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -33,8 +33,6 @@
 
 #include <QProcess>
 #include <QFormLayout>
-#include <QSpacerItem>
-#include <QFormLayout>
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QLabel>
diff --git a/src/plugins/git/clonewizardpage.cpp b/src/plugins/git/clonewizardpage.cpp
index 30e3f380d30..1ea045141eb 100644
--- a/src/plugins/git/clonewizardpage.cpp
+++ b/src/plugins/git/clonewizardpage.cpp
@@ -32,9 +32,6 @@
 #include "gitclient.h"
 
 #include <vcsbase/checkoutjobs.h>
-#include <utils/qtcassert.h>
-
-#include <QCheckBox>
 
 namespace Git {
 
diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp
index cc7c91b1fad..77b296a07f9 100644
--- a/src/plugins/git/commitdata.cpp
+++ b/src/plugins/git/commitdata.cpp
@@ -32,7 +32,6 @@
 
 #include <QCoreApplication>
 #include <QDebug>
-#include <QRegExp>
 
 namespace Git {
 namespace Internal {
diff --git a/src/plugins/git/gerrit/gerritdialog.cpp b/src/plugins/git/gerrit/gerritdialog.cpp
index da6e5da9778..7b1f55e8cf8 100644
--- a/src/plugins/git/gerrit/gerritdialog.cpp
+++ b/src/plugins/git/gerrit/gerritdialog.cpp
@@ -31,7 +31,6 @@
 #include "gerritmodel.h"
 #include "gerritparameters.h"
 
-#include <utils/filterlineedit.h>
 #include <utils/qtcassert.h>
 #include <coreplugin/icore.h>
 
@@ -42,16 +41,12 @@
 #include <QLabel>
 #include <QTextBrowser>
 #include <QTreeView>
-#include <QHeaderView>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QDesktopServices>
 #include <QSortFilterProxyModel>
 #include <QGroupBox>
 #include <QUrl>
-#include <QClipboard>
-#include <QApplication>
-#include <QProcess>
 #include <QStringListModel>
 #include <QCompleter>
 
diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp
index b964509266b..6c637bbb3af 100644
--- a/src/plugins/git/gerrit/gerritmodel.cpp
+++ b/src/plugins/git/gerrit/gerritmodel.cpp
@@ -30,7 +30,6 @@
 #include "gerritmodel.h"
 #include "gerritparameters.h"
 
-#include <coreplugin/vcsmanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/progressmanager/futureprogress.h>
@@ -40,9 +39,7 @@
 #include <QStringList>
 #include <QProcess>
 #include <QVariant>
-#include <QUrl>
 #include <QTextStream>
-#include <QDesktopServices>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QDebug>
diff --git a/src/plugins/git/gerrit/gerritmodel.h b/src/plugins/git/gerrit/gerritmodel.h
index 610cc682b77..f78d68f3c7f 100644
--- a/src/plugins/git/gerrit/gerritmodel.h
+++ b/src/plugins/git/gerrit/gerritmodel.h
@@ -32,8 +32,6 @@
 
 #include <QStandardItemModel>
 #include <QSharedPointer>
-#include <QMetaType>
-#include <QPair>
 #include <QDateTime>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/git/gerrit/gerritoptionspage.cpp b/src/plugins/git/gerrit/gerritoptionspage.cpp
index c0d887eb3c2..9523a1cbe3a 100644
--- a/src/plugins/git/gerrit/gerritoptionspage.cpp
+++ b/src/plugins/git/gerrit/gerritoptionspage.cpp
@@ -37,7 +37,6 @@
 #include <QSpinBox>
 #include <QCheckBox>
 #include <QFormLayout>
-#include <QVBoxLayout>
 
 namespace Gerrit {
 namespace Internal {
diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp
index 6f595c743c0..85a2c4cc4aa 100644
--- a/src/plugins/git/gerrit/gerritpushdialog.cpp
+++ b/src/plugins/git/gerrit/gerritpushdialog.cpp
@@ -32,10 +32,8 @@
 
 #include "../gitplugin.h"
 #include "../gitclient.h"
-#include <coreplugin/icore.h>
 
 #include <QDir>
-#include <QMessageBox>
 
 namespace Gerrit {
 namespace Internal {
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index c33282cda13..acc6c5e10f9 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -39,23 +39,16 @@
 
 #include <vcsbase/submitfilemodel.h>
 
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/messagemanager.h>
-#include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/vcsmanager.h>
 #include <coreplugin/id.h>
-#include <coreplugin/documentmanager.h>
 #include <coreplugin/iversioncontrol.h>
 
-#include <texteditor/itexteditor.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <utils/synchronousprocess.h>
-#include <utils/environment.h>
 #include <utils/fileutils.h>
 #include <vcsbase/command.h>
 #include <vcsbase/vcsbaseeditor.h>
@@ -71,7 +64,6 @@
 #include <QSignalMapper>
 #include <QTime>
 
-#include <QComboBox>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QToolButton>
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index d5c9c2ac45a..2e37f4e463a 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -30,25 +30,18 @@
 #include "giteditor.h"
 
 #include "annotationhighlighter.h"
-#include "gitconstants.h"
 #include "gitplugin.h"
 #include "gitclient.h"
 #include "gitsettings.h"
-#include <QTextCodec>
 
-#include <coreplugin/editormanager/editormanager.h>
 #include <utils/qtcassert.h>
-#include <vcsbase/diffhighlighter.h>
 #include <vcsbase/vcsbaseoutputwindow.h>
 #include <QDebug>
-#include <QDir>
 #include <QFileInfo>
 #include <QRegExp>
 #include <QSet>
-#include <QTextStream>
 
 #include <QTextCursor>
-#include <QTextEdit>
 #include <QTextBlock>
 
 #define CHANGE_PATTERN "[a-f0-9]{7,40}"
diff --git a/src/plugins/git/gitorious/gitorious.cpp b/src/plugins/git/gitorious/gitorious.cpp
index 0d86e26ae34..f76f15a4372 100644
--- a/src/plugins/git/gitorious/gitorious.cpp
+++ b/src/plugins/git/gitorious/gitorious.cpp
@@ -30,7 +30,6 @@
 #include "gitorious.h"
 
 #include <QDebug>
-#include <QCoreApplication>
 #include <QXmlStreamReader>
 #include <QSettings>
 
diff --git a/src/plugins/git/gitorious/gitoriousprojectwidget.cpp b/src/plugins/git/gitorious/gitoriousprojectwidget.cpp
index 523399493af..b374910f0e8 100644
--- a/src/plugins/git/gitorious/gitoriousprojectwidget.cpp
+++ b/src/plugins/git/gitorious/gitoriousprojectwidget.cpp
@@ -28,7 +28,6 @@
 ****************************************************************************/
 
 #include "gitoriousprojectwidget.h"
-#include "gitorioushostwizardpage.h"
 #include "gitorious.h"
 #include "ui_gitoriousprojectwidget.h"
 
@@ -42,7 +41,6 @@
 #include <QStandardItem>
 #include <QItemSelectionModel>
 #include <QDesktopServices>
-#include <QIcon>
 #include <QStyle>
 
 enum {
diff --git a/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp b/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
index 2a6c25816d4..d7de4cdd523 100644
--- a/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
+++ b/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
@@ -32,8 +32,6 @@
 #include "gitorioushostwizardpage.h"
 #include "gitorious.h"
 
-#include <utils/qtcassert.h>
-
 #include <QStackedWidget>
 #include <QVBoxLayout>
 
diff --git a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
index 33e58c9bb31..da6ecd25ea7 100644
--- a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
+++ b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
@@ -33,8 +33,6 @@
 #include "gitorious.h"
 #include "ui_gitoriousrepositorywizardpage.h"
 
-#include <utils/qtcassert.h>
-
 #include <QDebug>
 
 #include <QStandardItemModel>
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index e02081db6c4..22498c69d0c 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -51,7 +51,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/documentmanager.h>
-#include <coreplugin/messagemanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
@@ -62,7 +61,6 @@
 
 #include <utils/qtcassert.h>
 #include <utils/parameteraction.h>
-#include <utils/fileutils.h>
 
 #include <vcsbase/basevcseditorfactory.h>
 #include <vcsbase/submitfilemodel.h>
@@ -79,7 +77,6 @@
 
 #include <QAction>
 #include <QFileDialog>
-#include <QMenu>
 #include <QMessageBox>
 
 static const unsigned minimumRequiredVersion = 0x010702;
@@ -1284,8 +1281,6 @@ GitClient *GitPlugin::gitClient() const
 #ifdef WITH_TESTS
 
 #include <QTest>
-#include <QTextBlock>
-#include <QTextDocument>
 
 Q_DECLARE_METATYPE(FileStates)
 
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 00a032603a4..d52e75a54c6 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -34,11 +34,6 @@
 
 #include "vcsbase/vcsbaseplugin.h"
 
-#include <coreplugin/editormanager/ieditorfactory.h>
-#include <extensionsystem/iplugin.h>
-
-#include <QObject>
-#include <QProcess>
 #include <QStringList>
 #include <QPointer>
 #include <QPair>
@@ -51,6 +46,7 @@ class QFileInfo;
 QT_END_NAMESPACE
 
 namespace Core {
+class IEditor;
 class IEditorFactory;
 class Command;
 class Context;
diff --git a/src/plugins/git/gitsettings.h b/src/plugins/git/gitsettings.h
index 4f500ca630a..99f74cb200a 100644
--- a/src/plugins/git/gitsettings.h
+++ b/src/plugins/git/gitsettings.h
@@ -32,8 +32,6 @@
 
 #include <vcsbase/vcsbaseclientsettings.h>
 
-#include <QStringList>
-
 namespace Git {
 namespace Internal {
 
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp
index b994529000d..f479f6b4469 100644
--- a/src/plugins/git/gitsubmiteditor.cpp
+++ b/src/plugins/git/gitsubmiteditor.cpp
@@ -30,7 +30,6 @@
 #include "gitsubmiteditor.h"
 #include "commitdata.h"
 #include "gitclient.h"
-#include "gitconstants.h"
 #include "gitplugin.h"
 #include "gitsubmiteditorwidget.h"
 
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index 319b6f81ffd..8c76d2fdc2d 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -32,10 +32,8 @@
 
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/fontsettings.h>
-#include <texteditor/texteditorconstants.h>
 #include <utils/qtcassert.h>
 
-#include <QLineEdit>
 #include <QRegExpValidator>
 #include <QSyntaxHighlighter>
 #include <QTextEdit>
diff --git a/src/plugins/git/gitutils.cpp b/src/plugins/git/gitutils.cpp
index d318d97ee7d..7dab04257f2 100644
--- a/src/plugins/git/gitutils.cpp
+++ b/src/plugins/git/gitutils.cpp
@@ -30,7 +30,6 @@
 #include "gitutils.h"
 
 #include <QDebug>
-#include <QStringList>
 #include <QInputDialog>
 #include <QLineEdit>
 
diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp
index ecf823aaf9e..605fb8c3e76 100644
--- a/src/plugins/git/gitversioncontrol.cpp
+++ b/src/plugins/git/gitversioncontrol.cpp
@@ -29,10 +29,8 @@
 
 #include "gitversioncontrol.h"
 #include "gitclient.h"
-#include "gitplugin.h"
 #include "gitutils.h"
 
-#include <utils/qtcassert.h>
 #include <vcsbase/vcsbaseconstants.h>
 
 #include <QFileInfo>
diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp
index b38298531ed..28a3e44d8ff 100644
--- a/src/plugins/git/logchangedialog.cpp
+++ b/src/plugins/git/logchangedialog.cpp
@@ -39,7 +39,6 @@
 #include <QItemSelectionModel>
 #include <QVBoxLayout>
 #include <QComboBox>
-#include <QDir>
 
 namespace Git {
 namespace Internal {
diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index 862ca6d9b14..0bf3cfc6762 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -33,7 +33,6 @@
 
 #include <vcsbase/vcsbaseoutputwindow.h>
 
-#include <QFile>
 #include <QMessageBox>
 #include <QProcess>
 #include <QPushButton>
diff --git a/src/plugins/git/remotedialog.cpp b/src/plugins/git/remotedialog.cpp
index 05006dbb153..4488719f73f 100644
--- a/src/plugins/git/remotedialog.cpp
+++ b/src/plugins/git/remotedialog.cpp
@@ -38,8 +38,6 @@
 
 #include <vcsbase/vcsbaseoutputwindow.h>
 
-#include <QItemSelectionModel>
-#include <QPushButton>
 #include <QMessageBox>
 
 namespace Git {
diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp
index b017d5b7481..d2bf45d9ce7 100644
--- a/src/plugins/git/settingspage.cpp
+++ b/src/plugins/git/settingspage.cpp
@@ -34,14 +34,10 @@
 
 #include <vcsbase/vcsbaseconstants.h>
 #include <utils/hostosinfo.h>
-#include <utils/pathchooser.h>
 
-#include <QCoreApplication>
 #include <QDir>
-#include <QFileInfo>
 #include <QDebug>
 #include <QTextStream>
-#include <QProcessEnvironment>
 #include <QMessageBox>
 
 namespace Git {
diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h
index e936eaf7726..18e70f473b9 100644
--- a/src/plugins/git/settingspage.h
+++ b/src/plugins/git/settingspage.h
@@ -31,7 +31,6 @@
 #define SETTINGSPAGE_H
 
 #include <QWidget>
-#include <QPointer>
 
 #include <vcsbase/vcsbaseoptionspage.h>
 
diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp
index dcbe06dc7e4..1447230d39b 100644
--- a/src/plugins/git/stashdialog.cpp
+++ b/src/plugins/git/stashdialog.cpp
@@ -34,7 +34,6 @@
 #include "ui_stashdialog.h"
 
 #include <utils/qtcassert.h>
-#include <vcsbase/vcsbaseoutputwindow.h>
 
 #include <QDebug>
 #include <QDir>
@@ -42,7 +41,6 @@
 #include <QDateTime>
 #include <QStandardItemModel>
 #include <QSortFilterProxyModel>
-#include <QItemSelectionModel>
 #include <QMessageBox>
 #include <QPushButton>