diff -r 321a53705efc -r 772a24469179 symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Sat Mar 20 17:50:49 2010 +0000
+++ b/symbian3/single/sysdefs/system_model.xml	Wed Mar 24 12:43:27 2010 +0000
@@ -811,9 +811,6 @@
      <component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
       <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
      </component>
-     <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60" class="api placeholder">
-      <!-- FAULTY <unit bldFile="devicesrv_pub/platform_path_definitions_api/inc/platform_paths.hrh"/> -->
-     </component>
     </collection>
     <collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
      <component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
@@ -1222,7 +1219,7 @@
      <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
       <unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
      </component>
-     <component name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+     <component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
       <unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
      </component>
      <component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
@@ -6024,8 +6021,9 @@
    </block>
    <block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
     <collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-     <component name="inc" long-name="Inc" introduced="^1" filter="s60" class="api placeholder">
-      <!-- FAULTY <unit bldFile="mmappfw_plat/inc/mmappfwbldvariant.hrh"/> -->
+     <component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
+      <!-- this is no longer necessary when confguration is put in place -->
+      <unit bldFile="mw/mmappfw/mmappfw_plat"/>
      </component>
      <component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
       <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
@@ -7573,9 +7571,6 @@
      </component>
     </collection>
     <collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-     <component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api placeholder">
-      <!-- FAULTY <unit bldFile="web_plat/browser_platform_api/inc/browser_platform_variant.hrh"/> -->
-     </component>
      <component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
       <unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
      </component>
@@ -7895,9 +7890,6 @@
      <component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
       <unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
      </component>
-     <component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-      <unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-     </component>
      <component name="webservices_build" filter="s60" long-name="Web Services Build">
       <!-- need to split into self-contained components -->
       <unit bldFile="mw/websrv/webservices/group"/>
@@ -8589,7 +8581,7 @@
       <unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
      </component>
      <component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-      <unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
+      <unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
      </component>
      <component name="applicationmanagement_build" filter="s60" long-name="AM Build">
       <!-- If thes aren't collapsed into one cmp, can all  #includes removed from here, and it renamed AM ROM? -->