Index: generic/include/arch.h
===================================================================
--- generic/include/arch.h	(revision 75e1db00d0ee9a3395d39a41f301594454557f36)
+++ generic/include/arch.h	(revision d6e852916cb4672682728fa0540fe558bca857b2)
@@ -43,8 +43,4 @@
 #define PREEMPTION_DISABLED	THE->preemption_disabled
 
-#ifndef early_mapping
-#define early_mapping(stack, size)
-#endif /* early_mapping */
-
 /**
  * For each possible kernel stack, structure
Index: generic/include/config.h
===================================================================
--- generic/include/config.h	(revision 75e1db00d0ee9a3395d39a41f301594454557f36)
+++ generic/include/config.h	(revision d6e852916cb4672682728fa0540fe558bca857b2)
@@ -41,13 +41,18 @@
 
 struct config {
+	count_t cpu_count;
+	volatile count_t cpu_active;
+
 	__address base;
 	size_t memory_size;
-	size_t kernel_size;
 	
 	__address init_addr;
 	size_t init_size;
-
-	count_t cpu_count;
-	volatile count_t cpu_active;
+	
+	__address heap_addr;
+	size_t heap_size;
+	size_t heap_delta;            /**< Extra space between heap and stack (enforced by alignment requirements) */
+	
+	size_t kernel_size;           /**< Size of memory in bytes taken by kernel, heap and stack */
 };