diff --git a/src/filter/autotests/filteractionaddtoaddressbooktest.cpp b/src/filter/autotests/filteractionaddtoaddressbooktest.cpp
index 8ea8c9f..818abe3 100644
--- a/src/filter/autotests/filteractionaddtoaddressbooktest.cpp
+++ b/src/filter/autotests/filteractionaddtoaddressbooktest.cpp
@@ -22,7 +22,7 @@
 #include <QLabel>
 #include <KLineEdit>
 #include <QComboBox>
-#include <libkdepimakonadi/tagwidgets.h>
+#include <LibkdepimAkonadi/TagWidgets>
 #include <AkonadiWidgets/CollectionComboBox>
 
 FilterActionAddToAddressBookTest::FilterActionAddToAddressBookTest(QObject *parent)
diff --git a/src/filter/filteractions/filteraction.cpp b/src/filter/filteractions/filteraction.cpp
index f51d90c..ae50d7c 100644
--- a/src/filter/filteractions/filteraction.cpp
+++ b/src/filter/filteractions/filteraction.cpp
@@ -28,7 +28,7 @@
 #include <MessageComposer/MessageFactoryNG>
 #include <MessageComposer/MessageSender>
 #include <MessageComposer/Util>
-#include <messageviewer/messageviewersettings.h>
+#include <MessageViewer/MessageViewerSettings>
 
 #include <KLocalizedString>
 
diff --git a/src/filter/mdnadvicedialog.cpp b/src/filter/mdnadvicedialog.cpp
index ee2bac9..f4d46a1 100644
--- a/src/filter/mdnadvicedialog.cpp
+++ b/src/filter/mdnadvicedialog.cpp
@@ -24,9 +24,9 @@
 #include <MessageComposer/Util>
 using MessageComposer::MessageFactoryNG;
 
-#include <messageviewer/messageviewersettings.h>
+#include <MessageViewer/MessageViewerSettings>
 #ifndef QT_NO_CURSOR
-#include <libkdepim/kcursorsaver.h>
+#include <Libkdepim/KCursorSaver>
 #endif
 #include <MimeTreeParser/ObjectTreeParser>
 
diff --git a/src/mdn/sendmdnhandler.cpp b/src/mdn/sendmdnhandler.cpp
index c933670..f5deb9e 100644
--- a/src/mdn/sendmdnhandler.cpp
+++ b/src/mdn/sendmdnhandler.cpp
@@ -28,7 +28,7 @@
 #include <MessageComposer/Util>
 #include <MessageComposer/MessageFactoryNG>
 #include <MessageComposer/MessageSender>
-#include <messageviewer/messageviewersettings.h>
+#include <MessageViewer/MessageViewerSettings>
 
 #include <Collection>
 #include <Item>
diff --git a/src/mdn/sendmdnhandler.h b/src/mdn/sendmdnhandler.h
index f864a6c..e28cd72 100644
--- a/src/mdn/sendmdnhandler.h
+++ b/src/mdn/sendmdnhandler.h
@@ -23,7 +23,7 @@
 
 #include "mailcommon_export.h"
 
-#include <messageviewer/viewer.h>
+#include <MessageViewer/Viewer>
 
 #include <QObject>
 
diff --git a/src/search/widgethandler/rulewidgethandlermanager.cpp b/src/search/widgethandler/rulewidgethandlermanager.cpp
index fc8c00c..d1e3d52 100644
--- a/src/search/widgethandler/rulewidgethandlermanager.cpp
+++ b/src/search/widgethandler/rulewidgethandlermanager.cpp
@@ -40,7 +40,7 @@
 #include "encryptionwidgethandler.h"
 #include "interfaces/rulewidgethandler.h"
 
-#include <messageviewer/stl_util.h>
+#include <MessageViewer/Stl_Util>
 
 #include <QObject>
 #include <QStackedWidget>