Index: kernel/arch/ia32/include/boot/boot.h
===================================================================
--- kernel/arch/ia32/include/boot/boot.h	(revision deca67b8f66138a6a55b92cb5e6baa32bb733f52)
+++ kernel/arch/ia32/include/boot/boot.h	(revision 46db10e9dce687ab447a98a868f099f0b792fcd5)
@@ -43,10 +43,9 @@
 #define MULTIBOOT_HEADER_FLAGS  0x00010003
 
-#define MULTIBOOT_LOADER_MAGIC  0x2BADB002
-
 #ifndef __ASM__
 
 #ifdef CONFIG_SMP
 
+/* This is only a symbol so the type is dummy. Obtain the value using &. */
 extern int _hardcoded_unmapped_size;
 
Index: kernel/arch/ia32/include/boot/multiboot.h
===================================================================
--- kernel/arch/ia32/include/boot/multiboot.h	(revision deca67b8f66138a6a55b92cb5e6baa32bb733f52)
+++ 	(revision )
@@ -1,90 +1,0 @@
-/*
- * Copyright (c) 2005 Martin Decky
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup ia32
- * @{
- */
-/** @file
- */
-
-#ifndef KERN_ia32_MULTIBOOT_H__
-#define KERN_ia32_MULTIBOOT_H_
-
-#include <arch/types.h>
-#include <arch/boot/memmap.h>
-
-/** Multiboot mod structure */
-typedef struct {
-	uintptr_t start;
-	uintptr_t end;
-	char *string;
-	uint32_t reserved;
-} __attribute__ ((packed)) mb_mod_t;
-
-/** Multiboot mmap structure */
-typedef struct {
-	uint32_t size;
-	e820memmap_t mm_info;
-} __attribute__ ((packed)) mb_mmap_t;
-
-/** Multiboot information structure */
-typedef struct {
-	uint32_t flags;
-	uintptr_t mem_lower;
-	uintptr_t mem_upper;
-	
-	uint32_t boot_device;
-	char *cmdline;
-	
-	uint32_t mods_count;
-	mb_mod_t *mods_addr;
-	
-	uint32_t syms[4];
-	
-	uint32_t mmap_length;
-	mb_mmap_t *mmap_addr;
-	
-	/* ... */
-} __attribute__ ((packed)) mb_info_t;
-
-enum mb_info_flags {
-	MBINFO_FLAGS_MEM     = 0x01,
-	MBINFO_FLAGS_BOOT    = 0x02,
-	MBINFO_FLAGS_CMDLINE = 0x04,
-	MBINFO_FLAGS_MODS    = 0x08,
-	MBINFO_FLAGS_SYMS1   = 0x10,
-	MBINFO_FLAGS_SYMS2   = 0x20,
-	MBINFO_FLAGS_MMAP    = 0x40
-	
-	/* ... */
-};
-
-#endif
-
-/** @}
- */