diff --git a/configuredialog/configureappearancepage.cpp b/configuredialog/configureappearancepage.cpp
index 361b4e940..fc091ea63 100644
--- a/configuredialog/configureappearancepage.cpp
+++ b/configuredialog/configureappearancepage.cpp
@@ -38,7 +38,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
 
 #include "messagelist/core/settings.h"
 #include "messagelist/messagelistutil.h"
-#include "messagecore/settings/globalsettings.h"
+#include "messagecore/settings/globalsettings_messagecore_impl.h"
 #include "settings/globalsettings.h"
 
 #include "mailcommon/util/mailutil.h"
diff --git a/configuredialog/configurecomposerpage.cpp b/configuredialog/configurecomposerpage.cpp
index 9c8638a8c..cdd7941b3 100644
--- a/configuredialog/configurecomposerpage.cpp
+++ b/configuredialog/configurecomposerpage.cpp
@@ -24,7 +24,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
 #include "pimcommon/autocorrection/autocorrectionwidget.h"
 #include "messagecomposer/imagescaling/imagescalingwidget.h"
 #include "messagecomposer/settings/messagecomposersettings.h"
-#include "messagecore/settings/globalsettings.h"
+#include "messagecore/settings/globalsettings_messagecore_impl.h"
 #include "settings/globalsettings.h"
 #include "configuredialog/configuredialoglistview.h"
 #include "pimcommon/widgets/simplestringlisteditor.h"
diff --git a/editor/kmcomposereditorng.cpp b/editor/kmcomposereditorng.cpp
index afa18f760..6260f59a3 100644
--- a/editor/kmcomposereditorng.cpp
+++ b/editor/kmcomposereditorng.cpp
@@ -28,7 +28,7 @@
 #include <QCheckBox>
 #include "widgets/kactionmenuchangecase.h"
 #include <KPIMTextEdit/EMailQuoteHighlighter>
-#include "messagecore/settings/globalsettings.h"
+#include "messagecore/settings/globalsettings_messagecore_impl.h"
 #include <Sonnet/ConfigDialog>
 #include <composer-ng/richtextcomposeremailquotehighlighter.h>
 
diff --git a/editor/kmcomposewin.cpp b/editor/kmcomposewin.cpp
index f04d58b14..d754e1e14 100644
--- a/editor/kmcomposewin.cpp
+++ b/editor/kmcomposewin.cpp
@@ -111,7 +111,7 @@
 #include <messagecomposer/job/inserttextfilejob.h>
 #include <messagecomposer/composer/composerlineedit.h>
 #include <messagecore/attachment/attachmentpart.h>
-#include "messagecore/settings/globalsettings.h"
+#include "messagecore/settings/globalsettings_messagecore_impl.h"
 #include <templateparser.h>
 #include <templatesconfiguration.h>
 #include "messagecore/helpers/nodehelper.h"
diff --git a/editor/widgets/cryptostateindicatorwidget.cpp b/editor/widgets/cryptostateindicatorwidget.cpp
index 0164afa4f..dd90be9a1 100644
--- a/editor/widgets/cryptostateindicatorwidget.cpp
+++ b/editor/widgets/cryptostateindicatorwidget.cpp
@@ -16,7 +16,7 @@
 */
 
 #include "cryptostateindicatorwidget.h"
-#include "messagecore/settings/globalsettings.h"
+#include "messagecore/settings/globalsettings_messagecore_impl.h"
 
 #include <KColorScheme>
 #include <KLocalizedString>
diff --git a/kmcommands.cpp b/kmcommands.cpp
index 34bbb6dd0..39b0804a0 100644
--- a/kmcommands.cpp
+++ b/kmcommands.cpp
@@ -96,7 +96,7 @@ using KMail::SecondaryWindow;
 #include "utils/stringutil.h"
 #include "messageviewer/utils/autoqpointer.h"
 #include "messageviewer/settings/globalsettings.h"
-#include "messagecore/settings/globalsettings.h"
+#include "messagecore/settings/globalsettings_messagecore_impl.h"
 
 #include <AkonadiCore/itemmovejob.h>
 #include <AkonadiCore/itemcopyjob.h>
diff --git a/kmkernel.cpp b/kmkernel.cpp
index d78dc895d..bb55d29ed 100644
--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@@ -45,7 +45,7 @@ using KPIM::RecentAddresses;
 using KMail::MailServiceImpl;
 #include "job/jobscheduler.h"
 
-#include "messagecore/settings/globalsettings.h"
+#include "messagecore/settings/globalsettings_messagecore_impl.h"
 #include "messagelist/core/settings.h"
 #include "messagelist/messagelistutil.h"
 #include "messageviewer/settings/globalsettings.h"
diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index 6b0e6378b..de7d117e1 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -94,7 +94,7 @@ using KSieveUi::SieveDebugDialog;
 
 #include "templateparser.h"
 
-#include "messagecore/settings/globalsettings.h"
+#include "messagecore/settings/globalsettings_messagecore_impl.h"
 #include "messagecore/misc/mailinglist.h"
 #include "messagecore/helpers/messagehelpers.h"
 
diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp
index ff9b18df3..2bc8f182c 100644
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@@ -53,7 +53,7 @@ using MessageViewer::CSSHelper;
 
 #include "messageviewer/viewer/viewer.h"
 using namespace MessageViewer;
-#include <messagecore/settings/globalsettings.h>
+#include <messagecore/settings/globalsettings_messagecore_impl.h>
 
 #include "messageviewer/viewer/attachmentstrategy.h"
 #include "messagecomposer/sender/messagesender.h"
diff --git a/messageactions.cpp b/messageactions.cpp
index 4c0f44f9f..c2ede0eae 100644
--- a/messageactions.cpp
+++ b/messageactions.cpp
@@ -29,7 +29,7 @@
 
 #include "pimcommon/widgets/annotationdialog.h"
 #include "pimcommon/webshortcut/webshortcutmenumanager.h"
-#include "messagecore/settings/globalsettings.h"
+#include "messagecore/settings/globalsettings_messagecore_impl.h"
 #include "messagecore/misc/mailinglist.h"
 #include "messagecore/helpers/messagehelpers.h"
 #include "messageviewer/viewer/csshelper.h"