Index: Makefile.config
===================================================================
--- Makefile.config	(revision 40a468a0cd05f47e4f0e990d3c3e23eca81fc5ac)
+++ Makefile.config	(revision 941d1e99ff3976e5ce4d0bdde3856f222987c129)
@@ -5,6 +5,6 @@
 #ARCH=amd64
 
-# If this is yes, then cross compiler will be used instead of host compiler
-CROSS_COMPILER=no
+# If this is yes, then the native compiler will be used instead of cross compiler
+NATIVE_COMPILER=no
 
 # Support for symetric multiprocessors
Index: arch/ia32/Makefile.inc
===================================================================
--- arch/ia32/Makefile.inc	(revision 40a468a0cd05f47e4f0e990d3c3e23eca81fc5ac)
+++ arch/ia32/Makefile.inc	(revision 941d1e99ff3976e5ce4d0bdde3856f222987c129)
@@ -1,3 +1,9 @@
-ifeq (${CROSS_COMPILER},yes)
+ifeq (${NATIVE_COMPILER},yes)
+	CC=gcc
+	AS=as
+	LD=ld
+	OBJCOPY=objcopy
+	OBJDUMP=objdump
+else
 	IA-32_TARGET=i686-pc-linux-gnu
 
@@ -10,10 +16,4 @@
 	OBJCOPY=$(IA-32_BINUTILS_DIR)/$(IA-32_TARGET)-objcopy
 	OBJDUMP=$(IA-32_BINUTILS_DIR)/$(IA-32_TARGET)-objdump
-else
-	CC=gcc
-	AS=as
-	LD=ld
-	OBJCOPY=objcopy
-	OBJDUMP=objdump
 endif
 
Index: arch/ia32/_link.ld.in
===================================================================
--- arch/ia32/_link.ld.in	(revision 40a468a0cd05f47e4f0e990d3c3e23eca81fc5ac)
+++ arch/ia32/_link.ld.in	(revision 941d1e99ff3976e5ce4d0bdde3856f222987c129)
@@ -22,9 +22,10 @@
 		*(K_TEXT_START_2);
 		unmapped_ktext_end = .;
-		
+	
 		unmapped_kdata_start = .;
 		*(K_DATA_START);
-		LONG(0xdeadbeaf);		/* TODO: remove 0xdeadbeaf */
 		unmapped_kdata_end = .;
+		
+		LONG(0xdeadbeaf);		/* TODO: remove 0xdeadbeaf */						
 	}
 	
@@ -50,7 +51,4 @@
 		LONG(unmapped_kdata_end - unmapped_kdata_start);
 		*(.bss);			/* uninitialized static variables */
-		*(.note.GNU-stack);
-                *(.comment);
-
 		symbol_table = .;
 		*(symtab.*);            	/* Symbol table, must be LAST symbol! */
@@ -58,4 +56,10 @@
 		kdata_end = .;
 	}
+
+	/DISCARD/ : {
+		*(.note.GNU-stack);		
+		*(.comment);
+	}
+
 	
 	_hardcoded_kernel_size = (ktext_end - ktext_start) + (unmapped_ktext_end - unmapped_ktext_start) + (kdata_end - kdata_start) + (unmapped_kdata_end - unmapped_kdata_start);
Index: arch/ia32/src/asm.S
===================================================================
--- arch/ia32/src/asm.S	(revision 40a468a0cd05f47e4f0e990d3c3e23eca81fc5ac)
+++ arch/ia32/src/asm.S	(revision 941d1e99ff3976e5ce4d0bdde3856f222987c129)
@@ -207,6 +207,5 @@
 # Compare a given number of bytes (3rd argument)
 # at memory locations defined by 1st and 2nd argument
-# for equality. If the bytes are equal, EAX contains
-# 0.
+# for equality. If the bytes are equal, EAX contains 0.
 #
 SRC=12
