diff -r 5b2a402e96ac -r 25fce757be94 usbengines/usbwatcher/group/usbwatcherserver.mmp
--- a/usbengines/usbwatcher/group/usbwatcherserver.mmp	Thu Aug 19 10:54:11 2010 +0300
+++ b/usbengines/usbwatcher/group/usbwatcherserver.mmp	Tue Aug 31 16:13:57 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -37,7 +37,7 @@
 SOURCE      cusbdevicelock.cpp
 SOURCE      cusbdevconstarter.cpp
 SOURCE      cusbglobalsystemstateobserver.cpp
-SOURCE      tusbindicatorhandler.cpp
+SOURCE      cusbindicatorhandler.cpp
 
 
 USERINCLUDE   ../inc
@@ -45,36 +45,7 @@
 MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE ../../usbotgwatcher/inc
 SYSTEMINCLUDE   /epoc32/include/usb
-
-
-START RESOURCE usbman_pcsmtp.rss
-TARGET	usbman_pcsmtp
-TARGETPATH /private/101fe1db
-HEADER
-LANGUAGE_IDS
-END
-
-START RESOURCE usbman_pcs.rss
-TARGET	usbman_pcs
-TARGETPATH /private/101fe1db
-HEADER
-LANGUAGE_IDS
-END
-
-START RESOURCE usbman_pcspam.rss
-TARGET	usbman_pcspam
-TARGETPATH /private/101fe1db
-HEADER
-LANGUAGE_IDS
-END
-
-START RESOURCE usbman_pcsmtppam.rss
-TARGET	usbman_pcsmtppam
-TARGETPATH /private/101fe1db
-HEADER
-LANGUAGE_IDS
-END
-
+SYSTEMINCLUDE   /epoc32/include/mw/hb/hbcore
 
 LIBRARY       euser.lib             // Kernel API
 LIBRARY       usbman.lib            // RUsb API (i.e. USB Manager's client API)
@@ -84,5 +55,6 @@
 LIBRARY       centralrepository.lib // Central Repository (USB Personality API)
 LIBRARY       featmgr.lib
 LIBRARY       usbotgwatcher.lib  //OTG
+LIBRARY       hbcore.lib
 
 DEBUGLIBRARY  flogger.lib            // File logging