--- a/symbian3/app/commonemail/package_definition.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/app/commonemail/package_definition.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -89,9 +89,6 @@
           <component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
             <unit bldFile="/sf/app/commonemail/email_plat/email_setup_plugin_api/group"/>
           </component>
-          <component name="email_crkeys_api" long-name="Email CenRep Keys API" filter="s60" class="api">
-            <unit bldFile="/sf/app/commonemail/email_plat/email_crkeys_api/group"/>
-          </component>
         </collection>
         <collection name="emailservices" long-name="Email Services" level="service">
           <component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">

--- a/symbian3/app/commonemail/package_definition_3.0.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/app/commonemail/package_definition_3.0.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -16,9 +16,6 @@
     <meta rel="Api" href="email_plat/email_setup_plugin_api/email_setup_plugin_api.metaxml"/>
     <unit bldFile="email_plat/email_setup_plugin_api/group"/>
    </component>
-   <component id="email_crkeys_api" name="Email CenRep Keys API" class="api" filter="s60">
-    <unit bldFile="email_plat/email_crkeys_api/group"/>
-   </component>
   </collection>
     <collection id="emailservices" name="Email Services" level="service">
       <component id="emailframework" filter="s60" name="Email Framework" introduced="^2">

--- a/symbian3/app/contacts/package_definition.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/app/contacts/package_definition.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -229,9 +229,6 @@
           <component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
             <unit bldFile="/sf/app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
           </component>
-          <component name="phonebook_2_contact_related_icon_customization_api" long-name="Phonebook 2 Contact Related Icon Customization API" filter="s60" class="api">
-            <unit bldFile="/sf/app/contacts/contacts_plat/phonebook_2_contact_related_icon_customization_api/group"/>
-          </component>
           <component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
             <unit bldFile="/sf/app/contacts/contacts_plat/cca_launch_api/group"/>
             <unit bldFile="/sf/app/contacts/contacts_plat/cca_launch_api/tsrc/group" filter="test,api_test"/>

--- a/symbian3/app/contacts/package_definition_3.0.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/app/contacts/package_definition_3.0.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -200,10 +200,6 @@
     <meta rel="Api" href="contacts_plat/phonebook_2_ui_utilities_api/phonebook_2_ui_utilities_api.metaxml"/>
     <unit bldFile="contacts_plat/phonebook_2_ui_utilities_api/group"/>
    </component>
-   <component id="phonebook_2_contact_related_icon_customization_api" name="Phonebook 2 Contact Related Icon Customization API" class="api" filter="s60">
-    <meta rel="Api" href="contacts_plat/phonebook_2_contact_related_icon_customization_api/phonebook_2_contact_related_icon_customization_api.metaxml"/>
-    <unit bldFile="contacts_plat/phonebook_2_contact_related_icon_customization_api/group"/>
-   </component>
    <component id="cca_launch_api" name="CCA Launch API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/cca_launch_api/cca_launch_api.metaxml"/>
     <unit bldFile="contacts_plat/cca_launch_api/group" fitler="!test"/>

--- a/symbian3/app/contentcontrol/package_definition.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/app/contentcontrol/package_definition.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -87,12 +87,6 @@
           <component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
             <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
           </component>
-          <component name="adapter_customization_api" long-name="Adapter Customization API" filter="s60" class="api">
-            <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
-          </component>
-          <component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
-            <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
-          </component>
         </collection>
         <collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
           <!-- Component at wrong rank, should move down a directory -->

--- a/symbian3/app/contentcontrol/package_definition_3.0.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/app/contentcontrol/package_definition_3.0.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -14,14 +14,6 @@
     <meta rel="Api" href="contentctrl_plat/ds_folder_util_api/ds_folder_util_api.metaxml"/>
     <unit bldFile="contentctrl_plat/ds_folder_util_api/group"/>
    </component>
