Index: linux-2.6.19.1/arch/um/include/sysdep-i386/stub.h
===================================================================
--- linux-2.6.19.1.orig/arch/um/include/sysdep-i386/stub.h	2007-01-10 14:03:15.000000000 +0800
+++ linux-2.6.19.1/arch/um/include/sysdep-i386/stub.h	2007-01-10 14:03:24.000000000 +0800
@@ -12,6 +12,7 @@
 #include "stub-data.h"
 #include "kern_constants.h"
 #include "uml-config.h"
+#include "asm/page.h"
 
 extern void stub_segv_handler(int sig);
 extern void stub_clone_handler(void);
Index: linux-2.6.19.1/arch/um/sys-i386/user-offsets.c
===================================================================
--- linux-2.6.19.1.orig/arch/um/sys-i386/user-offsets.c	2007-01-10 13:59:22.000000000 +0800
+++ linux-2.6.19.1/arch/um/sys-i386/user-offsets.c	2007-01-10 13:59:30.000000000 +0800
@@ -2,7 +2,7 @@
 #include <signal.h>
 #include <asm/ptrace.h>
 #include <asm/user.h>
-#include <linux/stddef.h>
+#include <stddef.h>
 #include <sys/poll.h>
 
 #define DEFINE(sym, val) \