--- a/symbian3/split/sources.csv	Fri Dec 04 10:56:44 2009 +0000
+++ b/symbian3/split/sources.csv	Mon Dec 07 15:11:35 2009 +0000
@@ -110,17 +110,14 @@
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/usb/,/sf/os/usb,branch,default,
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml

--- a/symbian3/split/sources_fcl.csv	Fri Dec 04 10:56:44 2009 +0000
+++ b/symbian3/split/sources_fcl.csv	Mon Dec 07 15:11:35 2009 +0000
@@ -111,7 +111,6 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/unref/,/sf/os/unref,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/usb/,/sf/os/usb,branch,default,
@@ -120,10 +119,8 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml

--- a/symbian3/split/sysdefs/system_model_s60.xml	Fri Dec 04 10:56:44 2009 +0000
+++ b/symbian3/split/sysdefs/system_model_s60.xml	Mon Dec 07 15:11:35 2009 +0000
@@ -91,7 +91,7 @@
   cwd CDATA #REQUIRED
   command CDATA #REQUIRED>
 ]>
-<SystemDefinition name="S60_SystemBuild + sysdef_dtd_1_4_0_xml + QuickOffice + adobereader + tfxserver + webvideo + wmdrmkeystorage_dist + wmdrmpd_dist + zipviewer + oemrndtools + swconfigapps + toolsextensions + avdomain + btaudioadaptation_stub + drm_stub + ocrsrv_stub + omasuplasnconverterstubimpl + posmsgpluginreferenceimpl + power_save_display_mode_stub + srsfenginestub + systemswstubs + tactileclickplugin_stub + wlanhwinit_stub + camera + commonemail + conntools + contacts + contentcontrol + conversations + devicecontrol + systemswextensions + files + gallery + graphicsuis + helps + homescreen + im + imgvieweruis + iptelephony + java + location + messaging + mmsharinguis + avdomain + organizer + phone + photos + printing + profile + radio + rndtools + screensaver + settingsuis + speechsrv + utils + video + videotelephony + avdomain + webuis + accesssec + appinstall + appsupport + btservices + camerasrv + classicui + dlnasrv + drm + gsprofilesrv + hapticsservices + avdomain + homescreensrv + imghandling + imsrv + inputmethods + ipappprotocols + ipappservices + ipconnmgmt + legacypresence + locationsrv + mds + messagingmw + metadatasrv + avdomain + avdomain + mmuifw + netprotocols + networkingdm + opensrv + phonesrv + platformtools + remoteconn + remotemgmt + remotestorage + securitysrv + serviceapi + serviceapifw + shortlinkconn + ossrv + svgt + uiaccelerator + uiresources + uitools + usbservices + videoutils + vpnclient + web + websrv + wirelessacc + cellularsrv + S60Extras + devicesrv + graphics + imagingext + lbs + avdomainosext + networkingsrv + osrndtools + ossrv + shortlinksrv + systemswextensions + wlan + xmlsrv + buildplatforms + homescreentools + swconfigtools" schema="1.4.0">
+<SystemDefinition name="S60_SystemBuild + sysdef_dtd_1_4_0_xml + QuickOffice + adobereader + tfxserver + webvideo + wmdrmkeystorage_dist + wmdrmpd_dist + zipviewer + oemrndtools + swconfigapps + toolsextensions + avdomain + btaudioadaptation_stub + drm_stub + ocrsrv_stub + omasuplasnconverterstubimpl + posmsgpluginreferenceimpl + power_save_display_mode_stub + srsfenginestub + systemswstubs + tactileclickplugin_stub + wlanhwinit_stub + camera + commonemail + conntools + contacts + contentcontrol + conversations + devicecontrol + systemswextensions + files + gallery + graphicsuis + helps + homescreen + im + imgvieweruis + iptelephony + java + location + messaging + mmsharinguis + avdomain + organizer + phone + photos + printing + profile + radio + rndtools + screensaver + settingsuis + speechsrv + utils + video + videotelephony + avdomain + webuis + accesssec + appinstall + appsupport + btservices + camerasrv + classicui + dlnasrv + drm + gsprofilesrv + hapticsservices + avdomain + homescreensrv + imghandling + imsrv + inputmethods + ipappprotocols + ipappservices + ipconnmgmt + legacypresence + locationsrv + mds + messagingmw + metadatasrv + avdomain + avdomain + mmuifw + netprotocols + networkingdm + opensrv + phonesrv + platformtools + remoteconn + remotemgmt + remotestorage + securitysrv + serviceapi + serviceapifw + shortlinkconn + ossrv + svgt + uiaccelerator + uiresources + uitools + usbservices + videoutils + vpnclient + web + websrv + wirelessacc + cellularsrv + S60Extras + devicesrv + graphics + imagingext + lbs + avdomainosext + networkingsrv + osrndtools + ossrv + systemswextensions + wlan + xmlsrv + buildplatforms + homescreentools + swconfigtools" schema="1.4.0">
 <systemModel>
 	<layer name="os_layer">
 <module name="toolsextensions">
@@ -141,9 +141,6 @@
 <module name="ossrv">                             
 <unit name="ossrv" unitID="mrtdo.ossrv" bldFile="sf/os/ossrv/group" mrp=""/>
 </module>
-<module name="shortlinksrv">
-        <unit unitID="lcdo.shortlinksrv" mrp="" bldFile="sf/os/shortlinksrv/group" name="shortlinksrv"/>
-      </module>
 <module name="wlan">
         <unit unitID="netdo.wlan" mrp="" bldFile="sf/os/wlan/group" name="wlan"/>
       </module>
@@ -592,4 +589,4 @@
 -->
 <!--  OS Extension build configurations start  -->
   </build>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>