--- a/activityfw/activityserviceplugin/activityserviceplugin.pro	Wed Jun 23 18:33:40 2010 +0300
+++ b/activityfw/activityserviceplugin/activityserviceplugin.pro	Tue Jul 06 14:37:10 2010 +0300
@@ -21,19 +21,16 @@
 include(activityserviceplugin.pri)
 
 INCLUDEPATH += ./inc \
+               ../../inc
 
 HEADERS +=  ./inc/activityserviceplugin.h \
-            ./inc/activityclient.h \
-            ./inc/activityclient_p.h \
-            ./inc/activitymanager.h \
-            ./inc/activitymanager_p.h \
+            ./inc/afactivityclient.h \
+            ./inc/afactivitymanager.h \
             ./inc/applicationlauncher.h \
 
 SOURCES +=  ./src/activityserviceplugin.cpp \
-            ./src/activityclient.cpp \
-            ./src/activityclient_p.cpp \
-            ./src/activitymanager.cpp \
-            ./src/activitymanager_p.cpp \
+            ./src/afactivityclient.cpp \
+            ./src/afactivitymanager.cpp \
             ./src/applicationlauncher.cpp \
 
 symbian {
@@ -46,7 +43,7 @@
     LIBS += -lapparc \
             -lapgrfx \
             -lcone \
-            -lhsactivitydbclient \
+            -lafstorageclient \
             -lxqutils
  
 }