diff -r ccb4f6b3db21 -r 8cb079868133 sysstatemgmt/systemstatereferenceplugins/custcmd/group/ssmuiproviderdlldefault.mmp
--- a/sysstatemgmt/systemstatereferenceplugins/custcmd/group/ssmuiproviderdlldefault.mmp	Tue Aug 31 16:29:05 2010 +0300
+++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/group/ssmuiproviderdlldefault.mmp	Wed Sep 01 12:34:26 2010 +0100
@@ -35,33 +35,15 @@
 NOEXPORTLIBRARY
 
 SOURCEPATH		../src
-// This is a temporary fix for fixing the build issues arising out of XSymbian code
-// getting compiled before xS60 code is in the mainline. This will be removed after
-// the merged package issues are resolved
-#ifdef FF_SIMLESS_OFFLINE_SUPPORT
 SOURCE			ssmuiproviderdlldefault.cpp
-#else //FF_SIMLESS_OFFLINE_SUPPORT
-SOURCE			ssmuiproviderdllref.cpp
-#endif //FF_SIMLESS_OFFLINE_SUPPORT
 
 USERINCLUDE 	../inc
 USERINCLUDE		../../localinc
 USERINCLUDE		../../clayer/inc
 
-#ifdef FF_SIMLESS_OFFLINE_SUPPORT
-USERINCLUDE		../../../ssmmapperutility/inc
-USERINCLUDE		../../../ssmmapperutility/pubsub
-USERINCLUDE		../../../ssmpolicyplugins/inc
-#endif //FF_SIMLESS_OFFLINE_SUPPORT
-
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY			euser.lib
 LIBRARY			efsrv.lib
-#ifdef FF_SIMLESS_OFFLINE_SUPPORT
-LIBRARY         platformenv.lib
-LIBRARY         ssmcmn.lib
-LIBRARY         ssmmapperutility.lib
-#endif //FF_SIMLESS_OFFLINE_SUPPORT
 
 SMPSAFE