diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index f966dd653c2..b95fc3698c2 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -29,13 +29,9 @@
 #include "bazaarclient.h"
 #include "constants.h"
 
-#include <vcsbase/vcsbaseclientsettings.h>
 #include <vcsbase/vcsbaseplugin.h>
-#include <vcsbase/vcsbaseeditor.h>
 #include <vcsbase/vcsbaseeditorparameterwidget.h>
 
-#include <utils/qtcassert.h>
-
 #include <QDir>
 #include <QFileInfo>
 #include <QTextStream>
diff --git a/src/plugins/bazaar/bazaarcommitwidget.cpp b/src/plugins/bazaar/bazaarcommitwidget.cpp
index 52bccadf84a..34e075c3d4b 100644
--- a/src/plugins/bazaar/bazaarcommitwidget.cpp
+++ b/src/plugins/bazaar/bazaarcommitwidget.cpp
@@ -31,7 +31,6 @@
 
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/fontsettings.h>
-#include <texteditor/texteditorconstants.h>
 #include <utils/qtcassert.h>
 
 #include <QSyntaxHighlighter>
diff --git a/src/plugins/bazaar/bazaarcontrol.cpp b/src/plugins/bazaar/bazaarcontrol.cpp
index 28d174831e4..bf480761a0a 100644
--- a/src/plugins/bazaar/bazaarcontrol.cpp
+++ b/src/plugins/bazaar/bazaarcontrol.cpp
@@ -29,13 +29,11 @@
 #include "bazaarcontrol.h"
 #include "bazaarclient.h"
 
-#include <vcsbase/vcsbaseclientsettings.h>
 #include <vcsbase/vcsbaseconstants.h>
 
 #include <QFileInfo>
 #include <QVariant>
 #include <QStringList>
-#include <QDir>
 
 using namespace Bazaar::Internal;
 
diff --git a/src/plugins/bazaar/bazaareditor.cpp b/src/plugins/bazaar/bazaareditor.cpp
index ee190bc3745..917f819dd3b 100644
--- a/src/plugins/bazaar/bazaareditor.cpp
+++ b/src/plugins/bazaar/bazaareditor.cpp
@@ -29,19 +29,12 @@
 #include "bazaareditor.h"
 #include "annotationhighlighter.h"
 #include "constants.h"
-#include "bazaarplugin.h"
-#include "bazaarclient.h"
 
-#include <coreplugin/editormanager/editormanager.h>
 #include <utils/qtcassert.h>
-#include <vcsbase/diffhighlighter.h>
 
 #include <QRegExp>
 #include <QString>
 #include <QTextCursor>
-#include <QTextBlock>
-#include <QDir>
-#include <QFileInfo>
 #include <QDebug>
 
 #define BZR_CHANGE_PATTERN "[0-9]+"
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 413f09dcbbc..417761c1044 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -43,7 +43,6 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/id.h>
-#include <coreplugin/vcsmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/documentmanager.h>
@@ -63,12 +62,9 @@
 #include <QtPlugin>
 #include <QAction>
 #include <QMenu>
-#include <QMainWindow>
 #include <QDebug>
-#include <QtGlobal>
 #include <QDir>
 #include <QDialog>
-#include <QFileDialog>
 
 using namespace Bazaar::Internal;
 using namespace Bazaar;
diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h
index 0824c301413..60a562d274f 100644
--- a/src/plugins/bazaar/bazaarplugin.h
+++ b/src/plugins/bazaar/bazaarplugin.h
@@ -31,15 +31,10 @@
 
 #include "bazaarsettings.h"
 
-#include <vcsbase/vcsbaseclientsettings.h>
 #include <vcsbase/vcsbaseclient.h>
 #include <vcsbase/vcsbaseplugin.h>
 #include <coreplugin/icontext.h>
 
-#include <QFileInfo>
-#include <QHash>
-#include <qglobal.h>
-
 QT_BEGIN_NAMESPACE
 class QAction;
 QT_END_NAMESPACE
diff --git a/src/plugins/bazaar/bazaarsettings.cpp b/src/plugins/bazaar/bazaarsettings.cpp
index 74aee633339..50ce89c905d 100644
--- a/src/plugins/bazaar/bazaarsettings.cpp
+++ b/src/plugins/bazaar/bazaarsettings.cpp
@@ -29,8 +29,6 @@
 #include "bazaarsettings.h"
 #include "constants.h"
 
-#include <QSettings>
-
 namespace Bazaar {
 namespace Internal {
 
diff --git a/src/plugins/bazaar/commiteditor.cpp b/src/plugins/bazaar/commiteditor.cpp
index a7e528d4cdd..2ba32a59a42 100644
--- a/src/plugins/bazaar/commiteditor.cpp
+++ b/src/plugins/bazaar/commiteditor.cpp
@@ -34,8 +34,6 @@
 
 #include <QDebug>
 
-#include <QDir> //TODO REMOVE WHEN BASE FILE CHANGES ARE PULLED
-
 using namespace Bazaar::Internal;
 
 CommitEditor::CommitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters, QWidget *parent)
diff --git a/src/plugins/bazaar/optionspage.cpp b/src/plugins/bazaar/optionspage.cpp
index 2e33c5ea06d..8eea22e6a5d 100644
--- a/src/plugins/bazaar/optionspage.cpp
+++ b/src/plugins/bazaar/optionspage.cpp
@@ -27,12 +27,10 @@
 **
 ****************************************************************************/
 #include "optionspage.h"
-#include "constants.h"
 #include "bazaarsettings.h"
 #include "bazaarplugin.h"
 
 #include <coreplugin/icore.h>
-#include <utils/pathchooser.h>
 #include <vcsbase/vcsbaseconstants.h>
 
 #include <QTextStream>