-   <component id="adapter_customization_api" name="Adapter Customization API" class="api" filter="s60">
-    <meta rel="Api" href="contentctrl_plat/adapter_customization_api/adapter_customization_api.metaxml"/>
-    <unit bldFile="contentctrl_plat/adapter_customization_api/group"/>
-   </component>
-   <component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60">
-    <meta rel="Api" href="contentctrl_plat/ds_data_modification_api/ds_data_modification_api.metaxml"/>
-    <unit bldFile="contentctrl_plat/ds_data_modification_api/group"/>
-   </component>
   </collection>
   <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
    <!-- Component at wrong rank, should move down a directory -->

--- a/symbian3/mw/metadatasrv/package_definition.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/mw/metadatasrv/package_definition.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -79,21 +79,32 @@
       <block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
         <collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
           <component name="content_listing_framework_api" long-name="Content Listing Framework API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/content_listing_framework_api/group"/>
+            <!-- Leave commented out until confguration is in use
+	unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
           </component>
           <component name="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
             <unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
           </component>
+          <component name="metadatasrv_pub_build" long-name="Legacy Metadata Services Public Interface Build" filter="s60" class="api">
+            <!-- only needed for #ifdefs, remove when confguration is in use -->
+            <unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/group"/>
+          </component>
         </collection>
         <collection name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" level="specific">
           <component name="media_fetch_implementation_api" long-name="Media Fetch Implementation API" filter="s60" class="api">
             <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
           </component>
           <component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>
+            <!-- Leave commented out until confguration is in use
+    <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
           </component>
           <component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/content_listing_framework_extended_api/group"/>
+            <!-- Leave commented out until confguration is in use
+    <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
+          </component>
+          <component name="metadatasrv_plat_build" long-name="Legacy Metadata Services Platform Interface Build" filter="s60" class="api">
+            <!-- only needed for #ifdefs, remove when confguration is in use -->
+            <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/group"/>
           </component>
         </collection>
         <collection name="mediamanagementutilities" long-name="Media Management Utilities" level="generic">

--- a/symbian3/mw/metadatasrv/package_definition_3.0.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/mw/metadatasrv/package_definition_3.0.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -6,12 +6,17 @@
     <meta rel="config">
      <not-defined condition="RD_MDS_2_5"/>
     </meta>
-    <unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>
+    <!-- Leave commented out until confguration is in use
+	unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
    </component>
    <component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
     <meta rel="Api" href="metadatasrv_pub/media_fetch_api/media_fetch_api.metaxml"/>
     <unit bldFile="metadatasrv_pub/media_fetch_api/group"/>
    </component>
+   <component id="metadatasrv_pub_build" name="Legacy Metadata Services Public Interface Build" class="api" filter="s60">
+	<!-- only needed for #ifdefs, remove when confguration is in use -->
+    <unit bldFile="metadatasrv_pub/group"/>
+   </component>
   </collection>
   <collection id="metadatasrv_plat" name="Legacy Metadata Services Platform Interfaces" level="specific">
    <component id="media_fetch_implementation_api" name="Media Fetch Implementation API" class="api" filter="s60">
@@ -22,13 +27,19 @@
     <meta rel="config">
      <not-defined condition="RD_MDS_2_5"/>
     </meta>
-    <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>
+    <!-- Leave commented out until confguration is in use
+    <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
    </component>
    <component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" class="api" filter="s60">
     <meta rel="config">
      <not-defined condition="RD_MDS_2_5"/>
     </meta>
-    <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>
+    <!-- Leave commented out until confguration is in use
+    <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
+   </component>
+   <component id="metadatasrv_plat_build" name="Legacy Metadata Services Platform Interface Build" class="api" filter="s60">
+	<!-- only needed for #ifdefs, remove when confguration is in use -->
+    <unit bldFile="metadatasrv_plat/group"/>
    </component>
   </collection>
   <collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">

--- a/symbian3/mw/mmappfw/package_definition.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/mw/mmappfw/package_definition.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -134,10 +134,12 @@
             <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
           </component>
           <component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
+            <!-- uncomment when configuration is put in place
+	 <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
           </component>
           <component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
+            <!-- uncomment when configuration is put in place
+    <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
           </component>
           <component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
             <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
@@ -145,6 +147,10 @@
           <component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
             <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
           </component>
