diff -urN linux-2.6.21.1.old/include/linux/time.h linux-2.6.21.1.dev/include/linux/time.h
--- linux-2.6.21.1.old/include/linux/time.h	2007-04-27 23:49:26.000000000 +0200
+++ linux-2.6.21.1.dev/include/linux/time.h	2007-05-26 21:23:19.859617680 +0200
@@ -1,6 +1,10 @@
 #ifndef _LINUX_TIME_H
 #define _LINUX_TIME_H
 
+#ifndef __KERNEL__
+#include <time.h>
+#else
+
 #include <linux/types.h>
 
 #ifdef __KERNEL__
@@ -224,4 +228,6 @@
  */
 #define TIMER_ABSTIME			0x01
 
+#endif /* __KERNEL__ DEBIAN */
+
 #endif
diff -urN linux-2.6.21.1.old/include/linux/types.h linux-2.6.21.1.dev/include/linux/types.h
--- linux-2.6.21.1.old/include/linux/types.h	2007-04-27 23:49:26.000000000 +0200
+++ linux-2.6.21.1.dev/include/linux/types.h	2007-05-26 21:23:19.859617680 +0200
@@ -1,6 +1,14 @@
 #ifndef _LINUX_TYPES_H
 #define _LINUX_TYPES_H
 
+/* Debian: Use userland types instead.  */
+#ifndef __KERNEL__
+# include <sys/types.h>
+/* For other kernel headers.  */
+# include <linux/posix_types.h>
+# include <asm/types.h>
+#else
+
 #ifdef	__KERNEL__
 
 #define BITS_TO_LONGS(bits) \
@@ -162,6 +170,8 @@
 
 #endif /* __KERNEL_STRICT_NAMES */
 
+#endif /* __KERNEL__ DEBIAN */
+
 /*
  * Below are truly Linux-specific types that should never collide with
  * any application/library that wants linux/types.h.