--- a/usbengines/usbotgwatcher/eabi/usbotgwatcheru.def	Tue Jul 06 15:24:15 2010 +0300
+++ b/usbengines/usbotgwatcher/eabi/usbotgwatcheru.def	Thu Jul 22 16:44:03 2010 +0100
@@ -3,8 +3,8 @@
 	_ZN14CUsbOtgWatcher9IsDeviceAEv @ 2 NONAME
 	_ZTI14CUsbOtgWatcher @ 3 NONAME ; #<TI>#
 	_ZTI16CUsbNotifManager @ 4 NONAME ; #<TI>#
-	_ZTIN16CUsbNoteNotifier15CNotifierActiveE @ 5 NONAME ; #<TI>#
+	_ZTIN16CUsbNoteNotifier15CNotifierActiveE @ 5 NONAME ABSENT ; #<TI>#
 	_ZTV14CUsbOtgWatcher @ 6 NONAME ; #<VT>#
 	_ZTV16CUsbNotifManager @ 7 NONAME ; #<VT>#
-	_ZTVN16CUsbNoteNotifier15CNotifierActiveE @ 8 NONAME ; #<VT>#
+	_ZTVN16CUsbNoteNotifier15CNotifierActiveE @ 8 NONAME ABSENT ; #<VT>#
 

--- a/usbengines/usbotgwatcher/inc/debug.h	Tue Jul 06 15:24:15 2010 +0300
+++ b/usbengines/usbotgwatcher/inc/debug.h	Thu Jul 22 16:44:03 2010 +0100
@@ -1,23 +1,21 @@
 /*
 * Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
-* This material, including documentation and any related computer
-* programs, is protected by copyright controlled by Nokia. All
-* rights are reserved. Copying, including reproducing, storing
-* adapting or translating, any or all of this material requires the
-* prior written consent of Nokia. This material also contains
-* confidential information which may not be disclosed to others
-* without the prior written consent of Nokia.
+* 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: Debug macros and declarations. 
+* Description:  Debug macros and declarations. 
 *
 */
 
+
 #ifndef DEBUG_H
 #define DEBUG_H
 
@@ -104,11 +102,11 @@
 // Paramters same as above.
 #define LOG( str ) { RDebug::Printf( "["MODULE_NAME"] %s", str  ); }
 
-#define LOG1( s, v ) { RDebug::Printf( "["MODULE_NAME"] "##s , v ); }
+#define LOG1( s, v ) { RDebug::Printf( "["MODULE_NAME"] " s , v ); }
 
-#define LOG2( s, v1,v2 ) { RDebug::Printf( "["MODULE_NAME"] "##s , v1, v2 ); }
+#define LOG2( s, v1,v2 ) { RDebug::Printf( "["MODULE_NAME"] " s , v1, v2 ); }
 
-#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "["MODULE_NAME"] "##s , \
+#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "["MODULE_NAME"] " s , \
         v1, v2, v3); }
 
 class TFuncLogger

--- a/usbengines/usbwatcher/inc/debug.h	Tue Jul 06 15:24:15 2010 +0300
+++ b/usbengines/usbwatcher/inc/debug.h	Thu Jul 22 16:44:03 2010 +0100
@@ -109,13 +109,13 @@
 #define LOG( str ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] %s",\
         TUint(RThread().Id()), str  ); }
 
-#define LOG1( s, v ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s ,\
+#define LOG1( s, v ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s ,\
         TUint(RThread().Id()), v ); }
 
-#define LOG2( s, v1,v2 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s , \
+#define LOG2( s, v1,v2 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s , \
         TUint(RThread().Id()), v1, v2 ); }
 
-#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s, \
+#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s, \
         TUint(RThread().Id()), v1, v2, v3); }
 
 class TFuncLogger