--- a/symbian3/mw/usbservices/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/usbservices/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,10 +77,39 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
+        <collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
+          <component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/usbservices/usbservices_plat/pictbridge_api/group"/>
+          </component>
+          <component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
+          </component>
+          <component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
+          </component>
+          <component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
+          </component>
+          <component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
+          </component>
+          <component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
+          </component>
+          <component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
+          </component>
+          <component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
+          </component>
+          <component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
+          </component>
+          <component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
+          </component>
+        </collection>
         <collection name="usbservices_info" long-name="USB Services Info" level="plugin">
-          <component name="usbservices_plat" filter="s60" long-name="USB Services Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/usbservices/usbservices_plat/group"/>
-          </component>
           <component name="usbservices_test" filter="s60,test,api_test" long-name="USB Services Tests">
             <unit bldFile="/sf/mw/usbservices/tsrc/group"/>
           </component>
@@ -142,9 +171,6 @@
           <component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
             <unit bldFile="/sf/mw/usbservices/usbuis/imageprintui/group"/>
           </component>
-          <component name="rndisui" filter="s60" long-name="Remote NDIS UI" introduced="^3">
-            <unit bldFile="/sf/mw/usbservices/usbuis/rndisui/group"/>
-          </component>
         </collection>
       </block>
     </layer>