--- a/kernel/eka/kernel/ekern.mmp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kernel/eka/kernel/ekern.mmp	Wed Sep 01 12:34:56 2010 +0100
@@ -86,7 +86,7 @@
 sourcepath				../klib/arm
 source					 ckdes8.cia cumem.cia cbma.cia
 sourcepath				../common/arm
-source					carray.cia cdes8.cia cmem.cia
+source					carray.cia cdes8.cia cheap.cia cmem.cia
 #if defined(GCC32)
 source 					cgcchelp.cpp cgcchelp.cia
 #elif defined(ARMCC)
@@ -135,10 +135,6 @@
 source					 ckernel.cpp csched.cpp
 source					 cutils.cpp cache.cpp
 
-sourcepath				../common/win32
-userinclude				../common
-source					cmem.cpp
-
 library					emulator.lib
 #endif
 
@@ -162,15 +158,13 @@
 source					 stest.cpp
 source					 sshbuf.cpp smap.cpp
 source					 srandombuff.cpp
-source					 kerncorestats.cpp
 
 sourcepath				../klib
 source					dbase.cpp kdes8.cpp
 source					kheap.cpp bma.cpp
 
 sourcepath				../common
-source					alloc.cpp array.cpp des8.cpp mem.cpp
-source					heap_hybrid.cpp debugfunction.cpp   
+source					alloc.cpp array.cpp des8.cpp heap.cpp mem.cpp
 source					secure.cpp
 macro					__EXPORT_MEMCPY__
 #ifdef MARM