diff --git a/messageviewer/src/viewer/nodehelper.cpp b/messageviewer/src/viewer/nodehelper.cpp
--- a/messageviewer/src/viewer/nodehelper.cpp
+++ b/messageviewer/src/viewer/nodehelper.cpp
@@ -20,15 +20,12 @@
 #include "nodehelper.h"
 #include "messageviewer_debug.h"
 #include "utils/iconnamecache.h"
-#include "settings/messageviewersettings.h"
 #include "partmetadata.h"
 #include "interfaces/bodypart.h"
-#include "messageviewer/messageviewerutil.h"
+#include "messageviewer/mimetype.h"
 #include "PimCommon/AttachmentTemporaryFilesDirs"
 
 #include <MessageCore/NodeHelper>
-#include <MessageCore/StringUtil>
-#include "MessageCore/MessageCoreSettings"
 
 #include <kmime/kmime_content.h>
 #include <kmime/kmime_message.h>
diff --git a/messageviewer/src/viewer/objecttreeemptysource.h b/messageviewer/src/viewer/objecttreeemptysource.h
--- a/messageviewer/src/viewer/objecttreeemptysource.h
+++ b/messageviewer/src/viewer/objecttreeemptysource.h
@@ -21,7 +21,6 @@
 #define MAILVIEWER_OBJECTTREEEMPTYSOURCE_H
 
 #include "objecttreesourceif.h"
-#include "messageviewer/messageviewerutil.h"
 
 class QString;
 
diff --git a/messageviewer/src/viewer/partnodebodypart.h b/messageviewer/src/viewer/partnodebodypart.h
--- a/messageviewer/src/viewer/partnodebodypart.h
+++ b/messageviewer/src/viewer/partnodebodypart.h
@@ -34,8 +34,7 @@
 #ifndef __MESSAGEVIEWER_PARTNODEBODYPART_H_
 #define __MESSAGEVIEWER_PARTNODEBODYPART_H_
 
-#include "messageviewer/bodypart.h"
-#include <AkonadiCore/item.h>
+#include "interfaces/bodypart.h"
 
 class QTextCodec;
 
diff --git a/messageviewer/src/viewer/partnodebodypart.cpp b/messageviewer/src/viewer/partnodebodypart.cpp
--- a/messageviewer/src/viewer/partnodebodypart.cpp
+++ b/messageviewer/src/viewer/partnodebodypart.cpp
@@ -38,6 +38,7 @@
 #include <kmime/kmime_content.h>
 
 #include <QTextCodec>
+#include <QUrl>
 
 using namespace MessageViewer;
 
diff --git a/messageviewer/src/viewer/pluginloaderbase.cpp b/messageviewer/src/viewer/pluginloaderbase.cpp
--- a/messageviewer/src/viewer/pluginloaderbase.cpp
+++ b/messageviewer/src/viewer/pluginloaderbase.cpp
@@ -22,9 +22,9 @@
 #include "pluginloaderbase.h"
 #include "messageviewer_debug.h"
 
-#include <KConfigGroup>
 #include <KLocalizedString>
 #include <KConfig>
+#include <KConfigGroup>
 #include <KPluginLoader>
 
 #include <QDir>