diff -r b99b84bcd2d1 -r 9b022b1f357c activityfw/activityserviceplugin/src/activityserviceplugin.cpp
--- a/activityfw/activityserviceplugin/src/activityserviceplugin.cpp	Wed Jun 23 18:33:40 2010 +0300
+++ b/activityfw/activityserviceplugin/src/activityserviceplugin.cpp	Tue Jul 06 14:37:10 2010 +0300
@@ -21,8 +21,8 @@
 #include <qabstractsecuritysession.h>
 #include <qservicecontext.h>
 
-#include "activityclient.h"
-#include "activitymanager.h"
+#include "afactivityclient.h"
+#include "afactivitymanager.h"
 
 QObject *ActivityServicePlugin::createInstance(const QServiceInterfaceDescriptor &descriptor, QServiceContext *context, QAbstractSecuritySession *session)
 {
@@ -30,9 +30,9 @@
     Q_UNUSED(session);
 
     if (descriptor.interfaceName() == "com.nokia.qt.activities.ActivityClient") {
-        return new ActivityClient();
+        return new ActivityClient(QSharedPointer<AfStorageClient>(new AfStorageClient()));
     } else if (descriptor.interfaceName() == "com.nokia.qt.activities.ActivityManager") {
-        return new ActivityManager();
+        return new ActivityManager(QSharedPointer<AfStorageClient>(new AfStorageClient()));
     } else {
         return NULL;
     }