Index: generic/include/config.h
===================================================================
--- generic/include/config.h	(revision 6c68b975fa0cd622fb0bc38e292185539102f597)
+++ generic/include/config.h	(revision fa7450cfb2374cf51c3afea354ff4f324e2d3ae1)
@@ -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 */
 };