Index: build.ia32
===================================================================
--- build.ia32	(revision 40a468a0cd05f47e4f0e990d3c3e23eca81fc5ac)
+++ build.ia32	(revision 941d1e99ff3976e5ce4d0bdde3856f222987c129)
@@ -3,7 +3,7 @@
 COMPILER=""
 
-if [ $1 == "cross" ];
+if [ $1 == "native" ];
 then
-	COMPILER="CROSS_COMPILER=yes";
+	COMPILER="NATIVE_COMPILER=yes";
 fi;
 
Index: include/fpu_context.h
===================================================================
--- include/fpu_context.h	(revision 40a468a0cd05f47e4f0e990d3c3e23eca81fc5ac)
+++ include/fpu_context.h	(revision 941d1e99ff3976e5ce4d0bdde3856f222987c129)
@@ -27,6 +27,6 @@
  */
 
-#ifndef fpu_context_h
-#define fpu_context_h
+#ifndef __FPU_CONTEXT_H__
+#define __FPU_CONTEXT_H__
 
 
@@ -41,4 +41,4 @@
 
 
-#endif /*fpu_context_h*/
+#endif /* __FPU_CONTEXT_H__ */
 
Index: include/mm/buddy.h
===================================================================
--- include/mm/buddy.h	(revision 40a468a0cd05f47e4f0e990d3c3e23eca81fc5ac)
+++ include/mm/buddy.h	(revision 941d1e99ff3976e5ce4d0bdde3856f222987c129)
@@ -35,5 +35,5 @@
 #define BUDDY_SYSTEM_INNER_BLOCK	0xff
 
-struct buddy_operations {
+struct buddy_system_operations {
 	link_t *(* find_buddy)(link_t *);
 	link_t *(* bisect)(link_t *);
@@ -46,8 +46,8 @@
 	__u8 max_order;
 	link_t *order;
-	buddy_operations_t *op;
+	buddy_system_operations_t *op;
 };
 
-extern buddy_system_t *buddy_system_create(__u8 max_order, buddy_operations_t *op);
+extern buddy_system_t *buddy_system_create(__u8 max_order, buddy_system_operations_t *op);
 extern link_t *buddy_system_alloc(buddy_system_t *b, __u8 i);
 extern void buddy_system_free(buddy_system_t *b, link_t *block);
Index: include/mm/heap.h
===================================================================
--- include/mm/heap.h	(revision 40a468a0cd05f47e4f0e990d3c3e23eca81fc5ac)
+++ include/mm/heap.h	(revision 941d1e99ff3976e5ce4d0bdde3856f222987c129)
@@ -38,6 +38,6 @@
 struct chunk {
 	int used;
-	struct chunk *next;
-	struct chunk *prev;
+	chunk_t *next;
+	chunk_t *prev;
 	__u32 size;
 	__native data[0];
Index: include/typedefs.h
===================================================================
--- include/typedefs.h	(revision 40a468a0cd05f47e4f0e990d3c3e23eca81fc5ac)
+++ include/typedefs.h	(revision 941d1e99ff3976e5ce4d0bdde3856f222987c129)
@@ -65,5 +65,5 @@
 
 typedef struct buddy_system buddy_system_t;
-typedef struct buddy_operations buddy_operations_t;
+typedef struct buddy_system_operations buddy_system_operations_t;
 
 typedef struct zone zone_t;
Index: src/mm/buddy.c
===================================================================
--- src/mm/buddy.c	(revision 40a468a0cd05f47e4f0e990d3c3e23eca81fc5ac)
+++ src/mm/buddy.c	(revision 941d1e99ff3976e5ce4d0bdde3856f222987c129)
@@ -44,5 +44,5 @@
  * @return New buddy system.
  */
-buddy_system_t *buddy_system_create(__u8 max_order, buddy_operations_t *op)
+buddy_system_t *buddy_system_create(__u8 max_order, buddy_system_operations_t *op)
 {
 	buddy_system_t *b;