--- a/browserutilities/feedsengine/group/FeedsServer.mmp	Thu Aug 19 10:58:56 2010 +0300
+++ b/browserutilities/feedsengine/group/FeedsServer.mmp	Tue Aug 31 16:17:46 2010 +0300
@@ -15,10 +15,12 @@
 *
 */
 
+
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include <platform/mw/Browser_platform_variant.hrh>
+
 
 TARGET          FeedsServer.exe
 TARGETTYPE      exe
@@ -40,6 +42,7 @@
 TARGETPATH      /System/Programs
 #endif
 
+
 // FeedsServer/Server sources
 SOURCEPATH        ../FeedsServer/Server/src
 SOURCE            FeedsDatabase.cpp
@@ -54,6 +57,7 @@
 SOURCE            UpdateManager.cpp  
 SOURCE            UpdateQueue.cpp        
 
+
 // FeedsServer/FeedHandler sources
 SOURCEPATH        ../FeedsServer/FeedHandler/src
 SOURCE            AtomFeedParser.cpp
@@ -80,6 +84,7 @@
 SOURCE            XmlEntity.cpp
 SOURCE            XmlUtils.cpp
 
+
 // Utils sources
 SOURCEPATH        ../FeedsServer/Common/src
 SOURCE            LeakTracker.cpp
@@ -96,40 +101,36 @@
 USERINCLUDE       ../FeedsServer/XmlUtils/inc
 USERINCLUDE       ../../inc
 
+
 MW_LAYER_SYSTEMINCLUDE
-OS_LAYER_ESTLIB_SYSTEMINCLUDE
+MW_LAYER_LIBC_SYSTEMINCLUDE
 
 // Libraries
-LIBRARY       euser.lib
+LIBRARY             euser.lib
 #ifdef _DEBUG
 	LIBRARY    flogger.lib
 #else
 	DEBUGLIBRARY    flogger.lib
 #endif
-LIBRARY       bafl.lib
-LIBRARY       InetProtUtil.lib
-LIBRARY       http.lib
-LIBRARY       efsrv.lib
-LIBRARY       XmlEngine.lib
-LIBRARY       XmlEngineDOM.lib
-LIBRARY       XmlEngineUtils.Lib
-LIBRARY       estlib.lib
-LIBRARY       HttpFilterCommon.lib
-LIBRARY       connectionmanager.lib
-LIBRARY       ecom.lib
-LIBRARY       commdb.lib
-LIBRARY       charconv.lib
-LIBRARY       edbms.lib
-LIBRARY       estor.lib
-LIBRARY       centralrepository.lib
+LIBRARY             bafl.lib
+LIBRARY             InetProtUtil.lib
+LIBRARY             http.lib
+LIBRARY             efsrv.lib
+LIBRARY             XmlEngine.lib
+LIBRARY             XmlEngineDOM.lib
+LIBRARY             XmlEngineUtils.Lib
+LIBRARY             estlib.lib
+LIBRARY             HttpFilterCommon.lib
+LIBRARY             connectionmanager.lib
+LIBRARY             ecom.lib
+LIBRARY             commdb.lib
+LIBRARY             charconv.lib
+LIBRARY             edbms.lib
+LIBRARY             estor.lib
+LIBRARY             centralrepository.lib
 LIBRARY				apengine.lib
-LIBRARY			  ESock.lib
+LIBRARY			    ESock.lib
 LIBRARY				Avkon.lib
 LIBRARY				etel3rdparty.lib 
 LIBRARY				webutils.lib
-LIBRARY       sysutil.lib
-
-#ifdef BRDO_OCC_ENABLED_FF
-LIBRARY    featmgr.lib
-#endif
-
+LIBRARY             sysutil.lib