--- glibc-2.3.5/sysdeps/unix/sysv/linux/sys/kd.h.orig	2010-11-15 21:59:46.000000000 +0100
+++ glibc-2.3.5/sysdeps/unix/sysv/linux/sys/kd.h	2010-11-15 22:00:17.000000000 +0100
@@ -22,8 +22,14 @@
 /* Make sure the <linux/types.h> header is not loaded.  */
 #ifndef _LINUX_TYPES_H
 # define _LINUX_TYPES_H	1
+# define __undef_LINUX_TYPES_H 1
 #endif
 
 #include <linux/kd.h>
 
+#ifdef __undef_LINUX_TYPES_H
+# undef _LINUX_TYPES_H
+# undef __undef_LINUX_TYPES_H
+#endif
+
 #endif	/* sys/kd.h */