From: Franck Bui-Huu <vagabon.xyz@gmail.com>

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/bootmem.h |    5 +----
 mm/bootmem.c            |   10 +++-------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff -puN include/linux/bootmem.h~bootmem-remove-useless-headers-inclusions include/linux/bootmem.h
--- a/include/linux/bootmem.h~bootmem-remove-useless-headers-inclusions
+++ a/include/linux/bootmem.h
@@ -4,11 +4,8 @@
 #ifndef _LINUX_BOOTMEM_H
 #define _LINUX_BOOTMEM_H
 
-#include <asm/pgtable.h>
-#include <asm/dma.h>
-#include <linux/cache.h>
-#include <linux/init.h>
 #include <linux/mmzone.h>
+#include <asm/dma.h>
 
 /*
  *  simple boot-time physical memory area allocator.
diff -puN mm/bootmem.c~bootmem-remove-useless-headers-inclusions mm/bootmem.c
--- a/mm/bootmem.c~bootmem-remove-useless-headers-inclusions
+++ a/mm/bootmem.c
@@ -8,17 +8,13 @@
  *  free memory collector. It's used to deal with reserved
  *  system memory and memory holes as well.
  */
-
-#include <linux/mm.h>
-#include <linux/kernel_stat.h>
-#include <linux/swap.h>
-#include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
-#include <linux/mmzone.h>
 #include <linux/module.h>
-#include <asm/dma.h>
+
+#include <asm/bug.h>
 #include <asm/io.h>
+
 #include "internal.h"
 
 /*
_