+          <component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
+            <!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
+            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/group"/>
+          </component>
         </collection>
         <collection name="mpx" long-name="Multimedia Player" level="fw">
           <component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">

--- a/symbian3/mw/mmappfw/package_definition_3.0.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/mw/mmappfw/package_definition_3.0.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -79,14 +79,16 @@
     <meta rel="config">
      <defined condition="IAD_INCLUDE_BACKSTEPPING"/>
     </meta>
-    <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/>
+    <!-- uncomment when configuration is put in place
+	 <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
    </component>
    <component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
     <meta rel="Api" href="mmappfw_plat/asx_parser_api/asx_parser_api.metaxml"/>
     <meta rel="config">
      <defined condition="__WINDOWS_MEDIA"/>
     </meta>
-    <unit bldFile="mmappfw_plat/asx_parser_api/group"/>
+	<!-- uncomment when configuration is put in place
+    <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
    </component>
    <component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
     <unit bldFile="mmappfw_plat/playback_helper_api/group"/>
@@ -94,6 +96,10 @@
    <component id="videoplaylist_utility_api" name="Video Playlist Utility API" introduced="^1" class="api" filter="s60">
     <unit bldFile="mmappfw_plat/videoplaylist_utility_api/group"/>
    </component>
+   <component id="mmappfw_plat_build" name="Multimedia App Framework Platform Interface Build" introduced="^1" class="api" filter="s60">
+	<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
+    <unit bldFile="mmappfw_plat/group"/>
+   </component>
   </collection>
   <collection id="mpx" name="Multimedia Player" level="fw">
    <component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">

--- a/symbian3/os/kernelhwsrv/package_definition.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/os/kernelhwsrv/package_definition.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -79,7 +79,7 @@
       <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
         <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
           <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
-            <unit bldFile="/sf/os/kernelhwsrv/brdbootldr/ubootldr" mrp="/sf/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
+            <unit mrp="/sf/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
           </component>
         </collection>
         <collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">

--- a/symbian3/os/kernelhwsrv/package_definition_3.0.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/os/kernelhwsrv/package_definition_3.0.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -3,7 +3,7 @@
   <package id="kernelhwsrv" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
     <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
       <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
-        <unit bldFile="brdbootldr/ubootldr" mrp="brdbootldr/ubootldr/base_ubootldr.mrp"/>
+        <unit mrp="brdbootldr/ubootldr/base_ubootldr.mrp"/>
       </component>
     </collection>
     <collection id="bsptemplate" name="Board Support Package Template" level="hw-if">

--- a/symbian3/os/ossrv/package_definition.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/os/ossrv/package_definition.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -370,23 +370,18 @@
         <collection name="glib" long-name="GLib" level="utilities">
           <component name="glibbackend" filter="s60" long-name="GLib Backend">
             <unit bldFile="/sf/os/ossrv/glib/glibbackend/group"/>
-            <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
           </component>
           <component name="libglib" filter="s60" long-name="GLib Library">
             <unit bldFile="/sf/os/ossrv/glib/libglib/group"/>
-            <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
           </component>
           <component name="libgthread" filter="s60" long-name="Libg Thread">
             <unit bldFile="/sf/os/ossrv/glib/libgthread/group"/>
-            <!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
           </component>
           <component name="libgmodule" filter="s60" long-name="Libg Module">
             <unit bldFile="/sf/os/ossrv/glib/libgmodule/group"/>
-            <!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
           </component>
           <component name="libgobject" filter="s60" long-name="Libg Object">
             <unit bldFile="/sf/os/ossrv/glib/libgobject/group"/>
-            <!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
           </component>
         </collection>
         <collection name="stdcpp" long-name="C++ Standard Library" level="translation">

--- a/symbian3/os/ossrv/package_definition_3.0.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/os/ossrv/package_definition_3.0.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -380,24 +380,19 @@
     </collection>
     <collection id="glib" name="GLib" level="utilities">
       <component id="glibbackend" filter="s60" name="GLib Backend">
