--- a/locationmanager/locationtrail/group/locationtrail.mmp	Wed Sep 15 12:40:59 2010 +0300
+++ b/locationmanager/locationtrail/group/locationtrail.mmp	Wed Oct 13 15:02:02 2010 +0300
@@ -17,7 +17,6 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../inc/locplatsupport.mmh"
 
 VERSION         10.0
 TARGET          LocationTrail.dll
@@ -29,7 +28,7 @@
 
 #if defined(WINSCW)
 deffile ../bwincw/locationtrailwinscw.def
-#elif defined(EABI)
+#elif defined(ARMCC)
 deffile ../eabi/locationtrailarm.def
 #endif
 nostrictdef
@@ -38,22 +37,6 @@
 USERINCLUDE     ../../inc
 USERINCLUDE     ../../../inc
 
-#ifdef _LOC_REVERSEGEOCODE
-MACRO LOC_REVERSEGEOCODE
-USERINCLUDE     ../../tagcreator/inc
-#endif
-
-#ifdef     _LOC_GEOTAGGING_CELLID
-MACRO LOC_GEOTAGGING_CELLID
-USERINCLUDE     ../../geoconverter/inc
-#endif
-
-SYSTEMINCLUDE     /epoc32/include/stdapis
-SYSTEMINCLUDE     /epoc32/include/ecom
-SYSTEMINCLUDE     /epoc32/include/platform/lbs
-
-MW_LAYER_SYSTEMINCLUDE
-
 SOURCEPATH      ../src
 SOURCE          clocationrecord.cpp
 SOURCE          cnetworkinfo.cpp
@@ -62,34 +45,19 @@
 SOURCE          cgpxconverterao.cpp
 SOURCE          locationremappingao.cpp
 
+MW_LAYER_SYSTEMINCLUDE
+
 LIBRARY         euser.lib 
 LIBRARY         efsrv.lib
 LIBRARY         lbs.lib
 LIBRARY         etel3rdparty.lib
-LIBRARY         etel.lib
-LIBRARY         etelmm.lib
-LIBRARY	        mdeclient.lib
+LIBRARY	    mdeclient.lib
 LIBRARY         estor.lib
-LIBRARY	        PlatformEnv.lib
-LIBRARY 	centralrepository.lib 
-LIBRARY         ecom.lib
-LIBRARY         commsdat.lib
-
-LIBRARY        geotagger.lib
-LIBRARY        libc.lib
-
-#ifdef _LOC_REVERSEGEOCODE
-LIBRARY        tagcreator.lib 
-#endif
-
-#ifdef     _LOC_GEOTAGGING_CELLID
-LIBRARY       geoconverter.lib
-#endif
-
+LIBRARY	    PlatformEnv.lib
+LIBRARY 	    centralrepository.lib 
 
 PAGED
 BYTEPAIRCOMPRESSTARGET
 OPTION ARMCC -O3 -OTime
 
-// End of file
- 
+