diff -r 1af1a0af6f71 -r 41740e88d551 include/image.h
--- a/include/image.h	Tue Jun 17 11:20:52 2008 +0400
+++ b/include/image.h	Tue Oct 07 17:27:57 2008 +0400
@@ -34,6 +34,7 @@
 #define __IMAGE_H__
 
 #include <asm/byteorder.h>
+#include <linux/types.h>
 #include <command.h>
 
 #ifndef USE_HOSTCC
diff -r 1af1a0af6f71 -r 41740e88d551 include/linux/byteorder/generic.h
--- a/include/linux/byteorder/generic.h	Tue Jun 17 11:20:52 2008 +0400
+++ b/include/linux/byteorder/generic.h	Tue Oct 07 17:27:57 2008 +0400
@@ -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 1af1a0af6f71 -r 41740e88d551 include/linux/types.h
--- a/include/linux/types.h	Tue Jun 17 11:20:52 2008 +0400
+++ b/include/linux/types.h	Tue Oct 07 17:27:57 2008 +0400
@@ -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;
@@ -37,8 +39,10 @@
  * when it is included by non-kernel code
  */
 #else
+/*
 typedef __kernel_uid_t		uid_t;
 typedef __kernel_gid_t		gid_t;
+*/
 #endif /* __KERNEL__ */
 
 #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
@@ -66,12 +70,16 @@
 
 #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