--- a/kernel/eka/common/arm/carray.cia	Wed Jun 16 07:31:57 2010 +0100
+++ b/kernel/eka/common/arm/carray.cia	Wed Jun 16 12:01:26 2010 +0100
@@ -950,7 +950,7 @@
 #ifndef __KERNEL_MODE__
 EXPORT_C __NAKED__ void RArrayBase::HeapSortSigned()
 	{
-	__EH_FNSTART
+//	__EH_FNSTART
 #ifdef __EABI__
 	// need sp aligned correctly
 	asm("stmfd sp!, {r3-r11,lr} ");
@@ -1039,12 +1039,12 @@
 	asm("bl wordmove ");				// entry[0]=[sp]
 	asm("add sp, sp, r10 ");			// free temporary stack space
 	__JUMP(,r7);
-	__EH_FNEND
+//	__EH_FNEND
 	}
 
 EXPORT_C __NAKED__ void RArrayBase::HeapSortUnsigned()
 	{
-	__EH_FNSTART
+//	__EH_FNSTART
 #ifdef __EABI__
 	// need sp aligned correctly
 	asm("stmfd sp!, {r3-r11,lr} ");
@@ -1133,12 +1133,12 @@
 	asm("bl wordmove ");				// entry[0]=[sp]
 	asm("add sp, sp, r10 ");			// free temporary stack space
 	__JUMP(,r7);
-	__EH_FNEND
+//	__EH_FNEND
 	}
 
 EXPORT_C __NAKED__ void RArrayBase::HeapSort(TGeneralLinearOrder anOrder)
 	{
-	__EH_FNSTART
+//	__EH_FNSTART
 #ifdef __EABI__
 	// need sp aligned correctly
 	asm("stmfd sp!, {r3-r11,lr} ");
@@ -1230,7 +1230,7 @@
 	asm("bl wordmove ");				// entry[0]=[sp]
 	asm("ldr sp, [sp, r10] ");			// restore stack pointer, freeing temporary stack space
 	__POPRET("");
-	__EH_FNEND
+//	__EH_FNEND
 	}
 #endif	// __KERNEL_MODE__
 #endif	// __ARRAY_MACHINE_CODED__

--- a/kernel/eka/drivers/locmedia/traces/OstTraceDefinitions.h	Wed Jun 16 07:31:57 2010 +0100
+++ b/kernel/eka/drivers/locmedia/traces/OstTraceDefinitions.h	Wed Jun 16 12:01:26 2010 +0100
@@ -17,5 +17,5 @@
 // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
 // REMOVE BEFORE CHECK-IN TO VERSION CONTROL
 //#define OST_TRACE_COMPILER_IN_USE
-#include <OpenSystemTrace.h>
+#include <opensystemtrace.h>
 #endif

--- a/kernel/eka/include/cpudefs.h	Wed Jun 16 07:31:57 2010 +0100
+++ b/kernel/eka/include/cpudefs.h	Wed Jun 16 12:01:26 2010 +0100
@@ -247,7 +247,7 @@
 	#define __COBJECT_MACHINE_CODED__
 	#define __CACTIVESCHEDULER_MACHINE_CODED__
 	#define __CSERVER_MACHINE_CODED__
-	#define __ARRAY_MACHINE_CODED__
+//	#define __ARRAY_MACHINE_CODED__ IMK working around bug #2976
 	#define __HUFFMAN_MACHINE_CODED__
 #if defined(__MARM_ARM4__) || defined(__MARM_ARMI__) || defined(__MARM_THUMB__) || defined(__MARM_ARMV4__) || defined(__MARM_ARMV5__)
 	#define __DES16_MACHINE_CODED_HWORD__

--- a/userlibandfileserver/fileserver/sfile/sf_sys.cpp	Wed Jun 16 07:31:57 2010 +0100
+++ b/userlibandfileserver/fileserver/sfile/sf_sys.cpp	Wed Jun 16 12:01:26 2010 +0100
@@ -18,7 +18,7 @@
 #include "sf_std.h"
 #include <e32uid.h>
 #include "sf_file_cache.h"
-#include <kernel\localise.h>
+#include <kernel/localise.h>
 #include <f32file.h>
 
 typedef CFileSystem*(*TFileSystemNew)();