--- a/javacommons/gcfprotocols/http/build/javahttp_0x2002DCB1.mmp	Wed Sep 01 12:33:18 2010 +0100
+++ b/javacommons/gcfprotocols/http/build/javahttp_0x2002DCB1.mmp	Tue Sep 14 21:06:50 2010 +0300
@@ -28,8 +28,6 @@
 UID		0x1000008d 0x2002DCB1
 SECUREID		0x2002DCB1
 
-EPOCSTACKSIZE		0x14000
-EPOCHEAPSIZE		0x020000 0x800000
 EPOCALLOWDLLDATA
 
 
@@ -54,32 +52,14 @@
 MACRO		RD_JAVA_MIDPRMS_DB
 MACRO		__SYMBIAN32__
 MACRO		J9EPOC32
-MACRO		QT_GUI_LIB
-MACRO		QT_CORE_LIB
 
-SYSTEMINCLUDE		/epoc32/include/mw/QtCore
-SYSTEMINCLUDE		/epoc32/include/mw/QtGui
-SYSTEMINCLUDE		/epoc32/include/mw
 SYSTEMINCLUDE		../../../../../../mw/qt/mkspecs/common/symbian
-SYSTEMINCLUDE		/epoc32/include
-SYSTEMINCLUDE		/epoc32/include/stdapis
-SYSTEMINCLUDE		/epoc32/include/stdapis/sys
-SYSTEMINCLUDE		/epoc32/include/platform/mw
-SYSTEMINCLUDE		/epoc32/include/platform
-SYSTEMINCLUDE		/epoc32/include/app
-SYSTEMINCLUDE		/epoc32/include/platform/app
-SYSTEMINCLUDE		/epoc32/include/platform/loc
-SYSTEMINCLUDE		/epoc32/include/platform/mw/loc
-SYSTEMINCLUDE		/epoc32/include/platform/app/loc
-SYSTEMINCLUDE		/epoc32/include/platform/loc/sc
-SYSTEMINCLUDE		/epoc32/include/platform/mw/loc/sc
-SYSTEMINCLUDE		/epoc32/include/platform/app/loc/sc
-SYSTEMINCLUDE		/epoc32/include/stdapis/openssl
 SYSTEMINCLUDE		../inc.s60
 SYSTEMINCLUDE		../../../inc
 SYSTEMINCLUDE		../../../../inc
 SYSTEMINCLUDE		../src.s60
 SYSTEMINCLUDE		/epoc32/include/stdapis/stlportv5
+SYSTEMINCLUDE		/epoc32/include/mw
 SYSTEMINCLUDE		.
 
 SOURCEPATH 	../src.s60
@@ -110,8 +90,6 @@
 LIBRARY		javautils.lib
 LIBRARY		libpthread.lib
 LIBRARY		libstdcppv5.lib
-LIBRARY		QtGui.lib
-LIBRARY		QtCore.lib
 LIBRARY		libc.lib
 LIBRARY		libm.lib
 LIBRARY		libdl.lib
@@ -150,6 +128,12 @@
 
 #include <platform_paths.hrh>
 
+ APP_LAYER_SYSTEMINCLUDE
+
+ OS_LAYER_LIBC_SYSTEMINCLUDE
+
+ OS_LAYER_SSL_SYSTEMINCLUDE
+
 deffile ./~/javahttp.def
 
  SYSTEMINCLUDE OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5)
@@ -177,5 +161,3 @@
 #elif defined EABI
 DEFFILE ./eabi/javahttp.def
 #endif
-
-USERINCLUDE .