--- a/webengine/widgetengine/group/WidgetEngine.mmp	Tue Aug 31 16:17:46 2010 +0300
+++ b/webengine/widgetengine/group/WidgetEngine.mmp	Wed Sep 01 12:28:30 2010 +0100
@@ -22,14 +22,16 @@
 #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>
 
 MW_LAYER_SYSTEMINCLUDE
-USERINCLUDE ../../osswebengine/WebKit/s60/webview
-USERINCLUDE ../../osswebengine/WebKit/s60/plugins
-USERINCLUDE ../../osswebengine/WebKit/s60/webcoresupport
-USERINCLUDE ../../osswebengine/WebKit/s60/formcontrols
-USERINCLUDE ../../osswebengine/WebKit/s60/misc
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+
+USERINCLUDE ../../osswebengine/Webkit/S60/WebView
+USERINCLUDE ../../osswebengine/Webkit/S60/Plugins
+USERINCLUDE ../../osswebengine/Webkit/S60/WebCoreSupport
+USERINCLUDE ../../osswebengine/Webkit/S60/FormControls
+USERINCLUDE ../../osswebengine/Webkit/S60/Misc
 USERINCLUDE ../../osswebengine/cache/inc
 
 USERINCLUDE ../../osswebengine/WebCore
@@ -63,14 +65,9 @@
 SYSTEMINCLUDE ../../webkitutils/ToolBar
 SYSTEMINCLUDE ../../webkitutils/HistoryProvider
 
-MW_LAYER_ECOM_SYSTEMINCLUDE
-MW_LAYER_HTTP_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-MW_LAYER_SWI_SYSTEMINCLUDE
-#if defined(BRDO_BROWSER_50_FF)
-MW_LAYER_STDAPIS_SYSTEMINCLUDE
-#endif
-SYSTEMINCLUDE /epoc32/include/swi
+// #if defined(BRDO_BROWSER_50_FF)
+// MW_LAYER_STDAPIS_SYSTEMINCLUDE
+// #endif
 
 MACRO __S60__
 MACRO arm
@@ -92,11 +89,9 @@
 MACRO NOKIA_CHANGES
 MACRO __CPLUSPLUS
 
-
 USERINCLUDE     ../inc
 SOURCEPATH      ../src
 
-
 SOURCE      Widget.cpp
 SOURCE      WidgetFuncs.cpp
 SOURCE      WidgetEventHandler.cpp
@@ -115,7 +110,7 @@
 SOURCE      MenuItemClient.cpp
 SOURCE      WidgetEngineBridge.cpp
 
-START RESOURCE ../src/WidgetMenu.rss
+START RESOURCE ../Src/WidgetMenu.rss
 DEPENDS avkon.rsg
 HEADER
 TARGETPATH RESOURCE_FILES_DIR
@@ -144,3 +139,4 @@
 LIBRARY			etel.lib
 LIBRARY			etelmm.lib
 LIBRARY		  WebUtils.lib
+