diff --git a/autotests/favoritestest.cpp b/autotests/favoritestest.cpp
index f3e2a41..e0d6320 100644
--- a/autotests/favoritestest.cpp
+++ b/autotests/favoritestest.cpp
@@ -13,9 +13,9 @@
 #include <Akonadi/ChangeRecorder>
 #include <Akonadi/Control>
 #include <Akonadi/EntityTreeModel>
+#include <Akonadi/FavoriteCollectionsModel>
 #include <akonadi/qtest_akonadi.h>
 #include <favoritecollectionorderproxymodel.h>
-#include <favoritecollectionsmodel.h>
 
 using namespace Akonadi;
 using namespace MailCommon;
diff --git a/src/filter/filteractions/filteractionaddtoaddressbook.cpp b/src/filter/filteractions/filteractionaddtoaddressbook.cpp
index d752915..8234421 100644
--- a/src/filter/filteractions/filteractionaddtoaddressbook.cpp
+++ b/src/filter/filteractions/filteractionaddtoaddressbook.cpp
@@ -12,7 +12,7 @@
 #include <Akonadi/TagSelectionDialog>
 #include <Akonadi/TagWidget>
 
-#include <CollectionComboBox>
+#include <Akonadi/CollectionComboBox>
 #include <KComboBox>
 #include <KContacts/Addressee>
 #include <KEmailAddress>
diff --git a/src/filter/filteractions/filteractioncopy.cpp b/src/filter/filteractions/filteractioncopy.cpp
index 76b8a66..08dbe16 100644
--- a/src/filter/filteractions/filteractioncopy.cpp
+++ b/src/filter/filteractions/filteractioncopy.cpp
@@ -10,7 +10,7 @@
 #include "kernel/mailkernel.h"
 #include "util/mailutil.h"
 
-#include <ItemCopyJob>
+#include <Akonadi/ItemCopyJob>
 #include <KLocalizedString>
 
 using namespace MailCommon;
diff --git a/src/filter/filterimporter/autotests/filterimportbalsatest.cpp b/src/filter/filterimporter/autotests/filterimportbalsatest.cpp
index 94f9bd2..578adfe 100644
--- a/src/filter/filterimporter/autotests/filterimportbalsatest.cpp
+++ b/src/filter/filterimporter/autotests/filterimportbalsatest.cpp
@@ -6,8 +6,8 @@
 #include "filterimportbalsatest.h"
 #include "filter/mailfilter.h"
 #include "filtertestkernel.h"
-#include <AkonadiCore/qtest_akonadi.h>
 #include <MailCommon/MailKernel>
