diff -r 122d2b873fd1 -r 30b30f9da0b7 e32tools/elf2e32/group/elf2e32.mmp
--- a/e32tools/elf2e32/group/elf2e32.mmp	Fri Jun 25 20:58:33 2010 +0800
+++ b/e32tools/elf2e32/group/elf2e32.mmp	Tue Jun 29 14:52:54 2010 +0800
@@ -19,17 +19,23 @@
 
 sourcepath	../source
 source 	    deffile.cpp  deflatecompress.cpp  dll_fb_target.cpp  dll_rebuild_target.cpp  e32exporttable.cpp 
-source	 	filedump.cpp  e32imagefile.cpp elf2e32.cpp  elffilesupplied.cpp errorhandler.cpp exetarget.cpp exexp_fb_target.cpp 
-source	 	exexp_rebuild_target.cpp  export_type_fb_target.cpp  export_type_rebuild_target.cpp  export_type_target.cpp  h_utl.cpp 
+source	 	filedump.cpp  elf2e32.cpp  elffilesupplied.cpp errorhandler.cpp exetarget.cpp exexp_fb_target.cpp 
+source	 	exexp_rebuild_target.cpp  export_type_fb_target.cpp  export_type_rebuild_target.cpp  export_type_target.cpp 
 source	 	huffman.cpp  imgdump.cpp  inflate.cpp  librarytarget.cpp  main.cpp  messagehandler.cpp  messageimplementation.cpp 
 source	 	parameterlistinterface.cpp  parametermanager.cpp  pl_common.cpp  pl_dllsymbol.cpp 	pl_dso_handler.cpp  pl_elfconsumer.cpp 
 source	 	pl_elfexecutable.cpp  pl_elfexports.cpp  pl_elfimportrelocation.cpp  pl_elfimports.cpp  pl_elflocalrelocation.cpp  pl_elfproducer.cpp 
 source	 	pl_elfrelocation.cpp  pl_elfrelocations.cpp  pl_symbol.cpp  polydll_fb_target.cpp  polydll_rebuild_target.cpp  usecasebase.cpp 
-source	 	byte_pair.cpp  pagedcompress.cpp checksum.cpp stdexe_target.cpp
+source	 	checksum.cpp stdexe_target.cpp e32imagefile.cpp
 
-systeminclude    /epoc32/include  /epoc32/include/tools  
-userinclude		../source ../include
+sourcepath ../../../imgtools/imglib/host
+source	 	h_utl.cpp
+sourcepath ../../../imgtools/imglib/compress
+source	 	byte_pair.cpp pagedcompress.cpp
 
-option 	GCC -w
+userinclude		../source ../include ../../../bintools/elftools/inc
+userinclude   ../../../imgtools/imglib/compress ../../../imgtools/imglib/inc
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+option 	GCC -O2 -w
 
 VENDORID 0x70000001