-        <unit bldFile="glib/build/symbian/glibbackend/group"/>
-        <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
+        <unit bldFile="glib/glibbackend/group"/>
       </component>
       <component id="libglib" filter="s60" name="GLib Library">
-        <unit bldFile="glib/build/symbian/glib/group"/>
-        <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
+        <unit bldFile="glib/libglib/group"/>
       </component>
       <component id="libgthread" filter="s60" name="Libg Thread">
-        <unit bldFile="glib/build/symbian/gthread/group"/>
-        <!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
+        <unit bldFile="glib/libgthread/group"/>
       </component>
       <component id="libgmodule" filter="s60" name="Libg Module">
-        <unit bldFile="glib/build/symbian/gmodule/group"/>
-        <!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
+        <unit bldFile="glib/libgmodule/group"/>
       </component>
       <component id="libgobject" filter="s60" name="Libg Object">
-        <unit bldFile="glib/build/symbian/gobject/group"/>
-        <!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
+        <unit bldFile="glib/libgobject/group"/>
       </component>
     </collection>
     <collection id="stdcpp" name="C++ Standard Library" level="translation">
@@ -470,9 +465,6 @@
       <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
         <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
       </component>
-	  <component id="liboil" name="Liboil" introduced="^4" purpose="optional">
-        <unit bldFile="genericopenlibs/liboil/group" mrp="genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-      </component>
     </collection>
     <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
       <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">

--- a/symbian3/os/security/package_definition.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/os/security/package_definition.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -97,12 +97,10 @@
           <component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
             <unit bldFile="/sf/os/security/contentmgmt/cafrecogniserconfig" mrp="/sf/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
           </component>
-          <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development">
+          <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development" filter="test">
+            <!-- remove test filter once cafstreamingsupport is available -->
             <unit bldFile="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
           </component>
-          <component name="cafstreamingsupport" long-name="CAF Streaming Support" introduced="^3" purpose="optional">
-            <unit bldFile="/sf/os/security/contentmgmt/cafstreamingsupport/group" mrp="/sf/os/security/contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp"/>
-          </component>
         </collection>
         <collection name="crypto" long-name="Crypto Libraries" level="libraries">
           <component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">

--- a/symbian3/os/security/package_definition_3.0.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/os/security/package_definition_3.0.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -21,12 +21,10 @@
       <component id="cafrecogniserconfig" name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
         <unit bldFile="contentmgmt/cafrecogniserconfig" mrp="contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
       </component>
-      <component id="referencedrmagent" name="Reference DRM Agent" introduced="8.0" purpose="development">      
+      <component id="referencedrmagent" name="Reference DRM Agent" introduced="8.0" purpose="development" filter="test">
+		<!-- remove test filter once cafstreamingsupport is available -->
         <unit bldFile="contentmgmt/referencedrmagent/RefTestAgent/group" mrp="contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
       </component>
-      <component id="cafstreamingsupport" name="CAF Streaming Support" introduced="^3" purpose="optional">
-        <unit bldFile="contentmgmt/cafstreamingsupport/group" mrp="contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp"/>
-      </component>      
     </collection>
     <collection id="crypto" name="Crypto Libraries" level="libraries">
       <component id="weakcryptospi" name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">

--- a/symbian3/os/usb/package_definition.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/os/usb/package_definition.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -77,11 +77,6 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-        <collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
-          <component name="usb_audio_stream_plugin_api" long-name="USB Audio Stream Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/os/usb/usb_plat/usb_audio_stream_plugin_api/group"/>
-          </component>
-        </collection>
         <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
           <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
         </collection>

--- a/symbian3/os/usb/package_definition_3.0.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/os/usb/package_definition_3.0.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
  <package id="usb" name="USB" levels="adaptation hw-if plugin framework server app-if">
-  <collection id="usb_plat" name="USB Platform Interfaces" level="app-if">
-   <component id="usb_audio_stream_plugin_api" name="USB Audio Stream Plugin API" class="api" filter="s60">
-    <unit bldFile="usb_plat/usb_audio_stream_plugin_api/group"/>
-   </component>
-  </collection>
   <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
    <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
   </collection>