diff -r 7068aba64af5 -r a15c582fbf97 usbengines/usbotgwatcher/inc/cusbstatehostahost.h
--- a/usbengines/usbotgwatcher/inc/cusbstatehostahost.h	Fri Feb 19 23:50:33 2010 +0200
+++ b/usbengines/usbotgwatcher/inc/cusbstatehostahost.h	Fri Mar 12 15:48:40 2010 +0200
@@ -1,31 +1,26 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implementation of the concret state
+ * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
  *
-*/
-
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:  Implementation of the concret state
+ *
+ */
 
 #ifndef C_USBSTATEHOSTAHOST_H
 #define C_USBSTATEHOSTAHOST_H
 
-#include "cusbotgwatcher.h"
 #include "cusbstatehostabase.h"
-#ifndef STIF
-#include "cusbtimer.h"
-#else
-#include "mockcusbtimer.h"
-#endif
+
+class CUsbOtgWatcher;
 
 /**
  *  This class implements behaviour in Host state (Drivers loaded, device is in Host role)
@@ -39,7 +34,7 @@
      * Two-phased constructor.
      * @param aWatcher Owner
      */
-    static CUsbStateHostAHost* NewL(CUsbOtgWatcher* aWatcher);
+    static CUsbStateHostAHost* NewL(CUsbOtgWatcher& aWatcher);
 
     /**
      * Destructor.
@@ -52,7 +47,7 @@
      * Default construction
      * @param aWatcher owner
      */
-    CUsbStateHostAHost(CUsbOtgWatcher* aWatcher);
+    CUsbStateHostAHost(CUsbOtgWatcher& aWatcher);
 
     /**
      * 2nd phase construction
@@ -72,38 +67,27 @@
      * trigger it and transition will not happen. This forces the transition in such cases.
      *
      */
-    void JustAdvancedToThisStateL();
+    virtual void JustAdvancedToThisStateL();
 
     /**
      * State machine calls this, state object to perform any initial  
      * activity, just before leaving this state
      *
      */
-    void JustBeforeLeavingThisStateL();
+    virtual void JustBeforeLeavingThisStateL();
 
-    // From OTG state observer
-    /**
-     * Became a Host when A
-     */
-    void AHostL();
-
-    /**
-     * Became a Peripheral when A
-     */
-    void APeripheralL();
-    
     // From Host Event notification observer
     /**
      * Device is detached
      * @param aInfo Device event data
      */
-    void DeviceDetachedL(TDeviceEventInformation aInfo);
+    virtual void DeviceDetachedL(TDeviceEventInformation aInfo);
 
     // From message notification observer
     /**
      * Connected to hub in wrong level 
      */
-    void BadHubPositionL();
+    virtual void BadHubPositionL();
 
 private:
     // data