--- a/telephonyprotocols/csdagt/group/CSD.MMP	Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyprotocols/csdagt/group/CSD.MMP	Tue Aug 31 16:23:08 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -42,6 +42,7 @@
 USERINCLUDE		../src
 USERINCLUDE		../script 
 USERINCLUDE		../inc
+USERINCLUDE		../traces
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 // The resource file containing csd error messages, generated
@@ -58,19 +59,18 @@
 
 LIBRARY			commsdat.lib
 
-#if defined(WINS)
+#if defined(EABI)
+deffile    /epoc32/include/def/eabi/agent.def
+#elif defined(WINS)
 deffile    /epoc32/release/wins/agent.def
-#elif defined(GCC32)
+#else
 deffile    /epoc32/release/marm/agent.def
-#else
-deffile    /epoc32/include/def/eabi/agent.def
 #endif
 
 START WINS
 BASEADDRESS		0x47900000
 END
 
-#include	<comms-infras/commsdebugutility.mmh>
 CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
 
 UNPAGED