--- a/webengine/osswebengine/MemoryManager/Group/MemManTest.mmp	Tue Aug 31 16:17:46 2010 +0300
+++ b/webengine/osswebengine/MemoryManager/Group/MemManTest.mmp	Wed Sep 01 12:28:30 2010 +0100
@@ -38,10 +38,10 @@
 *
 * ==============================================================================
 */
-#ifndef __BROWSER_SDK
+
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
-#endif
+#include <platform/mw/browser_platform_variant.hrh>
+
 TARGET		MemManTest.exe
 TARGETTYPE  	exe
 UID         	0x01000007
@@ -55,29 +55,23 @@
 MACRO KHTML_NO_SCRIPTING
 
 EPOCHEAPSIZE 524288 8388608
-#ifndef __BROWSER_SDK
+
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-#else
-SYSTEMINCLUDE 	/epoc32/include /epoc32/include/libc
-#endif
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 USERINCLUDE 	../../WEBCORE/bridge ../../WEBCORE/kwq
 USERINCLUDE 	../Inc
 USERINCLUDE 	../tsrc
 
 SOURCEPATH	../tsrc
-SOURCE	        MemManUnit.cpp	
+SOURCE	    MemManUnit.cpp	
 SOURCE		MemManUTConsole.cpp
 SOURCE		MemManUTContainer.cpp
 
 
 LIBRARY		ResLoader.lib
-#if defined(__BROWSER_SDK)
-LIBRARY   MemMan_sdk.lib
-#else
-LIBRARY         memman.lib
-#endif
+LIBRARY     memman.lib
+
 LIBRARY		ESTLIB.lib 
 LIBRARY		euser.lib 
 LIBRARY		EFSRV.lib 
@@ -87,9 +81,9 @@
 LIBRARY		hal.lib
 STATICLIBRARY		kwq.lib KHTML.lib
 
-
 #ifdef __S60_32__
 LANG sc 
 #else
 LANGUAGE_IDS 
 #endif
+