Fix include/forward declaration

kmkernel.cpp

@@ -49,7 +49,7 @@ using KMail::MailServiceImpl;
 #include "messagecomposersettings.h"
 #include "messagecomposer/messagehelper.h"
 #include "messagecomposer/messagecomposersettings.h"
-#include "custommimeheader.h"
+//#include "custommimeheader.h"
 
 #include "templateparser/templateparser.h"
 #include "templateparser/globalsettings_base.h"
@@ -87,10 +87,7 @@ using KMail::MailServiceImpl;
 #include <akonadi/entitymimetypefiltermodel.h>
 #include <Akonadi/CollectionStatisticsJob>
 
-#include <QByteArray>
 #include <QDir>
-#include <QList>
-#include <QObject>
 #include <QWidget>
 #include <QFileInfo>
 #include <QtDBus/QtDBus>

kmkernel.h

@@ -5,14 +5,11 @@
 
 #include "mailinterfaces.h"
 
-#include <QByteArray>
 #include <QList>
 #include <QObject>
 #include <QPointer>
-#include <QString>
 #include <QDBusObjectPath>
 
-#include <kconfig.h>
 #include <kurl.h>
 
 #include "kmail_export.h"
@@ -65,7 +62,6 @@ namespace KPIMIdentities {
   class Identity;
   class IdentityManager;
 }
-class KMKernel;
 class KComponentData;
 class QTimer;
 class KMMainWin;

kmreaderwin.cpp

@@ -33,7 +33,6 @@
 #include <libkdepim/openemailaddressjob.h>
 #include "kmcommands.h"
 #include "mailcommon/sendmdnhandler.h"
-#include <QByteArray>
 #include <QVBoxLayout>
 #include "messageviewer/headerstrategy.h"
 #include "messageviewer/headerstyle.h"
@@ -59,21 +58,13 @@ using MessageComposer::MessageFactory;
 #include "messagecore/messagehelpers.h"
 
 
-// KABC includes
-#include <kabc/addressee.h>
-#include <kabc/vcardconverter.h>
-
-
 #include <kde_file.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kaction.h>
 #include <kicon.h>
-#include <kiconloader.h>
 #include <kcodecs.h>
-#include <kstandardaction.h>
 #include <ktoggleaction.h>
-#include <kconfiggroup.h>
 
 #include <QClipboard>
 

kmreaderwin.h

@@ -22,7 +22,7 @@
 
 #include <QWidget>
 #include <kurl.h>
-#include <kservice.h>
+//#include <kservice.h>
 #include <map>
 #include <messageviewer/viewer.h>
 #include <messageviewer/interfaces/bodypart.h>
@@ -30,8 +30,6 @@
 class KActionCollection;
 class KAction;
 class KToggleAction;
-class KToggleAction;
-class KUrl;
 namespace MessageViewer {
   class HeaderStrategy;
   class HeaderStyle;
@@ -40,9 +38,6 @@ namespace MessageViewer {
   class AttachmentStrategy;
 }
 
-namespace KParts {
-  struct BrowserArguments;
-}
 
 namespace Akonadi {
   class Item;