Fix includes

CMakeLists.txt

@@ -67,7 +67,7 @@ option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branc
 
 find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngineWidgets)
 set(LIBGRAVATAR_VERSION "5.19.40")
-set(MAILCOMMON_LIB_VERSION "5.19.42")
+set(MAILCOMMON_LIB_VERSION "5.19.43")
 set(MESSAGELIB_LIB_VERSION "5.19.40")
 set(LIBKLEO_LIB_VERSION "5.19.40")
 set(PIMCOMMON_LIB_VERSION "5.19.42")

src/configuredialog/configureappearancepage.cpp

@@ -22,7 +22,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
 
 #include "kmmainwidget.h"
 
-#include "mailcommonsettings_base.h"
+#include <mailcommon/mailcommonsettings_base.h>
 
 #include <MessageViewer/ConfigureWidget>
 #include <MessageViewer/MessageViewerSettings>

src/kmkernel.cpp

@@ -22,9 +22,7 @@ using PimCommon::RecentAddresses;
 #include "configuredialog/configuredialog.h"
 #include "folderarchive/folderarchivemanager.h"
 #include "kmcommands.h"
-#include "mailcommonsettings_base.h"
 #include "mailfilteragentinterface.h"
-#include "pop3settings.h"
 #include "sieveimapinterface/kmailsieveimapinstanceinterface.h"
 #include "unityservicemanager.h"
 #include <MailCommon/FolderTreeView>
@@ -32,6 +30,8 @@ using PimCommon::RecentAddresses;
 #include <MailCommon/MailUtil>
 #include <MessageCore/StringUtil>
 #include <PimCommon/PimUtil>
+#include <mailcommon/mailcommonsettings_base.h>
+#include <mailcommon/pop3settings.h>
 // kdepim includes
 #include "kmail-version.h"
 

src/kmmainwidget.cpp

@@ -54,7 +54,6 @@
 #include "tag/tagselectdialog.h"
 #include <Akonadi/CollectionMaintenancePage>
 
-#include "mailcommonsettings_base.h"
 #include <Akonadi/AgentConfigurationDialog>
 #include <MailCommon/CollectionExpiryPage>
 #include <MailCommon/CollectionGeneralPage>
@@ -65,6 +64,7 @@
 #include <MailCommon/MailFilter>
 #include <PimCommon/PimUtil>
 #include <PimCommonAkonadi/CollectionAclPage>
+#include <mailcommon/mailcommonsettings_base.h>
 
 #include "kmail-version.h"