Index: linux-2.6.17/include/linux/mm.h
===================================================================
--- linux-2.6.17.orig/include/linux/mm.h	2007-10-24 10:05:09.000000000 -0400
+++ linux-2.6.17/include/linux/mm.h	2007-11-19 16:29:57.000000000 -0500
@@ -5,6 +5,7 @@
 
 #ifdef __KERNEL__
 
+#include <linux/page-flags.h>
 #include <linux/gfp.h>
 #include <linux/list.h>
 #include <linux/mmzone.h>
@@ -185,12 +186,6 @@ struct inode;
 #define page_private(page)		((page)->private)
 #define set_page_private(page, v)	((page)->private = (v))
 
-/*
- * FIXME: take this include out, include page-flags.h in
- * files which need it (119 of them)
- */
-#include <linux/page-flags.h>
-
 #ifdef CONFIG_DEBUG_VM
 #define VM_BUG_ON(cond) BUG_ON(cond)
 #else
Index: linux-2.6.17/include/linux/mm_types.h
===================================================================
--- linux-2.6.17.orig/include/linux/mm_types.h	2007-11-19 16:31:00.000000000 -0500
+++ linux-2.6.17/include/linux/mm_types.h	2007-11-19 16:31:21.000000000 -0500
@@ -2,6 +2,7 @@
 #define _LINUX_MM_TYPES_H
 
 #include <linux/auxvec.h>
+#include <linux/cpumask.h>
 #include <linux/types.h>
 #include <linux/threads.h>
 #include <linux/list.h>