--- a/group/bld.inf	Sat Feb 20 00:38:00 2010 +0200
+++ b/group/bld.inf	Fri Mar 12 15:51:10 2010 +0200
@@ -21,4 +21,3 @@
 
 /* include subsystems build info */
 #include "../usb_plat/group/bld.inf"
-#include "../usbextension/group/bld.inf"

--- a/layers.sysdef.xml	Sat Feb 20 00:38:00 2010 +0200
+++ b/layers.sysdef.xml	Fri Mar 12 15:51:10 2010 +0200
@@ -9,6 +9,10 @@
       <module name="usb">
         <unit unitID="lcdo.usb" mrp="" bldFile="&layer_real_source_path;/group" name="usb" />
       </module>
+      <module name="">
+        <unit unitID="lcdo.usb.usbextension" mrp="" bldFile="&layer_real_source_path;/usbextension/group" filter="!sf_build" name="usb_usbextension" />
+        <unit unitID="lcdo.usb.usb_plat.usb_audio_stream_plugin_api" mrp="" bldFile="&layer_real_source_path;/usb_plat/usb_audio_stream_plugin_api/group" filter="!sf_build" name="usb_usb_plat_usb_audio_stream_plugin_api" />
+      </module>    
     </layer>
   </systemModel>
 </SystemDefinition>

--- a/package_definition.xml	Sat Feb 20 00:38:00 2010 +0200
+++ b/package_definition.xml	Fri Mar 12 15:51:10 2010 +0200
@@ -19,6 +19,9 @@
       <component id="usb_metadata" name="USB Metadata" class="config" introduced="^3" purpose="development" target="desktop">
         <unit mrp="usb_info/usb_metadata/usb_metadata.mrp"/>
       </component>
+      <component id="usb_plat" name="USB Platform Interfaces" class="api" filter="s60">
+        <!--unit bldFile="usb_plat/group"/-->
+      </component>
     </collection>
   </package>
 </SystemDefinition>

--- a/usb_plat/group/bld.inf	Sat Feb 20 00:38:00 2010 +0200
+++ b/usb_plat/group/bld.inf	Fri Mar 12 15:51:10 2010 +0200
@@ -19,8 +19,6 @@
 PRJ_PLATFORMS
 DEFAULT
 
-#include "../usb_audio_stream_plugin_api/group/bld.inf"
-
 PRJ_EXPORTS
 
 PRJ_MMPFILES

--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/group/refppnotifier.mmp	Sat Feb 20 00:38:00 2010 +0200
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/group/refppnotifier.mmp	Fri Mar 12 15:51:10 2010 +0200
@@ -28,6 +28,7 @@
 
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 SOURCEPATH	  ../src
 SOURCE  refppnotifier.cpp refppdialog.cpp

--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventhandler.cpp	Sat Feb 20 00:38:00 2010 +0200
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/eventhandler.cpp	Fri Mar 12 15:51:10 2010 +0200
@@ -263,11 +263,12 @@
         CompleteClient(aError);
         }
 
-    //    CompleteClient(aError);
-    if (IsActive())
+    //Restart the handler after error handling;
+    if (!IsActive())
         {
-        Complete(aError);
+        Start();
         }
+    Complete(aError);
     
     if (iSubCommandQueue.Count())
         {

--- a/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ClassControllerServerSession/group/classControllerServerSession.mmp	Sat Feb 20 00:38:00 2010 +0200
+++ b/usbmgmt/usbmgrtest/ObexClassController/ObexUsbClassController/ClassControllerServerSession/group/classControllerServerSession.mmp	Fri Mar 12 15:51:10 2010 +0200
@@ -32,6 +32,7 @@
 
 USERINCLUDE   ../inc
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY		euser.lib 
 LIBRARY		esock.lib 

--- a/usbmgmt/usbmgrtest/ObexClassController/test/group/simpleObexApp.mmp	Sat Feb 20 00:38:00 2010 +0200
+++ b/usbmgmt/usbmgrtest/ObexClassController/test/group/simpleObexApp.mmp	Fri Mar 12 15:51:10 2010 +0200
@@ -29,6 +29,7 @@
 
 USERINCLUDE   ../inc
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY		euser.lib 
 LIBRARY		efsrv.lib // Library for RFile and RFs