--- a/usbengines/usbwatcher/inc/cusbwatcher.h	Tue Aug 31 16:13:57 2010 +0300
+++ b/usbengines/usbwatcher/inc/cusbwatcher.h	Wed Sep 01 12:20:49 2010 +0100
@@ -30,7 +30,7 @@
 #include "debug.h"
 #include "musbwatchernotify.h"
 #include "cusbwatchersession.h"
-#include "cusbindicatorhandler.h"
+#include "tusbindicatorhandler.h"
 
 
 class CUsbActiveState;
@@ -180,7 +180,7 @@
      * @param aStateOld old device state
      * @param aStateNew new device state
      */
-    void StateChangeNotifyL( TUsbDeviceState aStateOld, 
+    void StateChangeNotify( TUsbDeviceState aStateOld, 
             TUsbDeviceState aStateNew );
     
    
@@ -427,7 +427,7 @@
     /*
      * USB indicator handler to handle device side indicator
      */
-    CUsbIndicatorHandler* iUsbIndicatorHandler;
+    TUsbIndicatorHandler iUsbIndicatorHandler;
     
     /*
      * Starting mode is normal?