+#include <akonadi/qtest_akonadi.h>
 
 void FilterImportBalsatest::initTestCase()
 {
diff --git a/src/filter/filterimporter/autotests/filterimportclawmailtest.cpp b/src/filter/filterimporter/autotests/filterimportclawmailtest.cpp
index 534282b..434d7f5 100644
--- a/src/filter/filterimporter/autotests/filterimportclawmailtest.cpp
+++ b/src/filter/filterimporter/autotests/filterimportclawmailtest.cpp
@@ -7,8 +7,8 @@
 #include "../filterimporterclawsmail.h"
 #include "filter/mailfilter.h"
 #include "filtertestkernel.h"
-#include <AkonadiCore/qtest_akonadi.h>
 #include <MailCommon/MailKernel>
+#include <akonadi/qtest_akonadi.h>
 
 void FilterImportClawMailtest::initTestCase()
 {
diff --git a/src/filter/filterimporter/autotests/filterimportergmailtest.cpp b/src/filter/filterimporter/autotests/filterimportergmailtest.cpp
index 9f0b569..317f774 100644
--- a/src/filter/filterimporter/autotests/filterimportergmailtest.cpp
+++ b/src/filter/filterimporter/autotests/filterimportergmailtest.cpp
@@ -6,8 +6,8 @@
 #include "filterimportergmailtest.h"
 #include "filter/mailfilter.h"
 #include "filtertestkernel.h"
-#include <AkonadiCore/qtest_akonadi.h>
 #include <MailCommon/MailKernel>
+#include <akonadi/qtest_akonadi.h>
 
 FilterImporterGmailTest::FilterImporterGmailTest(QObject *parent)
     : QObject(parent)
diff --git a/src/filter/filterimporter/autotests/filterimportevolutiontest.cpp b/src/filter/filterimporter/autotests/filterimportevolutiontest.cpp
index c34bf79..9992a63 100644
--- a/src/filter/filterimporter/autotests/filterimportevolutiontest.cpp
+++ b/src/filter/filterimporter/autotests/filterimportevolutiontest.cpp
@@ -6,8 +6,8 @@
 #include "filterimportevolutiontest.h"
 #include "filter/mailfilter.h"
 #include "filtertestkernel.h"
-#include <AkonadiCore/qtest_akonadi.h>
 #include <MailCommon/MailKernel>
+#include <akonadi/qtest_akonadi.h>
 
 void FilterImportEvolutiontest::initTestCase()
 {
diff --git a/src/filter/filterimporter/autotests/filterimportprocmailtest.cpp b/src/filter/filterimporter/autotests/filterimportprocmailtest.cpp
index c929824..77eaf21 100644
--- a/src/filter/filterimporter/autotests/filterimportprocmailtest.cpp
+++ b/src/filter/filterimporter/autotests/filterimportprocmailtest.cpp
@@ -7,8 +7,8 @@
 #include "../filterimporterprocmail.h"
 #include "filter/mailfilter.h"
 #include "filtertestkernel.h"
-#include <AkonadiCore/qtest_akonadi.h>
 #include <MailCommon/MailKernel>
+#include <akonadi/qtest_akonadi.h>
 
 void FilterImportProcmailtest::initTestCase()
 {
diff --git a/src/filter/filterimporter/autotests/filterimportsylpheedtest.cpp b/src/filter/filterimporter/autotests/filterimportsylpheedtest.cpp
index cb95c98..981cbd4 100644
--- a/src/filter/filterimporter/autotests/filterimportsylpheedtest.cpp
+++ b/src/filter/filterimporter/autotests/filterimportsylpheedtest.cpp
@@ -6,8 +6,8 @@
 #include "filterimportsylpheedtest.h"
 #include "filter/mailfilter.h"
 #include "filtertestkernel.h"
-#include <AkonadiCore/qtest_akonadi.h>
 #include <MailCommon/MailKernel>
+#include <akonadi/qtest_akonadi.h>
 
 void FilterImportSylpheedtest::initTestCase()
 {
diff --git a/src/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp b/src/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp
index 3263880..2090af5 100644
--- a/src/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp
+++ b/src/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp
@@ -7,8 +7,8 @@
 #include "../filterimporterthunderbird.h"
 #include "filter/mailfilter.h"
 #include "filtertestkernel.h"
-#include <AkonadiCore/qtest_akonadi.h>
 #include <MailCommon/MailKernel>
+#include <akonadi/qtest_akonadi.h>
 
 void FilterImportThunderbirdtest::initTestCase()
 {
diff --git a/src/folder/folderselectiondialog.cpp b/src/folder/folderselectiondialog.cpp
index 6721ed3..50a15b7 100644
--- a/src/folder/folderselectiondialog.cpp
+++ b/src/folder/folderselectiondialog.cpp
@@ -13,9 +13,9 @@
 #include "foldertreewidgetproxymodel.h"
 #include "kernel/mailkernel.h"
 
+#include <Akonadi/CollectionCreateJob>
 #include <Akonadi/EntityMimeTypeFilterModel>
 #include <Akonadi/EntityTreeModel>
-#include <CollectionCreateJob>
 
 #include <KLocalizedString>
 #include <KMessageBox>
diff --git a/src/folder/foldertreewidgetproxymodel.cpp b/src/folder/foldertreewidgetproxymodel.cpp
index afa7cf7..2beada2 100644
--- a/src/folder/foldertreewidgetproxymodel.cpp
+++ b/src/folder/foldertreewidgetproxymodel.cpp
@@ -16,9 +16,9 @@
 #include <Akonadi/EntityTreeModel>
 #include <Akonadi/MimeTypeChecker>
 
+#include <Akonadi/CollectionQuotaAttribute>
 #include <KColorScheme>
 #include <KLocalizedString>
-#include <collectionquotaattribute.h>
 
 #include <QIcon>
 #include <QPalette>
diff --git a/src/mdn/mdnstateattribute.cpp b/src/mdn/mdnstateattribute.cpp
index 5505031..12adf36 100644
--- a/src/mdn/mdnstateattribute.cpp
+++ b/src/mdn/mdnstateattribute.cpp
@@ -9,7 +9,7 @@
 
 #include "mdnstateattribute.h"
 
-#include <akonadi/attributefactory.h>
+#include <Akonadi/AttributeFactory>
 
 #include <QByteArray>
 
diff --git a/src/mdn/mdnstateattribute.h b/src/mdn/mdnstateattribute.h
index 4bb436c..54be6d9 100644
--- a/src/mdn/mdnstateattribute.h
+++ b/src/mdn/mdnstateattribute.h
@@ -11,7 +11,7 @@
 
 #include "mailcommon_export.h"
 
-#include <akonadi/attribute.h>
+#include <Akonadi/Attribute>
 
 namespace MailCommon
 {