diff -r a15c582fbf97 -r ff9df6630274 usbengines/usbotgwatcher/inc/cusbstate.h
--- a/usbengines/usbotgwatcher/inc/cusbstate.h	Fri Mar 12 15:48:40 2010 +0200
+++ b/usbengines/usbotgwatcher/inc/cusbstate.h	Mon Mar 15 12:44:42 2010 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2008 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"
@@ -20,24 +20,11 @@
 
 #include <e32base.h>
 #include <usbotgdefs.h>
-
-#include "cusbotgwatcher.h"
+#include <usbman.h>
 
-#ifndef STIF
-#include "cusbidpinobserver.h"
-#include "cusbvbusobserver.h"
-#include "cusbotgstateobserver.h"
-#include "cusbbusactivityobserver.h"
-#include "cusbhosteventnotificationobserver.h"
-#include "cusbmessagenotificationobserver.h"
-#else
-#include "mockcusbidpinobserver.h"
-#include "mockcusbvbusobserver.h"
-#include "mockcusbotgstateobserver.h"
-#include "mockcusbbusactivityobserver.h"
-#include "mockcusbhosteventnotificationobserver.h"
-#include "mockcusbmessagenotificationobserver.h"
-#endif
+#include "definitions.h"
+
+class CUsbOtgWatcher;
 
 /**
  *  Base class for usb states
@@ -76,12 +63,6 @@
      */
     virtual ~CUsbState();
 
-    /**
-     * Two-phased constructor.
-     * @param aWatcher owner
-     */
-    //static CUsbState* NewL(CUsbOtgWatcher& aWatcher);
-
 protected:
     /**
      * default constructor is protected to be able to be inherited be child classes