Index: kernel/arch/amd64/include/boot/boot.h
===================================================================
--- kernel/arch/amd64/include/boot/boot.h	(revision f476e76f55d2a90975277593ea1bcc21fb6d523c)
+++ kernel/arch/amd64/include/boot/boot.h	(revision 26678e5a1f0f0a6dda91a9e89a03aa3ca86e447c)
@@ -33,10 +33,10 @@
  */
 
-#ifndef __amd64_BOOT_H__
-#define __amd64_BOOT_H__
+#ifndef KERN_amd64_BOOT_H_
+#define KERN_amd64_BOOT_H_
 
-#define BOOT_OFFSET			0x108000
+#define BOOT_OFFSET		0x108000
 #define AP_BOOT_OFFSET		0x8000
-#define BOOT_STACK_SIZE	0x400
+#define BOOT_STACK_SIZE		0x400
 
 #define MULTIBOOT_HEADER_MAGIC	0x1BADB002