Index: tools/amd64/gencontext.c
===================================================================
--- tools/amd64/gencontext.c	(revision 616f175962fda61a6a7ac7fcc1c3e6bc51d71fa9)
+++ tools/amd64/gencontext.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -2,7 +2,7 @@
 #include <stdint.h>
 
-typedef uint64_t __u64;
-typedef __u64 ipl_t;
-typedef __u64 __address;
+typedef uint64_t uint64_t;
+typedef uint64_t ipl_t;
+typedef uint64_t uintptr_t;
 
 #define __amd64_TYPES_H__
Index: tools/mips32/gencontext.c
===================================================================
--- tools/mips32/gencontext.c	(revision 616f175962fda61a6a7ac7fcc1c3e6bc51d71fa9)
+++ tools/mips32/gencontext.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -2,7 +2,7 @@
 #include <stdint.h>
 
-typedef uint32_t __u32;
-typedef __u32 ipl_t;
-typedef __u32 __address;
+typedef uint32_t uint32_t;
+typedef uint32_t ipl_t;
+typedef uint32_t uintptr_t;
 
 #define __mips32_TYPES_H__
Index: tools/ppc32/gencontext.c
===================================================================
--- tools/ppc32/gencontext.c	(revision 616f175962fda61a6a7ac7fcc1c3e6bc51d71fa9)
+++ tools/ppc32/gencontext.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -2,8 +2,8 @@
 #include <stdint.h>
 
-typedef uint32_t __u32;
-typedef uint64_t __u64;
-typedef __u32 ipl_t;
-typedef __u32 __address;
+typedef uint32_t uint32_t;
+typedef uint64_t uint64_t;
+typedef uint32_t ipl_t;
+typedef uint32_t uintptr_t;
 
 #define __ppc32_TYPES_H__
Index: tools/ppc64/gencontext.c
===================================================================
--- tools/ppc64/gencontext.c	(revision 616f175962fda61a6a7ac7fcc1c3e6bc51d71fa9)
+++ tools/ppc64/gencontext.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -2,8 +2,8 @@
 #include <stdint.h>
 
-typedef uint32_t __u32;
-typedef uint64_t __u64;
-typedef __u64 ipl_t;
-typedef __u64 __address;
+typedef uint32_t uint32_t;
+typedef uint64_t uint64_t;
+typedef uint64_t ipl_t;
+typedef uint64_t uintptr_t;
 
 #define __ppc64_TYPES_H__
Index: tools/sparc64/gencontext.c
===================================================================
--- tools/sparc64/gencontext.c	(revision 616f175962fda61a6a7ac7fcc1c3e6bc51d71fa9)
+++ tools/sparc64/gencontext.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -2,7 +2,7 @@
 #include <stdint.h>
 
-typedef uint64_t __u64;
-typedef __u64 ipl_t;
-typedef __u64 __address;
+typedef uint64_t uint64_t;
+typedef uint64_t ipl_t;
+typedef uint64_t uintptr_t;
 
 #define __sparc64_TYPES_H__