diff -r e84fb4c9218b -r ef2686f7597e usbengines/usbwatcher/inc/cusbwatcher.h
--- a/usbengines/usbwatcher/inc/cusbwatcher.h	Mon Jun 21 22:40:15 2010 +0100
+++ b/usbengines/usbwatcher/inc/cusbwatcher.h	Thu Jul 22 16:44:03 2010 +0100
@@ -30,7 +30,7 @@
 #include "debug.h"
 #include "musbwatchernotify.h"
 #include "cusbwatchersession.h"
-#include "tusbindicatorhandler.h"
+#include "cusbindicatorhandler.h"
 
 
 class CUsbActiveState;
@@ -180,7 +180,7 @@
      * @param aStateOld old device state
      * @param aStateNew new device state
      */
-    void StateChangeNotify( TUsbDeviceState aStateOld, 
+    void StateChangeNotifyL( TUsbDeviceState aStateOld, 
             TUsbDeviceState aStateNew );
     
    
@@ -442,7 +442,7 @@
     /*
      * USB indicator handler to handle device side indicator
      */
-    TUsbIndicatorHandler iUsbIndicatorHandler;
+    CUsbIndicatorHandler* iUsbIndicatorHandler;
     
     /*
      * Starting mode is normal?