--- a/webengine/osswebengine/WebKit/s60/group/common.mmpi	Tue Aug 31 16:17:46 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/group/common.mmpi	Wed Sep 01 12:28:30 2010 +0100
@@ -17,9 +17,10 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 SYSTEMINCLUDE ../../../WebCore/platform/symbian/Libxml2
+
 MW_LAYER_SYSTEMINCLUDE
 
 USERINCLUDE ../../../WebCore 
@@ -38,15 +39,15 @@
 USERINCLUDE ../../../WebCore/platform/symbian
 USERINCLUDE ../../../WebCore/platform/graphics/symbian
 USERINCLUDE ../../../WebCore/platform/symbian/bitmap
-USERINCLUDE ../../../WebCore/loader/Symbian
+USERINCLUDE ../../../WebCore/loader/symbian
 USERINCLUDE ../../../WebCore/loader
 USERINCLUDE ../../../WebCore/loader/icon
 USERINCLUDE ../../../WebCore/loader/wml
-USERINCLUDE ../webview
-USERINCLUDE ../plugins
-USERINCLUDE ../webcoresupport
-USERINCLUDE ../formcontrols
-USERINCLUDE ../misc
+USERINCLUDE ../WebView
+USERINCLUDE ../Plugins
+USERINCLUDE ../WebCoreSupport
+USERINCLUDE ../FormControls
+USERINCLUDE ../Misc
 
 USERINCLUDE ../../../../../inc
 USERINCLUDE ../../../MemoryManager/Inc 
@@ -75,18 +76,15 @@
 SYSTEMINCLUDE ../../../WebCore/icu
 SYSTEMINCLUDE ../../../WebCore/bindings/js
 
-MW_LAYER_ECOM_SYSTEMINCLUDE
-MW_LAYER_HTTP_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-MW_LAYER_STDAPIS_SYSTEMINCLUDE
-
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+OS_LAYER_LIBC_SYSTEMINCLUDE
 
-SYSTEMINCLUDE ../../../../pagescaler/inc
-SYSTEMINCLUDE ../../../../widgetengine/inc
+SYSTEMINCLUDE ../../../../PageScaler/inc
+SYSTEMINCLUDE ../../../../WidgetEngine/inc
 SYSTEMINCLUDE ../../../../device/inc
-SYSTEMINCLUDE ../../../../webkitutils/ToolBar
-SYSTEMINCLUDE ../../../../webkitutils/HistoryProvider
-SYSTEMINCLUDE ../../../../webkitutils/SqliteSymbian
+SYSTEMINCLUDE ../../../../WebKitUtils/ToolBar
+SYSTEMINCLUDE ../../../../WebKitUtils/HistoryProvider
+SYSTEMINCLUDE ../../../../WebKitUtils/SqliteSymbian
 
 MACRO __S60__
 MACRO __OOM__