Index: arch/mips32/loader/types.h
===================================================================
--- arch/mips32/loader/types.h	(revision fec35544f72ae20ecc285146461af27bb0fa771a)
+++ arch/mips32/loader/types.h	(revision 83253ad3b0d532efbd62b20478ca3a2d7b95527a)
@@ -32,13 +32,13 @@
 #include <gentypes.h>
 
-typedef signed char __s8;
+typedef signed char int8_t;
 
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned int __u32;
-typedef unsigned long long __u64;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long long uint64_t;
 
-typedef __u32 __address;
-typedef __u32 __native;
+typedef uint32_t uintptr_t;
+typedef uint32_t unative_t;
 
 #endif
Index: arch/ppc32/loader/types.h
===================================================================
--- arch/ppc32/loader/types.h	(revision fec35544f72ae20ecc285146461af27bb0fa771a)
+++ arch/ppc32/loader/types.h	(revision 83253ad3b0d532efbd62b20478ca3a2d7b95527a)
@@ -32,13 +32,13 @@
 #include <gentypes.h>
 
-typedef signed char __s8;
+typedef signed char int8_t;
 
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned int __u32;
-typedef unsigned long long __u64;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long long uint64_t;
 
-typedef __u32 __address;
-typedef __u32 __native;
+typedef uint32_t uintptr_t;
+typedef uint32_t unative_t;
 
 #endif
Index: arch/ppc64/loader/types.h
===================================================================
--- arch/ppc64/loader/types.h	(revision fec35544f72ae20ecc285146461af27bb0fa771a)
+++ arch/ppc64/loader/types.h	(revision 83253ad3b0d532efbd62b20478ca3a2d7b95527a)
@@ -32,13 +32,13 @@
 #include <gentypes.h>
 
-typedef signed char __s8;
+typedef signed char int8_t;
 
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned int __u32;
-typedef unsigned long  __u64;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long  uint64_t;
 
-typedef __u64 __address;
-typedef __u64 __native;
+typedef uint64_t uintptr_t;
+typedef uint64_t unative_t;
 
 #endif
Index: arch/sparc64/loader/types.h
===================================================================
--- arch/sparc64/loader/types.h	(revision fec35544f72ae20ecc285146461af27bb0fa771a)
+++ arch/sparc64/loader/types.h	(revision 83253ad3b0d532efbd62b20478ca3a2d7b95527a)
@@ -32,13 +32,13 @@
 #include <gentypes.h>
 
-typedef signed char __s8;
+typedef signed char int8_t;
 
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned int __u32;
-typedef unsigned long __u64;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long uint64_t;
 
-typedef __u64 __address;
-typedef __u64 __native;
+typedef uint64_t uintptr_t;
+typedef uint64_t unative_t;
 
 #endif
Index: generic/printf.c
===================================================================
--- generic/printf.c	(revision fec35544f72ae20ecc285146461af27bb0fa771a)
+++ generic/printf.c	(revision 83253ad3b0d532efbd62b20478ca3a2d7b95527a)
@@ -57,5 +57,5 @@
  *
  */
-static void print_fixed_hex(const __u64 num, const int width)
+static void print_fixed_hex(const uint64_t num, const int width)
 {
 	int i;
@@ -76,9 +76,9 @@
  *
  */
-static void print_number(const __native num, const unsigned int base)
+static void print_number(const unative_t num, const unsigned int base)
 {
 	int val = num;
-	char d[sizeof(__native) * 8 + 1];		/* this is good enough even for base == 2 */
-	int i = sizeof(__native) * 8 - 1;
+	char d[sizeof(unative_t) * 8 + 1];		/* this is good enough even for base == 2 */
+	int i = sizeof(unative_t) * 8 - 1;
 	
 	do {
@@ -86,5 +86,5 @@
 	} while (val /= base);
 	
-	d[sizeof(__native) * 8] = 0;	
+	d[sizeof(unative_t) * 8] = 0;	
 	puts(&d[i + 1]);
 }
@@ -183,5 +183,5 @@
 						puts("0x");
 					case 'p':
-						print_fixed_hex(va_arg(ap, __native), sizeof(__native));
+						print_fixed_hex(va_arg(ap, unative_t), sizeof(unative_t));
 						goto loop;
 					
@@ -189,5 +189,5 @@
 						puts("0x");
 					case 'q':
-						print_fixed_hex(va_arg(ap, __u64), INT64);
+						print_fixed_hex(va_arg(ap, uint64_t), INT64);
 						goto loop;
 					
@@ -195,5 +195,5 @@
 						puts("0x");
 					case 'l':
-						print_fixed_hex(va_arg(ap, __native), INT32);
+						print_fixed_hex(va_arg(ap, unative_t), INT32);
 						goto loop;
 					
@@ -201,5 +201,5 @@
 						puts("0x");
 					case 'w':
-						print_fixed_hex(va_arg(ap, __native), INT16);
+						print_fixed_hex(va_arg(ap, unative_t), INT16);
 						goto loop;
 					
@@ -207,5 +207,5 @@
 						puts("0x");
 					case 'b':
-						print_fixed_hex(va_arg(ap, __native), INT8);
+						print_fixed_hex(va_arg(ap, unative_t), INT8);
 						goto loop;
 					
@@ -214,5 +214,5 @@
 					 */
 					case 'd':
-						print_number(va_arg(ap, __native), 10);
+						print_number(va_arg(ap, unative_t), 10);
 						goto loop;
 					
@@ -220,5 +220,5 @@
 						puts("0x");
 					case 'x':
-						print_number(va_arg(ap, __native), 16);
+						print_number(va_arg(ap, unative_t), 16);
 						goto loop;