Remove duplicate headers between cpp/h files

src/contacts/contactmanager.cpp

@@ -5,6 +5,9 @@
 
 #include "contactmanager.h"
 
+#include "contactcollectionmodel.h"
+#include "globalcontactmodel.h"
+#include "kalendar_contact_debug.h"
 #include <Akonadi/AgentManager>
 #include <Akonadi/Collection>
 #include <Akonadi/CollectionColorAttribute>
@@ -13,22 +16,17 @@
 #include <Akonadi/CollectionPropertiesDialog>
 #include <Akonadi/CollectionStatistics>
 #include <Akonadi/CollectionUtils>
+#include <Akonadi/ContactsFilterProxyModel>
+#include <Akonadi/ContactsTreeModel>
 #include <Akonadi/ETMViewStateSaver>
+#include <Akonadi/EmailAddressSelectionModel>
 #include <Akonadi/EntityMimeTypeFilterModel>
+#include <Akonadi/EntityRightsFilterModel>
 #include <Akonadi/ItemDeleteJob>
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
 #include <Akonadi/Monitor>
 #include <Akonadi/SelectionProxyModel>
-#include <QSortFilterProxyModel>
-#include <Akonadi/ContactsFilterProxyModel>
-#include <Akonadi/ContactsTreeModel>
-#include <Akonadi/EmailAddressSelectionModel>
-#include "contactcollectionmodel.h"
-#include "globalcontactmodel.h"
-#include "kalendar_contact_debug.h"
-#include <Akonadi/EntityMimeTypeFilterModel>
-#include <Akonadi/EntityRightsFilterModel>
 #include <KCheckableProxyModel>
 #include <KConfigGroup>
 #include <KContacts/Addressee>

src/mail/crypto.cpp

@@ -10,7 +10,6 @@
 #include <gpgme.h>
 #endif
 
-#include <QDateTime>
 #include <QDebug>
 #include <QFile>
 

src/mail/mailmodel.cpp

@@ -4,7 +4,6 @@
 
 #include "mailmodel.h"
 
-#include "messagestatus.h"
 #include <Akonadi/EntityTreeModel>
 #include <Akonadi/ItemModifyJob>
 #include <Akonadi/MessageStatus>

src/mail/mime/attachmentmodel.cpp

@@ -18,7 +18,6 @@
 #include <QStandardPaths>
 #include <QUrl>
 
-#include <memory>
 #include <qstringliteral.h>
 
 QString sizeHuman(float size)

src/mail/mime/htmlutils.cpp

@@ -4,7 +4,6 @@
 #include "htmlutils.h"
 
 #include <QMap>
-#include <QString>
 #include <QUrl>
 
 static QString resolveEntities(const QString &in)

src/mail/mime/mailtemplates.cpp

@@ -7,7 +7,6 @@
 #include "mailtemplates.h"
 
 #include <KLocalizedString>
-#include <QByteArray>
 #include <QDebug>
 #include <QList>
 #include <QRegularExpression>
@@ -15,15 +14,12 @@
 #include <QTextCodec>
 #include <QTextDocument>
 #include <QUuid>
-#include <functional>
 
 #include <KCodecs/KCharsets>
 #include <KMime/Types>
 
 #include "../mimetreeparser/objecttreeparser.h"
 
-#include "mailcrypto.h"
-
 QDebug operator<<(QDebug dbg, const KMime::Types::Mailbox &mb)
 {
     dbg << mb.addrSpec().asString();

src/mail/mime/messageparser.cpp

@@ -4,7 +4,6 @@
 #include "messageparser.h"
 
 #include "../mimetreeparser/objecttreeparser.h"
-#include <Akonadi/Item>
 #include <Akonadi/ItemFetchJob>
 #include <Akonadi/ItemFetchScope>
 #include <QElapsedTimer>

src/mail/mimetreeparser/objecttreeparser.cpp

@@ -9,7 +9,6 @@
 #include "objecttreeparser.h"
 
 #include "bodypartformatterbasefactory.h"
-#include "messagepart.h"
 
 #include "mimetreeparser_debug.h"