diff -r 05bc53fe583b -r 83ca720e2b9a connectionutilities/ConnectionDialogs/group/ConnectionUiUtilities.mmp
--- a/connectionutilities/ConnectionDialogs/group/ConnectionUiUtilities.mmp	Tue Aug 31 15:35:44 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/group/ConnectionUiUtilities.mmp	Wed Sep 01 12:23:51 2010 +0100
@@ -23,7 +23,6 @@
 
 TARGET      ConnectionUiUtilities.dll
 TARGETTYPE  DLL
-UID         0x1000008d 0x2002FF74
 
 CAPABILITY CAP_GENERAL_DLL
 VENDORID VID_DEFAULT
@@ -44,7 +43,7 @@
 SOURCE ChangeConnectionDlg.cpp
 SOURCE ActiveCChangeConnectionDlg.cpp
 SOURCE ActiveWrapper.cpp
-SOURCE connectionstatuspopup.cpp
+
 
 SOURCEPATH ../src
 SOURCE ConnectionInfo.cpp
@@ -53,11 +52,11 @@
 SOURCE ActiveIAPListing.cpp
 SOURCE ExpiryTimer.cpp
 
+
 USERINCLUDE	    ../ConnectionUiUtilities/inc
 
 // Component specific internal headers 
 USERINCLUDE			../inc
-USERINCLUDE         ../traces
 
 // ADO specific internal headers 
 SYSTEMINCLUDE		../../../inc
@@ -65,31 +64,23 @@
 //Macro to /epoc32 headers
 MW_LAYER_SYSTEMINCLUDE
 
-// Hb orbit headers
-SYSTEMINCLUDE /epoc32/include/mw/hb/hbcore
-SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets
-
 LIBRARY euser.lib cone.lib eikcore.lib eikcoctl.lib avkon.lib eikdlg.lib 
 LIBRARY bafl.lib commonengine.lib commdb.lib AknSkins.lib FeatMgr.lib 
 LIBRARY AknNotify.lib
 LIBRARY Ecom.lib
 LIBRARY	centralrepository.lib 
 LIBRARY	aknlayout.lib 
-LIBRARY hbcore.lib
-LIBRARY hbwidgets.lib
-LIBRARY cmmanager.lib
-LIBRARY efsrv.lib
 
 DEBUGLIBRARY flogger.lib
 
 
 #if defined( ARMCC )
 
-DEFFILE ../ConnectionUiUtilities/EABI/ConnectionUiUtilities_PROT.def
+    DEFFILE ../ConnectionUiUtilities/EABI/ConnectionUiUtilities_PROT.def
 
 #elif defined( WINSCW )
 
-DEFFILE ../ConnectionUiUtilities/BWinsCw/ConnectionUiUtilities_PROT.def
+    DEFFILE ../ConnectionUiUtilities/BWinsCw/ConnectionUiUtilities_PROT.def
 
 #endif