--- a/webengine/wmlengine/group/gdi/gdi.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/gdi/gdi.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          RbGdi.lib
 TARGETTYPE      lib
@@ -26,37 +25,9 @@
 
 MACRO NOKIA_MOBILE_BROWSER
 #define NOKIA_MOBILE_BROWSER 1
-#include  "../webkitcommon.mmpi"
 
 SOURCEPATH      ../../src/gdi/src
 
 SOURCE	GDIDeviceContext.cpp
 SOURCE	GDIFont.cpp
 SOURCE	Utils.c
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/mvc/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/system/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/browser/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/evt/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/image/include
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wmlcontrol/include
-USERINCLUDE			../../../OssWebengine/MemoryManager/Inc
-USERINCLUDE			../../../PageScaler/Inc
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/utils/include
-
-
-
-
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE