--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/inc/refppdialog.h	Wed Sep 01 12:35:00 2010 +0100
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/inc/refppdialog.h	Wed Sep 15 14:10:49 2010 +0300
@@ -24,7 +24,7 @@
 #define CREFPPDIALOG_H
 
 // INCLUDES
-#include <techview/eikdialg.h>
+#include <eikdialg.h>
 // CLASS DECLARATION
 
 /**

--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/inc/refppnotifier.h	Wed Sep 01 12:35:00 2010 +0100
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/inc/refppnotifier.h	Wed Sep 15 14:10:49 2010 +0300
@@ -23,7 +23,7 @@
 #ifndef REFPPNOTIFIER_H
 #define REFPPNOTIFIER_H
 
-#include <techview/eikdialg.h>
+#include <eikdialg.h>
 #include <eiknotapi.h>
 #include "refppdialog.h"
 

--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/src/dialog.rss	Wed Sep 01 12:35:00 2010 +0100
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/src/dialog.rss	Wed Sep 15 14:10:49 2010 +0300
@@ -20,10 +20,9 @@
  @file
  @internalComponent
 */
+#include <eikon.rh>
+#include <eikon.rsg>
 
-#include <techview/eikon.rh>
-#include <techview/eikon.rsg>
-#include <techview/techviewctl.rh>
 #include <eikcoctl.rsg>
 #include "refppnotifier.hrh"
 NAME REFN

--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/src/refppnotifier.cpp	Wed Sep 01 12:35:00 2010 +0100
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/refppnotifier/src/refppnotifier.cpp	Wed Sep 15 14:10:49 2010 +0300
@@ -23,9 +23,9 @@
 #include "refppnotifier.h"
 #include <ecom/implementationproxy.h>
 #include "refppnotifier.hrh"
-#include <techview/eikinfo.h>
+#include <eikinfo.h>
 #include <dialog.rsg>
-#include <techview/eiklabel.h>
+#include <eiklabel.h>
 #include <usb/hostms/srverr.h>
 #include <usb/hostms/policypluginnotifier.hrh>
 const TUid KMsmmRefNotifierChannel = {0x10009D48}; //0x10208C14

--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/subcommands.cpp	Wed Sep 01 12:35:00 2010 +0100
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/server/src/subcommands.cpp	Wed Sep 15 14:10:49 2010 +0300
@@ -142,6 +142,9 @@
     {
     LOG_FUNC
 
+	TRequestStatus* status = &iHandler.Status();
+    User::RequestComplete(status, KErrCancel);
+
     if(iInterfaceNode)
         {
         iInterfaceNode->iUsbMsDevice.Remove();