summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-09-13 22:53:09 +0200
committerMontel Laurent <[email protected]>2017-09-13 22:53:19 +0200
commitf94304e92cd021497d7b0a5c879ceaba375fbd7d (patch)
tree03662613eb5c75e57a8cc78c54739c7e7cf43c3d
parent307a453bbb3625e7b432bbc2dfeec3ab4ae56725 (diff)
Fix includes
-rw-r--r--agents/archivemailagent/addarchivemaildialog.cpp1
-rw-r--r--agents/archivemailagent/archivemailagent.cpp1
-rw-r--r--agents/archivemailagent/archivemaildialog.cpp1
-rw-r--r--agents/archivemailagent/archivemailwidget.cpp1
-rw-r--r--agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp1
-rw-r--r--agents/mailfilteragent/configuredialog.cpp1
-rw-r--r--agents/mailfilteragent/filterlogdialog.cpp1
-rw-r--r--agents/mailfilteragent/filtermanager.cpp1
-rw-r--r--agents/mailfilteragent/mailfilteragent.cpp1
-rw-r--r--agents/sendlateragent/sendlaterconfiguredialog.cpp3
-rw-r--r--agents/sendlateragent/sendlaterconfigurewidget.cpp1
-rw-r--r--src/autotests/kmcommandstest.cpp1
-rw-r--r--src/autotests/tagselectdialogtest.cpp1
-rw-r--r--src/collectionpage/collectionmailinglistpage.cpp1
-rw-r--r--src/collectionpage/collectionquotawidget.cpp2
-rw-r--r--src/collectionpage/collectionshortcutpage.cpp2
-rw-r--r--src/collectionpage/collectiontemplatespage.cpp2
-rw-r--r--src/collectionpage/collectionviewpage.cpp1
-rw-r--r--src/configuredialog/configurecomposerpage.cpp2
-rw-r--r--src/configuredialog/configuredialog.cpp1
-rw-r--r--src/configuredialog/configuredialog_p.cpp1
-rw-r--r--src/configuredialog/configuremiscpage.cpp3
-rw-r--r--src/configuredialog/configurepluginpage.cpp1
-rw-r--r--src/configuredialog/configureplugins/configurepluginslistwidget.cpp5
-rw-r--r--src/dialog/archivefolderdialog.cpp1
-rw-r--r--src/dialog/archivefolderdialog.h1
-rw-r--r--src/dialog/kmknotify.cpp2
-rw-r--r--src/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp2
-rw-r--r--src/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp1
-rw-r--r--src/identity/identityaddvcarddialog.cpp1
-rw-r--r--src/identity/identitydialog.cpp6
-rw-r--r--src/identity/identityeditvcarddialog.cpp2
-rw-r--r--src/identity/identityinvalidfolder.cpp1
-rw-r--r--src/identity/newidentitydialog.cpp2
-rw-r--r--src/identity/xfaceconfigurator.cpp2
-rw-r--r--src/job/createforwardmessagejob.cpp1
-rw-r--r--src/job/createreplymessagejob.cpp2
-rw-r--r--src/job/opencomposerhiddenjob.cpp1
-rw-r--r--src/job/opencomposerjob.cpp1
-rw-r--r--src/job/saveasfilejob.cpp1
-rw-r--r--src/kmail_part.h1
-rw-r--r--src/kmcommands.cpp1
-rw-r--r--src/kmkernel.cpp3
-rw-r--r--src/kmmainwidget.cpp4
-rw-r--r--src/kmmainwin.cpp2
-rw-r--r--src/kmreadermainwin.cpp2
-rw-r--r--src/kmsystemtray.cpp3
-rw-r--r--src/kontactplugin/kmail/kcmkmailsummary.cpp2
-rw-r--r--src/kontactplugin/summary/summaryview_part.cpp1
-rw-r--r--src/messageactions.cpp1
-rw-r--r--src/plugininterface/kmailplugininterface.cpp1
-rw-r--r--src/searchdialog/kmsearchmessagemodel.cpp1
-rw-r--r--src/searchdialog/searchwindow.cpp1
-rw-r--r--src/secondarywindow.cpp1
-rw-r--r--src/tag/tagselectdialog.cpp1
-rw-r--r--src/util.cpp4
-rw-r--r--src/util.h1
-rw-r--r--src/widgets/statusbarlabeltoggledstate.cpp1
58 files changed, 4 insertions, 90 deletions
diff --git a/agents/archivemailagent/addarchivemaildialog.cpp b/agents/archivemailagent/addarchivemaildialog.cpp
index 964bbc5..1ecabca 100644
--- a/agents/archivemailagent/addarchivemaildialog.cpp
+++ b/agents/archivemailagent/addarchivemaildialog.cpp
@@ -25,7 +25,6 @@
#include <Collection>
#include <KLocalizedString>
-#include <QComboBox>
#include <KUrlRequester>
#include <QSpinBox>
#include <KSeparator>
diff --git a/agents/archivemailagent/archivemailagent.cpp b/agents/archivemailagent/archivemailagent.cpp
index fd39662..3ac5757 100644
--- a/agents/archivemailagent/archivemailagent.cpp
+++ b/agents/archivemailagent/archivemailagent.cpp
@@ -24,7 +24,6 @@
#include "archivemailagentsettings.h"
#include <AkonadiCore/ServerManager>
-#include <KLocalizedString>
#include <MailCommon/MailKernel>
#include <kdbusconnectionpool.h>
#include <Monitor>
diff --git a/agents/archivemailagent/archivemaildialog.cpp b/agents/archivemailagent/archivemaildialog.cpp
index cb28b79..8314aca 100644
--- a/agents/archivemailagent/archivemaildialog.cpp
+++ b/agents/archivemailagent/archivemaildialog.cpp
@@ -34,7 +34,6 @@
#include <QDialogButtonBox>
#include <KConfigGroup>
#include <QPushButton>
-#include <QLocale>
namespace {
inline QString archiveMailCollectionPattern()
diff --git a/agents/archivemailagent/archivemailwidget.cpp b/agents/archivemailagent/archivemailwidget.cpp
index dd7fb87..06a6496 100644
--- a/agents/archivemailagent/archivemailwidget.cpp
+++ b/agents/archivemailagent/archivemailwidget.cpp
@@ -32,7 +32,6 @@
#include <QMenu>
#include <KRun>
-#include <QHBoxLayout>
namespace {
inline QString archiveMailCollectionPattern()
diff --git a/agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp b/agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
index 5f98887..ef2eace 100644
--- a/agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
+++ b/agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
@@ -21,7 +21,6 @@
#include "followupreminderagent_debug.h"
#include <QDBusConnection>
#include <QDBusInterface>
-#include <QDBusReply>
#include <QDBusConnectionInterface>
#include <ktoolinvocation.h>
diff --git a/agents/mailfilteragent/configuredialog.cpp b/agents/mailfilteragent/configuredialog.cpp
index 7672412..0b12f52 100644
--- a/agents/mailfilteragent/configuredialog.cpp
+++ b/agents/mailfilteragent/configuredialog.cpp
@@ -18,7 +18,6 @@
*/
#include "configuredialog.h"
#include "configurewidget.h"
-#include <KLocalizedString>
#include <QDialogButtonBox>
#include <QVBoxLayout>
#include <kconfiggroup.h>
diff --git a/agents/mailfilteragent/filterlogdialog.cpp b/agents/mailfilteragent/filterlogdialog.cpp
index 65815c4..b957d4a 100644
--- a/agents/mailfilteragent/filterlogdialog.cpp
+++ b/agents/mailfilteragent/filterlogdialog.cpp
@@ -38,7 +38,6 @@
#include <kmessagebox.h>
#include <QVBoxLayout>
#include <QIcon>
-#include <QUrl>
#include <QCheckBox>
#include <QLabel>
diff --git a/agents/mailfilteragent/filtermanager.cpp b/agents/mailfilteragent/filtermanager.cpp
index 671ecfa..1c39cbd 100644
--- a/agents/mailfilteragent/filtermanager.cpp
+++ b/agents/mailfilteragent/filtermanager.cpp
@@ -44,7 +44,6 @@
#include <MailCommon/MailFilter>
#include <MailCommon/MailKernel>
-#include <QTimer>
// other headers
#include <algorithm>
diff --git a/agents/mailfilteragent/mailfilteragent.cpp b/agents/mailfilteragent/mailfilteragent.cpp
index 6576bee..c3fccc3 100644
--- a/agents/mailfilteragent/mailfilteragent.cpp
+++ b/agents/mailfilteragent/mailfilteragent.cpp
@@ -48,7 +48,6 @@
#include <AttributeFactory>
#include <KConfigGroup>
-#include <QVector>
#include <QTimer>
#include <KSharedConfig>
diff --git a/agents/sendlateragent/sendlaterconfiguredialog.cpp b/agents/sendlateragent/sendlaterconfiguredialog.cpp
index 581dcfc..1a7902a 100644
--- a/agents/sendlateragent/sendlaterconfiguredialog.cpp
+++ b/agents/sendlateragent/sendlaterconfiguredialog.cpp
@@ -27,9 +27,8 @@
#include <KHelpMenu>
#include <QMenu>
#include <kaboutdata.h>
-#include <KMessageBox>
#include <QIcon>
-
+#include <QDialogButtonBox>
#include <QApplication>
SendLaterConfigureDialog::SendLaterConfigureDialog(QWidget *parent)
diff --git a/agents/sendlateragent/sendlaterconfigurewidget.cpp b/agents/sendlateragent/sendlaterconfigurewidget.cpp
index 861c567..791abb1 100644
--- a/agents/sendlateragent/sendlaterconfigurewidget.cpp
+++ b/agents/sendlateragent/sendlaterconfigurewidget.cpp
@@ -24,7 +24,6 @@
#include <KConfigGroup>
#include <KLocalizedString>
-#include <KHelpMenu>
#include <QMenu>
#include <KMessageBox>
#include <QIcon>
diff --git a/src/autotests/kmcommandstest.cpp b/src/autotests/kmcommandstest.cpp
index f0cd165..2405ac0 100644
--- a/src/autotests/kmcommandstest.cpp
+++ b/src/autotests/kmcommandstest.cpp
@@ -27,7 +27,6 @@
#include <KMime/Message>
-#include <QDebug>
#include <QEventLoop>
#include <QLabel>
#include <QStandardPaths>
diff --git a/src/autotests/tagselectdialogtest.cpp b/src/autotests/tagselectdialogtest.cpp
index 0109d32..1e16fd4 100644
--- a/src/autotests/tagselectdialogtest.cpp
+++ b/src/autotests/tagselectdialogtest.cpp
@@ -19,7 +19,6 @@
#include "tag/tagselectdialog.h"
#include <KListWidgetSearchLine>
#include <QListWidget>
-#include <QLineEdit>
#include <qtest.h>
#include <QStandardPaths>
diff --git a/src/collectionpage/collectionmailinglistpage.cpp b/src/collectionpage/collectionmailinglistpage.cpp
index a9712b9..7a3fba7 100644
--- a/src/collectionpage/collectionmailinglistpage.cpp
+++ b/src/collectionpage/collectionmailinglistpage.cpp
@@ -35,7 +35,6 @@
#include <QVBoxLayout>
#include <KComboBox>
-#include <QDialog>
#include <KLineEdit>
#include <KEditListWidget>
#include <KLocalizedString>
diff --git a/src/collectionpage/collectionquotawidget.cpp b/src/collectionpage/collectionquotawidget.cpp
index 5eeea28..e7e5322 100644
--- a/src/collectionpage/collectionquotawidget.cpp
+++ b/src/collectionpage/collectionquotawidget.cpp
@@ -33,13 +33,11 @@
#include "collectionquotawidget.h"
#include <KLocalizedString>
-#include <QDialog>
#include <QLabel>
#include <qlayout.h>
#include <qprogressbar.h>
#include <KFormat>
-#include <KConfigGroup>
CollectionQuotaWidget::CollectionQuotaWidget(QWidget *parent)
: QWidget(parent)
diff --git a/src/collectionpage/collectionshortcutpage.cpp b/src/collectionpage/collectionshortcutpage.cpp
index bf6c09f..cea9254 100644
--- a/src/collectionpage/collectionshortcutpage.cpp
+++ b/src/collectionpage/collectionshortcutpage.cpp
@@ -26,11 +26,9 @@
#include <QSpacerItem>
#include <QVBoxLayout>
-#include <QDialog>
#include <QHBoxLayout>
#include <KLocalizedString>
#include <KKeySequenceWidget>
-#include <KConfigGroup>
using namespace MailCommon;
diff --git a/src/collectionpage/collectiontemplatespage.cpp b/src/collectionpage/collectiontemplatespage.cpp
index ccce3a0..2d5ac9c 100644
--- a/src/collectionpage/collectiontemplatespage.cpp
+++ b/src/collectionpage/collectiontemplatespage.cpp
@@ -27,9 +27,7 @@
#include <KLocalizedString>
#include <QPushButton>
-#include <QDialog>
#include <QCheckBox>
-#include <KConfigGroup>
using namespace Akonadi;
using namespace MailCommon;
diff --git a/src/collectionpage/collectionviewpage.cpp b/src/collectionpage/collectionviewpage.cpp
index 8f0f72b..c92e948 100644
--- a/src/collectionpage/collectionviewpage.cpp
+++ b/src/collectionpage/collectionviewpage.cpp
@@ -32,7 +32,6 @@
#include <QVBoxLayout>
#include <KLocalizedString>
#include <KIconButton>
-#include <KConfigGroup>
#include <QRadioButton>
#include "kmail_debug.h"
diff --git a/src/configuredialog/configurecomposerpage.cpp b/src/configuredialog/configurecomposerpage.cpp
index d62ea12..76b990e 100644
--- a/src/configuredialog/configurecomposerpage.cpp
+++ b/src/configuredialog/configurecomposerpage.cpp
@@ -41,10 +41,8 @@ using KPIM::RecentAddresses;
#include <KLocalizedString>
#include <KSeparator>
#include <KCharsets>
-#include <KUrlRequester>
#include <QHBoxLayout>
#include <KMessageBox>
-#include <KFile>
#include <QSpinBox>
#include <KPluralHandlingSpinBox>
#include "kmail_debug.h"
diff --git a/src/configuredialog/configuredialog.cpp b/src/configuredialog/configuredialog.cpp
index bbb71e1..9fce8b4 100644
--- a/src/configuredialog/configuredialog.cpp
+++ b/src/configuredialog/configuredialog.cpp
@@ -29,7 +29,6 @@
#include <KWindowSystem>
#include <KIconLoader>
#include <QPushButton>
-#include <KHelpClient>
ConfigureDialog::ConfigureDialog(QWidget *parent, bool modal)
: KCMultiDialog(parent)
diff --git a/src/configuredialog/configuredialog_p.cpp b/src/configuredialog/configuredialog_p.cpp
index 801d880..ff61f5c 100644
--- a/src/configuredialog/configuredialog_p.cpp
+++ b/src/configuredialog/configuredialog_p.cpp
@@ -15,7 +15,6 @@
#include <QVBoxLayout>
// Other headers:
-#include <KConfigGroup>
ConfigModuleWithTabs::ConfigModuleWithTabs(QWidget *parent)
: ConfigModule(parent)
diff --git a/src/configuredialog/configuremiscpage.cpp b/src/configuredialog/configuremiscpage.cpp
index df0230d..beab4b6 100644
--- a/src/configuredialog/configuremiscpage.cpp
+++ b/src/configuredialog/configuremiscpage.cpp
@@ -27,10 +27,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include "MessageViewer/PrintingSettings"
-#include <KCModuleProxy>
-#include <KCModuleInfo>
#include <KLocalizedString>
-#include <KConfigGroup>
#include <QHBoxLayout>
#include <WebEngineViewer/NetworkPluginUrlInterceptorConfigureWidget>
diff --git a/src/configuredialog/configurepluginpage.cpp b/src/configuredialog/configurepluginpage.cpp
index 8238057..190716c 100644
--- a/src/configuredialog/configurepluginpage.cpp
+++ b/src/configuredialog/configurepluginpage.cpp
@@ -19,7 +19,6 @@
#include "configureplugins/configurepluginslistwidget.h"
#include <PimCommon/ConfigurePluginsWidget>
-#include <KLocalizedString>
#include <QHBoxLayout>
ConfigurePluginPage::ConfigurePluginPage(QWidget *parent)
diff --git a/src/configuredialog/configureplugins/configurepluginslistwidget.cpp b/src/configuredialog/configureplugins/configurepluginslistwidget.cpp
index 49523b7..8d9ac48 100644
--- a/src/configuredialog/configureplugins/configurepluginslistwidget.cpp
+++ b/src/configuredialog/configureplugins/configurepluginslistwidget.cpp
@@ -28,15 +28,10 @@
#include <PimCommon/GenericPluginManager>
#include <AkonadiCore/ServerManager>
#include <PimCommon/PluginUtil>
-#include <KConfigGroup>
#include <KSharedConfig>
#include <KLocalizedString>
#include <MessageComposer/PluginEditorManager>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QTreeWidget>
-#include <QDebug>
#include <QDBusInterface>
#include <QDBusReply>
#include <MessageComposer/PluginEditorInit>
diff --git a/src/dialog/archivefolderdialog.cpp b/src/dialog/archivefolderdialog.cpp
index 93d455c..86c3940 100644
--- a/src/dialog/archivefolderdialog.cpp
+++ b/src/dialog/archivefolderdialog.cpp
@@ -37,7 +37,6 @@
#include <QGridLayout>
#include <QStandardPaths>
#include <QMimeDatabase>
-#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QPushButton>
#include <QVBoxLayout>
diff --git a/src/dialog/archivefolderdialog.h b/src/dialog/archivefolderdialog.h
index f241c08..5500d0f 100644
--- a/src/dialog/archivefolderdialog.h
+++ b/src/dialog/archivefolderdialog.h
@@ -20,7 +20,6 @@
#define ARCHIVEFOLDERDIALOG_H
#include <QDialog>
-#include <KConfigGroup>
class QCheckBox;
class KUrlRequester;
diff --git a/src/dialog/kmknotify.cpp b/src/dialog/kmknotify.cpp
index 3b595ec..3dc1636 100644
--- a/src/dialog/kmknotify.cpp
+++ b/src/dialog/kmknotify.cpp
@@ -21,13 +21,11 @@
#include "kmkernel.h"
#include <QVBoxLayout>
-#include <QHBoxLayout>
#include <KComboBox>
#include <KNotifyConfigWidget>
#include <KLocalizedString>
#include <KConfig>
#include <KSeparator>
-#include <KIconLoader>
#include <QStandardPaths>
#include <QDialogButtonBox>
#include <KConfigGroup>
diff --git a/src/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp b/src/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp
index 7a11e08..de8c1d5 100644
--- a/src/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp
+++ b/src/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp
@@ -21,8 +21,6 @@
#include "potentialphishingdetaildialogtest.h"
#include "../potentialphishingdetaildialog.h"
#include "../potentialphishingdetailwidget.h"
-#include <QLabel>
-#include <QListWidget>
#include <qtest.h>
#include <QStandardPaths>
PotentialPhishingDetailDialogTest::PotentialPhishingDetailDialogTest(QObject *parent)
diff --git a/src/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp b/src/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp
index a125def..b02b94a 100644
--- a/src/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp
+++ b/src/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp
@@ -23,7 +23,6 @@
#include <qtest.h>
#include <QStringList>
#include <QSignalSpy>
-#include <QDebug>
PotentialPhishingEmailJobTest::PotentialPhishingEmailJobTest(QObject *parent)
: QObject(parent)
diff --git a/src/identity/identityaddvcarddialog.cpp b/src/identity/identityaddvcarddialog.cpp
index 6a32cc0..c1c708f 100644
--- a/src/identity/identityaddvcarddialog.cpp
+++ b/src/identity/identityaddvcarddialog.cpp
@@ -27,7 +27,6 @@
#include <QRadioButton>
#include <QLabel>
#include <QDialogButtonBox>
-#include <KConfigGroup>
#include <QPushButton>
IdentityAddVcardDialog::IdentityAddVcardDialog(const QStringList &shadowIdentities, QWidget *parent)
diff --git a/src/identity/identitydialog.cpp b/src/identity/identitydialog.cpp
index 062282a..880b554 100644
--- a/src/identity/identitydialog.cpp
+++ b/src/identity/identitydialog.cpp
@@ -36,6 +36,8 @@
#include "identityinvalidfolder.h"
#include "identityfolderrequester.h"
+#include <QGpgME/Protocol>
+#include <QGpgME/Job>
#include "MessageComposer/MessageComposerSettings"
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
@@ -70,8 +72,6 @@
#include <Libkleo/DefaultKeyGenerationJob>
#include <Libkleo/ProgressDialog>
-#include <QGpgME/Protocol>
-#include <QGpgME/Job>
// gpgme++
#include <gpgme++/keygenerationresult.h>
@@ -94,7 +94,6 @@ using MailTransport::TransportManager;
#include <QTabWidget>
#include <QIcon>
#include <sonnet/dictionarycombobox.h>
-#include <KHelpClient>
// Qt headers:
#include <QLabel>
@@ -115,7 +114,6 @@ using MailTransport::TransportManager;
#include <AkonadiCore/entitydisplayattribute.h>
#include <AkonadiCore/collectionmodifyjob.h>
#include <QStandardPaths>
-#include <KConfigGroup>
#include <QDialogButtonBox>
using namespace KPIM;
diff --git a/src/identity/identityeditvcarddialog.cpp b/src/identity/identityeditvcarddialog.cpp
index 1ee353e..7983cbb 100644
--- a/src/identity/identityeditvcarddialog.cpp
+++ b/src/identity/identityeditvcarddialog.cpp
@@ -24,9 +24,7 @@
#include <KMessageBox>
#include <QStandardPaths>
-#include <QHBoxLayout>
#include <QFileInfo>
-#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QPushButton>
#include <QVBoxLayout>
diff --git a/src/identity/identityinvalidfolder.cpp b/src/identity/identityinvalidfolder.cpp
index d389e79..d1a503c 100644
--- a/src/identity/identityinvalidfolder.cpp
+++ b/src/identity/identityinvalidfolder.cpp
@@ -16,7 +16,6 @@
*/
#include "identityinvalidfolder.h"
-#include <KLocalizedString>
using namespace KMail;
diff --git a/src/identity/newidentitydialog.cpp b/src/identity/newidentitydialog.cpp
index 689d21f..f11bf54 100644
--- a/src/identity/newidentitydialog.cpp
+++ b/src/identity/newidentitydialog.cpp
@@ -39,8 +39,6 @@
#include <assert.h>
#include <QDialogButtonBox>
-#include <KConfigGroup>
-#include <KHelpClient>
#include <QPushButton>
using namespace KMail;
diff --git a/src/identity/xfaceconfigurator.cpp b/src/identity/xfaceconfigurator.cpp
index 7f2cc78..201aaf6 100644
--- a/src/identity/xfaceconfigurator.cpp
+++ b/src/identity/xfaceconfigurator.cpp
@@ -39,7 +39,6 @@
#include "kpimtextedit/plaintexteditorwidget.h"
#include <messageviewer/kxface.h>
-#include <KConfigGroup>
#include <KJobWidgets>
#include <kcombobox.h>
#include <KLocalizedString>
@@ -47,7 +46,6 @@
#include <KIO/StoredTransferJob>
#include <QCheckBox>
-#include <QDialog>
#include <QHBoxLayout>
#include <QLabel>
#include <QPushButton>
diff --git a/src/job/createforwardmessagejob.cpp b/src/job/createforwardmessagejob.cpp
index cb3c16d..871fb5f 100644
--- a/src/job/createforwardmessagejob.cpp
+++ b/src/job/createforwardmessagejob.cpp
@@ -26,7 +26,6 @@
#include <KEmailAddress>
#include <MailCommon/MailUtil>
-#include <QUrl>
CreateForwardMessageJob::CreateForwardMessageJob(QObject *parent)
: QObject(parent)
diff --git a/src/job/createreplymessagejob.cpp b/src/job/createreplymessagejob.cpp
index 1824cd0..63308e4 100644
--- a/src/job/createreplymessagejob.cpp
+++ b/src/job/createreplymessagejob.cpp
@@ -26,8 +26,6 @@
#include <KMime/Message>
#include <KEmailAddress>
#include <MailCommon/MailUtil>
-#include <QUrl>
-#include <QDebug>
CreateReplyMessageJob::CreateReplyMessageJob(QObject *parent)
: QObject(parent)
diff --git a/src/job/opencomposerhiddenjob.cpp b/src/job/opencomposerhiddenjob.cpp
index 5f1b4f3..dbf3987 100644
--- a/src/job/opencomposerhiddenjob.cpp
+++ b/src/job/opencomposerhiddenjob.cpp
@@ -24,7 +24,6 @@
#include <KMime/Message>
#include <MessageComposer/MessageHelper>
-#include <KStartupInfo>
#include <TemplateParser/TemplateParserJob>
diff --git a/src/job/opencomposerjob.cpp b/src/job/opencomposerjob.cpp
index c9e2d26..3b1d8e4 100644
--- a/src/job/opencomposerjob.cpp
+++ b/src/job/opencomposerjob.cpp
@@ -32,7 +32,6 @@
#include <QFile>
#include <KMessageBox>
#include <KLocalizedString>
-#include <KStartupInfo>
OpenComposerJob::OpenComposerJob(QObject *parent)
: QObject(parent)
diff --git a/src/job/saveasfilejob.cpp b/src/job/saveasfilejob.cpp
index 5b64c9f..541dab0 100644
--- a/src/job/saveasfilejob.cpp
+++ b/src/job/saveasfilejob.cpp
@@ -23,7 +23,6 @@
#include <QFileDialog>
#include <qpointer.h>
#include <qtextdocumentwriter.h>
-#include <QUrl>
#include <KLocalizedString>
#include <QTextDocument>
diff --git a/src/kmail_part.h b/src/kmail_part.h
index de6efef..480194b 100644
--- a/src/kmail_part.h
+++ b/src/kmail_part.h
@@ -29,7 +29,6 @@
#include <kparts/readonlypart.h>
#include <QWidget>
-#include <QPixmap>
class KMMainWidget;
diff --git a/src/kmcommands.cpp b/src/kmcommands.cpp
index 1617d52..53a6d96 100644
--- a/src/kmcommands.cpp
+++ b/src/kmcommands.cpp
@@ -116,7 +116,6 @@
#include <KBookmarkManager>
-#include <KDBusServiceStarter>
#include <KEmailAddress>
#include <KFileWidget>
#include <KJobWidgets>
diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
index 16620c4..4eb4642 100644
--- a/src/kmkernel.cpp
+++ b/src/kmkernel.cpp
@@ -44,8 +44,8 @@ using KPIM::RecentAddresses;
#include <mailtransport/transportmanager.h>
#include <mailtransportakonadi/dispatcherinterface.h>
#include <AkonadiCore/servermanager.h>
-#include <KSieveUi/SieveImapInstanceInterfaceManager>
+#include <KSieveUi/SieveImapInstanceInterfaceManager>
#include "mailserviceimpl.h"
using KMail::MailServiceImpl;
#include "mailcommon/jobscheduler.h"
@@ -100,7 +100,6 @@ using KMail::MailServiceImpl;
#include <QWidget>
#include <QFileInfo>
#include <QtDBus/QtDBus>
-#include <QMimeDatabase>
#include <MailCommon/ResourceReadConfigFile>
diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index 0010ddf..4451a90 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -184,13 +184,9 @@ using KSieveUi::SieveDebugDialog;
#include <QVBoxLayout>
#include <QShortcut>
#include <QProcess>
-#include <QDBusConnection>
-#include <QTextDocument>
-#include <QDir>
#include <WebEngineViewer/WebHitTestResult>
// System includes
#include <AkonadiWidgets/standardactionmanager.h>
-#include <KHelpClient>
#include <QStandardPaths>
#include "PimCommonAkonadi/ManageServerSideSubscriptionJob"
diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp
index dd3d64b..58207c8 100644
--- a/src/kmmainwin.cpp
+++ b/src/kmmainwin.cpp
@@ -27,13 +27,11 @@
#include "tag/tagactionmanager.h"
#include <QTimer>
-#include <QAction>
#include <QStatusBar>
#include <QApplication>
#include <KConfigGui>
#include <QMenuBar>
-#include <KToggleAction>
#include <KConfigGui>
#include <KLocalizedString>
#include <kedittoolbar.h>
diff --git a/src/kmreadermainwin.cpp b/src/kmreadermainwin.cpp
index 8e4c97c..1b4d478 100644
--- a/src/kmreadermainwin.cpp
+++ b/src/kmreadermainwin.cpp
@@ -36,8 +36,6 @@
#include <ktoggleaction.h>
#include <ktoolbar.h>
#include "kmail_debug.h"
-#include <KFontAction>
-#include <KFontSizeAction>
#include <QStatusBar>
#include <KMessageBox>
#include <KAcceleratorManager>
diff --git a/src/kmsystemtray.cpp b/src/kmsystemtray.cpp
index aef469a..ca7ba5b 100644
--- a/src/kmsystemtray.cpp
+++ b/src/kmsystemtray.cpp
@@ -32,10 +32,7 @@
#include <QMenu>
#include <KLocalizedString>
#include <QAction>
-#include <KActionMenu>
#include "widgets/kactionmenutransport.h"
-#include <KActionCollection>
-#include <QPainter>
#include <AkonadiCore/ChangeRecorder>
#include <AkonadiCore/EntityTreeModel>
diff --git a/src/kontactplugin/kmail/kcmkmailsummary.cpp b/src/kontactplugin/kmail/kcmkmailsummary.cpp
index adb42db..5e5359c 100644
--- a/src/kontactplugin/kmail/kcmkmailsummary.cpp
+++ b/src/kontactplugin/kmail/kcmkmailsummary.cpp
@@ -32,11 +32,9 @@
#include <KAboutData>
#include <KAcceleratorManager>
#include "kmailplugin_debug.h"
-#include <QDialog>
#include <KLocalizedString>
#include <KSharedConfig>
#include <KConfig>
-#include <QLineEdit>
#include <QCheckBox>
#include <QTreeView>
diff --git a/src/kontactplugin/summary/summaryview_part.cpp b/src/kontactplugin/summary/summaryview_part.cpp
index 1b2367d..1fc2be7 100644
--- a/src/kontactplugin/summary/summaryview_part.cpp
+++ b/src/kontactplugin/summary/summaryview_part.cpp
@@ -39,7 +39,6 @@ using KPIM::BroadcastStatus;
#include <KActionCollection>
#include <KCMultiDialog>
#include <KConfigGroup>
-#include <QDialog>
#include <QIcon>
#include <KLocalizedString>
#include <KParts/PartActivateEvent>
diff --git a/src/messageactions.cpp b/src/messageactions.cpp
index e71e60c..667346d 100644
--- a/src/messageactions.cpp
+++ b/src/messageactions.cpp
@@ -53,7 +53,6 @@
#include <KRun>
#include <QMenu>
#include <KUriFilter>
-#include <KStringHandler>
#include <QIcon>
#include <QVariant>
diff --git a/src/plugininterface/kmailplugininterface.cpp b/src/plugininterface/kmailplugininterface.cpp
index 27b2239..5703f1a 100644
--- a/src/plugininterface/kmailplugininterface.cpp
+++ b/src/plugininterface/kmailplugininterface.cpp
@@ -18,7 +18,6 @@
*/
#include "kmailplugininterface.h"
-#include <KActionCollection>
#include <kmmainwidget.h>
#include "kmail_debug.h"
diff --git a/src/searchdialog/kmsearchmessagemodel.cpp b/src/searchdialog/kmsearchmessagemodel.cpp
index bc2262d..6d2a2a8 100644
--- a/src/searchdialog/kmsearchmessagemodel.cpp
+++ b/src/searchdialog/kmsearchmessagemodel.cpp
@@ -41,7 +41,6 @@
#include <QColor>
#include <QApplication>
#include <QPalette>
-#include <QTextDocument>
#include "kmail_debug.h"
#include <KLocalizedString>
#include <KFormat>
diff --git a/src/searchdialog/searchwindow.cpp b/src/searchdialog/searchwindow.cpp
index c68ec6a..15c8ece 100644
--- a/src/searchdialog/searchwindow.cpp
+++ b/src/searchdialog/searchwindow.cpp
@@ -65,7 +65,6 @@
#include <QKeyEvent>
#include <QMenu>
#include <QVBoxLayout>
-#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QPushButton>
diff --git a/src/secondarywindow.cpp b/src/secondarywindow.cpp
index e916ed3..be58c9c 100644
--- a/src/secondarywindow.cpp
+++ b/src/secondarywindow.cpp
@@ -32,7 +32,6 @@
#include "secondarywindow.h"
#include "kmkernel.h"
-#include <QApplication>
#include <KLocalizedString>
#include <QCloseEvent>
diff --git a/src/tag/tagselectdialog.cpp b/src/tag/tagselectdialog.cpp
index da69c3f..5f67bc4 100644
--- a/src/tag/tagselectdialog.cpp
+++ b/src/tag/tagselectdialog.cpp
@@ -30,7 +30,6 @@
#include <KLocalizedString>
#include <QIcon>
-#include <QGridLayout>
#include <QListWidget>
#include <AkonadiCore/TagFetchJob>
#include <AkonadiCore/TagFetchScope>
diff --git a/src/util.cpp b/src/util.cpp
index 65784a1..2b13c93 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -44,12 +44,8 @@
#include <kmime/kmime_message.h>
#include <kmessagebox.h>
-#include <KLocalizedString>
-#include <KProcess>
#include "kmail_debug.h"
-#include <QProcess>
-#include <QFileInfo>
#include <QAction>
#include <QStandardPaths>
diff --git a/src/util.h b/src/util.h
index 0957286..d1a5dab 100644
--- a/src/util.h
+++ b/src/util.h
@@ -38,7 +38,6 @@
#ifndef KMAILUTIL_H
#define KMAILUTIL_H
-#include <QWidget>
#include <AkonadiCore/item.h>
#include <AkonadiCore/Collection>
#include <MailCommon/FolderSettings>
diff --git a/src/widgets/statusbarlabeltoggledstate.cpp b/src/widgets/statusbarlabeltoggledstate.cpp
index df657a2..2b541cb 100644
--- a/src/widgets/statusbarlabeltoggledstate.cpp
+++ b/src/widgets/statusbarlabeltoggledstate.cpp
@@ -18,7 +18,6 @@
*/
#include "statusbarlabeltoggledstate.h"
-#include <KLocalizedString>
#include "kmail_debug.h"
StatusBarLabelToggledState::StatusBarLabelToggledState(QWidget *parent)