--- a/webengine/osswebengine/MemoryManager/Group/MemMan.mmp	Tue Aug 31 16:17:46 2010 +0300
+++ b/webengine/osswebengine/MemoryManager/Group/MemMan.mmp	Wed Sep 01 12:28:30 2010 +0100
@@ -15,21 +15,21 @@
 *
 */
 
-#if defined(__BROWSER_SDK)
-TARGET          MemMan_sdk.dll
-#else
+
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
+
 TARGET          MemMan.dll
-#endif
 
 TARGETTYPE      dll
 
 OPTION ARMCC -O3 -Otime
 UID 0x1000008D  0x10281B6D
 
+// Define these macros for OOM logs
 //MACRO OOM_LOGGING
-//MACRO DL_CHUNK_MEM_DEBUG
+//#define OOM_LOGGING 1
+
 
 MACRO USE_FAST_MALLOC
 MACRO NOKIA_CHANGES
@@ -39,14 +39,9 @@
 CAPABILITY CAP_GENERAL_DLL
 VENDORID    VID_DEFAULT
 EPOCALLOWDLLDATA
-#ifndef __BROWSER_SDK
+
 MW_LAYER_SYSTEMINCLUDE
-//MW_LAYER_LIBC_SYSTEMINCLUDE
-#else
-SYSTEMINCLUDE   /Epoc32/include
-#endif
-SYSTEMINCLUDE   /epoc32/include/libc
-//#endif
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 USERINCLUDE     ../Inc
 
@@ -59,10 +54,16 @@
 SOURCE heap.cpp
 SOURCE SymbianDLAllocatorWrapper.cpp
 
-LIBRARY euser.lib
-DEBUGLIBRARY flogger.lib
-LIBRARY avkon.lib
-LIBRARY estlib.lib
-LIBRARY hal.lib
+LIBRARY   euser.lib
+LIBRARY   avkon.lib
+LIBRARY   estlib.lib
+LIBRARY   hal.lib
 
 LIBRARY   oommonitor.lib
+LIBRARY   aknnotify.lib
+LIBRARY   commonengine.lib
+
+#ifdef OOM_LOGGING
+LIBRARY flogger.lib
+LIBRARY efsrv.lib
+#endif