diff -r 5221092ac503 -r e78f761f0c62 include/linux/byteorder/generic.h
--- a/include/linux/byteorder/generic.h	Fri Oct 31 01:46:20 2008 +0300
+++ b/include/linux/byteorder/generic.h	Fri Oct 31 02:00:44 2008 +0300
@@ -150,8 +150,10 @@
 extern __u32			ntohl(__u32);
 extern __u32			htonl(__u32);
 #else
+/*
 extern unsigned long int	ntohl(unsigned long int);
 extern unsigned long int	htonl(unsigned long int);
+*/
 #endif
 extern unsigned short int	ntohs(unsigned short int);
 extern unsigned short int	htons(unsigned short int);
diff -r 5221092ac503 -r e78f761f0c62 include/linux/types.h
--- a/include/linux/types.h	Fri Oct 31 01:46:20 2008 +0300
+++ b/include/linux/types.h	Fri Oct 31 02:00:44 2008 +0300
@@ -10,6 +10,7 @@
 
 #ifndef __KERNEL_STRICT_NAMES
 
+#ifdef __KERNEL__
 typedef __kernel_fd_set		fd_set;
 typedef __kernel_dev_t		dev_t;
 typedef __kernel_ino_t		ino_t;
@@ -20,6 +21,7 @@
 typedef __kernel_daddr_t	daddr_t;
 typedef __kernel_key_t		key_t;
 typedef __kernel_suseconds_t	suseconds_t;
+#endif
 
 #ifdef __KERNEL__
 typedef __kernel_uid32_t	uid_t;
@@ -36,42 +38,55 @@
 /* libc5 includes this file to define uid_t, thus uid_t can never change
  * when it is included by non-kernel code
  */
+
+/*
+ * The following typedefs are also protected by individual ifdefs for
+ * historical reasons:
+ */
+# ifndef _SIZE_T
+#define _SIZE_T
+typedef __kernel_size_t		size_t;
+# endif
+
+# ifndef _SSIZE_T
+#define _SSIZE_T
+typedef __kernel_ssize_t	ssize_t;
+# endif
+
+# ifndef _PTRDIFF_T
+#define _PTRDIFF_T
+typedef __kernel_ptrdiff_t	ptrdiff_t;
+# endif
+
+# if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+typedef		__u64		uint64_t;
+typedef		__u64		u_int64_t;
+typedef		__s64		int64_t;
+# endif
 #else
+/*
 typedef __kernel_uid_t		uid_t;
 typedef __kernel_gid_t		gid_t;
+*/
+
 #endif /* __KERNEL__ */
 
 #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
 typedef __kernel_loff_t		loff_t;
 #endif
 
-/*
- * The following typedefs are also protected by individual ifdefs for
- * historical reasons:
- */
-#ifndef _SIZE_T
-#define _SIZE_T
-typedef __kernel_size_t		size_t;
-#endif
-
-#ifndef _SSIZE_T
-#define _SSIZE_T
-typedef __kernel_ssize_t	ssize_t;
-#endif
-
-#ifndef _PTRDIFF_T
-#define _PTRDIFF_T
-typedef __kernel_ptrdiff_t	ptrdiff_t;
-#endif
-
 #ifndef _TIME_T
 #define _TIME_T
+#ifdef __KERNEL__
 typedef __kernel_time_t		time_t;
+#endif
 #endif
 
 #ifndef _CLOCK_T
 #define _CLOCK_T
+#ifdef __KERNEL__
 typedef __kernel_clock_t	clock_t;
+#endif
 #endif
 
 #ifndef _CADDR_T
@@ -107,12 +122,6 @@
 typedef		__u16		uint16_t;
 typedef		__u32		uint32_t;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef		__u64		uint64_t;
-typedef		__u64		u_int64_t;
-typedef		__s64		int64_t;
-#endif
-
 #endif /* __KERNEL_STRICT_NAMES */
 
 /*