--- a/locationmanager/server/group/locationmanagerserver.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/server/group/locationmanagerserver.mmp	Fri Sep 17 16:54:49 2010 +0300
@@ -44,11 +44,13 @@
 #ifdef _LOC_REVERSEGEOCODE
 MACRO LOC_REVERSEGEOCODE
 USERINCLUDE     ../../tagcreator/inc
-USERINCLUDE     ../../reversegeocode/inc 
 #endif
 
+#ifdef     _LOC_GEOTAGGING_CELLID
+MACRO LOC_GEOTAGGING_CELLID
+USERINCLUDE     ../../geoconverter/inc
+#endif
 
-USERINCLUDE     ../../geoconverter/inc
 
 SYSTEMINCLUDE     /epoc32/include/platform/lbs
 SYSTEMINCLUDE     /epoc32/include/stdapis
@@ -58,9 +60,7 @@
 SOURCEPATH      ../src
 SOURCE	    clocationmanagerserver.cpp
 SOURCE	    clocationmanagersession.cpp
-#ifdef _LOC_REVERSEGEOCODE
 SOURCE	    clocationgeotagtimerao.cpp 
-#endif
 SOURCE	    clocationservertimerhandler.cpp
 SOURCE      nwregistrationstatushandler.cpp
 
@@ -79,9 +79,7 @@
 LIBRARY         etelmm.lib
 LIBRARY         commsdat.lib
 
-#ifdef _LOC_REVERSEGEOCODE
 LIBRARY         geotagger.lib
-#endif
 
 PAGED
 BYTEPAIRCOMPRESSTARGET