--- a/activityfw/activityserviceplugin/activityserviceplugin.pro	Thu May 27 13:11:12 2010 +0300
+++ b/activityfw/activityserviceplugin/activityserviceplugin.pro	Fri Jun 11 13:58:37 2010 +0300
@@ -21,8 +21,6 @@
 include(activityserviceplugin.pri)
 
 INCLUDEPATH += ./inc \
-             #../cautils/inc \
-             #../extinc \
 
 HEADERS +=  ./inc/activityserviceplugin.h \
             ./inc/activitydatastorage.h \
@@ -45,7 +43,7 @@
 
     SOURCES += ./s60/src/applicationlauncher_p.cpp
     
-    HEADERS += ./s60/src/applicationlauncher_p.h
+    HEADERS += ./s60/inc/applicationlauncher_p.h
 
     LIBS += -lapparc \
             -lapgrfx \
@@ -76,4 +74,8 @@
     xml.path = $$RESOURCE_FILES_DIR/activity
     
     DEPLOYMENT += xml
+
+    #temporary workaround
+    BLD_INF_RULES.prj_exports += "data/activityserviceplugin.xml z:/resource/activity/activityserviceplugin.xml"
+    
 }