diff --git a/src/icalimporter.cpp b/src/icalimporter.cpp
--- a/src/icalimporter.cpp
+++ b/src/icalimporter.cpp
@@ -22,25 +22,16 @@
 #include "icalimporter.h"
 #include "icalimporter_p.h"
 #include "utils_p.h"
+#include "akonadicalendar_debug.h"
 
-#include <agentmanager.h>
-#include <agentinstancecreatejob.h>
+#include <AkonadiCore/ServerManager>
+#include <AkonadiCore/AgentInstanceCreateJob>
+#include <AkonadiCore/AgentManager>
 
-#include <kcalcore/filestorage.h>
-#include <kcalcore/memorycalendar.h>
-#include <kcalcore/event.h>
-#include <kcalcore/todo.h>
-#include <kcalcore/journal.h>
+#include <KCalCore/FileStorage>
 
-#include <KJob>
-#include <KLocalizedString>
-#include "akonadicalendar_debug.h"
-#include <KDateTime>
-#include <KIO/JobClasses>
-#include <KIO/Scheduler>
+#include <KIO/Job>
 
-#include <QUrl>
-#include <QFile>
 #include <QDBusInterface>
 #include <QTemporaryFile>
 
@@ -111,8 +102,9 @@
     }
 
     Akonadi::AgentInstance instance = createjob->instance();
-    QDBusInterface iface(QStringLiteral("org.freedesktop.Akonadi.Resource.%1").arg(instance.identifier()), QStringLiteral("/Settings"));
-
+    const QString service =
+        Akonadi::ServerManager::agentServiceName(Akonadi::ServerManager::Resource, instance.identifier());
+    QDBusInterface iface(service, QStringLiteral("/Settings"));
     if (!iface.isValid()) {
         setErrorMessage(i18n("Failed to obtain D-Bus interface for remote configuration."));
         emit q->importIntoNewFinished(false);