diff -r aa5a574040a4 -r a3cc46f37772 locationmanager/server/inc/clocationmanagerserver.h
--- a/locationmanager/server/inc/clocationmanagerserver.h	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/server/inc/clocationmanagerserver.h	Fri Sep 17 16:54:49 2010 +0300
@@ -41,9 +41,7 @@
 #include "clocationservertimerhandler.h"
 
 class CMdESession;
-#ifdef LOC_REVERSEGEOCODE
 class CLocationGeoTagTimerAO;
-#endif
 class CGeoTagger;
 class REComSession;
 class CNwRegistrationStatusHandler;
@@ -590,6 +588,11 @@
       * Retrieve home network
       */  
     void RetrieveHomeNetwork();
+    
+    /**
+      * Stop the server (if possible)
+      */  
+    void StopServer();
 
 private:
     /**
@@ -671,8 +674,9 @@
     RMobilePhone::TMobilePhoneNetworkInfoV1 iHomeNetwork;
     TBool iHomeNwInfoAvailableFlag;
   
+    CLocationGeoTagTimerAO* iGeoTagTimer;
+    
 #ifdef LOC_REVERSEGEOCODE
-    CLocationGeoTagTimerAO* iGeoTagTimer;
     CGeoTagger* iGeoTaggingPendingReqObj;
     RMessage2 iTagPendingMessage;
     RMessage2 iGeoTaggingMessage;