14 files changed, 27 insertions, 46 deletions
diff --git a/src/plugins/cpaster/codepasterprotocol.cpp b/src/plugins/cpaster/codepasterprotocol.cpp
index 118455ad25a..c9467e92cba 100644
--- a/src/plugins/cpaster/codepasterprotocol.cpp
+++ b/src/plugins/cpaster/codepasterprotocol.cpp
@@ -38,6 +38,9 @@
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/messageoutputwindow.h>
 
+#include <QtGui/QListWidget>
+#include <QtNetwork/QNetworkReply>
+
 using namespace CodePaster;
 using namespace Core;
 
diff --git a/src/plugins/cpaster/codepasterprotocol.h b/src/plugins/cpaster/codepasterprotocol.h
index f7c98e6465c..6a4ef01c119 100644
--- a/src/plugins/cpaster/codepasterprotocol.h
+++ b/src/plugins/cpaster/codepasterprotocol.h
@@ -32,10 +32,13 @@
 
 #include "protocol.h"
 
-#include <QtGui/QListWidget>
 #include <QtNetwork/QHttp>
 #include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
+
+QT_BEGIN_NAMESPACE
+class QListWidget;
+class QNetworkReply;
+QT_END_NAMESPACE
 
 namespace CodePaster {
 
diff --git a/src/plugins/cpaster/codepastersettings.cpp b/src/plugins/cpaster/codepastersettings.cpp
index 1d88242cba4..b5d310ed31f 100644
--- a/src/plugins/cpaster/codepastersettings.cpp
+++ b/src/plugins/cpaster/codepastersettings.cpp
@@ -39,6 +39,7 @@
 #include <QtGui/QGroupBox>
 #include <QtGui/QFormLayout>
 #include <QtGui/QVBoxLayout>
+#include <QtGui/QLabel>
 #include <QtCore/QDebug>
 #include <QtCore/QVariant>
 
diff --git a/src/plugins/cpaster/codepastersettings.h b/src/plugins/cpaster/codepastersettings.h
index 370f3caab24..42c2bdb5a90 100644
--- a/src/plugins/cpaster/codepastersettings.h
+++ b/src/plugins/cpaster/codepastersettings.h
@@ -30,14 +30,8 @@
 #ifndef CODEPASTERSETTINGSPAGE_H
 #define CODEPASTERSETTINGSPAGE_H
 
-#include "ui_settingspage.h"
-
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include <QtCore/QStringList>
-#include <QtCore/QUrl>
-#include <QtGui/QWidget>
-
 QT_BEGIN_NAMESPACE
 class QSettings;
 QT_END_NAMESPACE
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 4bc7c500ccd..572e3f86217 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -36,16 +36,15 @@
 #include "codepasterprotocol.h"
 #include "pastebindotcomprotocol.h"
 #include "pastebindotcaprotocol.h"
+#include "settingspage.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/filemanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
-#include <coreplugin/messageoutputwindow.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <texteditor/itexteditor.h>
 
@@ -55,9 +54,7 @@
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>
 #include <QtGui/QMenu>
-#include <QtGui/QMessageBox>
 #include <QtGui/QMainWindow>
-#include <QtGui/QListWidget>
 
 using namespace CodePaster;
 using namespace Core;
diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h
index 582325e2994..9306813d587 100644
--- a/src/plugins/cpaster/cpasterplugin.h
+++ b/src/plugins/cpaster/cpasterplugin.h
@@ -30,22 +30,18 @@
 #ifndef CODEPASTERPLUGIN_H
 #define CODEPASTERPLUGIN_H
 
-#include "settingspage.h"
-#include "protocol.h"
-
-#include <coreplugin/editormanager/ieditorfactory.h>
-#include <coreplugin/icorelistener.h>
 #include <extensionsystem/iplugin.h>
 
-#include <QtCore/QObject>
 #include <QtCore/QList>
 
 QT_BEGIN_NAMESPACE
-class QListWidget;
+class QAction;
 QT_END_NAMESPACE
 
-namespace CodePaster {
+class Protocol;
 
+namespace CodePaster {
+class SettingsPage;
 class CustomFetcher;
 class CustomPoster;
 
diff --git a/src/plugins/cpaster/pastebindotcaprotocol.cpp b/src/plugins/cpaster/pastebindotcaprotocol.cpp
index 716162794f5..36e2a527781 100644
--- a/src/plugins/cpaster/pastebindotcaprotocol.cpp
+++ b/src/plugins/cpaster/pastebindotcaprotocol.cpp
@@ -30,6 +30,8 @@
 #include "pastebindotcaprotocol.h"
 #include "cgi.h"
 
+#include <QtNetwork/QNetworkReply>
+
 using namespace Core;
 
 PasteBinDotCaProtocol::PasteBinDotCaProtocol()
diff --git a/src/plugins/cpaster/pastebindotcaprotocol.h b/src/plugins/cpaster/pastebindotcaprotocol.h
index be2ce17e5ea..813a6fe30af 100644
--- a/src/plugins/cpaster/pastebindotcaprotocol.h
+++ b/src/plugins/cpaster/pastebindotcaprotocol.h
@@ -33,7 +33,6 @@
 #include "protocol.h"
 
 #include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QHttp>
 
 class PasteBinDotCaProtocol : public Protocol
diff --git a/src/plugins/cpaster/pastebindotcomprotocol.cpp b/src/plugins/cpaster/pastebindotcomprotocol.cpp
index 6c943e348ea..2f5a3fa5b91 100644
--- a/src/plugins/cpaster/pastebindotcomprotocol.cpp
+++ b/src/plugins/cpaster/pastebindotcomprotocol.cpp
@@ -29,16 +29,10 @@
 
 #include "pastebindotcomprotocol.h"
 #include "pastebindotcomsettings.h"
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/messagemanager.h>
-#include <coreplugin/messageoutputwindow.h>
 
-#include <QDebug>
-#include <QtNetwork/QHttp>
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
+#include <QtCore/QDebug>
+#include <QtNetwork/QNetworkReply>
 
 using namespace Core;
 
diff --git a/src/plugins/cpaster/pastebindotcomprotocol.h b/src/plugins/cpaster/pastebindotcomprotocol.h
index 4803dadfc6b..ae6a021d089 100644
--- a/src/plugins/cpaster/pastebindotcomprotocol.h
+++ b/src/plugins/cpaster/pastebindotcomprotocol.h
@@ -33,7 +33,6 @@
 #include "protocol.h"
 
 #include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QHttp>
 
 class PasteBinDotComSettings;
diff --git a/src/plugins/cpaster/pasteview.cpp b/src/plugins/cpaster/pasteview.cpp
index 2e061090816..78b9a4074ee 100644
--- a/src/plugins/cpaster/pasteview.cpp
+++ b/src/plugins/cpaster/pasteview.cpp
@@ -29,11 +29,12 @@
 
 #include "pasteview.h"
 
-#include <QFontMetrics>
-#include <QPainter>
-#include <QScrollBar>
-#include <QPushButton>
-#include <QSettings>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QPainter>
+#include <QtGui/QScrollBar>
+#include <QtGui/QPushButton>
+#include <QtCore/QSettings>
+#include <QtCore/QByteArray>
 
 class ColumnIndicatorTextEdit : public QTextEdit
 {
diff --git a/src/plugins/cpaster/pasteview.h b/src/plugins/cpaster/pasteview.h
index 013a2a1d4c0..62ed44745e9 100644
--- a/src/plugins/cpaster/pasteview.h
+++ b/src/plugins/cpaster/pasteview.h
@@ -30,17 +30,16 @@
 #ifndef PASTEVIEW_H
 #define PASTEVIEW_H
 
-#include "splitter.h"
 #include "ui_pasteview.h"
+#include "splitter.h"
 
-#include <QDialog>
-#include <QByteArray>
+#include <QtGui/QDialog>
 
 class PasteView : public QDialog
 {
     Q_OBJECT
 public:
-    PasteView(QWidget *parent);
+    explicit PasteView(QWidget *parent);
     ~PasteView();
 
     int show(const QString &user, const QString &description, const QString &comment,
diff --git a/src/plugins/cpaster/protocol.h b/src/plugins/cpaster/protocol.h
index 3131a9078c7..21066fd77e6 100644
--- a/src/plugins/cpaster/protocol.h
+++ b/src/plugins/cpaster/protocol.h
@@ -30,13 +30,8 @@
 #ifndef PROTOCOL_H
 #define PROTOCOL_H
 
-#include "settingspage.h"
-
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include <QtCore/QObject>
-#include <QtCore/QString>
-
 QT_BEGIN_NAMESPACE
 class QListWidget;
 QT_END_NAMESPACE
diff --git a/src/plugins/cpaster/settingspage.h b/src/plugins/cpaster/settingspage.h
index 1846a08e017..834c4ef2666 100644
--- a/src/plugins/cpaster/settingspage.h
+++ b/src/plugins/cpaster/settingspage.h
@@ -35,8 +35,6 @@
 #include <coreplugin/dialogs/ioptionspage.h>
 
 #include <QtCore/QStringList>
-#include <QtCore/QUrl>
-#include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
 class QSettings;