diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.mmp
--- a/locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.mmp	Tue Feb 02 01:50:39 2010 +0200
+++ b/locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.mmp	Fri Apr 16 16:28:16 2010 +0300
@@ -97,7 +97,6 @@
 USERINCLUDE   ../../../locationmgmt/locationcore/LbsLocDataSource/inc
 USERINCLUDE   ../../../locationmgmt/locationcore/LbsPartnerCommon/inc
 USERINCLUDE   ../LBSPrivacyNotification/LbsPrivacyController/inc
-USERINCLUDE   ../LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc
 USERINCLUDE   ../../../locationmgmt/locationcore/inc
 USERINCLUDE		../../../locationmgmt/locationcore/LbsLocCommon/ServerFramework/inc
 USERINCLUDE   ../../../locationmgmt/locationcore/LbsDebug/inc
@@ -108,8 +107,8 @@
 USERINCLUDE		../../../locationmgmt/locationcore/LbsLocCommon/inc
 
 
-// OS_LAYER_SYSTEMINCLUDE_SYMBIAN relies on cntdef.h in app layer. This dependancy should be broken
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN //Needs macro for system include for epoc32\include\lbs
+
 
 LIBRARY		euser.lib
 LIBRARY		estor.lib