Index: arch/amd64/include/asm.h
===================================================================
--- arch/amd64/include/asm.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/asm.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,6 +40,6 @@
 #include <config.h>
 
-extern void asm_delay_loop(__u32 t);
-extern void asm_fake_loop(__u32 t);
+extern void asm_delay_loop(uint32_t t);
+extern void asm_fake_loop(uint32_t t);
 
 /** Return base address of current stack.
@@ -49,9 +49,9 @@
  * The stack must start on page boundary.
  */
-static inline __address get_stack_base(void)
-{
-	__address v;
+static inline uintptr_t get_stack_base(void)
+{
+	uintptr_t v;
 	
-	__asm__ volatile ("andq %%rsp, %0\n" : "=r" (v) : "0" (~((__u64)STACK_SIZE-1)));
+	__asm__ volatile ("andq %%rsp, %0\n" : "=r" (v) : "0" (~((uint64_t)STACK_SIZE-1)));
 	
 	return v;
@@ -69,5 +69,5 @@
  * @return Value read
  */
-static inline __u8 inb(__u16 port) { __u8 val; __asm__ volatile ("inb %w1, %b0 \n" : "=a" (val) : "d" (port) ); return val; }
+static inline uint8_t inb(uint16_t port) { uint8_t val; __asm__ volatile ("inb %w1, %b0 \n" : "=a" (val) : "d" (port) ); return val; }
 
 /** Byte to port
@@ -78,5 +78,5 @@
  * @param val Value to write
  */
-static inline void outb(__u16 port, __u8 val) { __asm__ volatile ("outb %b0, %w1\n" : : "a" (val), "d" (port) ); }
+static inline void outb(uint16_t port, uint8_t val) { __asm__ volatile ("outb %b0, %w1\n" : : "a" (val), "d" (port) ); }
 
 /** Swap Hidden part of GS register with visible one */
@@ -150,21 +150,21 @@
 
 /** Write to MSR */
-static inline void write_msr(__u32 msr, __u64 value)
+static inline void write_msr(uint32_t msr, uint64_t value)
 {
 	__asm__ volatile (
 		"wrmsr;" : : "c" (msr), 
-		"a" ((__u32)(value)),
-		"d" ((__u32)(value >> 32))
-		);
-}
-
-static inline __native read_msr(__u32 msr)
-{
-	__u32 ax, dx;
+		"a" ((uint32_t)(value)),
+		"d" ((uint32_t)(value >> 32))
+		);
+}
+
+static inline unative_t read_msr(uint32_t msr)
+{
+	uint32_t ax, dx;
 
 	__asm__ volatile (
 		"rdmsr;" : "=a"(ax), "=d"(dx) : "c" (msr)
 		);
-	return ((__u64)dx << 32) | ax;
+	return ((uint64_t)dx << 32) | ax;
 }
 
@@ -188,7 +188,7 @@
 }
 
-static inline __address * get_ip() 
-{
-	__address *ip;
+static inline uintptr_t * get_ip() 
+{
+	uintptr_t *ip;
 
 	__asm__ volatile (
@@ -203,7 +203,7 @@
  * @param addr Address on a page whose TLB entry is to be invalidated.
  */
-static inline void invlpg(__address addr)
-{
-	__asm__ volatile ("invlpg %0\n" :: "m" (*((__native *)addr)));
+static inline void invlpg(uintptr_t addr)
+{
+	__asm__ volatile ("invlpg %0\n" :: "m" (*((unative_t *)addr)));
 }
 
@@ -239,17 +239,17 @@
  * @param sel Selector specifying descriptor of TSS segment.
  */
-static inline void tr_load(__u16 sel)
+static inline void tr_load(uint16_t sel)
 {
 	__asm__ volatile ("ltr %0" : : "r" (sel));
 }
 
-#define GEN_READ_REG(reg) static inline __native read_ ##reg (void) \
+#define GEN_READ_REG(reg) static inline unative_t read_ ##reg (void) \
     { \
-	__native res; \
+	unative_t res; \
 	__asm__ volatile ("movq %%" #reg ", %0" : "=r" (res) ); \
 	return res; \
     }
 
-#define GEN_WRITE_REG(reg) static inline void write_ ##reg (__native regn) \
+#define GEN_WRITE_REG(reg) static inline void write_ ##reg (unative_t regn) \
     { \
 	__asm__ volatile ("movq %0, %%" #reg : : "r" (regn)); \
Index: arch/amd64/include/atomic.h
===================================================================
--- arch/amd64/include/atomic.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/atomic.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -84,6 +84,6 @@
 #define atomic_predec(val) (atomic_postdec(val)-1)
 
-static inline __u64 test_and_set(atomic_t *val) {
-	__u64 v;
+static inline uint64_t test_and_set(atomic_t *val) {
+	uint64_t v;
 	
 	__asm__ volatile (
@@ -100,5 +100,5 @@
 static inline void atomic_lock_arch(atomic_t *val)
 {
-	__u64 tmp;
+	uint64_t tmp;
 
 	preemption_disable();
Index: arch/amd64/include/byteorder.h
===================================================================
--- arch/amd64/include/byteorder.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/byteorder.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -37,6 +37,6 @@
 
 /* AMD64 is little-endian */
-#define __native_le2host(n)		(n)
-#define __u64_le2host(n)		(n)
+#define unative_t_le2host(n)		(n)
+#define uint64_t_le2host(n)		(n)
 
 #endif
Index: arch/amd64/include/context.h
===================================================================
--- arch/amd64/include/context.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/context.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -51,14 +51,14 @@
  */
 struct context {
-    __address sp;
-    __address pc;
+    uintptr_t sp;
+    uintptr_t pc;
     
-    __u64 rbx;
-    __u64 rbp;
+    uint64_t rbx;
+    uint64_t rbp;
 
-    __u64 r12;
-    __u64 r13;
-    __u64 r14;
-    __u64 r15;
+    uint64_t r12;
+    uint64_t r13;
+    uint64_t r14;
+    uint64_t r15;
 
     ipl_t ipl;
Index: arch/amd64/include/cpu.h
===================================================================
--- arch/amd64/include/cpu.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/cpu.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -77,5 +77,5 @@
 
 extern void set_efer_flag(int flag);
-extern __u64 read_efer_flag(void);
+extern uint64_t read_efer_flag(void);
 void cpu_setup_fpu(void);
 
Index: arch/amd64/include/cpuid.h
===================================================================
--- arch/amd64/include/cpuid.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/cpuid.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -48,16 +48,16 @@
 
 struct cpu_info {
-	__u32 cpuid_eax;
-	__u32 cpuid_ebx;
-	__u32 cpuid_ecx;
-	__u32 cpuid_edx;
+	uint32_t cpuid_eax;
+	uint32_t cpuid_ebx;
+	uint32_t cpuid_ecx;
+	uint32_t cpuid_edx;
 } __attribute__ ((packed));
 
 extern int has_cpuid(void);
 
-extern void cpuid(__u32 cmd, cpu_info_t *info);
+extern void cpuid(uint32_t cmd, cpu_info_t *info);
 
 
-extern __u64 rdtsc(void);
+extern uint64_t rdtsc(void);
 
 #endif /* __ASM__ */
Index: arch/amd64/include/faddr.h
===================================================================
--- arch/amd64/include/faddr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/faddr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup amd64	
+/** @addtogroup amd64	
  * @{
  */
@@ -38,9 +38,8 @@
 #include <arch/types.h>
 
-#define FADDR(fptr)		((__address) (fptr))
+#define FADDR(fptr)		((uintptr_t) (fptr))
 
 #endif
 
- /** @}
+/** @}
  */
-
Index: arch/amd64/include/interrupt.h
===================================================================
--- arch/amd64/include/interrupt.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/interrupt.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -71,24 +71,24 @@
 /** This is passed to interrupt handlers */
 struct istate {
-	__u64 rax;
-	__u64 rbx;
-	__u64 rcx;
-	__u64 rdx;
-	__u64 rsi;
-	__u64 rdi;
-	__u64 r8;
-	__u64 r9;
-	__u64 r10;
-	__u64 r11;
-	__u64 r12;
-	__u64 r13;
-	__u64 r14;
-	__u64 r15;
-	__u64 rbp;
-	__u64 error_word;
-	__u64 rip;
-	__u64 cs;
-	__u64 rflags;
-	__u64 stack[]; /* Additional data on stack */
+	uint64_t rax;
+	uint64_t rbx;
+	uint64_t rcx;
+	uint64_t rdx;
+	uint64_t rsi;
+	uint64_t rdi;
+	uint64_t r8;
+	uint64_t r9;
+	uint64_t r10;
+	uint64_t r11;
+	uint64_t r12;
+	uint64_t r13;
+	uint64_t r14;
+	uint64_t r15;
+	uint64_t rbp;
+	uint64_t error_word;
+	uint64_t rip;
+	uint64_t cs;
+	uint64_t rflags;
+	uint64_t stack[]; /* Additional data on stack */
 };
 
@@ -99,15 +99,15 @@
 }
 
-static inline void istate_set_retaddr(istate_t *istate, __address retaddr)
+static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
 {
 	istate->rip = retaddr;
 }
-static inline __native istate_get_pc(istate_t *istate)
+static inline unative_t istate_get_pc(istate_t *istate)
 {
 	return istate->rip;
 }
 
-extern void (* disable_irqs_function)(__u16 irqmask);
-extern void (* enable_irqs_function)(__u16 irqmask);
+extern void (* disable_irqs_function)(uint16_t irqmask);
+extern void (* enable_irqs_function)(uint16_t irqmask);
 extern void (* eoi_function)(void);
 
@@ -121,6 +121,6 @@
 extern void tlb_shootdown_ipi(int n, istate_t *istate);
 
-extern void trap_virtual_enable_irqs(__u16 irqmask);
-extern void trap_virtual_disable_irqs(__u16 irqmask);
+extern void trap_virtual_enable_irqs(uint16_t irqmask);
+extern void trap_virtual_disable_irqs(uint16_t irqmask);
 extern void trap_virtual_eoi(void);
 /* AMD64 - specific page handler */
Index: arch/amd64/include/memstr.h
===================================================================
--- arch/amd64/include/memstr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/memstr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -50,5 +50,5 @@
 static inline void * memcpy(void * dst, const void * src, size_t cnt)
 {
-        __native d0, d1, d2;
+        unative_t d0, d1, d2;
 
         __asm__ __volatile__(
@@ -60,5 +60,5 @@
                 "1:\n"
                 : "=&c" (d0), "=&D" (d1), "=&S" (d2)
-                : "0" ((__native)(cnt / 8)), "g" ((__native)cnt), "1" ((__native) dst), "2" ((__native) src)
+                : "0" ((unative_t)(cnt / 8)), "g" ((unative_t)cnt), "1" ((unative_t) dst), "2" ((unative_t) src)
                 : "memory");
 
@@ -80,6 +80,6 @@
 static inline int memcmp(const void * src, const void * dst, size_t cnt)
 {
-	__native d0, d1, d2;
-	__native ret;
+	unative_t d0, d1, d2;
+	unative_t ret;
 	
 	__asm__ (
@@ -90,5 +90,5 @@
 		"1:\n"
 		: "=a" (ret), "=%S" (d0), "=&D" (d1), "=&c" (d2)
-		: "0" (0), "1" (src), "2" (dst), "3" ((__native)cnt)
+		: "0" (0), "1" (src), "2" (dst), "3" ((unative_t)cnt)
 	);
 	
@@ -105,12 +105,12 @@
  * @param x Value to fill
  */
-static inline void memsetw(__address dst, size_t cnt, __u16 x)
+static inline void memsetw(uintptr_t dst, size_t cnt, uint16_t x)
 {
-	__native d0, d1;
+	unative_t d0, d1;
 	
 	__asm__ __volatile__ (
 		"rep stosw\n\t"
 		: "=&D" (d0), "=&c" (d1), "=a" (x)
-		: "0" (dst), "1" ((__native)cnt), "2" (x)
+		: "0" (dst), "1" ((unative_t)cnt), "2" (x)
 		: "memory"
 	);
@@ -127,12 +127,12 @@
  * @param x Value to fill
  */
-static inline void memsetb(__address dst, size_t cnt, __u8 x)
+static inline void memsetb(uintptr_t dst, size_t cnt, uint8_t x)
 {
-	__native d0, d1;
+	unative_t d0, d1;
 	
 	__asm__ __volatile__ (
 		"rep stosb\n\t"
 		: "=&D" (d0), "=&c" (d1), "=a" (x)
-		: "0" (dst), "1" ((__native)cnt), "2" (x)
+		: "0" (dst), "1" ((unative_t)cnt), "2" (x)
 		: "memory"
 	);
Index: arch/amd64/include/mm/frame.h
===================================================================
--- arch/amd64/include/mm/frame.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/mm/frame.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -45,5 +45,5 @@
 
 #ifndef __ASM__
-extern __address last_frame;
+extern uintptr_t last_frame;
 extern void frame_arch_init(void);
 #endif /* __ASM__ */
Index: arch/amd64/include/mm/page.h
===================================================================
--- arch/amd64/include/mm/page.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/mm/page.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup amd64mm	
+/** @addtogroup amd64mm
  * @{
  */
@@ -61,5 +61,5 @@
 
 #ifndef __ASM__
-static inline __address ka2pa(__address x)
+static inline uintptr_t ka2pa(uintptr_t x)
 {
 	if (x > 0xffffffff80000000)
@@ -68,7 +68,7 @@
 		return x - 0xffff800000000000;
 }
-# define KA2PA(x)      ka2pa((__address)x)
-# define PA2KA_CODE(x)      (((__address) (x)) + 0xffffffff80000000)
-# define PA2KA(x)      (((__address) (x)) + 0xffff800000000000)
+# define KA2PA(x)      ka2pa((uintptr_t)x)
+# define PA2KA_CODE(x)      (((uintptr_t) (x)) + 0xffffffff80000000)
+# define PA2KA(x)      (((uintptr_t) (x)) + 0xffff800000000000)
 #else
 # define KA2PA(x)      ((x) - 0xffffffff80000000)
@@ -86,10 +86,10 @@
 #define PTL3_INDEX_ARCH(vaddr)	(((vaddr)>>12)&0x1ff)
 
-#define GET_PTL1_ADDRESS_ARCH(ptl0, i)		((pte_t *) ((((__u64) ((pte_t *)(ptl0))[(i)].addr_12_31)<<12) | (((__u64) ((pte_t *)(ptl0))[(i)].addr_32_51)<<32 )))
-#define GET_PTL2_ADDRESS_ARCH(ptl1, i)		((pte_t *) ((((__u64) ((pte_t *)(ptl1))[(i)].addr_12_31)<<12) | (((__u64) ((pte_t *)(ptl1))[(i)].addr_32_51)<<32 )))
-#define GET_PTL3_ADDRESS_ARCH(ptl2, i)		((pte_t *) ((((__u64) ((pte_t *)(ptl2))[(i)].addr_12_31)<<12) | (((__u64) ((pte_t *)(ptl2))[(i)].addr_32_51)<<32 )))
-#define GET_FRAME_ADDRESS_ARCH(ptl3, i)		((__address *) ((((__u64) ((pte_t *)(ptl3))[(i)].addr_12_31)<<12) | (((__u64) ((pte_t *)(ptl3))[(i)].addr_32_51)<<32 )))
-
-#define SET_PTL0_ADDRESS_ARCH(ptl0)		(write_cr3((__address) (ptl0)))
+#define GET_PTL1_ADDRESS_ARCH(ptl0, i)		((pte_t *) ((((uint64_t) ((pte_t *)(ptl0))[(i)].addr_12_31)<<12) | (((uint64_t) ((pte_t *)(ptl0))[(i)].addr_32_51)<<32 )))
+#define GET_PTL2_ADDRESS_ARCH(ptl1, i)		((pte_t *) ((((uint64_t) ((pte_t *)(ptl1))[(i)].addr_12_31)<<12) | (((uint64_t) ((pte_t *)(ptl1))[(i)].addr_32_51)<<32 )))
+#define GET_PTL3_ADDRESS_ARCH(ptl2, i)		((pte_t *) ((((uint64_t) ((pte_t *)(ptl2))[(i)].addr_12_31)<<12) | (((uint64_t) ((pte_t *)(ptl2))[(i)].addr_32_51)<<32 )))
+#define GET_FRAME_ADDRESS_ARCH(ptl3, i)		((uintptr_t *) ((((uint64_t) ((pte_t *)(ptl3))[(i)].addr_12_31)<<12) | (((uint64_t) ((pte_t *)(ptl3))[(i)].addr_32_51)<<32 )))
+
+#define SET_PTL0_ADDRESS_ARCH(ptl0)		(write_cr3((uintptr_t) (ptl0)))
 #define SET_PTL1_ADDRESS_ARCH(ptl0, i, a)	set_pt_addr((pte_t *)(ptl0), (index_t)(i), a)
 #define SET_PTL2_ADDRESS_ARCH(ptl1, i, a)       set_pt_addr((pte_t *)(ptl1), (index_t)(i), a)
@@ -107,7 +107,7 @@
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x)	set_pt_flags((pte_t *)(ptl3), (index_t)(i), (x))
 
-#define PTE_VALID_ARCH(p)			(*((__u64 *) (p)) != 0)
+#define PTE_VALID_ARCH(p)			(*((uint64_t *) (p)) != 0)
 #define PTE_PRESENT_ARCH(p)			((p)->present != 0)
-#define PTE_GET_FRAME_ARCH(p)			((((__address)(p)->addr_12_31)<<12) | ((__address)(p)->addr_32_51<<32))
+#define PTE_GET_FRAME_ARCH(p)			((((uintptr_t)(p)->addr_12_31)<<12) | ((uintptr_t)(p)->addr_32_51<<32))
 #define PTE_WRITABLE_ARCH(p)			((p)->writeable != 0)
 #define PTE_EXECUTABLE_ARCH(p)			((p)->no_execute == 0)
@@ -165,5 +165,5 @@
 }
 
-static inline void set_pt_addr(pte_t *pt, index_t i, __address a)
+static inline void set_pt_addr(pte_t *pt, index_t i, uintptr_t a)
 {
 	pte_t *p = &pt[i];
@@ -198,5 +198,4 @@
 #endif
 
- /** @}
- */
-
+/** @}
+ */
Index: arch/amd64/include/pm.h
===================================================================
--- arch/amd64/include/pm.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/pm.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -141,32 +141,32 @@
 
 struct ptr_16_64 {
-	__u16 limit;
-	__u64 base;
+	uint16_t limit;
+	uint64_t base;
 } __attribute__ ((packed));
 typedef struct ptr_16_64 ptr_16_64_t;
 
 struct ptr_16_32 {
-	__u16 limit;
-	__u32 base;
+	uint16_t limit;
+	uint32_t base;
 } __attribute__ ((packed));
 typedef struct ptr_16_32 ptr_16_32_t;
 
 struct tss {
-	__u32 reserve1;
-	__u64 rsp0;
-	__u64 rsp1;
-	__u64 rsp2;
-	__u64 reserve2;
-	__u64 ist1;
-	__u64 ist2;
-	__u64 ist3;
-	__u64 ist4;
-	__u64 ist5;
-	__u64 ist6;
-	__u64 ist7;
-	__u64 reserve3;
-	__u16 reserve4;
-	__u16 iomap_base;
-	__u8 iomap[TSS_IOMAP_SIZE];
+	uint32_t reserve1;
+	uint64_t rsp0;
+	uint64_t rsp1;
+	uint64_t rsp2;
+	uint64_t reserve2;
+	uint64_t ist1;
+	uint64_t ist2;
+	uint64_t ist3;
+	uint64_t ist4;
+	uint64_t ist5;
+	uint64_t ist6;
+	uint64_t ist7;
+	uint64_t reserve3;
+	uint16_t reserve4;
+	uint16_t iomap_base;
+	uint8_t iomap[TSS_IOMAP_SIZE];
 } __attribute__ ((packed));
 typedef struct tss tss_t;
@@ -183,9 +183,9 @@
 extern void pm_init(void);
 
-extern void gdt_tss_setbase(descriptor_t *d, __address base);
-extern void gdt_tss_setlimit(descriptor_t *d, __u32 limit);
+extern void gdt_tss_setbase(descriptor_t *d, uintptr_t base);
+extern void gdt_tss_setlimit(descriptor_t *d, uint32_t limit);
 
 extern void idt_init(void);
-extern void idt_setoffset(idescriptor_t *d, __address offset);
+extern void idt_setoffset(idescriptor_t *d, uintptr_t offset);
 
 extern void tss_initialize(tss_t *t);
Index: arch/amd64/include/proc/thread.h
===================================================================
--- arch/amd64/include/proc/thread.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/proc/thread.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -39,5 +39,5 @@
 
 typedef struct {
-	__native tls;
+	unative_t tls;
 } thread_arch_t;
 
Index: arch/amd64/include/types.h
===================================================================
--- arch/amd64/include/types.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/include/types.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup amd64	
+/** @addtogroup amd64	
  * @{
  */
@@ -38,22 +38,22 @@
 #define NULL 0
 
-typedef signed char __s8;
-typedef signed short __s16;
-typedef signed int __s32;
-typedef signed long long __s64;
+typedef signed char int8_t;
+typedef signed short int16_t;
+typedef signed int int32_t;
+typedef signed long long int64_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 __u64 __address;
-typedef __u64 pfn_t;
+typedef uint64_t uintptr_t;
+typedef uint64_t pfn_t;
 
 /* Flags of processor (return value of interrupts_disable()) */
-typedef __u64 ipl_t;
+typedef uint64_t ipl_t;
 
-typedef __u64 __native;
-typedef __s64 __snative;
+typedef uint64_t unative_t;
+typedef int64_t native_t;
 
 typedef struct page_specifier pte_t;
@@ -61,5 +61,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: arch/amd64/src/amd64.c
===================================================================
--- arch/amd64/src/amd64.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/src/amd64.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -187,5 +187,5 @@
  * we need not to go to CPL0 to read it.
  */
-__native sys_tls_set(__native addr)
+unative_t sys_tls_set(unative_t addr)
 {
 	THREAD->arch.tls = addr;
Index: arch/amd64/src/cpu/cpu.c
===================================================================
--- arch/amd64/src/cpu/cpu.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/src/cpu/cpu.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -125,5 +125,5 @@
 {
 	CPU->arch.tss = tss_p;
-	CPU->arch.tss->iomap_base = &CPU->arch.tss->iomap[0] - ((__u8 *) CPU->arch.tss);
+	CPU->arch.tss->iomap_base = &CPU->arch.tss->iomap[0] - ((uint8_t *) CPU->arch.tss);
 	CPU->fpu_owner = NULL;
 }
Index: arch/amd64/src/ddi/ddi.c
===================================================================
--- arch/amd64/src/ddi/ddi.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/src/ddi/ddi.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -56,5 +56,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
 	count_t bits;
@@ -66,5 +66,5 @@
 	if (task->arch.iomap.bits < bits) {
 		bitmap_t oldiomap;
-		__u8 *newmap;
+		uint8_t *newmap;
 	
 		/*
@@ -72,5 +72,5 @@
 		 */
 		
-		newmap = (__u8 *) malloc(BITS2BYTES(bits), FRAME_ATOMIC);
+		newmap = (uint8_t *) malloc(BITS2BYTES(bits), FRAME_ATOMIC);
 		if (!newmap)
 			return ENOMEM;
Index: arch/amd64/src/debugger.c
===================================================================
--- arch/amd64/src/debugger.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/src/debugger.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -47,5 +47,5 @@
 
 typedef struct  {
-	__address address;      /**< Breakpoint address */
+	uintptr_t address;      /**< Breakpoint address */
 	int flags;              /**< Flags regarding breakpoint */
 	int counter;            /**< How many times the exception occured */
@@ -123,5 +123,5 @@
 static void setup_dr(int curidx)
 {
-	__native dr7;
+	unative_t dr7;
 	bpinfo_t *cur = &breakpoints[curidx];
 	int flags = breakpoints[curidx].flags;
@@ -154,12 +154,12 @@
 		} else {
 			if (sizeof(int) == 4)
-				dr7 |= ((__native) 0x3) << (18 + 4*curidx);
+				dr7 |= ((unative_t) 0x3) << (18 + 4*curidx);
 			else /* 8 */
-				dr7 |= ((__native) 0x2) << (18 + 4*curidx);
+				dr7 |= ((unative_t) 0x2) << (18 + 4*curidx);
 			
 			if ((flags & BKPOINT_WRITE))
-				dr7 |= ((__native) 0x1) << (16 + 4*curidx);
+				dr7 |= ((unative_t) 0x1) << (16 + 4*curidx);
 			else if ((flags & BKPOINT_READ_WRITE))
-				dr7 |= ((__native) 0x3) << (16 + 4*curidx);
+				dr7 |= ((unative_t) 0x3) << (16 + 4*curidx);
 		}
 
@@ -206,5 +206,5 @@
 	cur = &breakpoints[curidx];
 
-	cur->address = (__address) where;
+	cur->address = (uintptr_t) where;
 	cur->flags = flags;
 	cur->counter = 0;
@@ -236,5 +236,5 @@
 	if (! (breakpoints[slot].flags & BKPOINT_INSTR)) {
 		if ((breakpoints[slot].flags & BKPOINT_CHECK_ZERO)) {
-			if (*((__native *) breakpoints[slot].address) != 0)
+			if (*((unative_t *) breakpoints[slot].address) != 0)
 				return;
 			printf("**** Found ZERO on address %p ****\n",
@@ -242,5 +242,5 @@
 		} else {
 			printf("Data watchpoint - new data: %p\n",
-			       *((__native *) breakpoints[slot].address));
+			       *((unative_t *) breakpoints[slot].address));
 		}
 	}
@@ -316,5 +316,5 @@
 static void debug_exception(int n, istate_t *istate)
 {
-	__native dr6;
+	unative_t dr6;
 	int i;
 	
Index: arch/amd64/src/interrupt.c
===================================================================
--- arch/amd64/src/interrupt.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/src/interrupt.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -57,5 +57,5 @@
 {
 	char *symbol;
-/*	__u64 *x = &istate->stack[0]; */
+/*	uint64_t *x = &istate->stack[0]; */
 
 	if (!(symbol=get_symtab_entry(istate->rip)))
@@ -80,6 +80,6 @@
  */
 
-void (* disable_irqs_function)(__u16 irqmask) = NULL;
-void (* enable_irqs_function)(__u16 irqmask) = NULL;
+void (* disable_irqs_function)(uint16_t irqmask) = NULL;
+void (* enable_irqs_function)(uint16_t irqmask) = NULL;
 void (* eoi_function)(void) = NULL;
 
@@ -142,5 +142,5 @@
 }
 
-void trap_virtual_enable_irqs(__u16 irqmask)
+void trap_virtual_enable_irqs(uint16_t irqmask)
 {
 	if (enable_irqs_function)
@@ -150,5 +150,5 @@
 }
 
-void trap_virtual_disable_irqs(__u16 irqmask)
+void trap_virtual_disable_irqs(uint16_t irqmask)
 {
 	if (disable_irqs_function)
@@ -175,5 +175,5 @@
 
 /* Reregister irq to be IPC-ready */
-void irq_ipc_bind_arch(__native irq)
+void irq_ipc_bind_arch(unative_t irq)
 {
 	if (irq == IRQ_CLK)
Index: arch/amd64/src/mm/memory_init.c
===================================================================
--- arch/amd64/src/mm/memory_init.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/src/mm/memory_init.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,7 +38,7 @@
 #include <print.h>
 
-__u8 e820counter = 0xff;
+uint8_t e820counter = 0xff;
 struct e820memmap_ e820table[MEMMAP_E820_MAX_RECORDS];
-__u32 e801memorysize;
+uint32_t e801memorysize;
 
 size_t get_memory_size(void) 
@@ -49,5 +49,5 @@
 void memory_print_map(void)
 {
-	__u8 i;
+	uint8_t i;
 	
 	for (i=0;i<e820counter;i++) {
Index: arch/amd64/src/mm/page.c
===================================================================
--- arch/amd64/src/mm/page.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/src/mm/page.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -63,17 +63,17 @@
 
 #define SETUP_PTL1(ptl0, page, tgt)  {	\
-	SET_PTL1_ADDRESS_ARCH(ptl0, PTL0_INDEX_ARCH(page), (__address)KA2PA(tgt)); \
+	SET_PTL1_ADDRESS_ARCH(ptl0, PTL0_INDEX_ARCH(page), (uintptr_t)KA2PA(tgt)); \
         SET_PTL1_FLAGS_ARCH(ptl0, PTL0_INDEX_ARCH(page), PAGE_WRITE | PAGE_EXEC); \
     }
 #define SETUP_PTL2(ptl1, page, tgt)  {	\
-	SET_PTL2_ADDRESS_ARCH(ptl1, PTL1_INDEX_ARCH(page), (__address)KA2PA(tgt)); \
+	SET_PTL2_ADDRESS_ARCH(ptl1, PTL1_INDEX_ARCH(page), (uintptr_t)KA2PA(tgt)); \
         SET_PTL2_FLAGS_ARCH(ptl1, PTL1_INDEX_ARCH(page), PAGE_WRITE | PAGE_EXEC); \
     }
 #define SETUP_PTL3(ptl2, page, tgt)  {	\
-	SET_PTL3_ADDRESS_ARCH(ptl2, PTL2_INDEX_ARCH(page), (__address)KA2PA(tgt)); \
+	SET_PTL3_ADDRESS_ARCH(ptl2, PTL2_INDEX_ARCH(page), (uintptr_t)KA2PA(tgt)); \
         SET_PTL3_FLAGS_ARCH(ptl2, PTL2_INDEX_ARCH(page), PAGE_WRITE | PAGE_EXEC); \
     }
 #define SETUP_FRAME(ptl3, page, tgt)  {	\
-	SET_FRAME_ADDRESS_ARCH(ptl3, PTL3_INDEX_ARCH(page), (__address)KA2PA(tgt)); \
+	SET_FRAME_ADDRESS_ARCH(ptl3, PTL3_INDEX_ARCH(page), (uintptr_t)KA2PA(tgt)); \
         SET_FRAME_FLAGS_ARCH(ptl3, PTL3_INDEX_ARCH(page), PAGE_WRITE | PAGE_EXEC); \
     }
@@ -82,5 +82,5 @@
 void page_arch_init(void)
 {
-	__address cur;
+	uintptr_t cur;
 	int i;
 	int identity_flags = PAGE_CACHEABLE | PAGE_EXEC | PAGE_GLOBAL;
@@ -110,8 +110,8 @@
 
 		exc_register(14, "page_fault", (iroutine)page_fault);
-		write_cr3((__address) AS_KERNEL->page_table);
-	}
-	else {
-		write_cr3((__address) AS_KERNEL->page_table);
+		write_cr3((uintptr_t) AS_KERNEL->page_table);
+	}
+	else {
+		write_cr3((uintptr_t) AS_KERNEL->page_table);
 	}
 }
@@ -126,6 +126,6 @@
 void ident_page_fault(int n, istate_t *istate)
 {
-	__address page;
-	static __address oldpage = 0;
+	uintptr_t page;
+	static uintptr_t oldpage = 0;
 	pte_t *aptl_1, *aptl_2, *aptl_3;
 
@@ -174,5 +174,5 @@
 void page_fault(int n, istate_t *istate)
 {
-	__address page;
+	uintptr_t page;
 	pf_access_t access;
 	
@@ -199,10 +199,10 @@
 
 
-__address hw_map(__address physaddr, size_t size)
+uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
 	if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
 		panic("Unable to map physical memory %p (%d bytes)", physaddr, size)
 	
-	__address virtaddr = PA2KA(last_frame);
+	uintptr_t virtaddr = PA2KA(last_frame);
 	pfn_t i;
 	for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
Index: arch/amd64/src/pm.c
===================================================================
--- arch/amd64/src/pm.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/src/pm.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -124,11 +124,11 @@
 idescriptor_t idt[IDT_ITEMS];
 
-ptr_16_64_t gdtr = {.limit = sizeof(gdt), .base= (__u64) gdt };
-ptr_16_64_t idtr = {.limit = sizeof(idt), .base= (__u64) idt };
+ptr_16_64_t gdtr = {.limit = sizeof(gdt), .base= (uint64_t) gdt };
+ptr_16_64_t idtr = {.limit = sizeof(idt), .base= (uint64_t) idt };
 
 static tss_t tss;
 tss_t *tss_p = NULL;
 
-void gdt_tss_setbase(descriptor_t *d, __address base)
+void gdt_tss_setbase(descriptor_t *d, uintptr_t base)
 {
 	tss_descriptor_t *td = (tss_descriptor_t *) d;
@@ -140,5 +140,5 @@
 }
 
-void gdt_tss_setlimit(descriptor_t *d, __u32 limit)
+void gdt_tss_setlimit(descriptor_t *d, uint32_t limit)
 {
 	struct tss_descriptor *td = (tss_descriptor_t *) d;
@@ -148,5 +148,5 @@
 }
 
-void idt_setoffset(idescriptor_t *d, __address offset)
+void idt_setoffset(idescriptor_t *d, uintptr_t offset)
 {
 	/*
@@ -160,5 +160,5 @@
 void tss_initialize(tss_t *t)
 {
-	memsetb((__address) t, sizeof(tss_t), 0);
+	memsetb((uintptr_t) t, sizeof(tss_t), 0);
 }
 
@@ -180,5 +180,5 @@
 		d->type = AR_INTERRUPT;	/* masking interrupt */
 
-		idt_setoffset(d, ((__address) interrupt_handlers) + i*interrupt_handler_size);
+		idt_setoffset(d, ((uintptr_t) interrupt_handlers) + i*interrupt_handler_size);
 		exc_register(i, "undef", (iroutine)null_interrupt);
 	}
@@ -215,5 +215,5 @@
 		 * non boot-mapped pointer, initialize the CR3 register
 		 * ahead of page_init */
-		write_cr3((__address) AS_KERNEL->page_table);
+		write_cr3((uintptr_t) AS_KERNEL->page_table);
 
 		tss_p = (struct tss *) malloc(sizeof(tss_t), FRAME_ATOMIC);
@@ -229,5 +229,5 @@
 	tss_desc->dpl = PL_KERNEL;
 	
-	gdt_tss_setbase(&gdt_p[TSS_DES], (__address) tss_p);
+	gdt_tss_setbase(&gdt_p[TSS_DES], (uintptr_t) tss_p);
 	gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE - 1);
 
Index: arch/amd64/src/proc/scheduler.c
===================================================================
--- arch/amd64/src/proc/scheduler.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/src/proc/scheduler.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -57,10 +57,10 @@
 void before_thread_runs_arch(void)
 {
-	CPU->arch.tss->rsp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
+	CPU->arch.tss->rsp0 = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
 
 	/* Syscall support - write address of thread stack pointer to 
 	 * hidden part of gs */
 	swapgs();
-	write_msr(AMD_MSR_GS, (__u64)&THREAD->kstack);
+	write_msr(AMD_MSR_GS, (uint64_t)&THREAD->kstack);
 	swapgs();
 
Index: arch/amd64/src/syscall.c
===================================================================
--- arch/amd64/src/syscall.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/amd64/src/syscall.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -58,7 +58,7 @@
 	 */
 	write_msr(AMD_MSR_STAR,
-		  ((__u64)(gdtselector(KDATA_DES) | PL_USER)<<48) \
-		  | ((__u64)(gdtselector(KTEXT_DES) | PL_KERNEL)<<32));
-	write_msr(AMD_MSR_LSTAR, (__u64)syscall_entry);
+		  ((uint64_t)(gdtselector(KDATA_DES) | PL_USER)<<48) \
+		  | ((uint64_t)(gdtselector(KTEXT_DES) | PL_KERNEL)<<32));
+	write_msr(AMD_MSR_LSTAR, (uint64_t)syscall_entry);
 	/* Mask RFLAGS on syscall 
 	 * - disable interrupts, until we exchange the stack register
Index: arch/ia32/include/asm.h
===================================================================
--- arch/ia32/include/asm.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/asm.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -41,5 +41,5 @@
 #include <config.h>
 
-extern __u32 interrupt_handler_size;
+extern uint32_t interrupt_handler_size;
 
 extern void paging_on(void);
@@ -50,6 +50,6 @@
 
 
-extern void asm_delay_loop(__u32 t);
-extern void asm_fake_loop(__u32 t);
+extern void asm_delay_loop(uint32_t t);
+extern void asm_fake_loop(uint32_t t);
 
 
@@ -61,12 +61,12 @@
 static inline void cpu_sleep(void) { __asm__("hlt\n"); };
 
-#define GEN_READ_REG(reg) static inline __native read_ ##reg (void) \
+#define GEN_READ_REG(reg) static inline unative_t read_ ##reg (void) \
     { \
-	__native res; \
+	unative_t res; \
 	__asm__ volatile ("movl %%" #reg ", %0" : "=r" (res) ); \
 	return res; \
     }
 
-#define GEN_WRITE_REG(reg) static inline void write_ ##reg (__native regn) \
+#define GEN_WRITE_REG(reg) static inline void write_ ##reg (unative_t regn) \
     { \
 	__asm__ volatile ("movl %0, %%" #reg : : "r" (regn)); \
@@ -99,5 +99,5 @@
  * @param val Value to write
  */
-static inline void outb(__u16 port, __u8 val) { __asm__ volatile ("outb %b0, %w1\n" : : "a" (val), "d" (port) ); }
+static inline void outb(uint16_t port, uint8_t val) { __asm__ volatile ("outb %b0, %w1\n" : : "a" (val), "d" (port) ); }
 
 /** Word to port
@@ -108,5 +108,5 @@
  * @param val Value to write
  */
-static inline void outw(__u16 port, __u16 val) { __asm__ volatile ("outw %w0, %w1\n" : : "a" (val), "d" (port) ); }
+static inline void outw(uint16_t port, uint16_t val) { __asm__ volatile ("outw %w0, %w1\n" : : "a" (val), "d" (port) ); }
 
 /** Double word to port
@@ -117,5 +117,5 @@
  * @param val Value to write
  */
-static inline void outl(__u16 port, __u32 val) { __asm__ volatile ("outl %l0, %w1\n" : : "a" (val), "d" (port) ); }
+static inline void outl(uint16_t port, uint32_t val) { __asm__ volatile ("outl %l0, %w1\n" : : "a" (val), "d" (port) ); }
 
 /** Byte from port
@@ -126,5 +126,5 @@
  * @return Value read
  */
-static inline __u8 inb(__u16 port) { __u8 val; __asm__ volatile ("inb %w1, %b0 \n" : "=a" (val) : "d" (port) ); return val; }
+static inline uint8_t inb(uint16_t port) { uint8_t val; __asm__ volatile ("inb %w1, %b0 \n" : "=a" (val) : "d" (port) ); return val; }
 
 /** Word from port
@@ -135,5 +135,5 @@
  * @return Value read
  */
-static inline __u16 inw(__u16 port) { __u16 val; __asm__ volatile ("inw %w1, %w0 \n" : "=a" (val) : "d" (port) ); return val; }
+static inline uint16_t inw(uint16_t port) { uint16_t val; __asm__ volatile ("inw %w1, %w0 \n" : "=a" (val) : "d" (port) ); return val; }
 
 /** Double word from port
@@ -144,5 +144,5 @@
  * @return Value read
  */
-static inline __u32 inl(__u16 port) { __u32 val; __asm__ volatile ("inl %w1, %l0 \n" : "=a" (val) : "d" (port) ); return val; }
+static inline uint32_t inl(uint16_t port) { uint32_t val; __asm__ volatile ("inl %w1, %l0 \n" : "=a" (val) : "d" (port) ); return val; }
 
 /** Enable interrupts.
@@ -220,7 +220,7 @@
  * The stack must start on page boundary.
  */
-static inline __address get_stack_base(void)
-{
-	__address v;
+static inline uintptr_t get_stack_base(void)
+{
+	uintptr_t v;
 	
 	__asm__ volatile ("andl %%esp, %0\n" : "=r" (v) : "0" (~(STACK_SIZE-1)));
@@ -229,7 +229,7 @@
 }
 
-static inline __u64 rdtsc(void)
-{
-	__u64 v;
+static inline uint64_t rdtsc(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile("rdtsc\n" : "=A" (v));
@@ -239,7 +239,7 @@
 
 /** Return current IP address */
-static inline __address * get_ip() 
-{
-	__address *ip;
+static inline uintptr_t * get_ip() 
+{
+	uintptr_t *ip;
 
 	__asm__ volatile (
@@ -254,7 +254,7 @@
  * @param addr Address on a page whose TLB entry is to be invalidated.
  */
-static inline void invlpg(__address addr)
-{
-	__asm__ volatile ("invlpg %0\n" :: "m" (*(__native *)addr));
+static inline void invlpg(uintptr_t addr)
+{
+	__asm__ volatile ("invlpg %0\n" :: "m" (*(unative_t *)addr));
 }
 
@@ -290,5 +290,5 @@
  * @param sel Selector specifying descriptor of TSS segment.
  */
-static inline void tr_load(__u16 sel)
+static inline void tr_load(uint16_t sel)
 {
 	__asm__ volatile ("ltr %0" : : "r" (sel));
Index: arch/ia32/include/atomic.h
===================================================================
--- arch/ia32/include/atomic.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/atomic.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -84,6 +84,6 @@
 #define atomic_predec(val) (atomic_postdec(val)-1)
 
-static inline __u32 test_and_set(atomic_t *val) {
-	__u32 v;
+static inline uint32_t test_and_set(atomic_t *val) {
+	uint32_t v;
 	
 	__asm__ volatile (
@@ -99,5 +99,5 @@
 static inline void atomic_lock_arch(atomic_t *val)
 {
-	__u32 tmp;
+	uint32_t tmp;
 
 	preemption_disable();
Index: arch/ia32/include/bios/bios.h
===================================================================
--- arch/ia32/include/bios/bios.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/bios/bios.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,5 +40,5 @@
 #define BIOS_EBDA_PTR	0x40e
 
-extern __address ebda;
+extern uintptr_t ebda;
 
 extern void bios_init(void);
Index: arch/ia32/include/boot/memmap.h
===================================================================
--- arch/ia32/include/boot/memmap.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/boot/memmap.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -59,14 +59,14 @@
 
 struct e820memmap_ {
-	__u64 base_address;
-	__u64 size;
-	__u32 type;
+	uint64_t base_address;
+	uint64_t size;
+	uint32_t type;
 } __attribute__ ((packed));
 
 extern struct e820memmap_ e820table[MEMMAP_E820_MAX_RECORDS];
 
-extern __u8 e820counter; 
+extern uint8_t e820counter; 
 
-extern __u32 e801memorysize; /**< Size of available memory in KB. */
+extern uint32_t e801memorysize; /**< Size of available memory in KB. */
 
 #endif
Index: arch/ia32/include/byteorder.h
===================================================================
--- arch/ia32/include/byteorder.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/byteorder.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -37,6 +37,6 @@
 
 /* IA-32 is little-endian */
-#define __native_le2host(n)		(n)
-#define __u64_le2host(n)		(n)
+#define unative_t_le2host(n)		(n)
+#define uint64_t_le2host(n)		(n)
 
 #endif
Index: arch/ia32/include/context.h
===================================================================
--- arch/ia32/include/context.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/context.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -53,10 +53,10 @@
  */
 struct context {
-	__address sp;
-	__address pc;
-	__u32 ebx;
-	__u32 esi;
-	__u32 edi;
-	__u32 ebp;
+	uintptr_t sp;
+	uintptr_t pc;
+	uint32_t ebx;
+	uint32_t esi;
+	uint32_t edi;
+	uint32_t ebp;
 	ipl_t ipl;
 } __attribute__ ((packed));
Index: arch/ia32/include/cpuid.h
===================================================================
--- arch/ia32/include/cpuid.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/cpuid.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -39,8 +39,8 @@
 
 struct cpu_info {
-	__u32 cpuid_eax;
-	__u32 cpuid_ebx;
-	__u32 cpuid_ecx;
-	__u32 cpuid_edx;
+	uint32_t cpuid_eax;
+	uint32_t cpuid_ebx;
+	uint32_t cpuid_ecx;
+	uint32_t cpuid_edx;
 } __attribute__ ((packed));
 
@@ -53,5 +53,5 @@
 {
 	struct __cpuid_extended_feature_info bits;
-	__u32                                word;
+	uint32_t                                word;
 }cpuid_extended_feature_info;
 
@@ -69,11 +69,11 @@
 {
 	struct __cpuid_feature_info bits;
-	__u32                word       ;
+	uint32_t                word       ;
 }cpuid_feature_info;
 
 
-static inline __u32 has_cpuid(void)
+static inline uint32_t has_cpuid(void)
 {
-	__u32 val, ret;
+	uint32_t val, ret;
 	
 	__asm__ volatile (
@@ -98,5 +98,5 @@
 }
 
-static inline void cpuid(__u32 cmd, struct cpu_info *info)
+static inline void cpuid(uint32_t cmd, struct cpu_info *info)
 {
 	__asm__ volatile (
Index: arch/ia32/include/drivers/i8042.h
===================================================================
--- arch/ia32/include/drivers/i8042.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/drivers/i8042.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -46,20 +46,20 @@
 #define i8042_STATUS		0x64
 
-static inline void i8042_data_write(__u8 data)
+static inline void i8042_data_write(uint8_t data)
 {
 	outb(i8042_DATA, data);
 }
 
-static inline __u8 i8042_data_read(void)
+static inline uint8_t i8042_data_read(void)
 {
 	return inb(i8042_DATA);
 }
 
-static inline __u8 i8042_status_read(void)
+static inline uint8_t i8042_status_read(void)
 {
 	return inb(i8042_STATUS);
 }
 
-static inline void i8042_command_write(__u8 command)
+static inline void i8042_command_write(uint8_t command)
 {
 	outb(i8042_STATUS, command);
Index: arch/ia32/include/drivers/i8259.h
===================================================================
--- arch/ia32/include/drivers/i8259.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/drivers/i8259.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -48,6 +48,6 @@
 
 extern void i8259_init(void);
-extern void pic_enable_irqs(__u16 irqmask);
-extern void pic_disable_irqs(__u16 irqmask);
+extern void pic_enable_irqs(uint16_t irqmask);
+extern void pic_disable_irqs(uint16_t irqmask);
 extern void pic_eoi(void);
 
Index: arch/ia32/include/faddr.h
===================================================================
--- arch/ia32/include/faddr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/faddr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,5 +38,5 @@
 #include <arch/types.h>
 
-#define FADDR(fptr)		((__address) (fptr))
+#define FADDR(fptr)		((uintptr_t) (fptr))
 
 #endif
Index: arch/ia32/include/fpu_context.h
===================================================================
--- arch/ia32/include/fpu_context.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/fpu_context.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -46,5 +46,5 @@
 
 struct fpu_context {
-	__u8 fpu[512]; 		/* FXSAVE & FXRSTOR storage area */
+	uint8_t fpu[512]; 		/* FXSAVE & FXRSTOR storage area */
 };
 
Index: arch/ia32/include/interrupt.h
===================================================================
--- arch/ia32/include/interrupt.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/interrupt.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -70,22 +70,22 @@
 
 struct istate {
-	__u32 eax;
-	__u32 ecx;
-	__u32 edx;
-	__u32 esi;
-	__u32 edi;
-	__u32 ebp;
-	__u32 ebx;
+	uint32_t eax;
+	uint32_t ecx;
+	uint32_t edx;
+	uint32_t esi;
+	uint32_t edi;
+	uint32_t ebp;
+	uint32_t ebx;
 
-	__u32 gs;
-	__u32 fs;
-	__u32 es;
-	__u32 ds;
+	uint32_t gs;
+	uint32_t fs;
+	uint32_t es;
+	uint32_t ds;
 
-	__u32 error_word;
-	__u32 eip;
-	__u32 cs;
-	__u32 eflags;
-	__u32 stack[];
+	uint32_t error_word;
+	uint32_t eip;
+	uint32_t cs;
+	uint32_t eflags;
+	uint32_t stack[];
 };
 
@@ -96,16 +96,16 @@
 }
 
-static inline void istate_set_retaddr(istate_t *istate, __address retaddr)
+static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
 {
 	istate->eip = retaddr;
 }
 
-static inline __native istate_get_pc(istate_t *istate)
+static inline unative_t istate_get_pc(istate_t *istate)
 {
 	return istate->eip;
 }
 
-extern void (* disable_irqs_function)(__u16 irqmask);
-extern void (* enable_irqs_function)(__u16 irqmask);
+extern void (* disable_irqs_function)(uint16_t irqmask);
+extern void (* enable_irqs_function)(uint16_t irqmask);
 extern void (* eoi_function)(void);
 
@@ -119,6 +119,6 @@
 extern void tlb_shootdown_ipi(int n, istate_t *istate);
 
-extern void trap_virtual_enable_irqs(__u16 irqmask);
-extern void trap_virtual_disable_irqs(__u16 irqmask);
+extern void trap_virtual_enable_irqs(uint16_t irqmask);
+extern void trap_virtual_disable_irqs(uint16_t irqmask);
 extern void trap_virtual_eoi(void);
 
Index: arch/ia32/include/memstr.h
===================================================================
--- arch/ia32/include/memstr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/memstr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -50,5 +50,5 @@
 static inline void * memcpy(void * dst, const void * src, size_t cnt)
 {
-        __native d0, d1, d2;
+        unative_t d0, d1, d2;
 
         __asm__ __volatile__(
@@ -66,5 +66,5 @@
                 "1:\n"
                 : "=&c" (d0), "=&D" (d1), "=&S" (d2)
-                : "0" ((__native) (cnt / 4)), "g" ((__native) cnt), "1" ((__native) dst), "2" ((__native) src)
+                : "0" ((unative_t) (cnt / 4)), "g" ((unative_t) cnt), "1" ((unative_t) dst), "2" ((unative_t) src)
                 : "memory");
 
@@ -86,5 +86,5 @@
 static inline int memcmp(const void * src, const void * dst, size_t cnt)
 {
-	__u32 d0, d1, d2;
+	uint32_t d0, d1, d2;
 	int ret;
 	
@@ -96,5 +96,5 @@
 		"1:\n"
 		: "=a" (ret), "=%S" (d0), "=&D" (d1), "=&c" (d2)
-		: "0" (0), "1" ((__native) src), "2" ((__native) dst), "3" ((__native) cnt)
+		: "0" (0), "1" ((unative_t) src), "2" ((unative_t) dst), "3" ((unative_t) cnt)
 	);
 	
@@ -111,7 +111,7 @@
  * @param x Value to fill
  */
-static inline void memsetw(__address dst, size_t cnt, __u16 x)
+static inline void memsetw(uintptr_t dst, size_t cnt, uint16_t x)
 {
-	__u32 d0, d1;
+	uint32_t d0, d1;
 	
 	__asm__ __volatile__ (
@@ -133,7 +133,7 @@
  * @param x Value to fill
  */
-static inline void memsetb(__address dst, size_t cnt, __u8 x)
+static inline void memsetb(uintptr_t dst, size_t cnt, uint8_t x)
 {
-	__u32 d0, d1;
+	uint32_t d0, d1;
 	
 	__asm__ __volatile__ (
Index: arch/ia32/include/mm/frame.h
===================================================================
--- arch/ia32/include/mm/frame.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/mm/frame.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -45,5 +45,5 @@
 #include <arch/types.h>
 
-extern __address last_frame;
+extern uintptr_t last_frame;
 
 extern void frame_arch_init(void);
Index: arch/ia32/include/mm/page.h
===================================================================
--- arch/ia32/include/mm/page.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/mm/page.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -44,6 +44,6 @@
 
 #ifndef __ASM__
-#	define KA2PA(x)	(((__address) (x)) - 0x80000000)
-#	define PA2KA(x)	(((__address) (x)) + 0x80000000)
+#	define KA2PA(x)	(((uintptr_t) (x)) - 0x80000000)
+#	define PA2KA(x)	(((uintptr_t) (x)) + 0x80000000)
 #else
 #	define KA2PA(x)	((x) - 0x80000000)
@@ -68,7 +68,7 @@
 #define GET_PTL2_ADDRESS_ARCH(ptl1, i)		(ptl1)
 #define GET_PTL3_ADDRESS_ARCH(ptl2, i)		(ptl2)
-#define GET_FRAME_ADDRESS_ARCH(ptl3, i)		((__address)((((pte_t *)(ptl3))[(i)].frame_address)<<12))
+#define GET_FRAME_ADDRESS_ARCH(ptl3, i)		((uintptr_t)((((pte_t *)(ptl3))[(i)].frame_address)<<12))
 
-#define SET_PTL0_ADDRESS_ARCH(ptl0)		(write_cr3((__address) (ptl0)))
+#define SET_PTL0_ADDRESS_ARCH(ptl0)		(write_cr3((uintptr_t) (ptl0)))
 #define SET_PTL1_ADDRESS_ARCH(ptl0, i, a)	(((pte_t *)(ptl0))[(i)].frame_address = (a)>>12)
 #define SET_PTL2_ADDRESS_ARCH(ptl1, i, a)
@@ -86,5 +86,5 @@
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x)	set_pt_flags((pte_t *)(ptl3), (index_t)(i), (x))
 
-#define PTE_VALID_ARCH(p)			(*((__u32 *) (p)) != 0)
+#define PTE_VALID_ARCH(p)			(*((uint32_t *) (p)) != 0)
 #define PTE_PRESENT_ARCH(p)			((p)->present != 0)
 #define PTE_GET_FRAME_ARCH(p)			((p)->frame_address<<FRAME_WIDTH)
Index: arch/ia32/include/pm.h
===================================================================
--- arch/ia32/include/pm.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/pm.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -86,6 +86,6 @@
 
 struct ptr_16_32 {
-	__u16 limit;
-	__u32 base;
+	uint16_t limit;
+	uint32_t base;
 } __attribute__ ((packed));
 typedef struct ptr_16_32 ptr_16_32_t;
@@ -115,43 +115,43 @@
 
 struct tss {
-	__u16 link;
+	uint16_t link;
 	unsigned : 16;
-	__u32 esp0;
-	__u16 ss0;
+	uint32_t esp0;
+	uint16_t ss0;
 	unsigned : 16;
-	__u32 esp1;
-	__u16 ss1;
+	uint32_t esp1;
+	uint16_t ss1;
 	unsigned : 16;
-	__u32 esp2;
-	__u16 ss2;
+	uint32_t esp2;
+	uint16_t ss2;
 	unsigned : 16;
-	__u32 cr3;
-	__u32 eip;
-	__u32 eflags;
-	__u32 eax;
-	__u32 ecx;
-	__u32 edx;
-	__u32 ebx;
-	__u32 esp;
-	__u32 ebp;
-	__u32 esi;
-	__u32 edi;
-	__u16 es;
+	uint32_t cr3;
+	uint32_t eip;
+	uint32_t eflags;
+	uint32_t eax;
+	uint32_t ecx;
+	uint32_t edx;
+	uint32_t ebx;
+	uint32_t esp;
+	uint32_t ebp;
+	uint32_t esi;
+	uint32_t edi;
+	uint16_t es;
 	unsigned : 16;
-	__u16 cs;
+	uint16_t cs;
 	unsigned : 16;
-	__u16 ss;
+	uint16_t ss;
 	unsigned : 16;
-	__u16 ds;
+	uint16_t ds;
 	unsigned : 16;
-	__u16 fs;
+	uint16_t fs;
 	unsigned : 16;
-	__u16 gs;
+	uint16_t gs;
 	unsigned : 16;
-	__u16 ldtr;
+	uint16_t ldtr;
 	unsigned : 16;
 	unsigned : 16;
-	__u16 iomap_base;
-	__u8 iomap[TSS_IOMAP_SIZE];
+	uint16_t iomap_base;
+	uint8_t iomap[TSS_IOMAP_SIZE];
 } __attribute__ ((packed));
 typedef struct tss tss_t;
@@ -166,12 +166,12 @@
 extern void pm_init(void);
 
-extern void gdt_setbase(descriptor_t *d, __address base);
-extern void gdt_setlimit(descriptor_t *d, __u32 limit);
+extern void gdt_setbase(descriptor_t *d, uintptr_t base);
+extern void gdt_setlimit(descriptor_t *d, uint32_t limit);
 
 extern void idt_init(void);
-extern void idt_setoffset(idescriptor_t *d, __address offset);
+extern void idt_setoffset(idescriptor_t *d, uintptr_t offset);
 
 extern void tss_initialize(tss_t *t);
-extern void set_tls_desc(__address tls);
+extern void set_tls_desc(uintptr_t tls);
 
 #endif /* __ASM__ */
Index: arch/ia32/include/proc/thread.h
===================================================================
--- arch/ia32/include/proc/thread.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/proc/thread.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -39,5 +39,5 @@
 
 typedef struct {
-	__native tls;
+	unative_t tls;
 } thread_arch_t;
 
Index: arch/ia32/include/smp/apic.h
===================================================================
--- arch/ia32/include/smp/apic.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/smp/apic.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -106,11 +106,11 @@
 
 /** Interrupt Command Register. */
-#define ICRlo		(0x300/sizeof(__u32))
-#define ICRhi		(0x310/sizeof(__u32))
+#define ICRlo		(0x300/sizeof(uint32_t))
+#define ICRhi		(0x310/sizeof(uint32_t))
 struct icr {
 	union {
-		__u32 lo;
+		uint32_t lo;
 		struct {
-			__u8 vector;			/**< Interrupt Vector. */
+			uint8_t vector;			/**< Interrupt Vector. */
 			unsigned delmod : 3;		/**< Delivery Mode. */
 			unsigned destmod : 1;		/**< Destination Mode. */
@@ -125,8 +125,8 @@
 	};
 	union {
-		__u32 hi;
+		uint32_t hi;
 		struct {
 			unsigned : 24;			/**< Reserved. */
-			__u8 dest;			/**< Destination field. */
+			uint8_t dest;			/**< Destination field. */
 		} __attribute__ ((packed));
 	};
@@ -135,11 +135,11 @@
 
 /* End Of Interrupt. */
-#define EOI		(0x0b0/sizeof(__u32))
+#define EOI		(0x0b0/sizeof(uint32_t))
 
 /** Error Status Register. */
-#define ESR		(0x280/sizeof(__u32))
+#define ESR		(0x280/sizeof(uint32_t))
 union esr {
-	__u32 value;
-	__u8 err_bitmap;
+	uint32_t value;
+	uint8_t err_bitmap;
 	struct {
 		unsigned send_checksum_error : 1;
@@ -157,7 +157,7 @@
 
 /* Task Priority Register */
-#define TPR		(0x080/sizeof(__u32))
+#define TPR		(0x080/sizeof(uint32_t))
 union tpr {
-	__u32 value;
+	uint32_t value;
 	struct {
 		unsigned pri_sc : 4;		/**< Task Priority Sub-Class. */
@@ -168,9 +168,9 @@
 
 /** Spurious-Interrupt Vector Register. */
-#define SVR		(0x0f0/sizeof(__u32))
+#define SVR		(0x0f0/sizeof(uint32_t))
 union svr {
-	__u32 value;
-	struct {
-		__u8 vector;			/**< Spurious Vector. */
+	uint32_t value;
+	struct {
+		uint8_t vector;			/**< Spurious Vector. */
 		unsigned lapic_enabled : 1;	/**< APIC Software Enable/Disable. */
 		unsigned focus_checking : 1;	/**< Focus Processor Checking. */
@@ -181,7 +181,7 @@
 
 /** Time Divide Configuration Register. */
-#define TDCR		(0x3e0/sizeof(__u32))
+#define TDCR		(0x3e0/sizeof(uint32_t))
 union tdcr {
-	__u32 value;
+	uint32_t value;
 	struct {
 		unsigned div_value : 4;		/**< Divide Value, bit 2 is always 0. */
@@ -192,15 +192,15 @@
 
 /* Initial Count Register for Timer */
-#define ICRT		(0x380/sizeof(__u32))
+#define ICRT		(0x380/sizeof(uint32_t))
 
 /* Current Count Register for Timer */
-#define CCRT		(0x390/sizeof(__u32))
+#define CCRT		(0x390/sizeof(uint32_t))
 
 /** LVT Timer register. */
-#define LVT_Tm		(0x320/sizeof(__u32))
+#define LVT_Tm		(0x320/sizeof(uint32_t))
 union lvt_tm {
-	__u32 value;
-	struct {
-		__u8 vector;		/**< Local Timer Interrupt vector. */
+	uint32_t value;
+	struct {
+		uint8_t vector;		/**< Local Timer Interrupt vector. */
 		unsigned : 4;		/**< Reserved. */
 		unsigned delivs : 1;	/**< Delivery status (RO). */
@@ -214,10 +214,10 @@
 
 /** LVT LINT registers. */
-#define LVT_LINT0	(0x350/sizeof(__u32))
-#define LVT_LINT1	(0x360/sizeof(__u32))
+#define LVT_LINT0	(0x350/sizeof(uint32_t))
+#define LVT_LINT1	(0x360/sizeof(uint32_t))
 union lvt_lint {
-	__u32 value;
-	struct {
-		__u8 vector;			/**< LINT Interrupt vector. */
+	uint32_t value;
+	struct {
+		uint8_t vector;			/**< LINT Interrupt vector. */
 		unsigned delmod : 3;		/**< Delivery Mode. */
 		unsigned : 1;			/**< Reserved. */
@@ -233,9 +233,9 @@
 
 /** LVT Error register. */
-#define LVT_Err		(0x370/sizeof(__u32))
+#define LVT_Err		(0x370/sizeof(uint32_t))
 union lvt_error {
-	__u32 value;
-	struct {
-		__u8 vector;		/**< Local Timer Interrupt vector. */
+	uint32_t value;
+	struct {
+		uint8_t vector;		/**< Local Timer Interrupt vector. */
 		unsigned : 4;		/**< Reserved. */
 		unsigned delivs : 1;	/**< Delivery status (RO). */
@@ -248,10 +248,10 @@
 
 /** Local APIC ID Register. */
-#define L_APIC_ID	(0x020/sizeof(__u32))
+#define L_APIC_ID	(0x020/sizeof(uint32_t))
 union l_apic_id {
-	__u32 value;
+	uint32_t value;
 	struct {
 		unsigned : 24;		/**< Reserved. */
-		__u8 apic_id;		/**< Local APIC ID. */
+		uint8_t apic_id;		/**< Local APIC ID. */
 	} __attribute__ ((packed));
 };
@@ -259,5 +259,5 @@
 
 /** Local APIC Version Register */
-#define LAVR		(0x030/sizeof(__u32))
+#define LAVR		(0x030/sizeof(uint32_t))
 #define LAVR_Mask	0xff
 #define is_local_apic(x)	(((x)&LAVR_Mask&0xf0)==0x1)
@@ -266,10 +266,10 @@
 
 /** Logical Destination Register. */
-#define  LDR		(0x0d0/sizeof(__u32))
+#define  LDR		(0x0d0/sizeof(uint32_t))
 union ldr {
-	__u32 value;
+	uint32_t value;
 	struct {
 		unsigned : 24;		/**< Reserved. */
-		__u8 id;		/**< Logical APIC ID. */
+		uint8_t id;		/**< Logical APIC ID. */
 	} __attribute__ ((packed));
 };
@@ -277,7 +277,7 @@
 
 /** Destination Format Register. */
-#define DFR		(0x0e0/sizeof(__u32))
+#define DFR		(0x0e0/sizeof(uint32_t))
 union dfr {
-	__u32 value;
+	uint32_t value;
 	struct {
 		unsigned : 28;		/**< Reserved, all ones. */
@@ -288,6 +288,6 @@
 
 /* IO APIC */
-#define IOREGSEL	(0x00/sizeof(__u32))
-#define IOWIN		(0x10/sizeof(__u32))
+#define IOREGSEL	(0x00/sizeof(uint32_t))
+#define IOWIN		(0x10/sizeof(uint32_t))
 
 #define IOAPICID	0x00
@@ -298,7 +298,7 @@
 /** I/O Register Select Register. */
 union io_regsel {
-	__u32 value;
-	struct {
-		__u8 reg_addr;		/**< APIC Register Address. */
+	uint32_t value;
+	struct {
+		uint8_t reg_addr;		/**< APIC Register Address. */
 		unsigned : 24;		/**< Reserved. */
 	} __attribute__ ((packed));
@@ -309,7 +309,7 @@
 struct io_redirection_reg {
 	union {
-		__u32 lo;
+		uint32_t lo;
 		struct {
-			__u8 intvec;			/**< Interrupt Vector. */
+			uint8_t intvec;			/**< Interrupt Vector. */
 			unsigned delmod : 3;		/**< Delivery Mode. */
 			unsigned destmod : 1; 		/**< Destination mode. */
@@ -323,8 +323,8 @@
 	};
 	union {
-		__u32 hi;
+		uint32_t hi;
 		struct {
 			unsigned : 24;			/**< Reserved. */
-			__u8 dest : 8;			/**< Destination Field. */
+			uint8_t dest : 8;			/**< Destination Field. */
 		} __attribute__ ((packed));
 	};
@@ -336,5 +336,5 @@
 /** IO APIC Identification Register. */
 union io_apic_id {
-	__u32 value;
+	uint32_t value;
 	struct {
 		unsigned : 24;		/**< Reserved. */
@@ -345,8 +345,8 @@
 typedef union io_apic_id io_apic_id_t;
 
-extern volatile __u32 *l_apic;
-extern volatile __u32 *io_apic;
-
-extern __u32 apic_id_mask;
+extern volatile uint32_t *l_apic;
+extern volatile uint32_t *io_apic;
+
+extern uint32_t apic_id_mask;
 
 extern void apic_init(void);
@@ -354,14 +354,14 @@
 extern void l_apic_init(void);
 extern void l_apic_eoi(void);
-extern int l_apic_broadcast_custom_ipi(__u8 vector);
-extern int l_apic_send_init_ipi(__u8 apicid);
+extern int l_apic_broadcast_custom_ipi(uint8_t vector);
+extern int l_apic_send_init_ipi(uint8_t apicid);
 extern void l_apic_debug(void);
-extern __u8 l_apic_id(void);
-
-extern __u32 io_apic_read(__u8 address);
-extern void io_apic_write(__u8 address , __u32 x);
-extern void io_apic_change_ioredtbl(int pin, int dest, __u8 v, int flags);
-extern void io_apic_disable_irqs(__u16 irqmask);
-extern void io_apic_enable_irqs(__u16 irqmask);
+extern uint8_t l_apic_id(void);
+
+extern uint32_t io_apic_read(uint8_t address);
+extern void io_apic_write(uint8_t address , uint32_t x);
+extern void io_apic_change_ioredtbl(int pin, int dest, uint8_t v, int flags);
+extern void io_apic_disable_irqs(uint16_t irqmask);
+extern void io_apic_enable_irqs(uint16_t irqmask);
 
 #endif
Index: arch/ia32/include/smp/mps.h
===================================================================
--- arch/ia32/include/smp/mps.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/smp/mps.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -46,77 +46,77 @@
 
 struct mps_fs {
-	__u32 signature;
-	__u32 configuration_table;
-	__u8 length;
-	__u8 revision;
-	__u8 checksum;
-	__u8 config_type;
-	__u8 mpfib2;
-	__u8 mpfib3;
-	__u8 mpfib4;
-	__u8 mpfib5;
+	uint32_t signature;
+	uint32_t configuration_table;
+	uint8_t length;
+	uint8_t revision;
+	uint8_t checksum;
+	uint8_t config_type;
+	uint8_t mpfib2;
+	uint8_t mpfib3;
+	uint8_t mpfib4;
+	uint8_t mpfib5;
 } __attribute__ ((packed));
 
 struct mps_ct {
-	__u32 signature;
-	__u16 base_table_length;
-	__u8 revision;
-	__u8 checksum;
-	__u8 oem_id[8];
-	__u8 product_id[12];
-	__u32 oem_table;
-	__u16 oem_table_size;
-	__u16 entry_count;
-	__u32 l_apic;
-	__u16 ext_table_length;
-	__u8 ext_table_checksum;
-	__u8 xxx;
-	__u8 base_table[0];
+	uint32_t signature;
+	uint16_t base_table_length;
+	uint8_t revision;
+	uint8_t checksum;
+	uint8_t oem_id[8];
+	uint8_t product_id[12];
+	uint32_t oem_table;
+	uint16_t oem_table_size;
+	uint16_t entry_count;
+	uint32_t l_apic;
+	uint16_t ext_table_length;
+	uint8_t ext_table_checksum;
+	uint8_t xxx;
+	uint8_t base_table[0];
 } __attribute__ ((packed));
 
 struct __processor_entry {
-	__u8 type;
-	__u8 l_apic_id;
-	__u8 l_apic_version;
-	__u8 cpu_flags;
-	__u8 cpu_signature[4];
-	__u32 feature_flags;
-	__u32 xxx[2];
+	uint8_t type;
+	uint8_t l_apic_id;
+	uint8_t l_apic_version;
+	uint8_t cpu_flags;
+	uint8_t cpu_signature[4];
+	uint32_t feature_flags;
+	uint32_t xxx[2];
 } __attribute__ ((packed));
 
 struct __bus_entry {
-	__u8 type;
-	__u8 bus_id;
-	__u8 bus_type[6];
+	uint8_t type;
+	uint8_t bus_id;
+	uint8_t bus_type[6];
 } __attribute__ ((packed));
 
 struct __io_apic_entry {
-	__u8 type;
-	__u8 io_apic_id;
-	__u8 io_apic_version;
-	__u8 io_apic_flags;
-	__u32 io_apic;
+	uint8_t type;
+	uint8_t io_apic_id;
+	uint8_t io_apic_version;
+	uint8_t io_apic_flags;
+	uint32_t io_apic;
 } __attribute__ ((packed));
 
 struct __io_intr_entry {
-	__u8 type;
-	__u8 intr_type;
-	__u8 poel;
-	__u8 xxx;
-	__u8 src_bus_id;
-	__u8 src_bus_irq;
-	__u8 dst_io_apic_id;
-	__u8 dst_io_apic_pin;
+	uint8_t type;
+	uint8_t intr_type;
+	uint8_t poel;
+	uint8_t xxx;
+	uint8_t src_bus_id;
+	uint8_t src_bus_irq;
+	uint8_t dst_io_apic_id;
+	uint8_t dst_io_apic_pin;
 } __attribute__ ((packed));
 
 struct __l_intr_entry {
-	__u8 type;
-	__u8 intr_type;
-	__u8 poel;
-	__u8 xxx;
-	__u8 src_bus_id;
-	__u8 src_bus_irq;
-	__u8 dst_l_apic_id;
-	__u8 dst_l_apic_pin;
+	uint8_t type;
+	uint8_t intr_type;
+	uint8_t poel;
+	uint8_t xxx;
+	uint8_t src_bus_id;
+	uint8_t src_bus_irq;
+	uint8_t dst_l_apic_id;
+	uint8_t dst_l_apic_pin;
 } __attribute__ ((packed));
 
Index: arch/ia32/include/smp/smp.h
===================================================================
--- arch/ia32/include/smp/smp.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/smp/smp.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -44,5 +44,5 @@
 	bool (* cpu_enabled)(index_t i);	/**< Check whether the processor of index i is enabled. */
 	bool (*cpu_bootstrap)(index_t i);	/**< Check whether the processor of index i is BSP. */
-	__u8 (*cpu_apic_id)(index_t i);		/**< Return APIC ID of the processor of index i. */
+	uint8_t (*cpu_apic_id)(index_t i);		/**< Return APIC ID of the processor of index i. */
 	int (*irq_to_pin)(int irq);		/**< Return mapping between irq and APIC pin. */
 };
Index: arch/ia32/include/types.h
===================================================================
--- arch/ia32/include/types.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/include/types.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup ia32	
+/** @addtogroup ia32	
  * @{
  */
@@ -38,21 +38,21 @@
 #define NULL 0
 
-typedef signed char __s8;
-typedef signed short __s16;
-typedef signed long __s32;
-typedef signed long long __s64;
+typedef signed char int8_t;
+typedef signed short int16_t;
+typedef signed long int32_t;
+typedef signed long long int64_t;
 
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned long __u32;
-typedef unsigned long long __u64;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned long uint32_t;
+typedef unsigned long long uint64_t;
 
-typedef __u32 __address;
-typedef __u32 pfn_t;
+typedef uint32_t uintptr_t;
+typedef uint32_t pfn_t;
 
-typedef __u32 ipl_t;
+typedef uint32_t ipl_t;
 
-typedef __u32 __native;
-typedef __s32 __snative;
+typedef uint32_t unative_t;
+typedef int32_t native_t;
 
 typedef struct page_specifier pte_t;
@@ -60,5 +60,5 @@
 #endif
 
- /** @}
+/** @}
  */
 
Index: arch/ia32/src/bios/bios.c
===================================================================
--- arch/ia32/src/bios/bios.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/bios/bios.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -36,10 +36,10 @@
 #include <arch/types.h>
 
-__address ebda = 0;
+uintptr_t ebda = 0;
 
 void bios_init(void)
 {
 	/* Copy the EBDA address out from BIOS Data Area */
-	ebda = *((__u16 *) BIOS_EBDA_PTR) * 0x10;
+	ebda = *((uint16_t *) BIOS_EBDA_PTR) * 0x10;
 }
 
Index: arch/ia32/src/cpu/cpu.c
===================================================================
--- arch/ia32/src/cpu/cpu.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/cpu/cpu.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -99,8 +99,8 @@
 	cpuid_extended_feature_info efi;
 	cpu_info_t info;
-	__u32 help = 0;
+	uint32_t help = 0;
 	
 	CPU->arch.tss = tss_p;
-	CPU->arch.tss->iomap_base = &CPU->arch.tss->iomap[0] - ((__u8 *) CPU->arch.tss);
+	CPU->arch.tss->iomap_base = &CPU->arch.tss->iomap[0] - ((uint8_t *) CPU->arch.tss);
 
 	CPU->fpu_owner = NULL;
Index: arch/ia32/src/ddi/ddi.c
===================================================================
--- arch/ia32/src/ddi/ddi.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/ddi/ddi.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -57,5 +57,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
 	count_t bits;
@@ -67,5 +67,5 @@
 	if (task->arch.iomap.bits < bits) {
 		bitmap_t oldiomap;
-		__u8 *newmap;
+		uint8_t *newmap;
 	
 		/*
@@ -73,5 +73,5 @@
 		 */
 		
-		newmap = (__u8 *) malloc(BITS2BYTES(bits), FRAME_ATOMIC);
+		newmap = (uint8_t *) malloc(BITS2BYTES(bits), FRAME_ATOMIC);
 		if (!newmap)
 			return ENOMEM;
Index: arch/ia32/src/drivers/ega.c
===================================================================
--- arch/ia32/src/drivers/ega.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/drivers/ega.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -54,6 +54,6 @@
 
 SPINLOCK_INITIALIZE(egalock);
-static __u32 ega_cursor;
-static __u8 *videoram;
+static uint32_t ega_cursor;
+static uint8_t *videoram;
 
 static void ega_putchar(chardev_t *d, const char ch);
@@ -68,7 +68,7 @@
 void ega_init(void)
 {
-	__u8 hi, lo;
+	uint8_t hi, lo;
 	
-	videoram = (__u8 *) hw_map(VIDEORAM, SCREEN * 2);
+	videoram = (uint8_t *) hw_map(VIDEORAM, SCREEN * 2);
 	outb(0x3d4, 0xe);
 	hi = inb(0x3d5);
@@ -105,5 +105,5 @@
 
 	memcpy((void *) videoram, (void *) (videoram + ROW * 2), (SCREEN - ROW) * 2);
-	memsetw((__address) (videoram + (SCREEN - ROW) * 2), ROW, 0x0720);
+	memsetw((uintptr_t) (videoram + (SCREEN - ROW) * 2), ROW, 0x0720);
 	ega_cursor = ega_cursor - ROW;
 }
Index: arch/ia32/src/drivers/i8254.c
===================================================================
--- arch/ia32/src/drivers/i8254.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/drivers/i8254.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -79,7 +79,7 @@
 void i8254_calibrate_delay_loop(void)
 {
-	__u64 clk1, clk2;
-	__u32 t1, t2, o1, o2;
-	__u8 not_ok;
+	uint64_t clk1, clk2;
+	uint32_t t1, t2, o1, o2;
+	uint8_t not_ok;
 
 
Index: arch/ia32/src/drivers/i8259.c
===================================================================
--- arch/ia32/src/drivers/i8259.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/drivers/i8259.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -90,7 +90,7 @@
 }
 
-void pic_enable_irqs(__u16 irqmask)
+void pic_enable_irqs(uint16_t irqmask)
 {
-	__u8 x;
+	uint8_t x;
 
 	if (irqmask & 0xff) {
@@ -104,7 +104,7 @@
 }
 
-void pic_disable_irqs(__u16 irqmask)
+void pic_disable_irqs(uint16_t irqmask)
 {
-	__u8 x;
+	uint8_t x;
 
 	if (irqmask & 0xff) {
Index: arch/ia32/src/drivers/vesa.c
===================================================================
--- arch/ia32/src/drivers/vesa.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/drivers/vesa.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -51,9 +51,9 @@
 #include <bitops.h>
 
-__u32 vesa_ph_addr;
-__u16 vesa_width;
-__u16 vesa_height;
-__u16 vesa_bpp;
-__u16 vesa_scanline;
+uint32_t vesa_ph_addr;
+uint16_t vesa_width;
+uint16_t vesa_height;
+uint16_t vesa_bpp;
+uint16_t vesa_scanline;
 
 int vesa_present(void)
Index: arch/ia32/src/fpu_context.c
===================================================================
--- arch/ia32/src/fpu_context.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/fpu_context.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -109,5 +109,5 @@
 void fpu_init()
 {
-	__u32 help0=0,help1=0;
+	uint32_t help0=0,help1=0;
 	__asm__ volatile (
 		"fninit;\n"
Index: arch/ia32/src/ia32.c
===================================================================
--- arch/ia32/src/ia32.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/ia32.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -133,5 +133,5 @@
  * selector, and the descriptor->base is the correct address.
  */
-__native sys_tls_set(__native addr)
+unative_t sys_tls_set(unative_t addr)
 {
 	THREAD->arch.tls = addr;
Index: arch/ia32/src/interrupt.c
===================================================================
--- arch/ia32/src/interrupt.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/interrupt.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -57,6 +57,6 @@
  */
 
-void (* disable_irqs_function)(__u16 irqmask) = NULL;
-void (* enable_irqs_function)(__u16 irqmask) = NULL;
+void (* disable_irqs_function)(uint16_t irqmask) = NULL;
+void (* enable_irqs_function)(uint16_t irqmask) = NULL;
 void (* eoi_function)(void) = NULL;
 
@@ -130,5 +130,5 @@
 void simd_fp_exception(int n, istate_t *istate)
 {
-	__u32 mxcsr;
+	uint32_t mxcsr;
 	asm
 	(
@@ -137,8 +137,8 @@
 	);
 	fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zx",
-			     (__native)mxcsr);
-
-	PRINT_INFO_ERRCODE(istate);
-	printf("MXCSR: %#zx\n",(__native)(mxcsr));
+			     (unative_t)mxcsr);
+
+	PRINT_INFO_ERRCODE(istate);
+	printf("MXCSR: %#zx\n",(unative_t)(mxcsr));
 	panic("SIMD FP exception(19)\n");
 }
@@ -165,5 +165,5 @@
 }
 
-void trap_virtual_enable_irqs(__u16 irqmask)
+void trap_virtual_enable_irqs(uint16_t irqmask)
 {
 	if (enable_irqs_function)
@@ -173,5 +173,5 @@
 }
 
-void trap_virtual_disable_irqs(__u16 irqmask)
+void trap_virtual_disable_irqs(uint16_t irqmask)
 {
 	if (disable_irqs_function)
@@ -198,5 +198,5 @@
 
 /* Reregister irq to be IPC-ready */
-void irq_ipc_bind_arch(__native irq)
+void irq_ipc_bind_arch(unative_t irq)
 {
 	if (irq == IRQ_CLK)
Index: arch/ia32/src/mm/frame.c
===================================================================
--- arch/ia32/src/mm/frame.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/mm/frame.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -52,5 +52,5 @@
 size_t hardcoded_unmapped_kdata_size = 0;
 
-__address last_frame = 0;
+uintptr_t last_frame = 0;
 
 static void init_e820_memory(pfn_t minconf)
@@ -100,7 +100,7 @@
 			name = "invalid";
 		printf("%.*p %#.16llXB %s\n", 
-			sizeof(__native) * 2,
-		       (__native) e820table[i].base_address, 
-		       (__u64) e820table[i].size,
+			sizeof(unative_t) * 2,
+		       (unative_t) e820table[i].base_address, 
+		       (uint64_t) e820table[i].size,
 		       name);
 	}			
Index: arch/ia32/src/mm/memory_init.c
===================================================================
--- arch/ia32/src/mm/memory_init.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/mm/memory_init.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,7 +38,7 @@
 #include <print.h>
 
-__u8 e820counter = 0xff;
+uint8_t e820counter = 0xff;
 struct e820memmap_ e820table[MEMMAP_E820_MAX_RECORDS];
-__u32 e801memorysize;
+uint32_t e801memorysize;
 
 size_t get_memory_size(void) 
@@ -49,5 +49,5 @@
 void memory_print_map(void)
 {
-	__u8 i;
+	uint8_t i;
 	
 	for (i=0;i<e820counter;i++) {
Index: arch/ia32/src/mm/page.c
===================================================================
--- arch/ia32/src/mm/page.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/mm/page.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -52,5 +52,5 @@
 void page_arch_init(void)
 {
-	__address cur;
+	uintptr_t cur;
 	int flags;
 
@@ -69,8 +69,8 @@
 
 		exc_register(14, "page_fault", (iroutine) page_fault);
-		write_cr3((__address) AS_KERNEL->page_table);
+		write_cr3((uintptr_t) AS_KERNEL->page_table);
 	}
 	else {
-		write_cr3((__address) AS_KERNEL->page_table);
+		write_cr3((uintptr_t) AS_KERNEL->page_table);
 	}
 
@@ -79,10 +79,10 @@
 
 
-__address hw_map(__address physaddr, size_t size)
+uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
 	if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
 		panic("Unable to map physical memory %p (%d bytes)", physaddr, size)
 	
-	__address virtaddr = PA2KA(last_frame);
+	uintptr_t virtaddr = PA2KA(last_frame);
 	pfn_t i;
 	for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
@@ -96,5 +96,5 @@
 void page_fault(int n, istate_t *istate)
 {
-        __address page;
+        uintptr_t page;
 	pf_access_t access;
 	
Index: arch/ia32/src/mm/tlb.c
===================================================================
--- arch/ia32/src/mm/tlb.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/mm/tlb.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -60,5 +60,5 @@
  * @param cnt Number of entries to invalidate.
  */
-void tlb_invalidate_pages(asid_t asid, __address page, count_t cnt)
+void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
 {
 	int i;
Index: arch/ia32/src/pm.c
===================================================================
--- arch/ia32/src/pm.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/pm.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -87,8 +87,8 @@
 
 /* gdtr is changed by kmp before next CPU is initialized */
-ptr_16_32_t bootstrap_gdtr = { .limit = sizeof(gdt), .base = KA2PA((__address) gdt) };
-ptr_16_32_t gdtr = { .limit = sizeof(gdt), .base = (__address) gdt };
-
-void gdt_setbase(descriptor_t *d, __address base)
+ptr_16_32_t bootstrap_gdtr = { .limit = sizeof(gdt), .base = KA2PA((uintptr_t) gdt) };
+ptr_16_32_t gdtr = { .limit = sizeof(gdt), .base = (uintptr_t) gdt };
+
+void gdt_setbase(descriptor_t *d, uintptr_t base)
 {
 	d->base_0_15 = base & 0xffff;
@@ -97,5 +97,5 @@
 }
 
-void gdt_setlimit(descriptor_t *d, __u32 limit)
+void gdt_setlimit(descriptor_t *d, uint32_t limit)
 {
 	d->limit_0_15 = limit & 0xffff;
@@ -103,5 +103,5 @@
 }
 
-void idt_setoffset(idescriptor_t *d, __address offset)
+void idt_setoffset(idescriptor_t *d, uintptr_t offset)
 {
 	/*
@@ -114,5 +114,5 @@
 void tss_initialize(tss_t *t)
 {
-	memsetb((__address) t, sizeof(struct tss), 0);
+	memsetb((uintptr_t) t, sizeof(struct tss), 0);
 }
 
@@ -140,5 +140,5 @@
 		}
 		
-		idt_setoffset(d, ((__address) interrupt_handlers) + i*interrupt_handler_size);
+		idt_setoffset(d, ((uintptr_t) interrupt_handlers) + i*interrupt_handler_size);
 		exc_register(i, "undef", (iroutine) null_interrupt);
 	}
@@ -183,5 +183,5 @@
 	 */
 	idtr.limit = sizeof(idt);
-	idtr.base = (__address) idt;
+	idtr.base = (uintptr_t) idt;
 	gdtr_load(&gdtr);
 	idtr_load(&idtr);
@@ -212,5 +212,5 @@
 	gdt_p[TSS_DES].granularity = 0;
 	
-	gdt_setbase(&gdt_p[TSS_DES], (__address) tss_p);
+	gdt_setbase(&gdt_p[TSS_DES], (uintptr_t) tss_p);
 	gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE - 1);
 
@@ -225,5 +225,5 @@
 }
 
-void set_tls_desc(__address tls)
+void set_tls_desc(uintptr_t tls)
 {
 	ptr_16_32_t cpugdtr;
Index: arch/ia32/src/proc/scheduler.c
===================================================================
--- arch/ia32/src/proc/scheduler.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/proc/scheduler.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -59,5 +59,5 @@
 void before_thread_runs_arch(void)
 {
-	CPU->arch.tss->esp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
+	CPU->arch.tss->esp0 = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
 	CPU->arch.tss->ss0 = selector(KDATA_DES);
 
Index: arch/ia32/src/smp/ap.S
===================================================================
--- arch/ia32/src/smp/ap.S	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/smp/ap.S	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -70,5 +70,5 @@
 	movw %ax, %es
 	movw %ax, %ss
-	movl $KA2PA(ctx), %eax			# KA2PA((__address) &ctx)
+	movl $KA2PA(ctx), %eax			# KA2PA((uintptr_t) &ctx)
 	movl (%eax), %esp
 	subl $0x80000000, %esp			# KA2PA(ctx.sp)
Index: arch/ia32/src/smp/apic.c
===================================================================
--- arch/ia32/src/smp/apic.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/smp/apic.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -68,8 +68,8 @@
  * always be 32-bit, would use byte oriented instructions.
  */
-volatile __u32 *l_apic = (__u32 *) 0xfee00000;
-volatile __u32 *io_apic = (__u32 *) 0xfec00000;
-
-__u32 apic_id_mask = 0;
+volatile uint32_t *l_apic = (uint32_t *) 0xfee00000;
+volatile uint32_t *io_apic = (uint32_t *) 0xfec00000;
+
+uint32_t apic_id_mask = 0;
 
 static int apic_poll_errors(void);
@@ -219,5 +219,5 @@
  * @return 0 on failure, 1 on success.
  */
-int l_apic_broadcast_custom_ipi(__u8 vector)
+int l_apic_broadcast_custom_ipi(uint8_t vector)
 {
 	icr_t icr;
@@ -249,5 +249,5 @@
  * @return 0 on failure, 1 on success.
  */
-int l_apic_send_init_ipi(__u8 apicid)
+int l_apic_send_init_ipi(uint8_t apicid)
 {
 	icr_t icr;
@@ -306,5 +306,5 @@
 		for (i = 0; i<2; i++) {
 			icr.lo = l_apic[ICRlo];
-			icr.vector = ((__address) ap_boot) / 4096; /* calculate the reset vector */
+			icr.vector = ((uintptr_t) ap_boot) / 4096; /* calculate the reset vector */
 			icr.delmod = DELMOD_STARTUP;
 			icr.destmod = DESTMOD_PHYS;
@@ -332,5 +332,5 @@
 	ldr_t ldr;
 	dfr_t dfr;
-	__u32 t1, t2;
+	uint32_t t1, t2;
 
 	/* Initialize LVT Error register. */
@@ -456,5 +456,5 @@
  * @return Local APIC ID.
  */
-__u8 l_apic_id(void)
+uint8_t l_apic_id(void)
 {
 	l_apic_id_t idreg;
@@ -470,5 +470,5 @@
  * @return Content of the addressed IO APIC register.
  */
-__u32 io_apic_read(__u8 address)
+uint32_t io_apic_read(uint8_t address)
 {
 	io_regsel_t regsel;
@@ -485,5 +485,5 @@
  * @param x Content to be written to the addressed IO APIC register.
  */
-void io_apic_write(__u8 address, __u32 x)
+void io_apic_write(uint8_t address, uint32_t x)
 {
 	io_regsel_t regsel;
@@ -502,5 +502,5 @@
  * @param flags Flags.
  */
-void io_apic_change_ioredtbl(int pin, int dest, __u8 v, int flags)
+void io_apic_change_ioredtbl(int pin, int dest, uint8_t v, int flags)
 {
 	io_redirection_reg_t reg;
@@ -528,5 +528,5 @@
  * @param irqmask Bitmask of IRQs to be masked (0 = do not mask, 1 = mask).
  */
-void io_apic_disable_irqs(__u16 irqmask)
+void io_apic_disable_irqs(uint16_t irqmask)
 {
 	io_redirection_reg_t reg;
@@ -554,5 +554,5 @@
  * @param irqmask Bitmask of IRQs to be unmasked (0 = do not unmask, 1 = unmask).
  */
-void io_apic_enable_irqs(__u16 irqmask)
+void io_apic_enable_irqs(uint16_t irqmask)
 {
 	int i, pin;
Index: arch/ia32/src/smp/ipi.c
===================================================================
--- arch/ia32/src/smp/ipi.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/smp/ipi.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,5 +40,5 @@
 void ipi_broadcast_arch(int ipi)
 {
-	(void) l_apic_broadcast_custom_ipi((__u8) ipi);
+	(void) l_apic_broadcast_custom_ipi((uint8_t) ipi);
 }
 
Index: arch/ia32/src/smp/mps.c
===================================================================
--- arch/ia32/src/smp/mps.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/smp/mps.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -56,9 +56,9 @@
 #define CT_SIGNATURE 	0x504d4350
 
-int mps_fs_check(__u8 *base);
+int mps_fs_check(uint8_t *base);
 int mps_ct_check(void);
 
 int configure_via_ct(void);
-int configure_via_default(__u8 n);
+int configure_via_default(uint8_t n);
 
 int ct_processor_entry(struct __processor_entry *pr);
@@ -93,5 +93,5 @@
 static bool is_cpu_enabled(index_t i);
 static bool is_bsp(index_t i);
-static __u8 get_cpu_apic_id(index_t i);
+static uint8_t get_cpu_apic_id(index_t i);
 static int mps_irq_to_pin(int irq);
 
@@ -121,5 +121,5 @@
 }
 
-__u8 get_cpu_apic_id(index_t i)
+uint8_t get_cpu_apic_id(index_t i)
 {
 	ASSERT(i < processor_entry_cnt);
@@ -131,8 +131,8 @@
  * Used to check the integrity of the MP Floating Structure.
  */
-int mps_fs_check(__u8 *base)
+int mps_fs_check(uint8_t *base)
 {
 	int i;
-	__u8 sum;
+	uint8_t sum;
 	
 	for (i = 0, sum = 0; i < 16; i++)
@@ -147,7 +147,7 @@
 int mps_ct_check(void)
 {
-	__u8 *base = (__u8 *) ct;
-	__u8 *ext = base + ct->base_table_length;
-	__u8 sum;
+	uint8_t *base = (uint8_t *) ct;
+	uint8_t *ext = base + ct->base_table_length;
+	uint8_t sum;
 	int i;	
 	
@@ -168,5 +168,5 @@
 void mps_init(void)
 {
-	__u8 *addr[2] = { NULL, (__u8 *) PA2KA(0xf0000) };
+	uint8_t *addr[2] = { NULL, (uint8_t *) PA2KA(0xf0000) };
 	int i, j, length[2] = { 1024, 64*1024 };
 	
@@ -179,8 +179,8 @@
 	 */
 
-	addr[0] = (__u8 *) PA2KA(ebda ? ebda : 639 * 1024);
+	addr[0] = (uint8_t *) PA2KA(ebda ? ebda : 639 * 1024);
 	for (i = 0; i < 2; i++) {
 		for (j = 0; j < length[i]; j += 16) {
-			if (*((__u32 *) &addr[i][j]) == FS_SIGNATURE && mps_fs_check(&addr[i][j])) {
+			if (*((uint32_t *) &addr[i][j]) == FS_SIGNATURE && mps_fs_check(&addr[i][j])) {
 				fs = (struct mps_fs *) &addr[i][j];
 				goto fs_found;
@@ -200,5 +200,5 @@
 		}
 
-		ct = (struct mps_ct *)PA2KA((__address)fs->configuration_table);
+		ct = (struct mps_ct *)PA2KA((uintptr_t)fs->configuration_table);
 		config.cpu_count = configure_via_ct();
 	} 
@@ -211,5 +211,5 @@
 int configure_via_ct(void)
 {
-	__u8 *cur;
+	uint8_t *cur;
 	int i, cnt;
 		
@@ -227,5 +227,5 @@
 	}
 	
-	l_apic = (__u32 *)(__address)ct->l_apic;
+	l_apic = (uint32_t *)(uintptr_t)ct->l_apic;
 
 	cnt = 0;
@@ -290,5 +290,5 @@
 }
 
-int configure_via_default(__u8 n)
+int configure_via_default(uint8_t n)
 {
 	/*
@@ -337,5 +337,5 @@
 	}
 	
-	io_apic = (__u32 *)(__address)ioa->io_apic;
+	io_apic = (uint32_t *)(uintptr_t)ioa->io_apic;
 }
 
@@ -405,6 +405,6 @@
 void ct_extended_entries(void)
 {
-	__u8 *ext = (__u8 *) ct + ct->base_table_length;
-	__u8 *cur;
+	uint8_t *ext = (uint8_t *) ct + ct->base_table_length;
+	uint8_t *cur;
 
 	for (cur = ext; cur < ext + ct->ext_table_length; cur += cur[CT_EXT_ENTRY_LEN]) {
Index: arch/ia32/src/smp/smp.c
===================================================================
--- arch/ia32/src/smp/smp.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia32/src/smp/smp.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -62,5 +62,5 @@
 void smp_init(void)
 {
-	__address l_apic_address, io_apic_address;
+	uintptr_t l_apic_address, io_apic_address;
 
 	if (acpi_madt) {
@@ -73,20 +73,20 @@
 	}
 
-	l_apic_address = (__address) frame_alloc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA);
+	l_apic_address = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA);
 	if (!l_apic_address)
 		panic("cannot allocate address for l_apic\n");
 
-	io_apic_address = (__address) frame_alloc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA);
+	io_apic_address = (uintptr_t) frame_alloc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA);
 	if (!io_apic_address)
 		panic("cannot allocate address for io_apic\n");
 
 	if (config.cpu_count > 1) {		
-		page_mapping_insert(AS_KERNEL, l_apic_address, (__address) l_apic, 
+		page_mapping_insert(AS_KERNEL, l_apic_address, (uintptr_t) l_apic, 
 				  PAGE_NOT_CACHEABLE);
-		page_mapping_insert(AS_KERNEL, io_apic_address, (__address) io_apic,
+		page_mapping_insert(AS_KERNEL, io_apic_address, (uintptr_t) io_apic,
 				  PAGE_NOT_CACHEABLE);
 				  
-		l_apic = (__u32 *) l_apic_address;
-		io_apic = (__u32 *) io_apic_address;
+		l_apic = (uint32_t *) l_apic_address;
+		io_apic = (uint32_t *) io_apic_address;
         }
 }
@@ -115,6 +115,6 @@
 	 * Set the warm-reset vector to the real-mode address of 4K-aligned ap_boot()
 	 */
-	*((__u16 *) (PA2KA(0x467+0))) =  ((__address) ap_boot) >> 4;	/* segment */
-	*((__u16 *) (PA2KA(0x467+2))) =  0;				/* offset */
+	*((uint16_t *) (PA2KA(0x467+0))) =  ((uintptr_t) ap_boot) >> 4;	/* segment */
+	*((uint16_t *) (PA2KA(0x467+2))) =  0;				/* offset */
 	
 	/*
@@ -155,8 +155,8 @@
 
 		memcpy(gdt_new, gdt, GDT_ITEMS * sizeof(struct descriptor));
-		memsetb((__address)(&gdt_new[TSS_DES]), sizeof(struct descriptor), 0);
+		memsetb((uintptr_t)(&gdt_new[TSS_DES]), sizeof(struct descriptor), 0);
 		protected_ap_gdtr.limit = GDT_ITEMS * sizeof(struct descriptor);
-		protected_ap_gdtr.base = KA2PA((__address) gdt_new);
-		gdtr.base = (__address) gdt_new;
+		protected_ap_gdtr.base = KA2PA((uintptr_t) gdt_new);
+		gdtr.base = (uintptr_t) gdt_new;
 
 		if (l_apic_send_init_ipi(ops->cpu_apic_id(i))) {
Index: arch/ia64/include/asm.h
===================================================================
--- arch/ia64/include/asm.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/asm.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -46,7 +46,7 @@
  * The stack must start on page boundary.
  */
-static inline __address get_stack_base(void)
-{
-	__u64 v;
+static inline uintptr_t get_stack_base(void)
+{
+	uint64_t v;
 
 	__asm__ volatile ("and %0 = %1, r12" : "=r" (v) : "r" (~(STACK_SIZE-1)));
@@ -59,7 +59,7 @@
  * @return PSR.
  */
-static inline __u64 psr_read(void)
-{
-	__u64 v;
+static inline uint64_t psr_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("mov %0 = psr\n" : "=r" (v));
@@ -72,7 +72,7 @@
  * @return Return location of interruption vector table.
  */
-static inline __u64 iva_read(void)
-{
-	__u64 v;
+static inline uint64_t iva_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("mov %0 = cr.iva\n" : "=r" (v));
@@ -85,5 +85,5 @@
  * @param v New location of interruption vector table.
  */
-static inline void iva_write(__u64 v)
+static inline void iva_write(uint64_t v)
 {
 	__asm__ volatile ("mov cr.iva = %0\n" : : "r" (v));
@@ -95,7 +95,7 @@
  * @return Highest priority, pending, unmasked external interrupt vector.
  */
-static inline __u64 ivr_read(void)
-{
-	__u64 v;
+static inline uint64_t ivr_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("mov %0 = cr.ivr\n" : "=r" (v));
@@ -108,5 +108,5 @@
  * @param v New counter value.
  */
-static inline void itc_write(__u64 v)
+static inline void itc_write(uint64_t v)
 {
 	__asm__ volatile ("mov ar.itc = %0\n" : : "r" (v));
@@ -117,7 +117,7 @@
  * @return Current counter value.
  */
-static inline __u64 itc_read(void)
-{
-	__u64 v;
+static inline uint64_t itc_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("mov %0 = ar.itc\n" : "=r" (v));
@@ -130,5 +130,5 @@
  * @param v New match value.
  */
-static inline void itm_write(__u64 v)
+static inline void itm_write(uint64_t v)
 {
 	__asm__ volatile ("mov cr.itm = %0\n" : : "r" (v));
@@ -139,7 +139,7 @@
  * @return Match value.
  */
-static inline __u64 itm_read(void)
-{
-	__u64 v;
+static inline uint64_t itm_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("mov %0 = cr.itm\n" : "=r" (v));
@@ -152,7 +152,7 @@
  * @return Current vector and mask bit.
  */
-static inline __u64 itv_read(void)
-{
-	__u64 v;
+static inline uint64_t itv_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("mov %0 = cr.itv\n" : "=r" (v));
@@ -165,5 +165,5 @@
  * @param v New vector and mask bit.
  */
-static inline void itv_write(__u64 v)
+static inline void itv_write(uint64_t v)
 {
 	__asm__ volatile ("mov cr.itv = %0\n" : : "r" (v));
@@ -174,5 +174,5 @@
  * @param v This value is ignored.
  */
-static inline void eoi_write(__u64 v)
+static inline void eoi_write(uint64_t v)
 {
 	__asm__ volatile ("mov cr.eoi = %0\n" : : "r" (v));
@@ -183,7 +183,7 @@
  * @return Current value of TPR.
  */
-static inline __u64 tpr_read(void)
-{
-	__u64 v;
+static inline uint64_t tpr_read(void)
+{
+	uint64_t v;
 
 	__asm__ volatile ("mov %0 = cr.tpr\n"  : "=r" (v));
@@ -196,5 +196,5 @@
  * @param v New value of TPR.
  */
-static inline void tpr_write(__u64 v)
+static inline void tpr_write(uint64_t v)
 {
 	__asm__ volatile ("mov cr.tpr = %0\n" : : "r" (v));
@@ -210,5 +210,5 @@
 static ipl_t interrupts_disable(void)
 {
-	__u64 v;
+	uint64_t v;
 	
 	__asm__ volatile (
@@ -231,5 +231,5 @@
 static ipl_t interrupts_enable(void)
 {
-	__u64 v;
+	uint64_t v;
 	
 	__asm__ volatile (
@@ -276,7 +276,7 @@
 extern void cpu_halt(void);
 extern void cpu_sleep(void);
-extern void asm_delay_loop(__u32 t);
-
-extern void switch_to_userspace(__address entry, __address sp, __address bsp, __address uspace_uarg, __u64 ipsr, __u64 rsc);
+extern void asm_delay_loop(uint32_t t);
+
+extern void switch_to_userspace(uintptr_t entry, uintptr_t sp, uintptr_t bsp, uintptr_t uspace_uarg, uint64_t ipsr, uint64_t rsc);
 
 #endif
Index: arch/ia64/include/byteorder.h
===================================================================
--- arch/ia64/include/byteorder.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/byteorder.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -37,6 +37,6 @@
 
 /* IA-64 is little-endian */
-#define __native_le2host(n)		(n)
-#define __u64_le2host(n)		(n)
+#define unative_t_le2host(n)		(n)
+#define uint64_t_le2host(n)		(n)
 
 #endif
Index: arch/ia64/include/context.h
===================================================================
--- arch/ia64/include/context.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/context.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -57,8 +57,8 @@
 #define context_set(c, _pc, stack, size)								\
 	do {												\
-		(c)->pc = (__address) _pc;								\
-		(c)->bsp = ((__address) stack) + ALIGN_UP((size), REGISTER_STACK_ALIGNMENT);		\
+		(c)->pc = (uintptr_t) _pc;								\
+		(c)->bsp = ((uintptr_t) stack) + ALIGN_UP((size), REGISTER_STACK_ALIGNMENT);		\
 		(c)->ar_pfs &= PFM_MASK; 								\
-		(c)->sp = ((__address) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - SP_DELTA;		\
+		(c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - SP_DELTA;		\
 	} while (0);
 
@@ -72,37 +72,37 @@
 	 * Application registers
 	 */
-	__u64 ar_pfs;
-	__u64 ar_unat_caller;
-	__u64 ar_unat_callee;
-	__u64 ar_rsc;
-	__address bsp;		/* ar_bsp */
-	__u64 ar_rnat;
-	__u64 ar_lc;
+	uint64_t ar_pfs;
+	uint64_t ar_unat_caller;
+	uint64_t ar_unat_callee;
+	uint64_t ar_rsc;
+	uintptr_t bsp;		/* ar_bsp */
+	uint64_t ar_rnat;
+	uint64_t ar_lc;
 
 	/*
 	 * General registers
 	 */
-	__u64 r1;
-	__u64 r4;
-	__u64 r5;
-	__u64 r6;
-	__u64 r7;
-	__address sp;		/* r12 */
-	__u64 r13;
+	uint64_t r1;
+	uint64_t r4;
+	uint64_t r5;
+	uint64_t r6;
+	uint64_t r7;
+	uintptr_t sp;		/* r12 */
+	uint64_t r13;
 	
 	/*
 	 * Branch registers
 	 */
-	__address pc;		/* b0 */
-	__u64 b1;
-	__u64 b2;
-	__u64 b3;
-	__u64 b4;
-	__u64 b5;
+	uintptr_t pc;		/* b0 */
+	uint64_t b1;
+	uint64_t b2;
+	uint64_t b3;
+	uint64_t b4;
+	uint64_t b5;
 
 	/*
 	 * Predicate registers
 	 */
-	__u64 pr;
+	uint64_t pr;
 
 	__r128 f2 __attribute__ ((aligned(16)));
Index: arch/ia64/include/cpu.h
===================================================================
--- arch/ia64/include/cpu.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/cpu.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -44,6 +44,6 @@
 
 struct cpu_arch {
-	__u64 cpuid0;
-	__u64 cpuid1;
+	uint64_t cpuid0;
+	uint64_t cpuid1;
 	cpuid3_t cpuid3;
 };
@@ -55,7 +55,7 @@
  * @return Value of CPUID[n] register.
  */
-static inline __u64 cpuid_read(int n)
+static inline uint64_t cpuid_read(int n)
 {
-	__u64 v;
+	uint64_t v;
 	
 	__asm__ volatile ("mov %0 = cpuid[%1]\n" : "=r" (v) : "r" (n));
Index: arch/ia64/include/faddr.h
===================================================================
--- arch/ia64/include/faddr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/faddr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup ia64	
+/** @addtogroup ia64	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __ia64_FADDR_H__
-#define __ia64_FADDR_H__
+#ifndef KERN_ia64_FADDR_H_
+#define KERN_ia64_FADDR_H_
 
 #include <arch/types.h>
@@ -46,9 +46,8 @@
  *
  */
-#define FADDR(f)	 (*((__address *)(f)));
+#define FADDR(f)	 (*((uintptr_t *)(f)));
 
 #endif
 
- /** @}
+/** @}
  */
-
Index: arch/ia64/include/interrupt.h
===================================================================
--- arch/ia64/include/interrupt.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/interrupt.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -89,30 +89,30 @@
 	__r128 f31;
 		
-	__address ar_bsp;
-	__address ar_bspstore;
-	__address ar_bspstore_new;
-	__u64 ar_rnat;
-	__u64 ar_ifs;
-	__u64 ar_pfs;
-	__u64 ar_rsc;
-	__address cr_ifa;
+	uintptr_t ar_bsp;
+	uintptr_t ar_bspstore;
+	uintptr_t ar_bspstore_new;
+	uint64_t ar_rnat;
+	uint64_t ar_ifs;
+	uint64_t ar_pfs;
+	uint64_t ar_rsc;
+	uintptr_t cr_ifa;
 	cr_isr_t cr_isr;
-	__address cr_iipa;
+	uintptr_t cr_iipa;
 	psr_t cr_ipsr;
-	__address cr_iip;
-	__u64 pr;
-	__address sp;
+	uintptr_t cr_iip;
+	uint64_t pr;
+	uintptr_t sp;
 	
 	/*
 	 * The following variables are defined only for break_instruction handler. 
 	 */
-	__u64 in0;
-	__u64 in1;
-	__u64 in2;
-	__u64 in3;
-	__u64 in4;
+	uint64_t in0;
+	uint64_t in1;
+	uint64_t in2;
+	uint64_t in3;
+	uint64_t in4;
 };
 
-static inline void istate_set_retaddr(istate_t *istate, __address retaddr)
+static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
 {
 	istate->cr_iip = retaddr;
@@ -120,5 +120,5 @@
 }
 
-static inline __native istate_get_pc(istate_t *istate)
+static inline unative_t istate_get_pc(istate_t *istate)
 {
 	return istate->cr_iip;
@@ -132,11 +132,11 @@
 extern void *ivt;
 
-extern void general_exception(__u64 vector, istate_t *istate);
-extern int break_instruction(__u64 vector, istate_t *istate);
-extern void universal_handler(__u64 vector, istate_t *istate);
-extern void nop_handler(__u64 vector, istate_t *istate);
-extern void external_interrupt(__u64 vector, istate_t *istate);
-extern void virtual_interrupt(__u64 irq, void *param);
-extern void disabled_fp_register(__u64 vector, istate_t *istate);
+extern void general_exception(uint64_t vector, istate_t *istate);
+extern int break_instruction(uint64_t vector, istate_t *istate);
+extern void universal_handler(uint64_t vector, istate_t *istate);
+extern void nop_handler(uint64_t vector, istate_t *istate);
+extern void external_interrupt(uint64_t vector, istate_t *istate);
+extern void virtual_interrupt(uint64_t irq, void *param);
+extern void disabled_fp_register(uint64_t vector, istate_t *istate);
 
 
Index: arch/ia64/include/memstr.h
===================================================================
--- arch/ia64/include/memstr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/memstr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,8 +38,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(__address dst, size_t cnt, __u16 x);
-extern void memsetb(__address dst, size_t cnt, __u8 x);
+extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
+extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
 
-extern int memcmp(__address src, __address dst, int cnt);
+extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
 
 #endif
Index: arch/ia64/include/mm/asid.h
===================================================================
--- arch/ia64/include/mm/asid.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/mm/asid.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,6 +40,6 @@
 #include <arch/types.h>
 
-typedef __u16 asid_t;
-typedef __u32 rid_t;
+typedef uint16_t asid_t;
+typedef uint32_t rid_t;
 
 #endif  /* __ASM__ */
Index: arch/ia64/include/mm/page.h
===================================================================
--- arch/ia64/include/mm/page.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/mm/page.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -28,5 +28,5 @@
  */
 
- /** @addtogroup ia64mm	
+/** @addtogroup ia64mm	
  * @{
  */
@@ -62,6 +62,6 @@
 #define REGION_REGISTERS 		8
 
-#define KA2PA(x)	((__address) (x-(VRN_KERNEL<<VRN_SHIFT)))
-#define PA2KA(x)	((__address) (x+(VRN_KERNEL<<VRN_SHIFT)))
+#define KA2PA(x)	((uintptr_t) (x-(VRN_KERNEL<<VRN_SHIFT)))
+#define PA2KA(x)	((uintptr_t) (x+(VRN_KERNEL<<VRN_SHIFT)))
 
 #define VHPT_WIDTH 			20         	/* 1M */
@@ -127,5 +127,5 @@
 	
 	/* Word 3 */													
-	__u64 ig3 : 64;
+	uint64_t ig3 : 64;
 } __attribute__ ((packed));
 
@@ -145,5 +145,5 @@
 	
 	/* Word 3 */													
-	__u64 ig3 : 64;
+	uint64_t ig3 : 64;
 } __attribute__ ((packed));
 
@@ -151,5 +151,5 @@
 	struct vhpt_entry_present present;
 	struct vhpt_entry_not_present not_present;
-	__u64 word[4];
+	uint64_t word[4];
 } vhpt_entry_t;
 
@@ -178,5 +178,5 @@
 typedef union pta_register {
 	struct pta_register_map map;
-	__u64 word;
+	uint64_t word;
 } pta_register;
 
@@ -190,7 +190,7 @@
  * @return Address of the head of VHPT collision chain.
  */
-static inline __u64 thash(__u64 va)
-{
-	__u64 ret;
+static inline uint64_t thash(uint64_t va)
+{
+	uint64_t ret;
 
 	__asm__ volatile ("thash %0 = %1\n" : "=r" (ret) : "r" (va));
@@ -208,7 +208,7 @@
  * @return The unique tag for VPN and RID in the collision chain returned by thash().
  */
-static inline __u64 ttag(__u64 va)
-{
-	__u64 ret;
+static inline uint64_t ttag(uint64_t va)
+{
+	uint64_t ret;
 
 	__asm__ volatile ("ttag %0 = %1\n" : "=r" (ret) : "r" (va));
@@ -223,7 +223,7 @@
  * @return Current contents of rr[i].
  */
-static inline __u64 rr_read(index_t i)
-{
-	__u64 ret;
+static inline uint64_t rr_read(index_t i)
+{
+	uint64_t ret;
 	ASSERT(i < REGION_REGISTERS);
 	__asm__ volatile ("mov %0 = rr[%1]\n" : "=r" (ret) : "r" (i << VRN_SHIFT));
@@ -236,5 +236,5 @@
  * @param v Value to be written to rr[i].
  */
-static inline void rr_write(index_t i, __u64 v)
+static inline void rr_write(index_t i, uint64_t v)
 {
 	ASSERT(i < REGION_REGISTERS);
@@ -250,7 +250,7 @@
  * @return Current value stored in PTA.
  */
-static inline __u64 pta_read(void)
-{
-	__u64 ret;
+static inline uint64_t pta_read(void)
+{
+	uint64_t ret;
 	
 	__asm__ volatile ("mov %0 = cr.pta\n" : "=r" (ret));
@@ -263,5 +263,5 @@
  * @param v New value to be stored in PTA.
  */
-static inline void pta_write(__u64 v)
+static inline void pta_write(uint64_t v)
 {
 	__asm__ volatile ("mov cr.pta = %0\n" : : "r" (v));
@@ -270,7 +270,7 @@
 extern void page_arch_init(void);
 
-extern vhpt_entry_t *vhpt_hash(__address page, asid_t asid);
-extern bool vhpt_compare(__address page, asid_t asid, vhpt_entry_t *v);
-extern void vhpt_set_record(vhpt_entry_t *v, __address page, asid_t asid, __address frame, int flags);
+extern vhpt_entry_t *vhpt_hash(uintptr_t page, asid_t asid);
+extern bool vhpt_compare(uintptr_t page, asid_t asid, vhpt_entry_t *v);
+extern void vhpt_set_record(vhpt_entry_t *v, uintptr_t page, asid_t asid, uintptr_t frame, int flags);
 
 #endif /* __ASM__ */
@@ -280,5 +280,4 @@
 #endif
 
- /** @}
- */
-
+/** @}
+ */
Index: arch/ia64/include/mm/tlb.h
===================================================================
--- arch/ia64/include/mm/tlb.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/mm/tlb.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -53,5 +53,5 @@
 /** Portion of TLB insertion format data structure. */
 union tlb_entry {
-	__u64 word[2];
+	uint64_t word[2];
 	struct {
 		/* Word 0 */
@@ -77,25 +77,25 @@
 typedef union tlb_entry tlb_entry_t;
 
-extern void tc_mapping_insert(__address va, asid_t asid, tlb_entry_t entry, bool dtc);
-extern void dtc_mapping_insert(__address va, asid_t asid, tlb_entry_t entry);
-extern void itc_mapping_insert(__address va, asid_t asid, tlb_entry_t entry);
+extern void tc_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, bool dtc);
+extern void dtc_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry);
+extern void itc_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry);
 
-extern void tr_mapping_insert(__address va, asid_t asid, tlb_entry_t entry, bool dtr, index_t tr);
-extern void dtr_mapping_insert(__address va, asid_t asid, tlb_entry_t entry, index_t tr);
-extern void itr_mapping_insert(__address va, asid_t asid, tlb_entry_t entry, index_t tr);
+extern void tr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, bool dtr, index_t tr);
+extern void dtr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, index_t tr);
+extern void itr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, index_t tr);
 
-extern void dtlb_kernel_mapping_insert(__address page, __address frame, bool dtr, index_t tr);
-extern void dtr_purge(__address page, count_t width);
+extern void dtlb_kernel_mapping_insert(uintptr_t page, uintptr_t frame, bool dtr, index_t tr);
+extern void dtr_purge(uintptr_t page, count_t width);
 
 extern void dtc_pte_copy(pte_t *t);
 extern void itc_pte_copy(pte_t *t);
 
-extern void alternate_instruction_tlb_fault(__u64 vector, istate_t *istate);
-extern void alternate_data_tlb_fault(__u64 vector, istate_t *istate);
-extern void data_nested_tlb_fault(__u64 vector, istate_t *istate);
-extern void data_dirty_bit_fault(__u64 vector, istate_t *istate);
-extern void instruction_access_bit_fault(__u64 vector, istate_t *istate);
-extern void data_access_bit_fault(__u64 vector, istate_t *istate);
-extern void page_not_present(__u64 vector, istate_t *istate);
+extern void alternate_instruction_tlb_fault(uint64_t vector, istate_t *istate);
+extern void alternate_data_tlb_fault(uint64_t vector, istate_t *istate);
+extern void data_nested_tlb_fault(uint64_t vector, istate_t *istate);
+extern void data_dirty_bit_fault(uint64_t vector, istate_t *istate);
+extern void instruction_access_bit_fault(uint64_t vector, istate_t *istate);
+extern void data_access_bit_fault(uint64_t vector, istate_t *istate);
+extern void page_not_present(uint64_t vector, istate_t *istate);
 
 #endif
Index: arch/ia64/include/mm/vhpt.h
===================================================================
--- arch/ia64/include/mm/vhpt.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/mm/vhpt.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,5 +40,5 @@
 #include <arch/mm/page.h>
 
-__address vhpt_set_up(void);
+uintptr_t vhpt_set_up(void);
 
 static inline vhpt_entry_t tlb_entry_t2vhpt_entry_t(tlb_entry_t tentry) 
@@ -52,5 +52,5 @@
 }
 
-void vhpt_mapping_insert(__address va, asid_t asid, tlb_entry_t entry);
+void vhpt_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry);
 void vhpt_invalidate_all(void);
 void vhpt_invalidate_asid(asid_t asid);
Index: arch/ia64/include/register.h
===================================================================
--- arch/ia64/include/register.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/register.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -137,5 +137,5 @@
 /** Processor Status Register. */
 union psr {
-	__u64 value;
+	uint64_t value;
 	struct {
 		unsigned : 1;
@@ -180,5 +180,5 @@
 /** Register Stack Configuration Register */
 union rsc {
-	__u64 value;
+	uint64_t value;
 	struct {
 		unsigned mode : 2;
@@ -193,6 +193,6 @@
 /** External Interrupt Vector Register */
 union cr_ivr {
-	__u8  vector;
-	__u64 value;
+	uint8_t  vector;
+	uint64_t value;
 };
 
@@ -207,5 +207,5 @@
 		unsigned mmi: 1;		/**< Mask Maskable Interrupts. */
 	} __attribute__ ((packed));
-	__u64 value;
+	uint64_t value;
 };
 
@@ -221,5 +221,5 @@
 		unsigned m : 1;			/**< Mask. */
 	} __attribute__ ((packed));
-	__u64 value;
+	uint64_t value;
 };
 
@@ -235,7 +235,7 @@
 				unsigned ge_code : 4;
 			} __attribute__ ((packed));
-			__u16 code;
+			uint16_t code;
 		};
-		__u8 vector;
+		uint8_t vector;
 		unsigned : 8;
 		unsigned x : 1;			/**< Execute exception. */
@@ -252,5 +252,5 @@
 		unsigned : 20;
 	} __attribute__ ((packed));
-	__u64 value;
+	uint64_t value;
 };
 
@@ -260,11 +260,11 @@
 union cpuid3 {
 	struct {
-		__u8 number;
-		__u8 revision;
-		__u8 model;
-		__u8 family;
-		__u8 archrev;
-	} __attribute__ ((packed));
-	__u64 value;
+		uint8_t number;
+		uint8_t revision;
+		uint8_t model;
+		uint8_t family;
+		uint8_t archrev;
+	} __attribute__ ((packed));
+	uint64_t value;
 };
 
Index: arch/ia64/include/types.h
===================================================================
--- arch/ia64/include/types.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/include/types.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup ia64	
+/** @addtogroup ia64	
  * @{
  */
@@ -38,29 +38,30 @@
 #define NULL	0
 
-typedef signed char __s8;
-typedef signed short int __s16;
-typedef signed int __s32;
-typedef signed long __s64;
+typedef signed char int8_t;
+typedef signed short int int16_t;
+typedef signed int int32_t;
+typedef signed long int64_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 unsigned char __r8; 			/*Reserve byte*/
+typedef unsigned char __r8; 			/* Reserve byte */
 typedef unsigned short __r16;
 typedef unsigned int __r32;
 typedef unsigned long __r64;
-typedef struct __r128{__r64 lo;__r64 hi;} __r128;
+typedef struct __r128 {
+	__r64 lo;
+	__r64 hi;
+} __r128;
 
+typedef uint64_t uintptr_t;
+typedef uint64_t pfn_t;
 
-typedef __u64 __address;
-typedef __u64 pfn_t;
+typedef uint64_t ipl_t;
 
-typedef __u64 ipl_t;
-
-typedef __u64 __native;
-typedef __s64 __snative;
+typedef uint64_t unative_t;
+typedef int64_t native_t;
 
 typedef struct pte pte_t;
@@ -68,5 +69,5 @@
 #endif
 
- /** @}
+/** @}
  */
 
Index: arch/ia64/src/cpu/cpu.c
===================================================================
--- arch/ia64/src/cpu/cpu.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/src/cpu/cpu.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -52,8 +52,8 @@
 {
 	char *family_str;
-	char vendor[2*sizeof(__u64)+1];
+	char vendor[2*sizeof(uint64_t)+1];
 	
-	*((__u64 *) &vendor[0*sizeof(__u64)]) = CPU->arch.cpuid0;
-	*((__u64 *) &vendor[1*sizeof(__u64)]) = CPU->arch.cpuid1;
+	*((uint64_t *) &vendor[0*sizeof(uint64_t)]) = CPU->arch.cpuid0;
+	*((uint64_t *) &vendor[1*sizeof(uint64_t)]) = CPU->arch.cpuid1;
 	vendor[sizeof(vendor)-1] = '\0';
 	
Index: arch/ia64/src/ddi/ddi.c
===================================================================
--- arch/ia64/src/ddi/ddi.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/src/ddi/ddi.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -48,5 +48,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
 	return 0;
Index: arch/ia64/src/drivers/it.c
===================================================================
--- arch/ia64/src/drivers/it.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/src/drivers/it.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -72,6 +72,6 @@
 void it_interrupt(void)
 {
-	__s64 c;
-	__s64 m;
+	int64_t c;
+	int64_t m;
 	
 	eoi_write(EOI);
Index: arch/ia64/src/fpu_context.c
===================================================================
--- arch/ia64/src/fpu_context.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/src/fpu_context.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -283,5 +283,5 @@
 void fpu_enable(void)
 {
-		__u64 a = 0 ;
+		uint64_t a = 0 ;
 		asm volatile(
 			"rsm %0;;"
@@ -305,5 +305,5 @@
 {
 
-		__u64 a = 0 ;
+		uint64_t a = 0 ;
 		asm volatile(
 			"ssm %0;;\n"
@@ -326,5 +326,5 @@
 void fpu_init(void)
 {
-		__u64 a = 0 ;
+		uint64_t a = 0 ;
 		asm volatile
 		(
Index: arch/ia64/src/ia64.c
===================================================================
--- arch/ia64/src/ia64.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/src/ia64.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -78,5 +78,5 @@
 {
 	/* Set Interruption Vector Address (i.e. location of interruption vector table). */
-	iva_write((__address) &ivt);
+	iva_write((uintptr_t) &ivt);
 	srlz_d();
 	
@@ -117,8 +117,8 @@
 	rsc.mode = 3;				/* eager mode */
 
-	switch_to_userspace((__address) kernel_uarg->uspace_entry,
-			    ((__address) kernel_uarg->uspace_stack)+PAGE_SIZE-ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-			    ((__address) kernel_uarg->uspace_stack)+PAGE_SIZE,
-			    (__address) kernel_uarg->uspace_uarg,
+	switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
+			    ((uintptr_t) kernel_uarg->uspace_stack)+PAGE_SIZE-ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
+			    ((uintptr_t) kernel_uarg->uspace_stack)+PAGE_SIZE,
+			    (uintptr_t) kernel_uarg->uspace_uarg,
 			    psr.value, rsc.value);
 
@@ -132,5 +132,5 @@
  * We use r13 (a.k.a. tp) for this purpose.
  */
-__native sys_tls_set(__native addr)
+unative_t sys_tls_set(unative_t addr)
 {
         return 0;
Index: arch/ia64/src/interrupt.c
===================================================================
--- arch/ia64/src/interrupt.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/src/interrupt.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -120,8 +120,8 @@
 };
 
-static char *vector_to_string(__u16 vector);
+static char *vector_to_string(uint16_t vector);
 static void dump_interrupted_context(istate_t *istate);
 
-char *vector_to_string(__u16 vector)
+char *vector_to_string(uint16_t vector)
 {
 	ASSERT(vector <= VECTOR_MAX);
@@ -153,5 +153,5 @@
 }
 
-void general_exception(__u64 vector, istate_t *istate)
+void general_exception(uint64_t vector, istate_t *istate)
 {
 	char *desc = "";
@@ -189,17 +189,17 @@
 void fpu_enable(void);
 
-void disabled_fp_register(__u64 vector, istate_t *istate)
+void disabled_fp_register(uint64_t vector, istate_t *istate)
 {
 #ifdef CONFIG_FPU_LAZY 
 	scheduler_fpu_lazy_request();	
 #else
-	fault_if_from_uspace(istate, "Interruption: %#hx (%s)", (__u16) vector, vector_to_string(vector));
+	fault_if_from_uspace(istate, "Interruption: %#hx (%s)", (uint16_t) vector, vector_to_string(vector));
 	dump_interrupted_context(istate);
-	panic("Interruption: %#hx (%s)\n", (__u16) vector, vector_to_string(vector));
+	panic("Interruption: %#hx (%s)\n", (uint16_t) vector, vector_to_string(vector));
 #endif
 }
 
 
-void nop_handler(__u64 vector, istate_t *istate)
+void nop_handler(uint64_t vector, istate_t *istate)
 {
 }
@@ -208,5 +208,5 @@
 
 /** Handle syscall. */
-int break_instruction(__u64 vector, istate_t *istate)
+int break_instruction(uint64_t vector, istate_t *istate)
 {
 	/*
@@ -228,12 +228,12 @@
 }
 
-void universal_handler(__u64 vector, istate_t *istate)
-{
-	fault_if_from_uspace(istate,"Interruption: %#hx (%s)\n",(__u16) vector, vector_to_string(vector));
+void universal_handler(uint64_t vector, istate_t *istate)
+{
+	fault_if_from_uspace(istate,"Interruption: %#hx (%s)\n",(uint16_t) vector, vector_to_string(vector));
 	dump_interrupted_context(istate);
-	panic("Interruption: %#hx (%s)\n", (__u16) vector, vector_to_string(vector));
-}
-
-void external_interrupt(__u64 vector, istate_t *istate)
+	panic("Interruption: %#hx (%s)\n", (uint16_t) vector, vector_to_string(vector));
+}
+
+void external_interrupt(uint64_t vector, istate_t *istate)
 {
 	cr_ivr_t ivr;
@@ -255,5 +255,5 @@
 }
 
-void virtual_interrupt(__u64 irq,void *param)
+void virtual_interrupt(uint64_t irq,void *param)
 {
 	switch(irq) {
@@ -268,5 +268,5 @@
 
 /* Reregister irq to be IPC-ready */
-void irq_ipc_bind_arch(__native irq)
+void irq_ipc_bind_arch(unative_t irq)
 {
 	if(irq==IRQ_KBD) {
Index: arch/ia64/src/mm/page.c
===================================================================
--- arch/ia64/src/mm/page.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/src/mm/page.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -67,5 +67,5 @@
 	int i;
 #ifdef CONFIG_VHPT	
-	__address vhpt_base;
+	uintptr_t vhpt_base;
 #endif
 
@@ -129,5 +129,5 @@
  * @return VHPT entry address.
  */
-vhpt_entry_t *vhpt_hash(__address page, asid_t asid)
+vhpt_entry_t *vhpt_hash(uintptr_t page, asid_t asid)
 {
 	region_register rr_save, rr;
@@ -173,5 +173,5 @@
  * @return True if page and asid match the page and asid of t, false otherwise.
  */
-bool vhpt_compare(__address page, asid_t asid, vhpt_entry_t *v)
+bool vhpt_compare(uintptr_t page, asid_t asid, vhpt_entry_t *v)
 {
 	region_register rr_save, rr;	
@@ -217,10 +217,10 @@
  * @param flags Different flags for the mapping.
  */
-void vhpt_set_record(vhpt_entry_t *v, __address page, asid_t asid, __address frame, int flags)
+void vhpt_set_record(vhpt_entry_t *v, uintptr_t page, asid_t asid, uintptr_t frame, int flags)
 {
 	region_register rr_save, rr;	
 	index_t vrn;
 	rid_t rid;
-	__u64 tag;
+	uint64_t tag;
 
 	ASSERT(v);
Index: arch/ia64/src/mm/tlb.c
===================================================================
--- arch/ia64/src/mm/tlb.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/src/mm/tlb.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -58,6 +58,6 @@
 {
 		ipl_t ipl;
-		__address adr;
-		__u32 count1, count2, stride1, stride2;
+		uintptr_t adr;
+		uint32_t count1, count2, stride1, stride2;
 		
 		int i,j;
@@ -102,5 +102,5 @@
 
 
-void tlb_invalidate_pages(asid_t asid, __address page, count_t cnt)
+void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
 {
 	region_register rr;
@@ -109,5 +109,5 @@
 	int c = cnt;
 
-	__address va;
+	uintptr_t va;
 	va = page;
 
@@ -130,5 +130,5 @@
 		b++;
 	b >>= 1;
-	__u64 ps;
+	uint64_t ps;
 	
 	switch (b) {
@@ -202,5 +202,5 @@
  * @param entry The rest of TLB entry as required by TLB insertion format.
  */
-void dtc_mapping_insert(__address va, asid_t asid, tlb_entry_t entry)
+void dtc_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry)
 {
 	tc_mapping_insert(va, asid, entry, true);
@@ -213,5 +213,5 @@
  * @param entry The rest of TLB entry as required by TLB insertion format.
  */
-void itc_mapping_insert(__address va, asid_t asid, tlb_entry_t entry)
+void itc_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry)
 {
 	tc_mapping_insert(va, asid, entry, false);
@@ -225,5 +225,5 @@
  * @param dtc If true, insert into data translation cache, use instruction translation cache otherwise.
  */
-void tc_mapping_insert(__address va, asid_t asid, tlb_entry_t entry, bool dtc)
+void tc_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, bool dtc)
 {
 	region_register rr;
@@ -276,5 +276,5 @@
  * @param tr Translation register.
  */
-void itr_mapping_insert(__address va, asid_t asid, tlb_entry_t entry, index_t tr)
+void itr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, index_t tr)
 {
 	tr_mapping_insert(va, asid, entry, false, tr);
@@ -288,5 +288,5 @@
  * @param tr Translation register.
  */
-void dtr_mapping_insert(__address va, asid_t asid, tlb_entry_t entry, index_t tr)
+void dtr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, index_t tr)
 {
 	tr_mapping_insert(va, asid, entry, true, tr);
@@ -301,5 +301,5 @@
  * @param tr Translation register.
  */
-void tr_mapping_insert(__address va, asid_t asid, tlb_entry_t entry, bool dtr, index_t tr)
+void tr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, bool dtr, index_t tr)
 {
 	region_register rr;
@@ -352,5 +352,5 @@
  * @param tr Translation register if dtr is true, ignored otherwise.
  */
-void dtlb_kernel_mapping_insert(__address page, __address frame, bool dtr, index_t tr)
+void dtlb_kernel_mapping_insert(uintptr_t page, uintptr_t frame, bool dtr, index_t tr)
 {
 	tlb_entry_t entry;
@@ -381,5 +381,5 @@
  * @param width Width of the purge in bits.
  */
-void dtr_purge(__address page, count_t width)
+void dtr_purge(uintptr_t page, count_t width)
 {
 	__asm__ volatile ("ptr.d %0, %1\n" : : "r" (page), "r" (width<<2));
@@ -445,9 +445,9 @@
  * @param istate Structure with saved interruption state.
  */
-void alternate_instruction_tlb_fault(__u64 vector, istate_t *istate)
+void alternate_instruction_tlb_fault(uint64_t vector, istate_t *istate)
 {
 	region_register rr;
 	rid_t rid;
-	__address va;
+	uintptr_t va;
 	pte_t *t;
 	
@@ -482,9 +482,9 @@
  * @param istate Structure with saved interruption state.
  */
-void alternate_data_tlb_fault(__u64 vector, istate_t *istate)
+void alternate_data_tlb_fault(uint64_t vector, istate_t *istate)
 {
 	region_register rr;
 	rid_t rid;
-	__address va;
+	uintptr_t va;
 	pte_t *t;
 	
@@ -531,5 +531,5 @@
  * @param istate Structure with saved interruption state.
  */
-void data_nested_tlb_fault(__u64 vector, istate_t *istate)
+void data_nested_tlb_fault(uint64_t vector, istate_t *istate)
 {
 	panic("%s\n", __FUNCTION__);
@@ -541,9 +541,9 @@
  * @param istate Structure with saved interruption state.
  */
-void data_dirty_bit_fault(__u64 vector, istate_t *istate)
+void data_dirty_bit_fault(uint64_t vector, istate_t *istate)
 {
 	region_register rr;
 	rid_t rid;
-	__address va;
+	uintptr_t va;
 	pte_t *t;
 	
@@ -578,9 +578,9 @@
  * @param istate Structure with saved interruption state.
  */
-void instruction_access_bit_fault(__u64 vector, istate_t *istate)
+void instruction_access_bit_fault(uint64_t vector, istate_t *istate)
 {
 	region_register rr;
 	rid_t rid;
-	__address va;
+	uintptr_t va;
 	pte_t *t;	
 
@@ -615,9 +615,9 @@
  * @param istate Structure with saved interruption state.
  */
-void data_access_bit_fault(__u64 vector, istate_t *istate)
+void data_access_bit_fault(uint64_t vector, istate_t *istate)
 {
 	region_register rr;
 	rid_t rid;
-	__address va;
+	uintptr_t va;
 	pte_t *t;
 
@@ -652,9 +652,9 @@
  * @param istate Structure with saved interruption state.
  */
-void page_not_present(__u64 vector, istate_t *istate)
+void page_not_present(uint64_t vector, istate_t *istate)
 {
 	region_register rr;
 	rid_t rid;
-	__address va;
+	uintptr_t va;
 	pte_t *t;
 	
Index: arch/ia64/src/mm/vhpt.c
===================================================================
--- arch/ia64/src/mm/vhpt.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/src/mm/vhpt.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -41,5 +41,5 @@
 static vhpt_entry_t* vhpt_base;
 
-__address vhpt_set_up(void)
+uintptr_t vhpt_set_up(void)
 {
 	vhpt_base = frame_alloc(VHPT_WIDTH-FRAME_WIDTH,FRAME_KA | FRAME_ATOMIC);
@@ -47,14 +47,14 @@
 		panic("Kernel configured with VHPT but no memory for table.");
 	vhpt_invalidate_all();
-	return (__address) vhpt_base;
+	return (uintptr_t) vhpt_base;
 }
 
 
-void vhpt_mapping_insert(__address va, asid_t asid, tlb_entry_t entry)
+void vhpt_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry)
 {
 	region_register rr_save, rr;
 	index_t vrn;
 	rid_t rid;
-	__u64 tag;
+	uint64_t tag;
 
 	vhpt_entry_t *ventry;
@@ -85,5 +85,5 @@
 void vhpt_invalidate_all()
 {
-	memsetb((__address)vhpt_base,1<<VHPT_WIDTH,0);
+	memsetb((uintptr_t)vhpt_base,1<<VHPT_WIDTH,0);
 }
 
Index: arch/ia64/src/proc/scheduler.c
===================================================================
--- arch/ia64/src/proc/scheduler.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/src/proc/scheduler.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -51,9 +51,9 @@
 void before_thread_runs_arch(void)
 {
-	__address base;
+	uintptr_t base;
 	
 	base = ALIGN_DOWN(config.base, 1<<KERNEL_PAGE_WIDTH);
 
-	if ((__address) THREAD->kstack < base || (__address) THREAD->kstack > base + (1<<(KERNEL_PAGE_WIDTH))) {
+	if ((uintptr_t) THREAD->kstack < base || (uintptr_t) THREAD->kstack > base + (1<<(KERNEL_PAGE_WIDTH))) {
 		/*
 		 * Kernel stack of this thread is not mapped by DTR[TR_KERNEL].
@@ -62,9 +62,9 @@
 		 
 		/* purge DTR[TR_STACK1] and DTR[TR_STACK2] */
-		dtr_purge((__address) THREAD->kstack, PAGE_WIDTH+1);
+		dtr_purge((uintptr_t) THREAD->kstack, PAGE_WIDTH+1);
 		
 		/* insert DTR[TR_STACK1] and DTR[TR_STACK2] */
-		dtlb_kernel_mapping_insert((__address) THREAD->kstack, KA2PA(THREAD->kstack), true, DTR_KSTACK1);
-		dtlb_kernel_mapping_insert((__address) THREAD->kstack + PAGE_SIZE, KA2PA(THREAD->kstack) + FRAME_SIZE, true, DTR_KSTACK2);
+		dtlb_kernel_mapping_insert((uintptr_t) THREAD->kstack, KA2PA(THREAD->kstack), true, DTR_KSTACK1);
+		dtlb_kernel_mapping_insert((uintptr_t) THREAD->kstack + PAGE_SIZE, KA2PA(THREAD->kstack) + FRAME_SIZE, true, DTR_KSTACK2);
 	}
 	
Index: arch/ia64/src/ski/ski.c
===================================================================
--- arch/ia64/src/ski/ski.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ia64/src/ski/ski.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -45,5 +45,5 @@
 
 static void ski_putchar(chardev_t *d, const char ch);
-static __s32 ski_getchar(void);
+static int32_t ski_getchar(void);
 
 /** Display character on debug console
@@ -79,7 +79,7 @@
  * @return ASCII code of pressed key or 0 if no key pressed.
  */
-__s32 ski_getchar(void)
-{
-	__u64 ch;
+int32_t ski_getchar(void)
+{
+	uint64_t ch;
 	
 	__asm__ volatile (
@@ -93,5 +93,5 @@
 	);
 
-	return (__s32) ch;
+	return (int32_t) ch;
 }
 
Index: arch/mips32/include/arg.h
===================================================================
--- arch/mips32/include/arg.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/arg.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -43,5 +43,5 @@
  */
 
-typedef __address va_list;
+typedef uintptr_t va_list;
 
 #define va_start(ap, lst) \
@@ -49,5 +49,5 @@
 
 #define va_arg(ap, type)	\
-	(((type *)((ap) = (va_list)( (sizeof(type) <= 4) ? ((__address)((ap) + 2*4 - 1) & (~3)) : ((__address)((ap) + 2*8 -1) & (~7)) )))[-1])
+	(((type *)((ap) = (va_list)( (sizeof(type) <= 4) ? ((uintptr_t)((ap) + 2*4 - 1) & (~3)) : ((uintptr_t)((ap) + 2*8 -1) & (~7)) )))[-1])
 
 #define va_copy(dst,src) ((dst)=(src))
Index: arch/mips32/include/asm.h
===================================================================
--- arch/mips32/include/asm.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/asm.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -53,7 +53,7 @@
  * The stack must start on page boundary.
  */
-static inline __address get_stack_base(void)
+static inline uintptr_t get_stack_base(void)
 {
-	__address v;
+	uintptr_t v;
 	
 	__asm__ volatile ("and %0, $29, %1\n" : "=r" (v) : "r" (~(STACK_SIZE-1)));
@@ -63,7 +63,7 @@
 
 extern void cpu_halt(void);
-extern void asm_delay_loop(__u32 t);
-extern void userspace_asm(__address ustack, __address uspace_uarg,
-			  __address entry);
+extern void asm_delay_loop(uint32_t t);
+extern void userspace_asm(uintptr_t ustack, uintptr_t uspace_uarg,
+			  uintptr_t entry);
 
 #endif
Index: arch/mips32/include/boot.h
===================================================================
--- arch/mips32/include/boot.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/boot.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -35,10 +35,10 @@
 
 typedef struct {
-	__address addr;
-	__u32 size;
+	uintptr_t addr;
+	uint32_t size;
 } utask_t;
 
 typedef struct {
-	__u32 cnt;
+	uint32_t cnt;
 	utask_t tasks[TASKMAP_MAX_RECORDS];
 } bootinfo_t;
Index: arch/mips32/include/byteorder.h
===================================================================
--- arch/mips32/include/byteorder.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/byteorder.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,17 +40,17 @@
 
 #ifdef BIG_ENDIAN
-static inline __u64 __u64_le2host(__u64 n)
+static inline uint64_t uint64_t_le2host(uint64_t n)
 {
-	return __u64_byteorder_swap(n);
+	return uint64_t_byteorder_swap(n);
 }
 
-static inline __native __native_le2host(__native n)
+static inline unative_t unative_t_le2host(unative_t n)
 {
-	return __u32_byteorder_swap(n);
+	return uint32_t_byteorder_swap(n);
 }
 
 #else
-#  define __native_le2host(n)		(n)
-#  define __u64_le2host(n)		(n)
+#  define unative_t_le2host(n)		(n)
+#  define uint64_t_le2host(n)		(n)
 #endif
 
Index: arch/mips32/include/context.h
===================================================================
--- arch/mips32/include/context.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/context.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -56,17 +56,17 @@
  */
 struct context {
-	__address sp;
-	__address pc;
+	uintptr_t sp;
+	uintptr_t pc;
 	
-	__u32 s0;
-	__u32 s1;
-	__u32 s2;
-	__u32 s3;
-	__u32 s4;
-	__u32 s5;
-	__u32 s6;
-	__u32 s7;
-	__u32 s8;
-	__u32 gp;
+	uint32_t s0;
+	uint32_t s1;
+	uint32_t s2;
+	uint32_t s3;
+	uint32_t s4;
+	uint32_t s5;
+	uint32_t s6;
+	uint32_t s7;
+	uint32_t s8;
+	uint32_t gp;
 
 	ipl_t ipl;
Index: arch/mips32/include/cp0.h
===================================================================
--- arch/mips32/include/cp0.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/cp0.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -64,12 +64,12 @@
 #define cp0_unmask_int(it) cp0_status_write(cp0_status_read() | (1<<(cp0_status_im_shift+(it))))
 
-#define GEN_READ_CP0(nm,reg) static inline __u32 cp0_ ##nm##_read(void) \
+#define GEN_READ_CP0(nm,reg) static inline uint32_t cp0_ ##nm##_read(void) \
   { \
-      __u32 retval; \
+      uint32_t retval; \
       asm("mfc0 %0, $" #reg : "=r"(retval)); \
       return retval; \
   }
 
-#define GEN_WRITE_CP0(nm,reg) static inline void cp0_ ##nm##_write(__u32 val) \
+#define GEN_WRITE_CP0(nm,reg) static inline void cp0_ ##nm##_write(uint32_t val) \
  { \
     asm("mtc0 %0, $" #reg : : "r"(val) ); \
Index: arch/mips32/include/cpu.h
===================================================================
--- arch/mips32/include/cpu.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/cpu.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -39,6 +39,6 @@
 
 struct cpu_arch {
-	__u32 imp_num;
-	__u32 rev_num;
+	uint32_t imp_num;
+	uint32_t rev_num;
 };
 	
Index: arch/mips32/include/debugger.h
===================================================================
--- arch/mips32/include/debugger.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/debugger.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -51,7 +51,7 @@
 
 typedef struct  {
-	__address address;      /**< Breakpoint address */
-	__native instruction; /**< Original instruction */
-	__native nextinstruction;  /**< Original instruction following break */
+	uintptr_t address;      /**< Breakpoint address */
+	unative_t instruction; /**< Original instruction */
+	unative_t nextinstruction;  /**< Original instruction following break */
 	int flags;        /**< Flags regarding breakpoint */
 	count_t counter;
Index: arch/mips32/include/drivers/arc.h
===================================================================
--- arch/mips32/include/drivers/arc.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/drivers/arc.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -57,7 +57,7 @@
 
 typedef struct {
-	__u8 type;
-	__u8 sharedisposition;
-	__u16 flags;
+	uint8_t type;
+	uint8_t sharedisposition;
+	uint16_t flags;
 	union {
 		struct {
@@ -78,6 +78,6 @@
 
 typedef struct {
-	__u16 version;
-	__u16 revision;
+	uint16_t version;
+	uint16_t revision;
 	unsigned long count;
 	cm_resource_descriptor descr[1];
@@ -154,21 +154,21 @@
 	arc_component_type type;
 	arc_component_flags flags;
-	__u16 revision;
-	__u16 version;
-	__u32 key;
-	__u32 affinitymask;
-	__u32 configdatasize;
-	__u32 identifier_len;
+	uint16_t revision;
+	uint16_t version;
+	uint32_t key;
+	uint32_t affinitymask;
+	uint32_t configdatasize;
+	uint32_t identifier_len;
 	char *identifier;
 } __attribute__ ((packed)) arc_component;
 
 typedef struct {
-	__u16 year;
-	__u16 month;
-	__u16 day;
-	__u16 hour;
-	__u16 minutes;
-	__u16 seconds;
-	__u16 mseconds;
+	uint16_t year;
+	uint16_t month;
+	uint16_t day;
+	uint16_t hour;
+	uint16_t minutes;
+	uint16_t seconds;
+	uint16_t mseconds;
 } __attribute__ ((packed)) arc_timeinfo;
 
@@ -187,6 +187,6 @@
 typedef struct  {
 	arc_memorytype_t type;
-	__u32 basepage;  /* *4096 = baseaddr */
-	__u32 basecount;
+	uint32_t basepage;  /* *4096 = baseaddr */
+	uint32_t basecount;
 }arc_memdescriptor_t;
 
@@ -198,7 +198,7 @@
 typedef struct {
 	long (*load)(void); /* ... */
-	long (*invoke)(__u32 eaddr,__u32 saddr,__u32 argc,char **argv,
+	long (*invoke)(uint32_t eaddr,uint32_t saddr,uint32_t argc,char **argv,
 		       char **envp);
-	long (*execute)(char *path,__u32 argc,char **argv,char **envp);
+	long (*execute)(char *path,uint32_t argc,char **argv,char **envp);
 	void (*halt)(void);
 	void (*powerdown)(void);
@@ -222,11 +222,11 @@
 	long (*reserved2)(void);
 	arc_timeinfo * (*gettime)(void);
-	__u32 (*getrelativetime)(void);
+	uint32_t (*getrelativetime)(void);
 	long (*getdirectoryentry)();
 	long (*open)(void); /* ... */
-	long (*close)(__u32 fileid);
-	long (*read)(__u32 fileid,void *buf,__u32 n,__u32 *cnt);
-	long (*getreadstatus)(__u32 fileid);
-	long (*write)(__u32 fileid, void *buf,__u32 n,__u32 *cnt);
+	long (*close)(uint32_t fileid);
+	long (*read)(uint32_t fileid,void *buf,uint32_t n,uint32_t *cnt);
+	long (*getreadstatus)(uint32_t fileid);
+	long (*write)(uint32_t fileid, void *buf,uint32_t n,uint32_t *cnt);
 	long (*seek)(void); /* ... */
 /* 30 */
@@ -235,5 +235,5 @@
 	char * (*setenvironmentvariable)(char *name, char *value);
 	long (*getfileinformation)(void); /* ... */
-	long (*setfileinformation)(__u32 fileid,__u32 attflags,__u32 attmask);
+	long (*setfileinformation)(uint32_t fileid,uint32_t attflags,uint32_t attmask);
 	void (*flushallcaches)(void);
 	long (*testunicodecharacter)(void); /* ... */
@@ -242,17 +242,17 @@
 
 typedef struct {
-	__u32 signature;
-	__u32 length;
-	__u16 version;
-	__u16 revision;
+	uint32_t signature;
+	uint32_t length;
+	uint16_t version;
+	uint16_t revision;
 	void *restartblock;
 	void *debugblock;
 	void *gevector;
 	void *utlbmissvector;
-	__u32 firmwarevectorlen;
+	uint32_t firmwarevectorlen;
 	arc_func_vector_t *firmwarevector;
-	__u32 privvectorlen;
+	uint32_t privvectorlen;
 	void *privvector;
-	__u32 adaptercount;
+	uint32_t adaptercount;
 }__attribute__ ((packed)) arc_sbp;
 
Index: arch/mips32/include/exception.h
===================================================================
--- arch/mips32/include/exception.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/exception.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -63,43 +63,43 @@
 
 struct istate {
-	__u32 at;
-	__u32 v0;
-	__u32 v1;
-	__u32 a0;
-	__u32 a1;
-	__u32 a2;
-	__u32 a3;
-	__u32 t0;
-	__u32 t1;
-	__u32 t2;
-	__u32 t3;
-	__u32 t4;
-	__u32 t5;
-	__u32 t6;
-	__u32 t7;
-	__u32 s0;
-	__u32 s1;
-	__u32 s2;
-	__u32 s3;
-	__u32 s4;
-	__u32 s5;
-	__u32 s6;
-	__u32 s7;
-	__u32 t8;
-	__u32 t9;
-	__u32 gp;
-	__u32 sp;
-	__u32 s8;
-	__u32 ra;
+	uint32_t at;
+	uint32_t v0;
+	uint32_t v1;
+	uint32_t a0;
+	uint32_t a1;
+	uint32_t a2;
+	uint32_t a3;
+	uint32_t t0;
+	uint32_t t1;
+	uint32_t t2;
+	uint32_t t3;
+	uint32_t t4;
+	uint32_t t5;
+	uint32_t t6;
+	uint32_t t7;
+	uint32_t s0;
+	uint32_t s1;
+	uint32_t s2;
+	uint32_t s3;
+	uint32_t s4;
+	uint32_t s5;
+	uint32_t s6;
+	uint32_t s7;
+	uint32_t t8;
+	uint32_t t9;
+	uint32_t gp;
+	uint32_t sp;
+	uint32_t s8;
+	uint32_t ra;
 	
-	__u32 lo;
-	__u32 hi;
+	uint32_t lo;
+	uint32_t hi;
 
-	__u32 status; /* cp0_status */
-	__u32 epc; /* cp0_epc */
-	__u32 k1; /* We use it as thread-local pointer */
+	uint32_t status; /* cp0_status */
+	uint32_t epc; /* cp0_epc */
+	uint32_t k1; /* We use it as thread-local pointer */
 };
 
-static inline void istate_set_retaddr(istate_t *istate, __address retaddr)
+static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
 {
 	istate->epc = retaddr;
@@ -111,5 +111,5 @@
 	return istate->status & cp0_status_um_bit;
 }
-static inline __native istate_get_pc(istate_t *istate)
+static inline unative_t istate_get_pc(istate_t *istate)
 {
 	return istate->epc;
Index: arch/mips32/include/faddr.h
===================================================================
--- arch/mips32/include/faddr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/faddr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,5 +38,5 @@
 #include <arch/types.h>
 
-#define FADDR(fptr)		((__address) (fptr))
+#define FADDR(fptr)		((uintptr_t) (fptr))
 
 #endif
Index: arch/mips32/include/fpu_context.h
===================================================================
--- arch/mips32/include/fpu_context.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/fpu_context.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,9 +38,9 @@
 #include <arch/types.h>
 
-#define FPU_CONTEXT_ALIGN    sizeof(__native)
+#define FPU_CONTEXT_ALIGN    sizeof(unative_t)
 
 struct fpu_context {
-	__native dregs[32];
-	__native cregs[32];
+	unative_t dregs[32];
+	unative_t cregs[32];
 };
 
Index: arch/mips32/include/memstr.h
===================================================================
--- arch/mips32/include/memstr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/memstr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,8 +38,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(__address dst, size_t cnt, __u16 x);
-extern void memsetb(__address dst, size_t cnt, __u8 x);
+extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
+extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
 
-extern int memcmp(__address src, __address dst, int cnt);
+extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
 
 #endif
Index: arch/mips32/include/mm/asid.h
===================================================================
--- arch/mips32/include/mm/asid.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/mm/asid.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,5 +40,5 @@
 #define ASID_MAX_ARCH		255	/* 2^8 - 1 */
 
-typedef __u8 asid_t;
+typedef uint8_t asid_t;
 
 #endif
Index: arch/mips32/include/mm/page.h
===================================================================
--- arch/mips32/include/mm/page.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/mm/page.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -42,6 +42,6 @@
 
 #ifndef __ASM__
-#  define KA2PA(x)	(((__address) (x)) - 0x80000000)
-#  define PA2KA(x)	(((__address) (x)) + 0x80000000)
+#  define KA2PA(x)	(((uintptr_t) (x)) - 0x80000000)
+#  define PA2KA(x)	(((uintptr_t) (x)) + 0x80000000)
 #else
 #  define KA2PA(x)	((x) - 0x80000000)
@@ -101,5 +101,5 @@
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x)	set_pt_flags((pte_t *)(ptl3), (index_t)(i), (x))
 
-#define PTE_VALID_ARCH(pte)			(*((__u32 *) (pte)) != 0)
+#define PTE_VALID_ARCH(pte)			(*((uint32_t *) (pte)) != 0)
 #define PTE_PRESENT_ARCH(pte)			((pte)->p != 0)
 #define PTE_GET_FRAME_ARCH(pte)			((pte)->pfn<<12)
Index: arch/mips32/include/mm/tlb.h
===================================================================
--- arch/mips32/include/mm/tlb.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/mm/tlb.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -76,5 +76,5 @@
 #endif
 	} __attribute__ ((packed));
-	__u32 value;
+	uint32_t value;
 };
 
@@ -104,5 +104,5 @@
 #endif
 	} __attribute__ ((packed));
-	__u32 value;
+	uint32_t value;
 };
 
@@ -119,5 +119,5 @@
 #endif
 	} __attribute__ ((packed));
-	__u32 value;
+	uint32_t value;
 };
 
@@ -134,5 +134,5 @@
 #endif
 	} __attribute__ ((packed));
-	__u32 value;
+	uint32_t value;
 };
 
Index: arch/mips32/include/types.h
===================================================================
--- arch/mips32/include/types.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/include/types.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,26 +38,26 @@
 #define NULL	0
 
-typedef signed char __s8;
-typedef unsigned char __u8;
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
 
-typedef signed short __s16;
-typedef unsigned short __u16;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
 
-typedef unsigned long __u32;
-typedef signed long __s32;
+typedef unsigned long uint32_t;
+typedef signed long int32_t;
 
-typedef unsigned long long __u64;
-typedef signed long long __s64;
+typedef unsigned long long uint64_t;
+typedef signed long long int64_t;
 
-typedef __u32 __address;
+typedef uint32_t uintptr_t;
 
-typedef __u32 ipl_t;
+typedef uint32_t ipl_t;
 
-typedef __u32 __native;
-typedef __s32 __snative;
+typedef uint32_t unative_t;
+typedef int32_t native_t;
 
 typedef struct pte pte_t;
 
-typedef __u32 pfn_t;
+typedef uint32_t pfn_t;
 
 #endif
Index: arch/mips32/src/ddi/ddi.c
===================================================================
--- arch/mips32/src/ddi/ddi.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/src/ddi/ddi.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -51,5 +51,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
 	return 0;
Index: arch/mips32/src/debugger.c
===================================================================
--- arch/mips32/src/debugger.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/src/debugger.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -92,6 +92,6 @@
 
 static struct {
-	__u32 andmask;
-	__u32 value;
+	uint32_t andmask;
+	uint32_t value;
 }jmpinstr[] = {
 	{0xf3ff0000, 0x41000000}, /* BCzF */
@@ -126,5 +126,5 @@
  * @return true - it is jump instruction, false otherwise
  */
-static bool is_jump(__native instr)
+static bool is_jump(unative_t instr)
 {
 	int i;
@@ -154,10 +154,10 @@
 	/* Check, that the breakpoints do not conflict */
 	for (i=0; i<BKPOINTS_MAX; i++) {
-		if (breakpoints[i].address == (__address)argv->intval) {
+		if (breakpoints[i].address == (uintptr_t)argv->intval) {
 			printf("Duplicate breakpoint %d.\n", i);
 			spinlock_unlock(&bkpoints_lock);
 			return 0;
-		} else if (breakpoints[i].address == (__address)argv->intval + sizeof(__native) || \
-			   breakpoints[i].address == (__address)argv->intval - sizeof(__native)) {
+		} else if (breakpoints[i].address == (uintptr_t)argv->intval + sizeof(unative_t) || \
+			   breakpoints[i].address == (uintptr_t)argv->intval - sizeof(unative_t)) {
 			printf("Adjacent breakpoints not supported, conflict with %d.\n", i);
 			spinlock_unlock(&bkpoints_lock);
@@ -178,8 +178,8 @@
 		return 0;
 	}
-	cur->address = (__address) argv->intval;
+	cur->address = (uintptr_t) argv->intval;
 	printf("Adding breakpoint on address: %p\n", argv->intval);
-	cur->instruction = ((__native *)cur->address)[0];
-	cur->nextinstruction = ((__native *)cur->address)[1];
+	cur->instruction = ((unative_t *)cur->address)[0];
+	cur->nextinstruction = ((unative_t *)cur->address)[1];
 	if (argv == &add_argv) {
 		cur->flags = 0;
@@ -193,5 +193,5 @@
 
 	/* Set breakpoint */
-	*((__native *)cur->address) = 0x0d;
+	*((unative_t *)cur->address) = 0x0d;
 
 	spinlock_unlock(&bkpoint_lock);
@@ -229,6 +229,6 @@
 		return 0;
 	}
-	((__u32 *)cur->address)[0] = cur->instruction;
-	((__u32 *)cur->address)[1] = cur->nextinstruction;
+	((uint32_t *)cur->address)[0] = cur->instruction;
+	((uint32_t *)cur->address)[1] = cur->nextinstruction;
 
 	cur->address = NULL;
@@ -299,5 +299,5 @@
 {
 	bpinfo_t *cur = NULL;
-	__address fireaddr = istate->epc;
+	uintptr_t fireaddr = istate->epc;
 	int i;
 
@@ -316,5 +316,5 @@
 		/* Reinst only breakpoint */
 		if ((breakpoints[i].flags & BKPOINT_REINST) \
-		    && (fireaddr ==breakpoints[i].address+sizeof(__native))) {
+		    && (fireaddr ==breakpoints[i].address+sizeof(unative_t))) {
 			cur = &breakpoints[i];
 			break;
@@ -324,7 +324,7 @@
 		if (cur->flags & BKPOINT_REINST) {
 			/* Set breakpoint on first instruction */
-			((__u32 *)cur->address)[0] = 0x0d;
+			((uint32_t *)cur->address)[0] = 0x0d;
 			/* Return back the second */
-			((__u32 *)cur->address)[1] = cur->nextinstruction;
+			((uint32_t *)cur->address)[1] = cur->nextinstruction;
 			cur->flags &= ~BKPOINT_REINST;
 			spinlock_unlock(&bkpoint_lock);
@@ -339,9 +339,9 @@
 
 		/* Return first instruction back */
-		((__u32 *)cur->address)[0] = cur->instruction;
+		((uint32_t *)cur->address)[0] = cur->instruction;
 
 		if (! (cur->flags & BKPOINT_ONESHOT)) {
 			/* Set Breakpoint on next instruction */
-			((__u32 *)cur->address)[1] = 0x0d;
+			((uint32_t *)cur->address)[1] = 0x0d;
 			cur->flags |= BKPOINT_REINST;
 		} 
Index: arch/mips32/src/drivers/arc.c
===================================================================
--- arch/mips32/src/drivers/arc.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/src/drivers/arc.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -143,5 +143,5 @@
 		case CmResourceTypePort:
 			printf("Port: %p-size:%d ",
-			       (__address)configdata->descr[i].u.port.start,
+			       (uintptr_t)configdata->descr[i].u.port.start,
 			       configdata->descr[i].u.port.length);
 			break;
@@ -153,5 +153,5 @@
 		case CmResourceTypeMemory:
 			printf("Memory: %p-size:%d ",
-			       (__address)configdata->descr[i].u.port.start,
+			       (uintptr_t)configdata->descr[i].u.port.start,
 			       configdata->descr[i].u.port.length);
 			break;
@@ -237,5 +237,5 @@
 static void arc_putchar(char ch)
 {
-	__u32 cnt;
+	uint32_t cnt;
 	ipl_t ipl;
 
@@ -294,5 +294,5 @@
 {
 	char ch;
-	__u32 count;
+	uint32_t count;
 	long result;
 	
@@ -317,5 +317,5 @@
 {
 	char ch;
-	__u32 count;
+	uint32_t count;
 	long result;
 
@@ -381,5 +381,5 @@
 	arc_memdescriptor_t *desc;
 	int total = 0;
-	__address base;
+	uintptr_t base;
 	size_t basesize;
 
Index: arch/mips32/src/exception.c
===================================================================
--- arch/mips32/src/exception.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/src/exception.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -96,5 +96,5 @@
 static void reserved_instr_exception(int n, istate_t *istate)
 {
-	if (*((__u32 *)istate->epc) == 0x7c03e83b) {
+	if (*((uint32_t *)istate->epc) == 0x7c03e83b) {
 		ASSERT(THREAD);
 		istate->epc += 4;
@@ -140,5 +140,5 @@
 static void interrupt_exception(int n, istate_t *istate)
 {
-	__u32 cause;
+	uint32_t cause;
 	int i;
 	
Index: arch/mips32/src/interrupt.c
===================================================================
--- arch/mips32/src/interrupt.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/src/interrupt.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -133,5 +133,5 @@
 
 /* Reregister irq to be IPC-ready */
-void irq_ipc_bind_arch(__native irq)
+void irq_ipc_bind_arch(unative_t irq)
 {
 	/* Do not allow to redefine timer */
Index: arch/mips32/src/mips32.c
===================================================================
--- arch/mips32/src/mips32.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/src/mips32.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -72,5 +72,5 @@
  * when not in .text section ????????
  */
-__address supervisor_sp __attribute__ ((section (".text")));
+uintptr_t supervisor_sp __attribute__ ((section (".text")));
 /* Stack pointer saved when entering user mode */
 /* TODO: How do we do it on SMP system???? */
@@ -82,5 +82,5 @@
 	init.cnt = bootinfo.cnt;
 	
-	__u32 i;
+	uint32_t i;
 	
 	for (i = 0; i < bootinfo.cnt; i++) {
@@ -147,8 +147,8 @@
 					      cp0_status_um_bit |
 					      cp0_status_ie_enabled_bit));
-	cp0_epc_write((__address) kernel_uarg->uspace_entry);
-	userspace_asm(((__address) kernel_uarg->uspace_stack+PAGE_SIZE), 
-		      (__address) kernel_uarg->uspace_uarg,
-		      (__address) kernel_uarg->uspace_entry);
+	cp0_epc_write((uintptr_t) kernel_uarg->uspace_entry);
+	userspace_asm(((uintptr_t) kernel_uarg->uspace_stack+PAGE_SIZE), 
+		      (uintptr_t) kernel_uarg->uspace_uarg,
+		      (uintptr_t) kernel_uarg->uspace_entry);
 	while (1)
 		;
@@ -163,5 +163,5 @@
 void before_thread_runs_arch(void)
 {
-	supervisor_sp = (__address) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
+	supervisor_sp = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
 }
 
@@ -175,5 +175,5 @@
  * possible to have it separately in the future.
  */
-__native sys_tls_set(__native addr)
+unative_t sys_tls_set(unative_t addr)
 {
 	return 0;
Index: arch/mips32/src/mm/page.c
===================================================================
--- arch/mips32/src/mm/page.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/src/mm/page.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -46,5 +46,5 @@
  *   translate the physical address to uncached area
  */
-__address hw_map(__address physaddr, size_t size)
+uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
 	return physaddr + 0xa0000000;
Index: arch/mips32/src/mm/tlb.c
===================================================================
--- arch/mips32/src/mm/tlb.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/mips32/src/mm/tlb.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -52,8 +52,8 @@
 static void tlb_modified_fail(istate_t *istate);
 
-static pte_t *find_mapping_and_check(__address badvaddr, int access, istate_t *istate, int *pfrc);
-
-static void prepare_entry_lo(entry_lo_t *lo, bool g, bool v, bool d, bool cacheable, __address pfn);
-static void prepare_entry_hi(entry_hi_t *hi, asid_t asid, __address addr);
+static pte_t *find_mapping_and_check(uintptr_t badvaddr, int access, istate_t *istate, int *pfrc);
+
+static void prepare_entry_lo(entry_lo_t *lo, bool g, bool v, bool d, bool cacheable, uintptr_t pfn);
+static void prepare_entry_hi(entry_hi_t *hi, asid_t asid, uintptr_t addr);
 
 /** Initialize TLB
@@ -97,5 +97,5 @@
 	entry_hi_t hi;
 	asid_t asid;
-	__address badvaddr;
+	uintptr_t badvaddr;
 	pte_t *pte;
 	int pfrc;
@@ -167,5 +167,5 @@
 {
 	tlb_index_t index;
-	__address badvaddr;
+	uintptr_t badvaddr;
 	entry_lo_t lo;
 	entry_hi_t hi;
@@ -251,5 +251,5 @@
 {
 	tlb_index_t index;
-	__address badvaddr;
+	uintptr_t badvaddr;
 	entry_lo_t lo;
 	entry_hi_t hi;
@@ -384,5 +384,5 @@
  * @return PTE on success, NULL otherwise.
  */
-pte_t *find_mapping_and_check(__address badvaddr, int access, istate_t *istate, int *pfrc)
+pte_t *find_mapping_and_check(uintptr_t badvaddr, int access, istate_t *istate, int *pfrc)
 {
 	entry_hi_t hi;
@@ -446,5 +446,5 @@
 }
 
-void prepare_entry_lo(entry_lo_t *lo, bool g, bool v, bool d, bool cacheable, __address pfn)
+void prepare_entry_lo(entry_lo_t *lo, bool g, bool v, bool d, bool cacheable, uintptr_t pfn)
 {
 	lo->value = 0;
@@ -456,5 +456,5 @@
 }
 
-void prepare_entry_hi(entry_hi_t *hi, asid_t asid, __address addr)
+void prepare_entry_hi(entry_hi_t *hi, asid_t asid, uintptr_t addr)
 {
 	hi->value = ALIGN_DOWN(addr, PAGE_SIZE * 2);
@@ -568,5 +568,5 @@
  * @param cnt Number of entries to invalidate.
  */
-void tlb_invalidate_pages(asid_t asid, __address page, count_t cnt)
+void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
 {
 	int i;
Index: arch/ppc32/include/asm.h
===================================================================
--- arch/ppc32/include/asm.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/asm.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -129,7 +129,7 @@
  * The stack must start on page boundary.
  */
-static inline __address get_stack_base(void)
+static inline uintptr_t get_stack_base(void)
 {
-	__address v;
+	uintptr_t v;
 	
 	asm volatile (
@@ -146,7 +146,7 @@
 
 void cpu_halt(void);
-void asm_delay_loop(__u32 t);
+void asm_delay_loop(uint32_t t);
 
-extern void userspace_asm(__address uspace_uarg, __address stack, __address entry);
+extern void userspace_asm(uintptr_t uspace_uarg, uintptr_t stack, uintptr_t entry);
 
 #endif
Index: arch/ppc32/include/boot/boot.h
===================================================================
--- arch/ppc32/include/boot/boot.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/boot/boot.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -49,26 +49,26 @@
 
 typedef struct {
-	__address addr;
-	__u32 size;
+	uintptr_t addr;
+	uint32_t size;
 } utask_t;
 
 typedef struct {
-	__u32 count;
+	uint32_t count;
 	utask_t tasks[TASKMAP_MAX_RECORDS];
 } taskmap_t;
 
 typedef struct {
-	__address start;
-	__u32 size;
+	uintptr_t start;
+	uint32_t size;
 } memzone_t;
 
 typedef struct {
-	__u32 total;
-	__u32 count;
+	uint32_t total;
+	uint32_t count;
 	memzone_t zones[MEMMAP_MAX_RECORDS];
 } memmap_t;
 
 typedef struct {
-	__address addr;
+	uintptr_t addr;
 	unsigned int width;
 	unsigned int height;
@@ -78,5 +78,5 @@
 
 typedef struct {
-	__address addr;
+	uintptr_t addr;
 	unsigned int size;
 } keyboard_t;
Index: arch/ppc32/include/byteorder.h
===================================================================
--- arch/ppc32/include/byteorder.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/byteorder.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -41,22 +41,22 @@
 #define BIG_ENDIAN
 
-static inline __u64 __u64_le2host(__u64 n)
+static inline uint64_t uint64_t_le2host(uint64_t n)
 {
-	return __u64_byteorder_swap(n);
+	return uint64_t_byteorder_swap(n);
 }
 
 
-/** Convert little-endian __native to host __native
+/** Convert little-endian unative_t to host unative_t
  *
- * Convert little-endian __native parameter to host endianess.
+ * Convert little-endian unative_t parameter to host endianess.
  *
- * @param n Little-endian __native argument.
+ * @param n Little-endian unative_t argument.
  *
  * @return Result in host endianess.
  *
  */
-static inline __native __native_le2host(__native n)
+static inline unative_t unative_t_le2host(unative_t n)
 {
-	__address v;
+	uintptr_t v;
 	
 	asm volatile (
Index: arch/ppc32/include/context.h
===================================================================
--- arch/ppc32/include/context.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/context.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -43,29 +43,29 @@
 
 struct context {
-	__address sp;
-	__address pc;
+	uintptr_t sp;
+	uintptr_t pc;
 	
-	__u32 r2;
-	__u32 r13;
-	__u32 r14;
-	__u32 r15;
-	__u32 r16;
-	__u32 r17;
-	__u32 r18;
-	__u32 r19;
-	__u32 r20;
-	__u32 r21;
-	__u32 r22;
-	__u32 r23;
-	__u32 r24;
-	__u32 r25;
-	__u32 r26;
-	__u32 r27;
-	__u32 r28;
-	__u32 r29;
-	__u32 r30;
-	__u32 r31;
+	uint32_t r2;
+	uint32_t r13;
+	uint32_t r14;
+	uint32_t r15;
+	uint32_t r16;
+	uint32_t r17;
+	uint32_t r18;
+	uint32_t r19;
+	uint32_t r20;
+	uint32_t r21;
+	uint32_t r22;
+	uint32_t r23;
+	uint32_t r24;
+	uint32_t r25;
+	uint32_t r26;
+	uint32_t r27;
+	uint32_t r28;
+	uint32_t r29;
+	uint32_t r30;
+	uint32_t r31;
 	
-	__u32 cr;
+	uint32_t cr;
 	
 	ipl_t ipl;
Index: arch/ppc32/include/cpuid.h
===================================================================
--- arch/ppc32/include/cpuid.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/cpuid.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -39,6 +39,6 @@
 
 struct cpu_info {
-	__u16 version;
-	__u16 revision;
+	uint16_t version;
+	uint16_t revision;
 } __attribute__ ((packed));
 
Index: arch/ppc32/include/drivers/cuda.h
===================================================================
--- arch/ppc32/include/drivers/cuda.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/drivers/cuda.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -41,5 +41,5 @@
 #define CUDA_IRQ 10
 
-extern void cuda_init(__address base, size_t size);
+extern void cuda_init(uintptr_t base, size_t size);
 extern int cuda_get_scancode(void);
 extern void cuda_grab(void);
Index: arch/ppc32/include/drivers/pic.h
===================================================================
--- arch/ppc32/include/drivers/pic.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/drivers/pic.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -43,5 +43,5 @@
 #define PIC_ACK_HIGH       6
 
-void pic_init(__address base, size_t size);
+void pic_init(uintptr_t base, size_t size);
 void pic_enable_interrupt(int intnum);
 void pic_disable_interrupt(int intnum);
Index: arch/ppc32/include/exception.h
===================================================================
--- arch/ppc32/include/exception.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/exception.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -43,45 +43,45 @@
 
 struct istate {
-	__u32 r0;
-	__u32 r2;
-	__u32 r3;
-	__u32 r4;
-	__u32 r5;
-	__u32 r6;
-	__u32 r7;
-	__u32 r8;
-	__u32 r9;
-	__u32 r10;
-	__u32 r11;
-	__u32 r13;
-	__u32 r14;
-	__u32 r15;
-	__u32 r16;
-	__u32 r17;
-	__u32 r18;
-	__u32 r19;
-	__u32 r20;
-	__u32 r21;
-	__u32 r22;
-	__u32 r23;
-	__u32 r24;
-	__u32 r25;
-	__u32 r26;
-	__u32 r27;
-	__u32 r28;
-	__u32 r29;
-	__u32 r30;
-	__u32 r31;
-	__u32 cr;
-	__u32 pc;
-	__u32 srr1;
-	__u32 lr;
-	__u32 ctr;
-	__u32 xer;
-	__u32 r12;
-	__u32 sp;
+	uint32_t r0;
+	uint32_t r2;
+	uint32_t r3;
+	uint32_t r4;
+	uint32_t r5;
+	uint32_t r6;
+	uint32_t r7;
+	uint32_t r8;
+	uint32_t r9;
+	uint32_t r10;
+	uint32_t r11;
+	uint32_t r13;
+	uint32_t r14;
+	uint32_t r15;
+	uint32_t r16;
+	uint32_t r17;
+	uint32_t r18;
+	uint32_t r19;
+	uint32_t r20;
+	uint32_t r21;
+	uint32_t r22;
+	uint32_t r23;
+	uint32_t r24;
+	uint32_t r25;
+	uint32_t r26;
+	uint32_t r27;
+	uint32_t r28;
+	uint32_t r29;
+	uint32_t r30;
+	uint32_t r31;
+	uint32_t cr;
+	uint32_t pc;
+	uint32_t srr1;
+	uint32_t lr;
+	uint32_t ctr;
+	uint32_t xer;
+	uint32_t r12;
+	uint32_t sp;
 };
 
-static inline void istate_set_retaddr(istate_t *istate, __address retaddr)
+static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
 {
 	istate->pc = retaddr;
@@ -94,5 +94,5 @@
 	return 0;
 }
-static inline __native istate_get_pc(istate_t *istate)
+static inline unative_t istate_get_pc(istate_t *istate)
 {
 	return istate->pc;
Index: arch/ppc32/include/faddr.h
===================================================================
--- arch/ppc32/include/faddr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/faddr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,5 +38,5 @@
 #include <arch/types.h>
 
-#define FADDR(fptr)		((__address) (fptr))
+#define FADDR(fptr)		((uintptr_t) (fptr))
 
 #endif
Index: arch/ppc32/include/fpu_context.h
===================================================================
--- arch/ppc32/include/fpu_context.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/fpu_context.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -41,23 +41,23 @@
 
 struct fpu_context {
-	__u64 fr14;
-	__u64 fr15;
-	__u64 fr16;
-	__u64 fr17;
-	__u64 fr18;
-	__u64 fr19;
-	__u64 fr20;
-	__u64 fr21;
-	__u64 fr22;
-	__u64 fr23;
-	__u64 fr24;
-	__u64 fr25;
-	__u64 fr26;
-	__u64 fr27;
-	__u64 fr28;
-	__u64 fr29;
-	__u64 fr30;
-	__u64 fr31;
-	__u32 fpscr;
+	uint64_t fr14;
+	uint64_t fr15;
+	uint64_t fr16;
+	uint64_t fr17;
+	uint64_t fr18;
+	uint64_t fr19;
+	uint64_t fr20;
+	uint64_t fr21;
+	uint64_t fr22;
+	uint64_t fr23;
+	uint64_t fr24;
+	uint64_t fr25;
+	uint64_t fr26;
+	uint64_t fr27;
+	uint64_t fr28;
+	uint64_t fr29;
+	uint64_t fr30;
+	uint64_t fr31;
+	uint32_t fpscr;
 } __attribute__ ((packed));
 
Index: arch/ppc32/include/memstr.h
===================================================================
--- arch/ppc32/include/memstr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/memstr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,8 +38,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(__address dst, size_t cnt, __u16 x);
-extern void memsetb(__address dst, size_t cnt, __u8 x);
+extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
+extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
 
-extern int memcmp(__address src, __address dst, int cnt);
+extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
 
 #endif
Index: arch/ppc32/include/mm/asid.h
===================================================================
--- arch/ppc32/include/mm/asid.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/mm/asid.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,5 +40,5 @@
 #define ASID_MAX_ARCH		4096
 
-typedef __u32 asid_t;
+typedef uint32_t asid_t;
 
 #endif
Index: arch/ppc32/include/mm/frame.h
===================================================================
--- arch/ppc32/include/mm/frame.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/mm/frame.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -44,5 +44,5 @@
 #include <arch/types.h> 
 
-extern __address last_frame;
+extern uintptr_t last_frame;
 
 extern void frame_arch_init(void);
Index: arch/ppc32/include/mm/page.h
===================================================================
--- arch/ppc32/include/mm/page.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/mm/page.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -44,6 +44,6 @@
 
 #ifndef __ASM__
-#	define KA2PA(x)	(((__address) (x)) - 0x80000000)
-#	define PA2KA(x)	(((__address) (x)) + 0x80000000)
+#	define KA2PA(x)	(((uintptr_t) (x)) - 0x80000000)
+#	define PA2KA(x)	(((uintptr_t) (x)) + 0x80000000)
 #else
 #	define KA2PA(x)	((x) - 0x80000000)
@@ -95,5 +95,5 @@
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x)	set_pt_flags((pte_t *) (ptl3), (index_t) (i), (x))
 
-#define PTE_VALID_ARCH(pte)			(*((__u32 *) (pte)) != 0)
+#define PTE_VALID_ARCH(pte)			(*((uint32_t *) (pte)) != 0)
 #define PTE_PRESENT_ARCH(pte)			((pte)->p != 0)
 #define PTE_GET_FRAME_ARCH(pte)			((pte)->pfn << 12)
Index: arch/ppc32/include/types.h
===================================================================
--- arch/ppc32/include/types.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/include/types.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,20 +38,20 @@
 #define NULL 0
 
-typedef signed char __s8;
-typedef signed short __s16;
-typedef signed int __s32;
-typedef signed long long __s64;
+typedef signed char int8_t;
+typedef signed short int16_t;
+typedef signed int int32_t;
+typedef signed long long int64_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 pfn_t;
+typedef uint32_t uintptr_t;
+typedef uint32_t pfn_t;
 
-typedef __u32 ipl_t;
+typedef uint32_t ipl_t;
 
-typedef __u32 __native;
+typedef uint32_t unative_t;
 
 /** Page Table Entry. */
Index: arch/ppc32/src/ddi/ddi.c
===================================================================
--- arch/ppc32/src/ddi/ddi.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/src/ddi/ddi.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -48,5 +48,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
 	return 0;
Index: arch/ppc32/src/drivers/cuda.c
===================================================================
--- arch/ppc32/src/drivers/cuda.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/src/drivers/cuda.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -60,5 +60,5 @@
 
 
-static volatile __u8 *cuda = NULL;
+static volatile uint8_t *cuda = NULL;
 static iroutine vector;
 
@@ -191,8 +191,8 @@
 
 
-void send_packet(const __u8 kind, index_t count, ...);
-
-
-static void receive_packet(__u8 *kind, index_t count, __u8 data[])
+void send_packet(const uint8_t kind, index_t count, ...);
+
+
+static void receive_packet(uint8_t *kind, index_t count, uint8_t data[])
 {
 	cuda[B] = cuda[B] & ~TIP;
@@ -238,6 +238,6 @@
 int cuda_get_scancode(void)
 {
-	__u8 kind;
-	__u8 data[4];
+	uint8_t kind;
+	uint8_t data[4];
 	
 	receive_packet(&kind, 4, data);
@@ -254,5 +254,5 @@
 	
 	if (scan_code != -1) {
-		__u8 scancode = (__u8) scan_code;
+		uint8_t scancode = (uint8_t) scan_code;
 		if ((scancode & 0x80) != 0x80)
 			chardev_push_character(&kbrd, lchars[scancode & 0x7f]);
@@ -276,7 +276,7 @@
 
 
-void cuda_init(__address base, size_t size)
-{
-	cuda = (__u8 *) hw_map(base, size);
+void cuda_init(uintptr_t base, size_t size)
+{
+	cuda = (uint8_t *) hw_map(base, size);
 	
 	int_register(CUDA_IRQ, "cuda", cuda_irq);
@@ -291,5 +291,5 @@
 
 
-void send_packet(const __u8 kind, index_t count, ...)
+void send_packet(const uint8_t kind, index_t count, ...)
 {
 	index_t i;
Index: arch/ppc32/src/drivers/pic.c
===================================================================
--- arch/ppc32/src/drivers/pic.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/src/drivers/pic.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -39,9 +39,9 @@
 #include <bitops.h>
 
-static volatile __u32 *pic;
+static volatile uint32_t *pic;
 
-void pic_init(__address base, size_t size)
+void pic_init(uintptr_t base, size_t size)
 {
-	pic = (__u32 *) hw_map(base, size);
+	pic = (uint32_t *) hw_map(base, size);
 }
 
Index: arch/ppc32/src/interrupt.c
===================================================================
--- arch/ppc32/src/interrupt.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/src/interrupt.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -89,5 +89,5 @@
 
 /* Reregister irq to be IPC-ready */
-void irq_ipc_bind_arch(__native irq)
+void irq_ipc_bind_arch(unative_t irq)
 {
 	int_register(irq, "ipc_int", ipc_int);
Index: arch/ppc32/src/mm/as.c
===================================================================
--- arch/ppc32/src/mm/as.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/src/mm/as.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -56,5 +56,5 @@
 	asid_t asid;
 	ipl_t ipl;
-	__u32 sr;
+	uint32_t sr;
 
 	ipl = interrupts_disable();
Index: arch/ppc32/src/mm/frame.c
===================================================================
--- arch/ppc32/src/mm/frame.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/src/mm/frame.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,5 +40,5 @@
 #include <macros.h>
 
-__address last_frame = 0;
+uintptr_t last_frame = 0;
 
 void frame_arch_init(void)
@@ -68,5 +68,5 @@
 	
 	/* Mark the Page Hash Table frames as unavailable */
-	__u32 sdr1;
+	uint32_t sdr1;
 	asm volatile (
 		"mfsdr1 %0\n"
Index: arch/ppc32/src/mm/page.c
===================================================================
--- arch/ppc32/src/mm/page.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/src/mm/page.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -46,10 +46,10 @@
 
 
-__address hw_map(__address physaddr, size_t size)
+uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
 	if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
 		panic("Unable to map physical memory %p (%d bytes)", physaddr, size)
 	
-	__address virtaddr = PA2KA(last_frame);
+	uintptr_t virtaddr = PA2KA(last_frame);
 	pfn_t i;
 	for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
Index: arch/ppc32/src/mm/tlb.c
===================================================================
--- arch/ppc32/src/mm/tlb.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/src/mm/tlb.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -57,5 +57,5 @@
  *
  */
-static pte_t *find_mapping_and_check(as_t *as, bool lock, __address badvaddr, int access, istate_t *istate, int *pfrc)
+static pte_t *find_mapping_and_check(as_t *as, bool lock, uintptr_t badvaddr, int access, istate_t *istate, int *pfrc)
 {
 	/*
@@ -104,5 +104,5 @@
 
 
-static void pht_refill_fail(__address badvaddr, istate_t *istate)
+static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
 {
 	char *symbol = "";
@@ -119,10 +119,10 @@
 
 
-static void pht_insert(const __address vaddr, const pfn_t pfn)
-{
-	__u32 page = (vaddr >> 12) & 0xffff;
-	__u32 api = (vaddr >> 22) & 0x3f;
-	
-	__u32 vsid;
+static void pht_insert(const uintptr_t vaddr, const pfn_t pfn)
+{
+	uint32_t page = (vaddr >> 12) & 0xffff;
+	uint32_t api = (vaddr >> 22) & 0x3f;
+	
+	uint32_t vsid;
 	asm volatile (
 		"mfsrin %0, %1\n"
@@ -131,5 +131,5 @@
 	);
 	
-	__u32 sdr1;
+	uint32_t sdr1;
 	asm volatile (
 		"mfsdr1 %0\n"
@@ -139,8 +139,8 @@
 	
 	/* Primary hash (xor) */
-	__u32 h = 0;
-	__u32 hash = vsid ^ page;
-	__u32 base = (hash & 0x3ff) << 3;
-	__u32 i;
+	uint32_t h = 0;
+	uint32_t hash = vsid ^ page;
+	uint32_t base = (hash & 0x3ff) << 3;
+	uint32_t i;
 	bool found = false;
 	
@@ -156,5 +156,5 @@
 	if (!found) {
 		/* Secondary hash (not) */
-		__u32 base2 = (~hash & 0x3ff) << 3;
+		uint32_t base2 = (~hash & 0x3ff) << 3;
 		
 		/* Find unused or colliding
@@ -186,10 +186,10 @@
 
 
-static void pht_real_insert(const __address vaddr, const pfn_t pfn)
-{
-	__u32 page = (vaddr >> 12) & 0xffff;
-	__u32 api = (vaddr >> 22) & 0x3f;
-	
-	__u32 vsid;
+static void pht_real_insert(const uintptr_t vaddr, const pfn_t pfn)
+{
+	uint32_t page = (vaddr >> 12) & 0xffff;
+	uint32_t api = (vaddr >> 22) & 0x3f;
+	
+	uint32_t vsid;
 	asm volatile (
 		"mfsrin %0, %1\n"
@@ -198,5 +198,5 @@
 	);
 	
-	__u32 sdr1;
+	uint32_t sdr1;
 	asm volatile (
 		"mfsdr1 %0\n"
@@ -206,8 +206,8 @@
 	
 	/* Primary hash (xor) */
-	__u32 h = 0;
-	__u32 hash = vsid ^ page;
-	__u32 base = (hash & 0x3ff) << 3;
-	__u32 i;
+	uint32_t h = 0;
+	uint32_t hash = vsid ^ page;
+	uint32_t base = (hash & 0x3ff) << 3;
+	uint32_t i;
 	bool found = false;
 	
@@ -223,5 +223,5 @@
 	if (!found) {
 		/* Secondary hash (not) */
-		__u32 base2 = (~hash & 0x3ff) << 3;
+		uint32_t base2 = (~hash & 0x3ff) << 3;
 		
 		/* Find unused or colliding
@@ -261,5 +261,5 @@
 void pht_refill(int n, istate_t *istate)
 {
-	__address badvaddr;
+	uintptr_t badvaddr;
 	pte_t *pte;
 	int pfrc;
@@ -323,5 +323,5 @@
 bool pht_real_refill(int n, istate_t *istate)
 {
-	__address badvaddr;
+	uintptr_t badvaddr;
 	
 	if (n == VECTOR_DATA_STORAGE) {
@@ -333,5 +333,5 @@
 		badvaddr = istate->pc;
 	
-	__u32 physmem;
+	uint32_t physmem;
 	asm volatile (
 		"mfsprg3 %0\n"
@@ -365,5 +365,5 @@
 void tlb_invalidate_asid(asid_t asid)
 {
-	__u32 sdr1;
+	uint32_t sdr1;
 	asm volatile (
 		"mfsdr1 %0\n"
@@ -372,5 +372,5 @@
 	phte_t *phte = (phte_t *) PA2KA(sdr1 & 0xffff0000);
 	
-	__u32 i;
+	uint32_t i;
 	for (i = 0; i < 8192; i++) {
 		if ((phte[i].v) && (phte[i].vsid >= (asid << 4)) && (phte[i].vsid < ((asid << 4) + 16)))
@@ -381,5 +381,5 @@
 
 
-void tlb_invalidate_pages(asid_t asid, __address page, count_t cnt)
+void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
 {
 	// TODO
@@ -396,5 +396,5 @@
 	mask = (upper & 0x1ffc) >> 2; \
 	if (upper & 3) { \
-		__u32 tmp = mask; \
+		uint32_t tmp = mask; \
 		length = 128; \
 		while (tmp) { \
@@ -413,8 +413,8 @@
 void tlb_print(void)
 {
-	__u32 sr;
+	uint32_t sr;
 	
 	for (sr = 0; sr < 16; sr++) {
-		__u32 vsid;
+		uint32_t vsid;
 		asm volatile (
 			"mfsrin %0, %1\n"
@@ -425,8 +425,8 @@
 	}
 	
-	__u32 upper;
-	__u32 lower;
-	__u32 mask;
-	__u32 length;
+	uint32_t upper;
+	uint32_t lower;
+	uint32_t mask;
+	uint32_t length;
 	
 	PRINT_BAT("ibat[0]", 528, 529);
Index: arch/ppc32/src/ppc32.c
===================================================================
--- arch/ppc32/src/ppc32.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc32/src/ppc32.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -51,5 +51,5 @@
 	init.cnt = bootinfo.taskmap.count;
 	
-	__u32 i;
+	uint32_t i;
 	
 	for (i = 0; i < bootinfo.taskmap.count; i++) {
@@ -98,5 +98,5 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
-	userspace_asm((__address) kernel_uarg->uspace_uarg, (__address) kernel_uarg->uspace_stack + THREAD_STACK_SIZE - SP_DELTA, (__address) kernel_uarg->uspace_entry);
+	userspace_asm((uintptr_t) kernel_uarg->uspace_uarg, (uintptr_t) kernel_uarg->uspace_stack + THREAD_STACK_SIZE - SP_DELTA, (uintptr_t) kernel_uarg->uspace_entry);
 	
 	/* Unreachable */
Index: arch/ppc64/include/asm.h
===================================================================
--- arch/ppc64/include/asm.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/include/asm.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -129,7 +129,7 @@
  * The stack must start on page boundary.
  */
-static inline __address get_stack_base(void)
+static inline uintptr_t get_stack_base(void)
 {
-	__address v;
+	uintptr_t v;
 	
 	asm volatile (
@@ -152,7 +152,7 @@
 }
 
-void asm_delay_loop(__u32 t);
+void asm_delay_loop(uint32_t t);
 
-extern void userspace_asm(__address uspace_uarg, __address stack, __address entry);
+extern void userspace_asm(uintptr_t uspace_uarg, uintptr_t stack, uintptr_t entry);
 
 #endif
Index: arch/ppc64/include/boot/boot.h
===================================================================
--- arch/ppc64/include/boot/boot.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/include/boot/boot.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -49,26 +49,26 @@
 
 typedef struct {
-	__address addr;
-	__u64 size;
+	uintptr_t addr;
+	uint64_t size;
 } utask_t;
 
 typedef struct {
-	__u32 count;
+	uint32_t count;
 	utask_t tasks[TASKMAP_MAX_RECORDS];
 } taskmap_t;
 
 typedef struct {
-	__address start;
-	__u64 size;
+	uintptr_t start;
+	uint64_t size;
 } memzone_t;
 
 typedef struct {
-	__u64 total;
-	__u32 count;
+	uint64_t total;
+	uint32_t count;
 	memzone_t zones[MEMMAP_MAX_RECORDS];
 } memmap_t;
 
 typedef struct {
-	__address addr;
+	uintptr_t addr;
 	unsigned int width;
 	unsigned int height;
Index: arch/ppc64/include/byteorder.h
===================================================================
--- arch/ppc64/include/byteorder.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/include/byteorder.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -41,22 +41,22 @@
 #define BIG_ENDIAN
 
-static inline __u64 __u64_le2host(__u64 n)
+static inline uint64_t uint64_t_le2host(uint64_t n)
 {
-	return __u64_byteorder_swap(n);
+	return uint64_t_byteorder_swap(n);
 }
 
 
-/** Convert little-endian __native to host __native
+/** Convert little-endian unative_t to host unative_t
  *
- * Convert little-endian __native parameter to host endianess.
+ * Convert little-endian unative_t parameter to host endianess.
  *
- * @param n Little-endian __native argument.
+ * @param n Little-endian unative_t argument.
  *
  * @return Result in host endianess.
  *
  */
-static inline __native __native_le2host(__native n)
+static inline unative_t unative_t_le2host(unative_t n)
 {
-	__address v;
+	uintptr_t v;
 	
 	asm volatile (
Index: arch/ppc64/include/context.h
===================================================================
--- arch/ppc64/include/context.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/include/context.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -43,29 +43,29 @@
 
 struct context {
-	__address sp;
-	__address pc;
+	uintptr_t sp;
+	uintptr_t pc;
 	
-	__u64 r2;
-	__u64 r13;
-	__u64 r14;
-	__u64 r15;
-	__u64 r16;
-	__u64 r17;
-	__u64 r18;
-	__u64 r19;
-	__u64 r20;
-	__u64 r21;
-	__u64 r22;
-	__u64 r23;
-	__u64 r24;
-	__u64 r25;
-	__u64 r26;
-	__u64 r27;
-	__u64 r28;
-	__u64 r29;
-	__u64 r30;
-	__u64 r31;
+	uint64_t r2;
+	uint64_t r13;
+	uint64_t r14;
+	uint64_t r15;
+	uint64_t r16;
+	uint64_t r17;
+	uint64_t r18;
+	uint64_t r19;
+	uint64_t r20;
+	uint64_t r21;
+	uint64_t r22;
+	uint64_t r23;
+	uint64_t r24;
+	uint64_t r25;
+	uint64_t r26;
+	uint64_t r27;
+	uint64_t r28;
+	uint64_t r29;
+	uint64_t r30;
+	uint64_t r31;
 	
-	__u64 cr;
+	uint64_t cr;
 	
 	ipl_t ipl;
Index: arch/ppc64/include/cpuid.h
===================================================================
--- arch/ppc64/include/cpuid.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/include/cpuid.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -39,6 +39,6 @@
 
 struct cpu_info {
-	__u16 version;
-	__u16 revision;
+	uint16_t version;
+	uint16_t revision;
 } __attribute__ ((packed));
 
Index: arch/ppc64/include/exception.h
===================================================================
--- arch/ppc64/include/exception.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/include/exception.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -43,45 +43,45 @@
 
 struct istate {
-	__u64 r0;
-	__u64 r2;
-	__u64 r3;
-	__u64 r4;
-	__u64 r5;
-	__u64 r6;
-	__u64 r7;
-	__u64 r8;
-	__u64 r9;
-	__u64 r10;
-	__u64 r11;
-	__u64 r13;
-	__u64 r14;
-	__u64 r15;
-	__u64 r16;
-	__u64 r17;
-	__u64 r18;
-	__u64 r19;
-	__u64 r20;
-	__u64 r21;
-	__u64 r22;
-	__u64 r23;
-	__u64 r24;
-	__u64 r25;
-	__u64 r26;
-	__u64 r27;
-	__u64 r28;
-	__u64 r29;
-	__u64 r30;
-	__u64 r31;
-	__u64 cr;
-	__u64 pc;
-	__u64 srr1;
-	__u64 lr;
-	__u64 ctr;
-	__u64 xer;
-	__u64 r12;
-	__u64 sp;
+	uint64_t r0;
+	uint64_t r2;
+	uint64_t r3;
+	uint64_t r4;
+	uint64_t r5;
+	uint64_t r6;
+	uint64_t r7;
+	uint64_t r8;
+	uint64_t r9;
+	uint64_t r10;
+	uint64_t r11;
+	uint64_t r13;
+	uint64_t r14;
+	uint64_t r15;
+	uint64_t r16;
+	uint64_t r17;
+	uint64_t r18;
+	uint64_t r19;
+	uint64_t r20;
+	uint64_t r21;
+	uint64_t r22;
+	uint64_t r23;
+	uint64_t r24;
+	uint64_t r25;
+	uint64_t r26;
+	uint64_t r27;
+	uint64_t r28;
+	uint64_t r29;
+	uint64_t r30;
+	uint64_t r31;
+	uint64_t cr;
+	uint64_t pc;
+	uint64_t srr1;
+	uint64_t lr;
+	uint64_t ctr;
+	uint64_t xer;
+	uint64_t r12;
+	uint64_t sp;
 };
 
-static inline void istate_set_retaddr(istate_t *istate, __address retaddr)
+static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
 {
 	istate->pc = retaddr;
@@ -94,5 +94,5 @@
 	return 0;
 }
-static inline __native istate_get_pc(istate_t *istate)
+static inline unative_t istate_get_pc(istate_t *istate)
 {
 	return istate->pc;
Index: arch/ppc64/include/faddr.h
===================================================================
--- arch/ppc64/include/faddr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/include/faddr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,5 +38,5 @@
 #include <arch/types.h>
 
-#define FADDR(fptr)		((__address) (fptr))
+#define FADDR(fptr)		((uintptr_t) (fptr))
 
 #endif
Index: arch/ppc64/include/fpu_context.h
===================================================================
--- arch/ppc64/include/fpu_context.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/include/fpu_context.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -41,23 +41,23 @@
 
 struct fpu_context {
-	__u64 fr14;
-	__u64 fr15;
-	__u64 fr16;
-	__u64 fr17;
-	__u64 fr18;
-	__u64 fr19;
-	__u64 fr20;
-	__u64 fr21;
-	__u64 fr22;
-	__u64 fr23;
-	__u64 fr24;
-	__u64 fr25;
-	__u64 fr26;
-	__u64 fr27;
-	__u64 fr28;
-	__u64 fr29;
-	__u64 fr30;
-	__u64 fr31;
-	__u32 fpscr;
+	uint64_t fr14;
+	uint64_t fr15;
+	uint64_t fr16;
+	uint64_t fr17;
+	uint64_t fr18;
+	uint64_t fr19;
+	uint64_t fr20;
+	uint64_t fr21;
+	uint64_t fr22;
+	uint64_t fr23;
+	uint64_t fr24;
+	uint64_t fr25;
+	uint64_t fr26;
+	uint64_t fr27;
+	uint64_t fr28;
+	uint64_t fr29;
+	uint64_t fr30;
+	uint64_t fr31;
+	uint32_t fpscr;
 } __attribute__ ((packed));
 
Index: arch/ppc64/include/memstr.h
===================================================================
--- arch/ppc64/include/memstr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/include/memstr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,8 +38,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(__address dst, size_t cnt, __u16 x);
-extern void memsetb(__address dst, size_t cnt, __u8 x);
+extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
+extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
 
-extern int memcmp(__address src, __address dst, int cnt);
+extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
 
 #endif
Index: arch/ppc64/include/mm/frame.h
===================================================================
--- arch/ppc64/include/mm/frame.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/include/mm/frame.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -44,5 +44,5 @@
 #include <arch/types.h> 
 
-extern __address last_frame;
+extern uintptr_t last_frame;
 
 extern void frame_arch_init(void);
Index: arch/ppc64/include/mm/page.h
===================================================================
--- arch/ppc64/include/mm/page.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/include/mm/page.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -44,6 +44,6 @@
 
 #ifndef __ASM__
-#	define KA2PA(x)	(((__address) (x)) - 0x80000000)
-#	define PA2KA(x)	(((__address) (x)) + 0x80000000)
+#	define KA2PA(x)	(((uintptr_t) (x)) - 0x80000000)
+#	define PA2KA(x)	(((uintptr_t) (x)) + 0x80000000)
 #else
 #	define KA2PA(x)	((x) - 0x80000000)
@@ -95,7 +95,7 @@
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x)	set_pt_flags((pte_t *) (ptl3), (index_t) (i), (x))
 
-#define PTE_VALID_ARCH(pte)			(*((__u32 *) (pte)) != 0)
+#define PTE_VALID_ARCH(pte)			(*((uint32_t *) (pte)) != 0)
 #define PTE_PRESENT_ARCH(pte)			((pte)->p != 0)
-#define PTE_GET_FRAME_ARCH(pte)			((__address) ((pte)->pfn << 12))
+#define PTE_GET_FRAME_ARCH(pte)			((uintptr_t) ((pte)->pfn << 12))
 #define PTE_WRITABLE_ARCH(pte)			1
 #define PTE_EXECUTABLE_ARCH(pte)		1
Index: arch/ppc64/include/types.h
===================================================================
--- arch/ppc64/include/types.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/include/types.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,20 +38,20 @@
 #define NULL 0
 
-typedef signed char __s8;
-typedef signed short __s16;
-typedef signed int __s32;
-typedef signed long __s64;
+typedef signed char int8_t;
+typedef signed short int16_t;
+typedef signed int int32_t;
+typedef signed long int64_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 pfn_t;
+typedef uint64_t uintptr_t;
+typedef uint64_t pfn_t;
 
-typedef __u64 ipl_t;
+typedef uint64_t ipl_t;
 
-typedef __u64 __native;
+typedef uint64_t unative_t;
 
 /** Page Table Entry. */
Index: arch/ppc64/src/ddi/ddi.c
===================================================================
--- arch/ppc64/src/ddi/ddi.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/src/ddi/ddi.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -48,5 +48,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
 	return 0;
Index: arch/ppc64/src/interrupt.c
===================================================================
--- arch/ppc64/src/interrupt.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/src/interrupt.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -66,5 +66,5 @@
 
 /* Reregister irq to be IPC-ready */
-void irq_ipc_bind_arch(__native irq)
+void irq_ipc_bind_arch(unative_t irq)
 {
 	panic("not implemented\n");
Index: arch/ppc64/src/mm/frame.c
===================================================================
--- arch/ppc64/src/mm/frame.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/src/mm/frame.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,5 +40,5 @@
 #include <macros.h>
 
-__address last_frame = 0;
+uintptr_t last_frame = 0;
 
 void frame_arch_init(void)
Index: arch/ppc64/src/mm/page.c
===================================================================
--- arch/ppc64/src/mm/page.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/src/mm/page.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -66,5 +66,5 @@
  *
  */
-static pte_t *find_mapping_and_check(as_t *as, bool lock, __address badvaddr, int access,
+static pte_t *find_mapping_and_check(as_t *as, bool lock, uintptr_t badvaddr, int access,
 				     istate_t *istate, int *pfrc)
 {
@@ -114,5 +114,5 @@
 
 
-static void pht_refill_fail(__address badvaddr, istate_t *istate)
+static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
 {
 	char *symbol = "";
@@ -129,9 +129,9 @@
 
 
-static void pht_insert(const __address vaddr, const pfn_t pfn)
-{
-	__u32 page = (vaddr >> 12) & 0xffff;
-	__u32 api = (vaddr >> 22) & 0x3f;
-	__u32 vsid;
+static void pht_insert(const uintptr_t vaddr, const pfn_t pfn)
+{
+	uint32_t page = (vaddr >> 12) & 0xffff;
+	uint32_t api = (vaddr >> 22) & 0x3f;
+	uint32_t vsid;
 	
 	asm volatile (
@@ -142,8 +142,8 @@
 	
 	/* Primary hash (xor) */
-	__u32 h = 0;
-	__u32 hash = vsid ^ page;
-	__u32 base = (hash & 0x3ff) << 3;
-	__u32 i;
+	uint32_t h = 0;
+	uint32_t hash = vsid ^ page;
+	uint32_t base = (hash & 0x3ff) << 3;
+	uint32_t i;
 	bool found = false;
 	
@@ -159,5 +159,5 @@
 	if (!found) {
 		/* Secondary hash (not) */
-		__u32 base2 = (~hash & 0x3ff) << 3;
+		uint32_t base2 = (~hash & 0x3ff) << 3;
 		
 		/* Find unused or colliding
@@ -197,5 +197,5 @@
 void pht_refill(bool data, istate_t *istate)
 {
-	__address badvaddr;
+	uintptr_t badvaddr;
 	pte_t *pte;
 	int pfrc;
@@ -253,5 +253,5 @@
 void pht_init(void)
 {
-	memsetb((__address) phte, 1 << PHT_BITS, 0);
+	memsetb((uintptr_t) phte, 1 << PHT_BITS, 0);
 }
 
@@ -262,5 +262,5 @@
 		page_mapping_operations = &pt_mapping_operations;
 		
-		__address cur;
+		uintptr_t cur;
 		int flags;
 		
@@ -277,5 +277,5 @@
 		phte_t *physical_phte = (phte_t *) frame_alloc(PHT_ORDER, FRAME_KA | FRAME_ATOMIC);
 		
-		ASSERT((__address) physical_phte % (1 << PHT_BITS) == 0);
+		ASSERT((uintptr_t) physical_phte % (1 << PHT_BITS) == 0);
 		pht_init();
 		
@@ -283,5 +283,5 @@
 			"mtsdr1 %0\n"
 			:
-			: "r" ((__address) physical_phte)
+			: "r" ((uintptr_t) physical_phte)
 		);
 	}
@@ -289,10 +289,10 @@
 
 
-__address hw_map(__address physaddr, size_t size)
+uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
 	if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
 		panic("Unable to map physical memory %p (%d bytes)", physaddr, size)
 	
-	__address virtaddr = PA2KA(last_frame);
+	uintptr_t virtaddr = PA2KA(last_frame);
 	pfn_t i;
 	for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
Index: arch/ppc64/src/mm/tlb.c
===================================================================
--- arch/ppc64/src/mm/tlb.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/src/mm/tlb.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -71,5 +71,5 @@
  * @param cnt Number of entries to invalidate.
  */
-void tlb_invalidate_pages(asid_t asid, __address page, count_t cnt)
+void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
 {
 	tlb_invalidate_all();
Index: arch/ppc64/src/ppc64.c
===================================================================
--- arch/ppc64/src/ppc64.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/ppc64/src/ppc64.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -49,5 +49,5 @@
 	init.cnt = bootinfo.taskmap.count;
 	
-	__u32 i;
+	uint32_t i;
 	
 	for (i = 0; i < bootinfo.taskmap.count; i++) {
@@ -91,5 +91,5 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
-	userspace_asm((__address) kernel_uarg->uspace_uarg, (__address) kernel_uarg->uspace_stack + THREAD_STACK_SIZE - SP_DELTA, (__address) kernel_uarg->uspace_entry);
+	userspace_asm((uintptr_t) kernel_uarg->uspace_uarg, (uintptr_t) kernel_uarg->uspace_stack + THREAD_STACK_SIZE - SP_DELTA, (uintptr_t) kernel_uarg->uspace_entry);
 	
 	/* Unreachable */
Index: arch/sparc64/include/asm.h
===================================================================
--- arch/sparc64/include/asm.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/asm.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -45,7 +45,7 @@
  * @return Value of PSTATE register.
  */
-static inline __u64 pstate_read(void)
-{
-	__u64 v;
+static inline uint64_t pstate_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("rdpr %%pstate, %0\n" : "=r" (v));
@@ -58,5 +58,5 @@
  * @param v New value of PSTATE register.
  */
-static inline void pstate_write(__u64 v)
+static inline void pstate_write(uint64_t v)
 {
 	__asm__ volatile ("wrpr %0, %1, %%pstate\n" : : "r" (v), "i" (0));
@@ -67,7 +67,7 @@
  * @return Value of TICK_comapre register.
  */
-static inline __u64 tick_compare_read(void)
-{
-	__u64 v;
+static inline uint64_t tick_compare_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("rd %%tick_cmpr, %0\n" : "=r" (v));
@@ -80,5 +80,5 @@
  * @param v New value of TICK_comapre register.
  */
-static inline void tick_compare_write(__u64 v)
+static inline void tick_compare_write(uint64_t v)
 {
 	__asm__ volatile ("wr %0, %1, %%tick_cmpr\n" : : "r" (v), "i" (0));
@@ -89,7 +89,7 @@
  * @return Value of TICK register.
  */
-static inline __u64 tick_read(void)
-{
-	__u64 v;
+static inline uint64_t tick_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("rdpr %%tick, %0\n" : "=r" (v));
@@ -102,5 +102,5 @@
  * @param v New value of TICK register.
  */
-static inline void tick_write(__u64 v)
+static inline void tick_write(uint64_t v)
 {
 	__asm__ volatile ("wrpr %0, %1, %%tick\n" : : "r" (v), "i" (0));
@@ -111,7 +111,7 @@
  * @return Value of SOFTINT register.
  */
-static inline __u64 softint_read(void)
-{
-	__u64 v;
+static inline uint64_t softint_read(void)
+{
+	uint64_t v;
 
 	__asm__ volatile ("rd %%softint, %0\n" : "=r" (v));
@@ -124,5 +124,5 @@
  * @param v New value of SOFTINT register.
  */
-static inline void softint_write(__u64 v)
+static inline void softint_write(uint64_t v)
 {
 	__asm__ volatile ("wr %0, %1, %%softint\n" : : "r" (v), "i" (0));
@@ -135,5 +135,5 @@
  * @param v New value of CLEAR_SOFTINT register.
  */
-static inline void clear_softint_write(__u64 v)
+static inline void clear_softint_write(uint64_t v)
 {
 	__asm__ volatile ("wr %0, %1, %%clear_softint\n" : : "r" (v), "i" (0));
@@ -149,5 +149,5 @@
 static inline ipl_t interrupts_enable(void) {
 	pstate_reg_t pstate;
-	__u64 value;
+	uint64_t value;
 	
 	value = pstate_read();
@@ -168,5 +168,5 @@
 static inline ipl_t interrupts_disable(void) {
 	pstate_reg_t pstate;
-	__u64 value;
+	uint64_t value;
 	
 	value = pstate_read();
@@ -208,7 +208,7 @@
  * The stack must start on page boundary.
  */
-static inline __address get_stack_base(void)
-{
-	__address v;
+static inline uintptr_t get_stack_base(void)
+{
+	uintptr_t v;
 	
 	__asm__ volatile ("and %%sp, %1, %0\n" : "=r" (v) : "r" (~(STACK_SIZE-1)));
@@ -221,7 +221,7 @@
  * @return Value of VER register.
  */
-static inline __u64 ver_read(void)
-{
-	__u64 v;
+static inline uint64_t ver_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("rdpr %%ver, %0\n" : "=r" (v));
@@ -234,7 +234,7 @@
  * @return Current value in TBA.
  */
-static inline __u64 tba_read(void)
-{
-	__u64 v;
+static inline uint64_t tba_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("rdpr %%tba, %0\n" : "=r" (v));
@@ -247,7 +247,7 @@
  * @return Current value in TPC.
  */
-static inline __u64 tpc_read(void)
-{
-	__u64 v;
+static inline uint64_t tpc_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("rdpr %%tpc, %0\n" : "=r" (v));
@@ -260,7 +260,7 @@
  * @return Current value in TL.
  */
-static inline __u64 tl_read(void)
-{
-	__u64 v;
+static inline uint64_t tl_read(void)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("rdpr %%tl, %0\n" : "=r" (v));
@@ -273,10 +273,10 @@
  * @param v New value of TBA.
  */
-static inline void tba_write(__u64 v)
+static inline void tba_write(uint64_t v)
 {
 	__asm__ volatile ("wrpr %0, %1, %%tba\n" : : "r" (v), "i" (0));
 }
 
-/** Load __u64 from alternate space.
+/** Load uint64_t from alternate space.
  *
  * @param asi ASI determining the alternate space.
@@ -285,7 +285,7 @@
  * @return Value read from the virtual address in the specified address space.
  */
-static inline __u64 asi_u64_read(asi_t asi, __address va)
-{
-	__u64 v;
+static inline uint64_t asi_u64_read(asi_t asi, uintptr_t va)
+{
+	uint64_t v;
 	
 	__asm__ volatile ("ldxa [%1] %2, %0\n" : "=r" (v) : "r" (va), "i" (asi));
@@ -294,5 +294,5 @@
 }
 
-/** Store __u64 to alternate space.
+/** Store uint64_t to alternate space.
  *
  * @param asi ASI determining the alternate space.
@@ -300,5 +300,5 @@
  * @param v Value to be written.
  */
-static inline void asi_u64_write(asi_t asi, __address va, __u64 v)
+static inline void asi_u64_write(asi_t asi, uintptr_t va, uint64_t v)
 {
 	__asm__ volatile ("stxa %0, [%1] %2\n" : :  "r" (v), "r" (va), "i" (asi) : "memory");
@@ -309,5 +309,5 @@
 void cpu_halt(void);
 void cpu_sleep(void);
-void asm_delay_loop(__u32 t);
+void asm_delay_loop(uint32_t t);
 
 #endif
Index: arch/sparc64/include/atomic.h
===================================================================
--- arch/sparc64/include/atomic.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/atomic.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -50,6 +50,6 @@
 static inline long atomic_add(atomic_t *val, int i)
 {
-	__u64 a, b;
-	volatile __u64 x = (__u64) &val->count;
+	uint64_t a, b;
+	volatile uint64_t x = (uint64_t) &val->count;
 
 	__asm__ volatile (
@@ -61,5 +61,5 @@
 		"bne 0b\n"		/* The operation failed and must be attempted again if a != b. */
 		"nop\n"
-		: "=m" (*((__u64 *)x)), "=r" (a), "=r" (b)
+		: "=m" (*((uint64_t *)x)), "=r" (a), "=r" (b)
 		: "r" (i)
 	);
Index: arch/sparc64/include/byteorder.h
===================================================================
--- arch/sparc64/include/byteorder.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/byteorder.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -39,12 +39,12 @@
 #include <byteorder.h>
 
-static inline __u64 __u64_le2host(__u64 n)
+static inline uint64_t uint64_t_le2host(uint64_t n)
 {
-	return __u64_byteorder_swap(n);
+	return uint64_t_byteorder_swap(n);
 }
 
-static inline __native __native_le2host(__native n)
+static inline unative_t unative_t_le2host(unative_t n)
 {
-	return __u64_byteorder_swap(n);
+	return uint64_t_byteorder_swap(n);
 }
 
Index: arch/sparc64/include/context.h
===================================================================
--- arch/sparc64/include/context.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/context.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -55,6 +55,6 @@
 
 #define context_set(c, _pc, stack, size)								\
-        (c)->pc = ((__address) _pc) - 8;								\
-        (c)->sp = ((__address) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);	\
+        (c)->pc = ((uintptr_t) _pc) - 8;								\
+        (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);	\
 	(c)->fp = -STACK_BIAS;										\
 	(c)->cleanwin = 0
@@ -66,24 +66,24 @@
  */
 struct context {
-	__address sp;		/* %o6 */
-	__address pc;		/* %o7 */
-	__u64 i0;
-	__u64 i1;
-	__u64 i2;
-	__u64 i3;
-	__u64 i4;
-	__u64 i5;
-	__address fp;		/* %i6 */
-	__address i7;
-	__u64 l0;
-	__u64 l1;
-	__u64 l2;
-	__u64 l3;
-	__u64 l4;
-	__u64 l5;
-	__u64 l6;
-	__u64 l7;
+	uintptr_t sp;		/* %o6 */
+	uintptr_t pc;		/* %o7 */
+	uint64_t i0;
+	uint64_t i1;
+	uint64_t i2;
+	uint64_t i3;
+	uint64_t i4;
+	uint64_t i5;
+	uintptr_t fp;		/* %i6 */
+	uintptr_t i7;
+	uint64_t l0;
+	uint64_t l1;
+	uint64_t l2;
+	uint64_t l3;
+	uint64_t l4;
+	uint64_t l5;
+	uint64_t l6;
+	uint64_t l7;
 	ipl_t ipl;
-	__u64 cleanwin;
+	uint64_t cleanwin;
 };
 
Index: arch/sparc64/include/drivers/i8042.h
===================================================================
--- arch/sparc64/include/drivers/i8042.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/drivers/i8042.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -46,22 +46,22 @@
 #define LAST_REG	DATA_REG
 
-extern volatile __u8 *kbd_virt_address;
+extern volatile uint8_t *kbd_virt_address;
 
-static inline void i8042_data_write(__u8 data)
+static inline void i8042_data_write(uint8_t data)
 {
 	kbd_virt_address[DATA_REG] = data;
 }
 
-static inline __u8 i8042_data_read(void)
+static inline uint8_t i8042_data_read(void)
 {
 	return kbd_virt_address[DATA_REG];
 }
 
-static inline __u8 i8042_status_read(void)
+static inline uint8_t i8042_status_read(void)
 {
 	return kbd_virt_address[STATUS_REG];
 }
 
-static inline void i8042_command_write(__u8 command)
+static inline void i8042_command_write(uint8_t command)
 {
 	kbd_virt_address[COMMAND_REG] = command;
Index: arch/sparc64/include/faddr.h
===================================================================
--- arch/sparc64/include/faddr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/faddr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,5 +38,5 @@
 #include <arch/types.h>
 
-#define FADDR(fptr)		((__address) (fptr))
+#define FADDR(fptr)		((uintptr_t) (fptr))
 
 #endif
Index: arch/sparc64/include/interrupt.h
===================================================================
--- arch/sparc64/include/interrupt.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/interrupt.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -55,5 +55,5 @@
 };
 
-static inline void istate_set_retaddr(istate_t *istate, __address retaddr)
+static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
 {
 	/* TODO */
@@ -64,5 +64,5 @@
 	return 0;
 }
-static inline __native istate_get_pc(istate_t *istate)
+static inline unative_t istate_get_pc(istate_t *istate)
 {
 	/* TODO */
Index: arch/sparc64/include/memstr.h
===================================================================
--- arch/sparc64/include/memstr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/memstr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,8 +38,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(__address dst, size_t cnt, __u16 x);
-extern void memsetb(__address dst, size_t cnt, __u8 x);
+extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
+extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
 
-extern int memcmp(__address src, __address dst, int cnt);
+extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
 
 #endif
Index: arch/sparc64/include/mm/asid.h
===================================================================
--- arch/sparc64/include/mm/asid.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/mm/asid.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -41,5 +41,5 @@
  * On SPARC, Context means the same thing as ASID trough out the kernel.
  */
-typedef __u16 asid_t;
+typedef uint16_t asid_t;
 
 #define ASID_MAX_ARCH		8191	/* 2^13 - 1 */
Index: arch/sparc64/include/mm/frame.h
===================================================================
--- arch/sparc64/include/mm/frame.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/mm/frame.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -45,8 +45,8 @@
 
 union frame_address {
-	__address address;
+	uintptr_t address;
 	struct {
 		unsigned : 23;
-		__u64 pfn : 28;         /**< Physical Frame Number. */
+		uint64_t pfn : 28;         /**< Physical Frame Number. */
 		unsigned offset : 13;   /**< Offset. */
 	} __attribute__ ((packed));
Index: arch/sparc64/include/mm/mmu.h
===================================================================
--- arch/sparc64/include/mm/mmu.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/mm/mmu.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -83,5 +83,5 @@
 /** LSU Control Register. */
 union lsu_cr_reg {
-	__u64 value;
+	uint64_t value;
 	struct {
 		unsigned : 23;
Index: arch/sparc64/include/mm/page.h
===================================================================
--- arch/sparc64/include/mm/page.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/mm/page.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -47,11 +47,11 @@
 #include <genarch/mm/page_ht.h>
 
-#define KA2PA(x)	((__address) (x))
-#define PA2KA(x)	((__address) (x))
+#define KA2PA(x)	((uintptr_t) (x))
+#define PA2KA(x)	((uintptr_t) (x))
 
 union page_address {
-	__address address;
+	uintptr_t address;
 	struct {
-		__u64 vpn : 51;		/**< Virtual Page Number. */
+		uint64_t vpn : 51;		/**< Virtual Page Number. */
 		unsigned offset : 13;	/**< Offset. */
 	} __attribute__ ((packed));
Index: arch/sparc64/include/mm/tlb.h
===================================================================
--- arch/sparc64/include/mm/tlb.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/mm/tlb.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -57,5 +57,5 @@
 
 union tlb_context_reg {
-	__u64 v;
+	uint64_t v;
 	struct {
 		unsigned long : 51;
@@ -70,7 +70,7 @@
 /** I-/D-TLB Data Access Address in Alternate Space. */
 union tlb_data_access_addr {
-	__u64 value;
+	uint64_t value;
 	struct {
-		__u64 : 55;
+		uint64_t : 55;
 		unsigned tlb_entry : 6;
 		unsigned : 3;
@@ -82,7 +82,7 @@
 /** I-/D-TLB Tag Read Register. */
 union tlb_tag_read_reg {
-	__u64 value;
+	uint64_t value;
 	struct {
-		__u64 vpn : 51;		/**< Virtual Address bits 63:13. */
+		uint64_t vpn : 51;		/**< Virtual Address bits 63:13. */
 		unsigned context : 13;	/**< Context identifier. */
 	} __attribute__ ((packed));
@@ -102,7 +102,7 @@
 /** TLB Demap Operation Address. */
 union tlb_demap_addr {
-	__u64 value;
+	uint64_t value;
 	struct {
-		__u64 vpn: 51;		/**< Virtual Address bits 63:13. */
+		uint64_t vpn: 51;		/**< Virtual Address bits 63:13. */
 		unsigned : 6;		/**< Ignored. */
 		unsigned type : 1;	/**< The type of demap operation. */
@@ -115,5 +115,5 @@
 /** TLB Synchronous Fault Status Register. */
 union tlb_sfsr_reg {
-	__u64 value;
+	uint64_t value;
 	struct {
 		unsigned long : 39;	/**< Implementation dependent. */
@@ -137,5 +137,5 @@
  * @return Current value of Primary Context Register.
  */
-static inline __u64 mmu_primary_context_read(void)
+static inline uint64_t mmu_primary_context_read(void)
 {
 	return asi_u64_read(ASI_DMMU, VA_PRIMARY_CONTEXT_REG);
@@ -146,5 +146,5 @@
  * @param v New value of Primary Context Register.
  */
-static inline void mmu_primary_context_write(__u64 v)
+static inline void mmu_primary_context_write(uint64_t v)
 {
 	asi_u64_write(ASI_DMMU, VA_PRIMARY_CONTEXT_REG, v);
@@ -156,5 +156,5 @@
  * @return Current value of Secondary Context Register.
  */
-static inline __u64 mmu_secondary_context_read(void)
+static inline uint64_t mmu_secondary_context_read(void)
 {
 	return asi_u64_read(ASI_DMMU, VA_SECONDARY_CONTEXT_REG);
@@ -165,5 +165,5 @@
  * @param v New value of Primary Context Register.
  */
-static inline void mmu_secondary_context_write(__u64 v)
+static inline void mmu_secondary_context_write(uint64_t v)
 {
 	asi_u64_write(ASI_DMMU, VA_PRIMARY_CONTEXT_REG, v);
@@ -177,5 +177,5 @@
  * @return Current value of specified IMMU TLB Data Access Register.
  */
-static inline __u64 itlb_data_access_read(index_t entry)
+static inline uint64_t itlb_data_access_read(index_t entry)
 {
 	tlb_data_access_addr_t reg;
@@ -191,5 +191,5 @@
  * @param value Value to be written.
  */
-static inline void itlb_data_access_write(index_t entry, __u64 value)
+static inline void itlb_data_access_write(index_t entry, uint64_t value)
 {
 	tlb_data_access_addr_t reg;
@@ -207,5 +207,5 @@
  * @return Current value of specified DMMU TLB Data Access Register.
  */
-static inline __u64 dtlb_data_access_read(index_t entry)
+static inline uint64_t dtlb_data_access_read(index_t entry)
 {
 	tlb_data_access_addr_t reg;
@@ -221,5 +221,5 @@
  * @param value Value to be written.
  */
-static inline void dtlb_data_access_write(index_t entry, __u64 value)
+static inline void dtlb_data_access_write(index_t entry, uint64_t value)
 {
 	tlb_data_access_addr_t reg;
@@ -237,5 +237,5 @@
  * @return Current value of specified IMMU TLB Tag Read Register.
  */
-static inline __u64 itlb_tag_read_read(index_t entry)
+static inline uint64_t itlb_tag_read_read(index_t entry)
 {
 	tlb_tag_read_addr_t tag;
@@ -252,5 +252,5 @@
  * @return Current value of specified DMMU TLB Tag Read Register.
  */
-static inline __u64 dtlb_tag_read_read(index_t entry)
+static inline uint64_t dtlb_tag_read_read(index_t entry)
 {
 	tlb_tag_read_addr_t tag;
@@ -265,5 +265,5 @@
  * @param v Value to be written.
  */
-static inline void itlb_tag_access_write(__u64 v)
+static inline void itlb_tag_access_write(uint64_t v)
 {
 	asi_u64_write(ASI_IMMU, VA_IMMU_TAG_ACCESS, v);
@@ -275,5 +275,5 @@
  * @return Current value of IMMU TLB Tag Access Register.
  */
-static inline __u64 itlb_tag_access_read(void)
+static inline uint64_t itlb_tag_access_read(void)
 {
 	return asi_u64_read(ASI_IMMU, VA_IMMU_TAG_ACCESS);
@@ -284,5 +284,5 @@
  * @param v Value to be written.
  */
-static inline void dtlb_tag_access_write(__u64 v)
+static inline void dtlb_tag_access_write(uint64_t v)
 {
 	asi_u64_write(ASI_DMMU, VA_DMMU_TAG_ACCESS, v);
@@ -294,5 +294,5 @@
  * @return Current value of DMMU TLB Tag Access Register.
  */
-static inline __u64 dtlb_tag_access_read(void)
+static inline uint64_t dtlb_tag_access_read(void)
 {
 	return asi_u64_read(ASI_DMMU, VA_DMMU_TAG_ACCESS);
@@ -304,5 +304,5 @@
  * @param v Value to be written.
  */
-static inline void itlb_data_in_write(__u64 v)
+static inline void itlb_data_in_write(uint64_t v)
 {
 	asi_u64_write(ASI_ITLB_DATA_IN_REG, 0, v);
@@ -314,5 +314,5 @@
  * @param v Value to be written.
  */
-static inline void dtlb_data_in_write(__u64 v)
+static inline void dtlb_data_in_write(uint64_t v)
 {
 	asi_u64_write(ASI_DTLB_DATA_IN_REG, 0, v);
@@ -324,5 +324,5 @@
  * @return Current content of I-SFSR register.
  */
-static inline __u64 itlb_sfsr_read(void)
+static inline uint64_t itlb_sfsr_read(void)
 {
 	return asi_u64_read(ASI_IMMU, VA_IMMU_SFSR);
@@ -333,5 +333,5 @@
  * @param v New value of I-SFSR register.
  */
-static inline void itlb_sfsr_write(__u64 v)
+static inline void itlb_sfsr_write(uint64_t v)
 {
 	asi_u64_write(ASI_IMMU, VA_IMMU_SFSR, v);
@@ -343,5 +343,5 @@
  * @return Current content of D-SFSR register.
  */
-static inline __u64 dtlb_sfsr_read(void)
+static inline uint64_t dtlb_sfsr_read(void)
 {
 	return asi_u64_read(ASI_DMMU, VA_DMMU_SFSR);
@@ -352,5 +352,5 @@
  * @param v New value of D-SFSR register.
  */
-static inline void dtlb_sfsr_write(__u64 v)
+static inline void dtlb_sfsr_write(uint64_t v)
 {
 	asi_u64_write(ASI_DMMU, VA_DMMU_SFSR, v);
@@ -362,5 +362,5 @@
  * @return Current content of D-SFAR register.
  */
-static inline __u64 dtlb_sfar_read(void)
+static inline uint64_t dtlb_sfar_read(void)
 {
 	return asi_u64_read(ASI_DMMU, VA_DMMU_SFAR);
@@ -373,5 +373,5 @@
  * @param page Address which is on the page to be demapped.
  */
-static inline void itlb_demap(int type, int context_encoding, __address page)
+static inline void itlb_demap(int type, int context_encoding, uintptr_t page)
 {
 	tlb_demap_addr_t da;
@@ -395,5 +395,5 @@
  * @param page Address which is on the page to be demapped.
  */
-static inline void dtlb_demap(int type, int context_encoding, __address page)
+static inline void dtlb_demap(int type, int context_encoding, uintptr_t page)
 {
 	tlb_demap_addr_t da;
@@ -415,5 +415,5 @@
 extern void fast_data_access_protection(void);
 
-extern void dtlb_insert_mapping(__address page, __address frame, int pagesize, bool locked, bool cacheable);
+extern void dtlb_insert_mapping(uintptr_t page, uintptr_t frame, int pagesize, bool locked, bool cacheable);
 
 #endif
Index: arch/sparc64/include/mm/tte.h
===================================================================
--- arch/sparc64/include/mm/tte.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/mm/tte.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,5 +40,5 @@
 /** Translation Table Entry - Tag. */
 union tte_tag {
-	__u64 value;
+	uint64_t value;
 	struct {
 		unsigned g : 1;		/**< Global. */
@@ -46,5 +46,5 @@
 		unsigned context : 13;	/**< Context identifier. */
 		unsigned : 6;		/**< Reserved. */
-		__u64 va_tag : 42;	/**< Virtual Address Tag, bits 63:22. */
+		uint64_t va_tag : 42;	/**< Virtual Address Tag, bits 63:22. */
 	} __attribute__ ((packed));
 };
@@ -54,5 +54,5 @@
 /** Translation Table Entry - Data. */
 union tte_data {
-	__u64 value;
+	uint64_t value;
 	struct {
 		unsigned v : 1;		/**< Valid. */
Index: arch/sparc64/include/register.h
===================================================================
--- arch/sparc64/include/register.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/register.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,11 +40,11 @@
 /** Version Register. */
 union ver_reg {
-	__u64 value;
+	uint64_t value;
 	struct {
-		__u16 manuf;	/**< Manufacturer code. */
-		__u16 impl;	/**< Implementation code. */
-		__u8 mask;	/**< Mask set revision. */
+		uint16_t manuf;	/**< Manufacturer code. */
+		uint16_t impl;	/**< Implementation code. */
+		uint8_t mask;	/**< Mask set revision. */
 		unsigned : 8;
-		__u8 maxtl;
+		uint8_t maxtl;
 		unsigned : 3;
 		unsigned maxwin : 5;
@@ -55,7 +55,7 @@
 /** Processor State Register. */
 union pstate_reg {
-	__u64 value;
+	uint64_t value;
 	struct {
-		__u64 : 52;
+		uint64_t : 52;
 		unsigned ig : 1;	/**< Interrupt Globals. */
 		unsigned mg : 1;	/**< MMU Globals. */
@@ -75,8 +75,8 @@
 /** TICK Register. */
 union tick_reg {
-	__u64 value;
+	uint64_t value;
 	struct {
 		unsigned npt : 1;	/**< Non-privileged Trap enable. */
-		__u64 counter : 63;	/**< Elapsed CPU clck cycle counter. */
+		uint64_t counter : 63;	/**< Elapsed CPU clck cycle counter. */
 	} __attribute__ ((packed));
 };
@@ -85,8 +85,8 @@
 /** TICK_compare Register. */
 union tick_compare_reg {
-	__u64 value;
+	uint64_t value;
 	struct {
 		unsigned int_dis : 1;	/**< TICK_INT interrupt disabled flag. */
-		__u64 tick_cmpr : 63;	/**< Compare value for TICK interrupts. */
+		uint64_t tick_cmpr : 63;	/**< Compare value for TICK interrupts. */
 	} __attribute__ ((packed));
 };
@@ -95,7 +95,7 @@
 /** SOFTINT Register. */
 union softint_reg {
-	__u64 value;
+	uint64_t value;
 	struct {
-		__u64 : 47; 
+		uint64_t : 47; 
 		unsigned stick_int : 1;
 		unsigned int_level : 15;
Index: arch/sparc64/include/trap/trap.h
===================================================================
--- arch/sparc64/include/trap/trap.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/trap/trap.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -43,5 +43,5 @@
 {
 	/* Point TBA to kernel copy of OFW's trap table. */
-	tba_write((__u64) trap_table);
+	tba_write((uint64_t) trap_table);
 }
 
Index: arch/sparc64/include/trap/trap_table.h
===================================================================
--- arch/sparc64/include/trap/trap_table.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/trap/trap_table.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -48,5 +48,5 @@
 #ifndef __ASM__
 struct trap_table_entry {
-	__u8 octets[TRAP_TABLE_ENTRY_SIZE];
+	uint8_t octets[TRAP_TABLE_ENTRY_SIZE];
 } __attribute__ ((packed));
 
Index: arch/sparc64/include/types.h
===================================================================
--- arch/sparc64/include/types.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/include/types.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,25 +38,25 @@
 #define NULL	0
 
-typedef signed char __s8;
-typedef signed short __s16;
-typedef signed int __s32;
-typedef signed long __s64;
+typedef signed char int8_t;
+typedef signed short int16_t;
+typedef signed int int32_t;
+typedef signed long int64_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 pfn_t;
+typedef uint64_t uintptr_t;
+typedef uint64_t pfn_t;
 
-typedef __u64 ipl_t;
+typedef uint64_t ipl_t;
 
-typedef __u64 __native;
-typedef __s64 __snative;
+typedef uint64_t unative_t;
+typedef int64_t native_t;
 
 typedef struct pte pte_t;
 
-typedef __u8 asi_t;
+typedef uint8_t asi_t;
 
 #endif
Index: arch/sparc64/src/ddi/ddi.c
===================================================================
--- arch/sparc64/src/ddi/ddi.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/src/ddi/ddi.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -48,5 +48,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
 	return 0;
Index: arch/sparc64/src/drivers/i8042.c
===================================================================
--- arch/sparc64/src/drivers/i8042.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/src/drivers/i8042.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,9 +38,9 @@
 #include <arch/mm/page.h>
 
-volatile __u8 *kbd_virt_address = NULL;
+volatile uint8_t *kbd_virt_address = NULL;
 
 void kbd_init()
 {
-	kbd_virt_address = (__u8 *) hw_map(KBD_PHYS_ADDRESS, LAST_REG);
+	kbd_virt_address = (uint8_t *) hw_map(KBD_PHYS_ADDRESS, LAST_REG);
 	i8042_init();
 }
Index: arch/sparc64/src/mm/page.c
===================================================================
--- arch/sparc64/src/mm/page.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/src/mm/page.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -45,5 +45,5 @@
 }
 
-__address hw_map(__address physaddr, size_t size)
+uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
 	unsigned int order;
@@ -74,5 +74,5 @@
 		order = (fnzb32(size - 1) + 1) - FRAME_WIDTH;
 	
-	__address virtaddr = (__address) frame_alloc(order, FRAME_KA);
+	uintptr_t virtaddr = (uintptr_t) frame_alloc(order, FRAME_KA);
 
 	for (i = 0; i < sizemap[order].count; i++)
Index: arch/sparc64/src/mm/tlb.c
===================================================================
--- arch/sparc64/src/mm/tlb.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/src/mm/tlb.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -132,5 +132,5 @@
  * @param cacheable True if the mapping is cacheable, false otherwise.
  */
-void dtlb_insert_mapping(__address page, __address frame, int pagesize, bool locked, bool cacheable)
+void dtlb_insert_mapping(uintptr_t page, uintptr_t frame, int pagesize, bool locked, bool cacheable)
 {
 	tlb_tag_access_reg_t tag;
@@ -171,5 +171,5 @@
 {
 	tlb_tag_access_reg_t tag;
-	__address tpc;
+	uintptr_t tpc;
 	char *tpc_str;
 
@@ -269,5 +269,5 @@
  * @param cnt Number of ITLB and DTLB entries to invalidate.
  */
-void tlb_invalidate_pages(asid_t asid, __address page, count_t cnt)
+void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
 {
 	int i;
Index: arch/sparc64/src/proc/scheduler.c
===================================================================
--- arch/sparc64/src/proc/scheduler.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/src/proc/scheduler.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -49,9 +49,9 @@
 void before_thread_runs_arch(void)
 {
-	__address base;
+	uintptr_t base;
 	
 	base = ALIGN_DOWN(config.base, 1<<KERNEL_PAGE_WIDTH);
 
-	if ((__address) THREAD->kstack < base || (__address) THREAD->kstack > base + (1<<KERNEL_PAGE_WIDTH)) {
+	if ((uintptr_t) THREAD->kstack < base || (uintptr_t) THREAD->kstack > base + (1<<KERNEL_PAGE_WIDTH)) {
 		/*
 		 * Kernel stack of this thread is not locked in DTLB.
@@ -59,6 +59,6 @@
 		 * If not, create a locked mapping for it.
 		 */
-		 dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, (__address) THREAD->kstack);
-		 dtlb_insert_mapping((__address) THREAD->kstack, KA2PA(THREAD->kstack), PAGESIZE_8K, true, true);
+		 dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, (uintptr_t) THREAD->kstack);
+		 dtlb_insert_mapping((uintptr_t) THREAD->kstack, KA2PA(THREAD->kstack), PAGESIZE_8K, true, true);
 	}	
 }
@@ -67,14 +67,14 @@
 void after_thread_ran_arch(void)
 {
-	__address base;
+	uintptr_t base;
 
 	base = ALIGN_DOWN(config.base, 1<<KERNEL_PAGE_WIDTH);
 
-	if ((__address) THREAD->kstack < base || (__address) THREAD->kstack > base + (1<<KERNEL_PAGE_WIDTH)) {
+	if ((uintptr_t) THREAD->kstack < base || (uintptr_t) THREAD->kstack > base + (1<<KERNEL_PAGE_WIDTH)) {
 		/*
 		 * Kernel stack of this thread is locked in DTLB.
 		 * Destroy the mapping.
 		 */
-		dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, (__address) THREAD->kstack);
+		dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, (uintptr_t) THREAD->kstack);
 	}
 }
Index: arch/sparc64/src/trap/interrupt.c
===================================================================
--- arch/sparc64/src/trap/interrupt.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ arch/sparc64/src/trap/interrupt.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -53,5 +53,5 @@
 
 /* Reregister irq to be IPC-ready */
-void irq_ipc_bind_arch(__native irq)
+void irq_ipc_bind_arch(unative_t irq)
 {
 	panic("not implemented\n");
Index: genarch/include/acpi/acpi.h
===================================================================
--- genarch/include/acpi/acpi.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/include/acpi/acpi.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,30 +40,30 @@
 /* Root System Description Pointer */
 struct acpi_rsdp {
-	__u8 signature[8];
-	__u8 checksum;
-	__u8 oemid[6];
-	__u8 revision;
-	__u32 rsdt_address;
-	__u32 length;
-	__u64 xsdt_address;
-	__u32 ext_checksum;
-	__u8 reserved[3];
+	uint8_t signature[8];
+	uint8_t checksum;
+	uint8_t oemid[6];
+	uint8_t revision;
+	uint32_t rsdt_address;
+	uint32_t length;
+	uint64_t xsdt_address;
+	uint32_t ext_checksum;
+	uint8_t reserved[3];
 } __attribute__ ((packed));
 
 /* System Description Table Header */
 struct acpi_sdt_header {
-	__u8 signature[4];
-	__u32 length;
-	__u8 revision;
-	__u8 checksum;
-	__u8 oemid[6];
-	__u8 oem_table_id[8];
-	__u32 oem_revision;
-	__u32 creator_id;
-	__u32 creator_revision;
+	uint8_t signature[4];
+	uint32_t length;
+	uint8_t revision;
+	uint8_t checksum;
+	uint8_t oemid[6];
+	uint8_t oem_table_id[8];
+	uint32_t oem_revision;
+	uint32_t creator_id;
+	uint32_t creator_revision;
 } __attribute__ ((packed));;
 
 struct acpi_signature_map {
-	__u8 *signature;
+	uint8_t *signature;
 	struct acpi_sdt_header **sdt_ptr;
 	char *description;
@@ -73,5 +73,5 @@
 struct acpi_rsdt {
 	struct acpi_sdt_header header;
-	__u32 entry[];
+	uint32_t entry[];
 } __attribute__ ((packed));;
 
@@ -79,5 +79,5 @@
 struct acpi_xsdt {
 	struct acpi_sdt_header header;
-	__u64 entry[];
+	uint64_t entry[];
 } __attribute__ ((packed));;
 
@@ -87,5 +87,5 @@
 
 extern void acpi_init(void);
-extern int acpi_sdt_check(__u8 *sdt);
+extern int acpi_sdt_check(uint8_t *sdt);
 
 #endif /* __ACPI_H__ */
Index: genarch/include/acpi/madt.h
===================================================================
--- genarch/include/acpi/madt.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/include/acpi/madt.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -54,6 +54,6 @@
 
 struct madt_apic_header {
-	__u8 type;
-	__u8 length;
+	uint8_t type;
+	uint8_t length;
 } __attribute__ ((packed));
 
@@ -62,6 +62,6 @@
 struct acpi_madt {
 	struct acpi_sdt_header header;
-	__u32 l_apic_address;
-	__u32 flags;
+	uint32_t l_apic_address;
+	uint32_t flags;
 	struct madt_apic_header apic_header[];
 } __attribute__ ((packed));
@@ -69,72 +69,72 @@
 struct madt_l_apic {
 	struct madt_apic_header header;
-	__u8 acpi_id;
-	__u8 apic_id;
-	__u32 flags;	
+	uint8_t acpi_id;
+	uint8_t apic_id;
+	uint32_t flags;	
 } __attribute__ ((packed));
 
 struct madt_io_apic {
 	struct madt_apic_header header;
-	__u8 io_apic_id;
-	__u8 reserved;
-	__u32 io_apic_address;	
-	__u32 global_intr_base;
+	uint8_t io_apic_id;
+	uint8_t reserved;
+	uint32_t io_apic_address;	
+	uint32_t global_intr_base;
 } __attribute__ ((packed));
 
 struct madt_intr_src_ovrd {
 	struct madt_apic_header header;
-	__u8 bus;
-	__u8 source;
-	__u32 global_int;
-	__u16 flags;
+	uint8_t bus;
+	uint8_t source;
+	uint32_t global_int;
+	uint16_t flags;
 } __attribute__ ((packed));
 
 struct madt_nmi_src {
 	struct madt_apic_header header;
-	__u16 flags;
-	__u32 global_intr;
+	uint16_t flags;
+	uint32_t global_intr;
 } __attribute__ ((packed));
 
 struct madt_l_apic_nmi {
 	struct madt_apic_header header;
-	__u8 acpi_id;
-	__u16 flags;
-	__u8 l_apic_lint;
+	uint8_t acpi_id;
+	uint16_t flags;
+	uint8_t l_apic_lint;
 } __attribute__ ((packed));
 
 struct madt_l_apic_addr_ovrd {
 	struct madt_apic_header header;
-	__u16 reserved;
-	__u64 l_apic_address;
+	uint16_t reserved;
+	uint64_t l_apic_address;
 } __attribute__ ((packed));
 
 struct madt_io_sapic {
 	struct madt_apic_header header;
-	__u8 io_apic_id;
-	__u8 reserved;
-	__u32 global_intr_base;
-	__u64 io_apic_address;		
+	uint8_t io_apic_id;
+	uint8_t reserved;
+	uint32_t global_intr_base;
+	uint64_t io_apic_address;		
 } __attribute__ ((packed));
 
 struct madt_l_sapic {
 	struct madt_apic_header header;
-	__u8 acpi_id;
-	__u8 sapic_id;
-	__u8 sapic_eid;
-	__u8 reserved[3];
-	__u32 flags;
-	__u32 acpi_processor_uid_value;
-	__u8 acpi_processor_uid_str[1];
+	uint8_t acpi_id;
+	uint8_t sapic_id;
+	uint8_t sapic_eid;
+	uint8_t reserved[3];
+	uint32_t flags;
+	uint32_t acpi_processor_uid_value;
+	uint8_t acpi_processor_uid_str[1];
 } __attribute__ ((packed));
 
 struct madt_platform_intr_src {
 	struct madt_apic_header header;
-	__u16 flags;
-	__u8 intr_type;
-	__u8 processor_id;
-	__u8 processor_eid;
-	__u8 io_sapic_vector;
-	__u32 global_intr;
-	__u32 platform_intr_src_flags;
+	uint16_t flags;
+	uint8_t intr_type;
+	uint8_t processor_id;
+	uint8_t processor_eid;
+	uint8_t io_sapic_vector;
+	uint32_t global_intr;
+	uint32_t platform_intr_src_flags;
 } __attribute__ ((packed));
 
Index: genarch/include/fb/fb.h
===================================================================
--- genarch/include/fb/fb.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/include/fb/fb.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,5 +40,5 @@
 
 extern spinlock_t fb_lock;
-void fb_init(__address addr, unsigned int x, unsigned int y, unsigned int bpp, unsigned int scan);
+void fb_init(uintptr_t addr, unsigned int x, unsigned int y, unsigned int bpp, unsigned int scan);
 
 #endif
Index: genarch/include/mm/page_ht.h
===================================================================
--- genarch/include/mm/page_ht.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/include/mm/page_ht.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -67,6 +67,6 @@
 	link_t link;		/**< Page hash table link. */
 	as_t *as;		/**< Address space. */
-	__address page;		/**< Virtual memory page. */
-	__address frame;	/**< Physical memory frame. */
+	uintptr_t page;		/**< Virtual memory page. */
+	uintptr_t frame;	/**< Physical memory frame. */
 	unsigned g : 1;		/**< Global page. */
 	unsigned x : 1;		/**< Execute. */
Index: genarch/include/mm/page_pt.h
===================================================================
--- genarch/include/mm/page_pt.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/include/mm/page_pt.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -110,6 +110,6 @@
 extern page_mapping_operations_t pt_mapping_operations;
 
-extern void page_mapping_insert_pt(as_t *as, __address page, __address frame, int flags);
-extern pte_t *page_mapping_find_pt(as_t *as, __address page);
+extern void page_mapping_insert_pt(as_t *as, uintptr_t page, uintptr_t frame, int flags);
+extern pte_t *page_mapping_find_pt(as_t *as, uintptr_t page);
 
 #endif
Index: genarch/include/ofw/ofw.h
===================================================================
--- genarch/include/ofw/ofw.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/include/ofw/ofw.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,5 +40,5 @@
 #define MAX_OFW_ARGS	10
 
-typedef __native ofw_arg_t;
+typedef unative_t ofw_arg_t;
 typedef int ihandle;
 typedef int phandle;
@@ -49,6 +49,6 @@
 typedef struct {
 	const char *service;          /**< Command name */
-	__native nargs;               /**< Number of in arguments */
-	__native nret;                /**< Number of out arguments */
+	unative_t nargs;               /**< Number of in arguments */
+	unative_t nret;                /**< Number of out arguments */
 	ofw_arg_t args[MAX_OFW_ARGS]; /**< List of arguments */
 } ofw_args_t;
@@ -60,5 +60,5 @@
 extern void ofw_init(void);
 extern void ofw_done(void);
-extern __native ofw_call(const char *service, const int nargs, const int nret, ...);
+extern unative_t ofw_call(const char *service, const int nargs, const int nret, ...);
 extern void ofw_putchar(const char ch);
 extern char ofw_getchar(void);
Index: genarch/src/acpi/acpi.c
===================================================================
--- genarch/src/acpi/acpi.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/src/acpi/acpi.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -52,10 +52,10 @@
 
 struct acpi_signature_map signature_map[] = { 
-	{ (__u8 *)"APIC", (void *) &acpi_madt, "Multiple APIC Description Table" }
+	{ (uint8_t *)"APIC", (void *) &acpi_madt, "Multiple APIC Description Table" }
 };
 
-static int rsdp_check(__u8 *rsdp) {
+static int rsdp_check(uint8_t *rsdp) {
 	struct acpi_rsdp *r = (struct acpi_rsdp *) rsdp;
-	__u8 sum = 0;
+	uint8_t sum = 0;
 	int i;
 	
@@ -76,8 +76,8 @@
 }
 
-int acpi_sdt_check(__u8 *sdt)
+int acpi_sdt_check(uint8_t *sdt)
 {
 	struct acpi_sdt_header *h = (struct acpi_sdt_header *) sdt;
-	__u8 sum = 0;
+	uint8_t sum = 0;
 	int i;
 
@@ -90,19 +90,19 @@
 static void map_sdt(struct acpi_sdt_header *sdt)
 {
-	page_mapping_insert(AS_KERNEL, (__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE);
-	map_structure((__address) sdt, sdt->length);
+	page_mapping_insert(AS_KERNEL, (uintptr_t) sdt, (uintptr_t) sdt, PAGE_NOT_CACHEABLE);
+	map_structure((uintptr_t) sdt, sdt->length);
 }
 
 static void configure_via_rsdt(void)
 {
-	int i, j, cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header))/sizeof(__u32);
+	int i, j, cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header))/sizeof(uint32_t);
 	
 	for (i=0; i<cnt; i++) {
 		for (j=0; j<sizeof(signature_map)/sizeof(struct acpi_signature_map); j++) {
-			struct acpi_sdt_header *h = (struct acpi_sdt_header *) (__native) acpi_rsdt->entry[i];
+			struct acpi_sdt_header *h = (struct acpi_sdt_header *) (unative_t) acpi_rsdt->entry[i];
 		
 			map_sdt(h);	
-			if (*((__u32 *) &h->signature[0])==*((__u32 *) &signature_map[j].signature[0])) {
-				if (!acpi_sdt_check((__u8 *) h))
+			if (*((uint32_t *) &h->signature[0])==*((uint32_t *) &signature_map[j].signature[0])) {
+				if (!acpi_sdt_check((uint8_t *) h))
 					goto next;
 				*signature_map[j].sdt_ptr = h;
@@ -117,13 +117,13 @@
 static void configure_via_xsdt(void)
 {
-	int i, j, cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header))/sizeof(__u64);
+	int i, j, cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header))/sizeof(uint64_t);
 	
 	for (i=0; i<cnt; i++) {
 		for (j=0; j<sizeof(signature_map)/sizeof(struct acpi_signature_map); j++) {
-			struct acpi_sdt_header *h = (struct acpi_sdt_header *) ((__address) acpi_rsdt->entry[i]);
+			struct acpi_sdt_header *h = (struct acpi_sdt_header *) ((uintptr_t) acpi_rsdt->entry[i]);
 
 			map_sdt(h);
-			if (*((__u32 *) &h->signature[0])==*((__u32 *) &signature_map[j].signature[0])) {
-				if (!acpi_sdt_check((__u8 *) h))
+			if (*((uint32_t *) &h->signature[0])==*((uint32_t *) &signature_map[j].signature[0])) {
+				if (!acpi_sdt_check((uint8_t *) h))
 					goto next;
 				*signature_map[j].sdt_ptr = h;
@@ -139,7 +139,7 @@
 void acpi_init(void)
 {
-	__u8 *addr[2] = { NULL, (__u8 *) PA2KA(0xe0000) };
+	uint8_t *addr[2] = { NULL, (uint8_t *) PA2KA(0xe0000) };
 	int i, j, length[2] = { 1024, 128*1024 };
-	__u64 *sig = (__u64 *) RSDP_SIGNATURE;
+	uint64_t *sig = (uint64_t *) RSDP_SIGNATURE;
 
 	/*
@@ -149,8 +149,8 @@
 	 */
 
-	addr[0] = (__u8 *) PA2KA(ebda);
+	addr[0] = (uint8_t *) PA2KA(ebda);
 	for (i = (ebda ? 0 : 1); i < 2; i++) {
 		for (j = 0; j < length[i]; j += 16) {
-			if (*((__u64 *) &addr[i][j]) == *sig && rsdp_check(&addr[i][j])) {
+			if (*((uint64_t *) &addr[i][j]) == *sig && rsdp_check(&addr[i][j])) {
 				acpi_rsdp = (struct acpi_rsdp *) &addr[i][j];
 				goto rsdp_found;
@@ -164,15 +164,15 @@
 	printf("%#zx: ACPI Root System Description Pointer\n", acpi_rsdp);
 
-	acpi_rsdt = (struct acpi_rsdt *) (__native) acpi_rsdp->rsdt_address;
-	if (acpi_rsdp->revision) acpi_xsdt = (struct acpi_xsdt *) ((__address) acpi_rsdp->xsdt_address);
+	acpi_rsdt = (struct acpi_rsdt *) (unative_t) acpi_rsdp->rsdt_address;
+	if (acpi_rsdp->revision) acpi_xsdt = (struct acpi_xsdt *) ((uintptr_t) acpi_rsdp->xsdt_address);
 
 	if (acpi_rsdt) map_sdt((struct acpi_sdt_header *) acpi_rsdt);
 	if (acpi_xsdt) map_sdt((struct acpi_sdt_header *) acpi_xsdt);	
 
-	if (acpi_rsdt && !acpi_sdt_check((__u8 *) acpi_rsdt)) {
+	if (acpi_rsdt && !acpi_sdt_check((uint8_t *) acpi_rsdt)) {
 		printf("RSDT: %s\n", "bad checksum");
 		return;
 	}
-	if (acpi_xsdt && !acpi_sdt_check((__u8 *) acpi_xsdt)) {
+	if (acpi_xsdt && !acpi_sdt_check((uint8_t *) acpi_xsdt)) {
 		printf("XSDT: %s\n", "bad checksum");
 		return;
Index: genarch/src/acpi/madt.c
===================================================================
--- genarch/src/acpi/madt.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/src/acpi/madt.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -56,7 +56,7 @@
 int isa_irq_map[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
 
-static void madt_l_apic_entry(struct madt_l_apic *la, __u32 index);
-static void madt_io_apic_entry(struct madt_io_apic *ioa, __u32 index);
-static void madt_intr_src_ovrd_entry(struct madt_intr_src_ovrd *override, __u32 index);
+static void madt_l_apic_entry(struct madt_l_apic *la, uint32_t index);
+static void madt_io_apic_entry(struct madt_io_apic *ioa, uint32_t index);
+static void madt_intr_src_ovrd_entry(struct madt_intr_src_ovrd *override, uint32_t index);
 static int madt_cmp(void * a, void * b);
 
@@ -91,5 +91,5 @@
 static bool madt_cpu_enabled(index_t i);
 static bool madt_cpu_bootstrap(index_t i);
-static __u8 madt_cpu_apic_id(index_t i);
+static uint8_t madt_cpu_apic_id(index_t i);
 static int madt_irq_to_pin(int irq);
 
@@ -120,5 +120,5 @@
 }
 
-__u8 madt_cpu_apic_id(index_t i)
+uint8_t madt_cpu_apic_id(index_t i)
 {
 	ASSERT(i < madt_l_apic_entry_cnt);
@@ -142,11 +142,11 @@
 void acpi_madt_parse(void)
 {
-	struct madt_apic_header *end = (struct madt_apic_header *) (((__u8 *) acpi_madt) + acpi_madt->header.length);
+	struct madt_apic_header *end = (struct madt_apic_header *) (((uint8_t *) acpi_madt) + acpi_madt->header.length);
 	struct madt_apic_header *h;
 	
-        l_apic = (__u32 *) (__native) acpi_madt->l_apic_address;
+        l_apic = (uint32_t *) (unative_t) acpi_madt->l_apic_address;
 
 	/* calculate madt entries */
-	for (h = &acpi_madt->apic_header[0]; h < end; h = (struct madt_apic_header *) (((__u8 *) h) + h->length)) {
+	for (h = &acpi_madt->apic_header[0]; h < end; h = (struct madt_apic_header *) (((uint8_t *) h) + h->length)) {
 		madt_entries_index_cnt++;
 	}
@@ -157,12 +157,12 @@
 		panic("Memory allocation error.");
 
-	__u32 index = 0;
-
-	for (h = &acpi_madt->apic_header[0]; h < end; h = (struct madt_apic_header *) (((__u8 *) h) + h->length)) {
+	uint32_t index = 0;
+
+	for (h = &acpi_madt->apic_header[0]; h < end; h = (struct madt_apic_header *) (((uint8_t *) h) + h->length)) {
 		madt_entries_index[index++] = h;
 	}
 
 	/* Quicksort MADT index structure */
-	qsort(madt_entries_index, madt_entries_index_cnt, sizeof(__address), &madt_cmp);
+	qsort(madt_entries_index, madt_entries_index_cnt, sizeof(uintptr_t), &madt_cmp);
 
 	/* Parse MADT entries */	
@@ -207,5 +207,5 @@
  
 
-void madt_l_apic_entry(struct madt_l_apic *la, __u32 index)
+void madt_l_apic_entry(struct madt_l_apic *la, uint32_t index)
 {
 	if (!madt_l_apic_entry_cnt++) {
@@ -222,10 +222,10 @@
 }
 
-void madt_io_apic_entry(struct madt_io_apic *ioa, __u32 index)
+void madt_io_apic_entry(struct madt_io_apic *ioa, uint32_t index)
 {
 	if (!madt_io_apic_entry_cnt++) {
 		/* remember index of the first io apic entry */
 		madt_io_apic_entry_index = index;
-		io_apic = (__u32 *) (__native) ioa->io_apic_address;
+		io_apic = (uint32_t *) (unative_t) ioa->io_apic_address;
 	} else {
 		/* currently not supported */
@@ -234,5 +234,5 @@
 }
 
-void madt_intr_src_ovrd_entry(struct madt_intr_src_ovrd *override, __u32 index)
+void madt_intr_src_ovrd_entry(struct madt_intr_src_ovrd *override, uint32_t index)
 {
 	ASSERT(override->source < sizeof(isa_irq_map)/sizeof(int));
Index: genarch/src/fb/fb.c
===================================================================
--- genarch/src/fb/fb.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/src/fb/fb.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -50,8 +50,8 @@
 SPINLOCK_INITIALIZE(fb_lock);
 
-static __u8 *fbaddress = NULL;
-
-static __u8 *blankline = NULL;
-static __u8 *dbbuffer = NULL; /* Buffer for fast scrolling console */
+static uint8_t *fbaddress = NULL;
+
+static uint8_t *blankline = NULL;
+static uint8_t *dbbuffer = NULL; /* Buffer for fast scrolling console */
 static int dboffset;
 
@@ -99,5 +99,5 @@
 static void rgb_3byte(void *dst, int rgb)
 {
-	__u8 *scr = dst;
+	uint8_t *scr = dst;
 #if (defined(BIG_ENDIAN) || defined(FB_BIG_ENDIAN))
 	scr[0] = RED(rgb, 8);
@@ -113,5 +113,5 @@
 static int byte3_rgb(void *src)
 {
-	__u8 *scr = src;
+	uint8_t *scr = src;
 #if (defined(BIG_ENDIAN) || defined(FB_BIG_ENDIAN))
 	return scr[0] << 16 | scr[1] << 8 | scr[2];
@@ -125,5 +125,5 @@
 {
 	/* 5-bit, 6-bits, 5-bits */ 
-	*((__u16 *)(dst)) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 | BLUE(rgb, 5);
+	*((uint16_t *)(dst)) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 | BLUE(rgb, 5);
 }
 
@@ -131,5 +131,5 @@
 static int byte2_rgb(void *src)
 {
-	int color = *(__u16 *)(src);
+	int color = *(uint16_t *)(src);
 	return (((color >> 11) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x3f) << (8 + 2)) | ((color & 0x1f) << 3);
 }
@@ -138,5 +138,5 @@
 static void rgb_1byte(void *dst, int rgb)
 {
-	*(__u8 *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3);
+	*(uint8_t *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3);
 }
 
@@ -144,5 +144,5 @@
 static int byte1_rgb(void *src)
 {
-	int color = *(__u8 *)src;
+	int color = *(uint8_t *)src;
 	return (((color >> 5) & 0x7) << (16 + 5)) | (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5);
 }
@@ -185,5 +185,5 @@
 static void scroll_screen(void)
 {
-	__u8 *lastline = &fbaddress[(rows - 1) * ROW_BYTES];
+	uint8_t *lastline = &fbaddress[(rows - 1) * ROW_BYTES];
 	int firstsz;
 
@@ -226,5 +226,5 @@
 
 /** Draw character at given position */
-static void draw_glyph(__u8 glyph, unsigned int col, unsigned int row)
+static void draw_glyph(uint8_t glyph, unsigned int col, unsigned int row)
 {
 	unsigned int y;
@@ -337,5 +337,5 @@
  *
  */
-void fb_init(__address addr, unsigned int x, unsigned int y, unsigned int bpp, unsigned int scan)
+void fb_init(uintptr_t addr, unsigned int x, unsigned int y, unsigned int bpp, unsigned int scan)
 {
 	switch (bpp) {
@@ -367,5 +367,5 @@
 	
 	/* Map the framebuffer */
-	fbaddress = (__u8 *) hw_map((__address) addr, fbsize);
+	fbaddress = (uint8_t *) hw_map((uintptr_t) addr, fbsize);
 	
 	xres = x;
@@ -400,5 +400,5 @@
 
 	/* Initialized blank line */
-	blankline = (__u8 *) malloc(ROW_BYTES, FRAME_ATOMIC);
+	blankline = (uint8_t *) malloc(ROW_BYTES, FRAME_ATOMIC);
 	if (!blankline)
 		panic("Failed to allocate blank line for framebuffer.");
Index: genarch/src/i8042/i8042.c
===================================================================
--- genarch/src/i8042/i8042.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/src/i8042/i8042.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -85,6 +85,6 @@
 #define IGNORE_CODE	0x7f
 
-static void key_released(__u8 sc);
-static void key_pressed(__u8 sc);
+static void key_released(uint8_t sc);
+static void key_pressed(uint8_t sc);
 static char key_read(chardev_t *d);
 
@@ -95,5 +95,5 @@
 #define ACTIVE_READ_BUFF_SIZE 16 	/* Must be power of 2 */
 
-static __u8 active_read_buff[ACTIVE_READ_BUFF_SIZE];
+static uint8_t active_read_buff[ACTIVE_READ_BUFF_SIZE];
 
 SPINLOCK_INITIALIZE(keylock);		/**< keylock protects keyflags and lockflags. */
@@ -323,6 +323,6 @@
 void i8042_interrupt(int n, istate_t *istate)
 {
-	__u8 x;
-	__u8 status;
+	uint8_t x;
+	uint8_t status;
 
 	while (((status=i8042_status_read()) & i8042_BUFFER_FULL_MASK)) {
@@ -351,5 +351,5 @@
  * @param sc Scancode of the key being released.
  */
-void key_released(__u8 sc)
+void key_released(uint8_t sc)
 {
 	spinlock_lock(&keylock);
@@ -376,5 +376,5 @@
  * @param sc Scancode of the key being pressed.
  */
-void key_pressed(__u8 sc)
+void key_pressed(uint8_t sc)
 {
 	char *map = sc_primary_map;
@@ -454,5 +454,5 @@
 }
 
-static __u8 active_read_buff_read(void)
+static uint8_t active_read_buff_read(void)
 {
 	static int i=0;
@@ -464,5 +464,5 @@
 }
 
-static void active_read_buff_write(__u8 ch)
+static void active_read_buff_write(uint8_t ch)
 {
 	static int i=0;
@@ -474,5 +474,5 @@
 
 
-static void active_read_key_pressed(__u8 sc)
+static void active_read_key_pressed(uint8_t sc)
 {
 	char *map = sc_primary_map;
@@ -548,5 +548,5 @@
 
 	while(!(ch = active_read_buff_read())) {
-		__u8 x;
+		uint8_t x;
 		while (!(i8042_status_read() & i8042_BUFFER_FULL_MASK))
 			;
@@ -568,5 +568,5 @@
 void i8042_poll(void)
 {
-	__u8 x;
+	uint8_t x;
 
 	while (((x = i8042_status_read() & i8042_BUFFER_FULL_MASK))) {
Index: genarch/src/mm/as_pt.c
===================================================================
--- genarch/src/mm/as_pt.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/src/mm/as_pt.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -77,7 +77,7 @@
 
 	if (flags & FLAG_AS_KERNEL) {
-		memsetb((__address) dst_ptl0, PAGE_SIZE, 0);
+		memsetb((uintptr_t) dst_ptl0, PAGE_SIZE, 0);
 	} else {
-		__address src, dst;
+		uintptr_t src, dst;
 	
 		/*
@@ -87,16 +87,16 @@
 		ipl = interrupts_disable();
 		mutex_lock(&AS_KERNEL->lock);		
-		src_ptl0 = (pte_t *) PA2KA((__address) AS_KERNEL->page_table);
+		src_ptl0 = (pte_t *) PA2KA((uintptr_t) AS_KERNEL->page_table);
 
-		src = (__address) &src_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
-		dst = (__address) &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
+		src = (uintptr_t) &src_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
+		dst = (uintptr_t) &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
 
-		memsetb((__address) dst_ptl0, PAGE_SIZE, 0);
-		memcpy((void *) dst, (void *) src, PAGE_SIZE - (src - (__address) src_ptl0));
+		memsetb((uintptr_t) dst_ptl0, PAGE_SIZE, 0);
+		memcpy((void *) dst, (void *) src, PAGE_SIZE - (src - (uintptr_t) src_ptl0));
 		mutex_unlock(&AS_KERNEL->lock);
 		interrupts_restore(ipl);
 	}
 
-	return (pte_t *) KA2PA((__address) dst_ptl0);
+	return (pte_t *) KA2PA((uintptr_t) dst_ptl0);
 }
 
@@ -109,5 +109,5 @@
 void ptl0_destroy(pte_t *page_table)
 {
-	frame_free((__address)page_table);
+	frame_free((uintptr_t)page_table);
 }
 
Index: genarch/src/mm/page_ht.c
===================================================================
--- genarch/src/mm/page_ht.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/src/mm/page_ht.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -53,11 +53,11 @@
 #include <align.h>
 
-static index_t hash(__native key[]);
-static bool compare(__native key[], count_t keys, link_t *item);
+static index_t hash(unative_t key[]);
+static bool compare(unative_t key[], count_t keys, link_t *item);
 static void remove_callback(link_t *item);
 
-static void ht_mapping_insert(as_t *as, __address page, __address frame, int flags);
-static void ht_mapping_remove(as_t *as, __address page);
-static pte_t *ht_mapping_find(as_t *as, __address page);
+static void ht_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame, int flags);
+static void ht_mapping_remove(as_t *as, uintptr_t page);
+static pte_t *ht_mapping_find(as_t *as, uintptr_t page);
 
 /**
@@ -94,8 +94,8 @@
  * @return Index into page hash table.
  */
-index_t hash(__native key[])
+index_t hash(unative_t key[])
 {
 	as_t *as = (as_t *) key[KEY_AS];
-	__address page = (__address) key[KEY_PAGE];
+	uintptr_t page = (uintptr_t) key[KEY_PAGE];
 	index_t index;
 	
@@ -112,5 +112,5 @@
 	 * hash index.
 	 */
-	index |= ((__native) as) & (PAGE_HT_ENTRIES-1);
+	index |= ((unative_t) as) & (PAGE_HT_ENTRIES-1);
 	
 	return index;
@@ -125,5 +125,5 @@
  * @return true on match, false otherwise.
  */
-bool compare(__native key[], count_t keys, link_t *item)
+bool compare(unative_t key[], count_t keys, link_t *item)
 {
 	pte_t *t;
@@ -138,7 +138,7 @@
 
 	if (keys == PAGE_HT_KEYS) {
-		return (key[KEY_AS] == (__address) t->as) && (key[KEY_PAGE] == t->page);
+		return (key[KEY_AS] == (uintptr_t) t->as) && (key[KEY_PAGE] == t->page);
 	} else {
-		return (key[KEY_AS] == (__address) t->as);
+		return (key[KEY_AS] == (uintptr_t) t->as);
 	}
 }
@@ -174,8 +174,8 @@
  * @param flags Flags to be used for mapping.
  */
-void ht_mapping_insert(as_t *as, __address page, __address frame, int flags)
+void ht_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame, int flags)
 {
 	pte_t *t;
-	__native key[2] = { (__address) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
+	unative_t key[2] = { (uintptr_t) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
 	
 	if (!hash_table_find(&page_ht, key)) {
@@ -209,7 +209,7 @@
  * @param page Virtual address of the page to be demapped.
  */
-void ht_mapping_remove(as_t *as, __address page)
-{
-	__native key[2] = { (__address) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
+void ht_mapping_remove(as_t *as, uintptr_t page)
+{
+	unative_t key[2] = { (uintptr_t) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
 	
 	/*
@@ -232,9 +232,9 @@
  * @return NULL if there is no such mapping; requested mapping otherwise.
  */
-pte_t *ht_mapping_find(as_t *as, __address page)
+pte_t *ht_mapping_find(as_t *as, uintptr_t page)
 {
 	link_t *hlp;
 	pte_t *t = NULL;
-	__native key[2] = { (__address) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
+	unative_t key[2] = { (uintptr_t) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
 	
 	hlp = hash_table_find(&page_ht, key);
Index: genarch/src/mm/page_pt.c
===================================================================
--- genarch/src/mm/page_pt.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/src/mm/page_pt.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -47,7 +47,7 @@
 #include <memstr.h>
 
-static void pt_mapping_insert(as_t *as, __address page, __address frame, int flags);
-static void pt_mapping_remove(as_t *as, __address page);
-static pte_t *pt_mapping_find(as_t *as, __address page);
+static void pt_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame, int flags);
+static void pt_mapping_remove(as_t *as, uintptr_t page);
+static pte_t *pt_mapping_find(as_t *as, uintptr_t page);
 
 page_mapping_operations_t pt_mapping_operations = {
@@ -69,14 +69,14 @@
  * @param flags Flags to be used for mapping.
  */
-void pt_mapping_insert(as_t *as, __address page, __address frame, int flags)
+void pt_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame, int flags)
 {
 	pte_t *ptl0, *ptl1, *ptl2, *ptl3;
 	pte_t *newpt;
 
-	ptl0 = (pte_t *) PA2KA((__address) as->page_table);
+	ptl0 = (pte_t *) PA2KA((uintptr_t) as->page_table);
 
 	if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
 		newpt = (pte_t *)frame_alloc(ONE_FRAME, FRAME_KA);
-		memsetb((__address)newpt, PAGE_SIZE, 0);
+		memsetb((uintptr_t)newpt, PAGE_SIZE, 0);
 		SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
 		SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE | PAGE_WRITE);
@@ -87,5 +87,5 @@
 	if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
 		newpt = (pte_t *)frame_alloc(ONE_FRAME, FRAME_KA);
-		memsetb((__address)newpt, PAGE_SIZE, 0);
+		memsetb((uintptr_t)newpt, PAGE_SIZE, 0);
 		SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
 		SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE | PAGE_WRITE);
@@ -96,5 +96,5 @@
 	if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
 		newpt = (pte_t *)frame_alloc(ONE_FRAME, FRAME_KA);
-		memsetb((__address)newpt, PAGE_SIZE, 0);
+		memsetb((uintptr_t)newpt, PAGE_SIZE, 0);
 		SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
 		SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE | PAGE_WRITE);
@@ -120,5 +120,5 @@
  * @param page Virtual address of the page to be demapped.
  */
-void pt_mapping_remove(as_t *as, __address page)
+void pt_mapping_remove(as_t *as, uintptr_t page)
 {
 	pte_t *ptl0, *ptl1, *ptl2, *ptl3;
@@ -130,5 +130,5 @@
 	 */
 
-	ptl0 = (pte_t *) PA2KA((__address) as->page_table);
+	ptl0 = (pte_t *) PA2KA((uintptr_t) as->page_table);
 
 	if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)
@@ -148,5 +148,5 @@
 
 	/* Destroy the mapping. Setting to PAGE_NOT_PRESENT is not sufficient. */
-	memsetb((__address) &ptl3[PTL3_INDEX(page)], sizeof(pte_t), 0);
+	memsetb((uintptr_t) &ptl3[PTL3_INDEX(page)], sizeof(pte_t), 0);
 
 	/*
@@ -166,11 +166,11 @@
 		 * Release the frame and remove PTL3 pointer from preceding table.
 		 */
-		frame_free(KA2PA((__address) ptl3));
+		frame_free(KA2PA((uintptr_t) ptl3));
 		if (PTL2_ENTRIES)
-			memsetb((__address) &ptl2[PTL2_INDEX(page)], sizeof(pte_t), 0);
+			memsetb((uintptr_t) &ptl2[PTL2_INDEX(page)], sizeof(pte_t), 0);
 		else if (PTL1_ENTRIES)
-			memsetb((__address) &ptl1[PTL1_INDEX(page)], sizeof(pte_t), 0);
+			memsetb((uintptr_t) &ptl1[PTL1_INDEX(page)], sizeof(pte_t), 0);
 		else
-			memsetb((__address) &ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
+			memsetb((uintptr_t) &ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
 	} else {
 		/*
@@ -195,9 +195,9 @@
 			 * Release the frame and remove PTL2 pointer from preceding table.
 			 */
-			frame_free(KA2PA((__address) ptl2));
+			frame_free(KA2PA((uintptr_t) ptl2));
 			if (PTL1_ENTRIES)
-				memsetb((__address) &ptl1[PTL1_INDEX(page)], sizeof(pte_t), 0);
+				memsetb((uintptr_t) &ptl1[PTL1_INDEX(page)], sizeof(pte_t), 0);
 			else
-				memsetb((__address) &ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
+				memsetb((uintptr_t) &ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
 		}
 		else {
@@ -224,6 +224,6 @@
 			 * Release the frame and remove PTL1 pointer from preceding table.
 			 */
-			frame_free(KA2PA((__address) ptl1));
-			memsetb((__address) &ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
+			frame_free(KA2PA((uintptr_t) ptl1));
+			memsetb((uintptr_t) &ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
 		}
 	}
@@ -242,9 +242,9 @@
  * @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
  */
-pte_t *pt_mapping_find(as_t *as, __address page)
+pte_t *pt_mapping_find(as_t *as, uintptr_t page)
 {
 	pte_t *ptl0, *ptl1, *ptl2, *ptl3;
 
-	ptl0 = (pte_t *) PA2KA((__address) as->page_table);
+	ptl0 = (pte_t *) PA2KA((uintptr_t) as->page_table);
 
 	if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)
Index: genarch/src/ofw/memory_init.c
===================================================================
--- genarch/src/ofw/memory_init.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/src/ofw/memory_init.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -44,5 +44,5 @@
 
 typedef struct {
-	__address start;
+	uintptr_t start;
 	size_t size;
 } memmap_t;
Index: genarch/src/ofw/ofw.c
===================================================================
--- genarch/src/ofw/ofw.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ genarch/src/ofw/ofw.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -64,5 +64,5 @@
 }
 
-__native ofw_call(const char *service, const int nargs, const int nret, ...)
+unative_t ofw_call(const char *service, const int nargs, const int nret, ...)
 {
 	va_list list;
Index: generic/include/adt/bitmap.h
===================================================================
--- generic/include/adt/bitmap.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/adt/bitmap.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -42,9 +42,9 @@
 
 typedef struct {
-	__u8 *map;
+	uint8_t *map;
 	count_t bits;
 } bitmap_t;
 
-extern void bitmap_initialize(bitmap_t *bitmap, __u8 *map, count_t bits);
+extern void bitmap_initialize(bitmap_t *bitmap, uint8_t *map, count_t bits);
 extern void bitmap_set_range(bitmap_t *bitmap, index_t start, count_t bits);
 extern void bitmap_clear_range(bitmap_t *bitmap, index_t start, count_t bits);
Index: generic/include/adt/btree.h
===================================================================
--- generic/include/adt/btree.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/adt/btree.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -43,5 +43,5 @@
 #define BTREE_MAX_KEYS	(BTREE_M - 1)
 
-typedef __u64 btree_key_t;
+typedef uint64_t btree_key_t;
 
 /** B-tree node structure. */
Index: generic/include/adt/hash_table.h
===================================================================
--- generic/include/adt/hash_table.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/adt/hash_table.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -56,5 +56,5 @@
 	 * @return Index into hash table.
 	 */
-	index_t (* hash)(__native key[]);
+	index_t (* hash)(unative_t key[]);
 	
 	/** Hash table item comparison function.
@@ -64,5 +64,5 @@
 	 * @return true if the keys match, false otherwise.
 	 */
-	bool (*compare)(__native key[], count_t keys, link_t *item);
+	bool (*compare)(unative_t key[], count_t keys, link_t *item);
 
 	/** Hash table item removal callback.
@@ -76,7 +76,7 @@
 
 extern void hash_table_create(hash_table_t *h, count_t m, count_t max_keys, hash_table_operations_t *op);
-extern void hash_table_insert(hash_table_t *h, __native key[], link_t *item);
-extern link_t *hash_table_find(hash_table_t *h, __native key[]);
-extern void hash_table_remove(hash_table_t *h, __native key[], count_t keys);
+extern void hash_table_insert(hash_table_t *h, unative_t key[], link_t *item);
+extern link_t *hash_table_find(hash_table_t *h, unative_t key[]);
+extern void hash_table_remove(hash_table_t *h, unative_t key[], count_t keys);
 
 #endif
Index: generic/include/adt/list.h
===================================================================
--- generic/include/adt/list.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/adt/list.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -176,5 +176,5 @@
 }
 
-#define list_get_instance(link,type,member) (type *)(((__u8*)(link))-((__u8*)&(((type *)NULL)->member)))
+#define list_get_instance(link,type,member) (type *)(((uint8_t*)(link))-((uint8_t*)&(((type *)NULL)->member)))
 
 extern bool list_member(const link_t *link, const link_t *head);
Index: generic/include/bitops.h
===================================================================
--- generic/include/bitops.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/bitops.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -43,5 +43,5 @@
  * If number is zero, it returns 0
  */
-static inline int fnzb32(__u32 arg)
+static inline int fnzb32(uint32_t arg)
 {
 	int n = 0;
@@ -55,10 +55,10 @@
 }
 
-static inline int fnzb64(__u64 arg)
+static inline int fnzb64(uint64_t arg)
 {
 	int n = 0;
 
 	if (arg >> 32) { arg >>= 32;n += 32;}
-	return n + fnzb32((__u32) arg);
+	return n + fnzb32((uint32_t) arg);
 }
 
Index: generic/include/byteorder.h
===================================================================
--- generic/include/byteorder.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/byteorder.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -36,5 +36,5 @@
 #define __BYTEORDER_H__
 
-static inline __u64 __u64_byteorder_swap(__u64 n)
+static inline uint64_t uint64_t_byteorder_swap(uint64_t n)
 {
 	return ((n & 0xff) << 56) |
@@ -48,5 +48,5 @@
 }
 
-static inline __u32 __u32_byteorder_swap(__u32 n)
+static inline uint32_t uint32_t_byteorder_swap(uint32_t n)
 {
 	return ((n & 0xff) << 24) |
Index: generic/include/config.h
===================================================================
--- generic/include/config.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/config.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -47,5 +47,5 @@
 
 typedef struct {
-	__address addr;
+	uintptr_t addr;
 	size_t size;
 } init_task_t;
@@ -60,5 +60,5 @@
 	volatile count_t cpu_active;	/**< Number of processors that are up and running. */
 
-	__address base;
+	uintptr_t base;
 	size_t memory_size;		/**< Size of detected memory in bytes. */
 	size_t kernel_size;		/**< Size of memory in bytes taken by kernel and stack */
Index: generic/include/console/chardev.h
===================================================================
--- generic/include/console/chardev.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/console/chardev.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -60,5 +60,5 @@
 	waitq_t wq;
 	SPINLOCK_DECLARE(lock);		/**< Protects everything below. */
-	__u8 buffer[CHARDEV_BUFLEN];
+	uint8_t buffer[CHARDEV_BUFLEN];
 	count_t counter;
 	chardev_operations_t *op;	/**< Implementation of chardev operations. */
@@ -70,5 +70,5 @@
 			       chardev_t *chardev, 
 			       chardev_operations_t *op);
-extern void chardev_push_character(chardev_t *chardev, __u8 ch);
+extern void chardev_push_character(chardev_t *chardev, uint8_t ch);
 
 #endif /* __CHARDEV_H__ */
Index: generic/include/console/console.h
===================================================================
--- generic/include/console/console.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/console/console.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -42,6 +42,6 @@
 extern chardev_t *stdout;
 
-extern __u8 getc(chardev_t *chardev);
-__u8 _getc(chardev_t *chardev);
+extern uint8_t getc(chardev_t *chardev);
+uint8_t _getc(chardev_t *chardev);
 extern count_t gets(chardev_t *chardev, char *buf, size_t buflen);
 extern void putchar(char c);
Index: generic/include/console/kconsole.h
===================================================================
--- generic/include/console/kconsole.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/console/kconsole.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -55,5 +55,5 @@
 	void *buffer;			/**< Buffer where to store data. */
 	size_t len;			/**< Size of the buffer. */
-	__native intval;                /**< Integer value */
+	unative_t intval;                /**< Integer value */
 	cmd_arg_type_t vartype;         /**< Resulting type of variable arg */
 };
Index: generic/include/context.h
===================================================================
--- generic/include/context.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/context.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -43,6 +43,6 @@
 #ifndef context_set
 #define context_set(c, _pc, stack, size) 	\
-	(c)->pc = (__address) (_pc);		\
-	(c)->sp = ((__address) (stack)) + (size) - SP_DELTA;
+	(c)->pc = (uintptr_t) (_pc);		\
+	(c)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA;
 #endif /* context_set */
 
Index: generic/include/cpu.h
===================================================================
--- generic/include/cpu.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/cpu.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -81,6 +81,6 @@
 	int tlb_active;
 
-	__u16 frequency_mhz;
-	__u32 delay_loop_const;
+	uint16_t frequency_mhz;
+	uint32_t delay_loop_const;
 
 	cpu_arch_t arch;
@@ -91,5 +91,5 @@
 	 * Stack used by scheduler when there is no running thread.
 	 */
-	__u8 *stack;
+	uint8_t *stack;
 };
 
Index: generic/include/ddi/ddi.h
===================================================================
--- generic/include/ddi/ddi.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/ddi/ddi.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,13 +40,13 @@
 #include <typedefs.h>
 
-__native sys_physmem_map(__native phys_base, __native virt_base, __native pages, 
-			 __native flags);
-extern __native sys_iospace_enable(ddi_ioarg_t *uspace_io_arg);
-extern __native sys_preempt_control(int enable);
+unative_t sys_physmem_map(unative_t phys_base, unative_t virt_base, unative_t pages, 
+			 unative_t flags);
+extern unative_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg);
+extern unative_t sys_preempt_control(int enable);
 
 /*
  * Interface to be implemented by all architectures.
  */
-extern int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size);
+extern int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size);
 
 #endif
Index: generic/include/debug.h
===================================================================
--- generic/include/debug.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/debug.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -39,9 +39,9 @@
 #include <arch/debug.h>
 
-#define CALLER       ((__address)__builtin_return_address(0))
+#define CALLER       ((uintptr_t)__builtin_return_address(0))
 
 #ifndef HERE
 /** Current Instruction Pointer address */
-#  define HERE ((__address *)0)
+#  define HERE ((uintptr_t *)0)
 #endif
 
@@ -56,5 +56,5 @@
  */
 #ifdef CONFIG_DEBUG
-#	define ASSERT(expr) if (!(expr)) { panic("assertion failed (%s), caller=%.*p\n", #expr, sizeof(__address) * 2, CALLER); }
+#	define ASSERT(expr) if (!(expr)) { panic("assertion failed (%s), caller=%.*p\n", #expr, sizeof(uintptr_t) * 2, CALLER); }
 #else
 #	define ASSERT(expr)
Index: generic/include/elf.h
===================================================================
--- generic/include/elf.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/elf.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -194,9 +194,9 @@
  * in ELF header.
  */
-typedef __u64 elf_xword;
-typedef __s64 elf_sxword;
-typedef __u32 elf_word;
-typedef __s32 elf_sword;
-typedef __u16 elf_half;
+typedef uint64_t elf_xword;
+typedef int64_t elf_sxword;
+typedef uint32_t elf_word;
+typedef int32_t elf_sword;
+typedef uint16_t elf_half;
 
 /**
@@ -205,6 +205,6 @@
  * These types are specific for 32-bit format.
  */
-typedef __u32 elf32_addr;
-typedef __u32 elf32_off;
+typedef uint32_t elf32_addr;
+typedef uint32_t elf32_off;
 
 /**
@@ -213,10 +213,10 @@
  * These types are specific for 64-bit format.
  */
-typedef __u64 elf64_addr;
-typedef __u64 elf64_off;
+typedef uint64_t elf64_addr;
+typedef uint64_t elf64_off;
 
 /** ELF header */
 struct elf32_header {
-	__u8 e_ident[EI_NIDENT];
+	uint8_t e_ident[EI_NIDENT];
 	elf_half e_type;
 	elf_half e_machine;
@@ -234,5 +234,5 @@
 };
 struct elf64_header {
-	__u8 e_ident[EI_NIDENT];
+	uint8_t e_ident[EI_NIDENT];
 	elf_half e_type;
 	elf_half e_machine;
@@ -310,12 +310,12 @@
 	elf32_addr st_value;
 	elf_word st_size;
-	__u8 st_info;
-	__u8 st_other;
+	uint8_t st_info;
+	uint8_t st_other;
 	elf_half st_shndx;
 };
 struct elf64_symbol {
 	elf_word st_name;
-	__u8 st_info;
-	__u8 st_other;
+	uint8_t st_info;
+	uint8_t st_other;
 	elf_half st_shndx;
 	elf64_addr st_value;
Index: generic/include/func.h
===================================================================
--- generic/include/func.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/func.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -47,5 +47,5 @@
 extern int strncmp(const char *src, const char *dst, size_t len);
 extern void strncpy(char *dest, const char *src, size_t len);
-extern __native atoi(const char *text);
+extern unative_t atoi(const char *text);
 
 #endif
Index: generic/include/ipc/ipc.h
===================================================================
--- generic/include/ipc/ipc.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/ipc/ipc.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -165,5 +165,5 @@
 typedef struct phone_s phone_t;
 typedef struct {
-	__native args[IPC_CALL_LEN];
+	unative_t args[IPC_CALL_LEN];
 	phone_t *phone;
 }ipc_data_t;
@@ -215,5 +215,5 @@
 	answerbox_t *callerbox;
 
-	__native private; /**< Private data to internal IPC */
+	unative_t private; /**< Private data to internal IPC */
 
 	ipc_data_t data;  /**< Data passed from/to userspace */
@@ -221,5 +221,5 @@
 
 extern void ipc_init(void);
-extern call_t * ipc_wait_for_call(answerbox_t *box, __u32 usec, int flags);
+extern call_t * ipc_wait_for_call(answerbox_t *box, uint32_t usec, int flags);
 extern void ipc_answer(answerbox_t *box, call_t *request);
 extern int ipc_call(phone_t *phone, call_t *call);
@@ -235,5 +235,5 @@
 void ipc_cleanup(void);
 int ipc_phone_hangup(phone_t *phone);
-extern void ipc_backsend_err(phone_t *phone, call_t *call, __native err);
+extern void ipc_backsend_err(phone_t *phone, call_t *call, unative_t err);
 extern void ipc_print_task(task_id_t taskid);
 
Index: generic/include/ipc/ipcrsc.h
===================================================================
--- generic/include/ipc/ipcrsc.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/ipc/ipcrsc.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -36,5 +36,5 @@
 #define __IPCRSC_H__
 
-call_t * get_call(__native callid);
+call_t * get_call(unative_t callid);
 int phone_alloc(void);
 void phone_connect(int phoneid, answerbox_t *box);
Index: generic/include/ipc/irq.h
===================================================================
--- generic/include/ipc/irq.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/ipc/irq.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -80,7 +80,7 @@
 extern int ipc_irq_register(answerbox_t *box, int irq, irq_code_t *ucode);
 extern void ipc_irq_send_notif(int irq);
-extern void ipc_irq_send_msg(int irq, __native a1, __native a2, __native a3);
+extern void ipc_irq_send_msg(int irq, unative_t a1, unative_t a2, unative_t a3);
 extern void ipc_irq_unregister(answerbox_t *box, int irq);
-extern void irq_ipc_bind_arch(__native irq);
+extern void irq_ipc_bind_arch(unative_t irq);
 extern void ipc_irq_cleanup(answerbox_t *box);
 
Index: generic/include/ipc/sysipc.h
===================================================================
--- generic/include/ipc/sysipc.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/ipc/sysipc.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -40,20 +40,20 @@
 #include <arch/types.h>
 
-__native sys_ipc_call_sync_fast(__native phoneid, __native method, 
-				__native arg1, ipc_data_t *data);
-__native sys_ipc_call_sync(__native phoneid, ipc_data_t *question, 
+unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method, 
+				unative_t arg1, ipc_data_t *data);
+unative_t sys_ipc_call_sync(unative_t phoneid, ipc_data_t *question, 
 			   ipc_data_t *reply);
-__native sys_ipc_call_async_fast(__native phoneid, __native method, 
-				 __native arg1, __native arg2);
-__native sys_ipc_call_async(__native phoneid, ipc_data_t *data);
-__native sys_ipc_answer_fast(__native callid, __native retval, 
-			     __native arg1, __native arg2);
-__native sys_ipc_answer(__native callid, ipc_data_t *data);
-__native sys_ipc_wait_for_call(ipc_data_t *calldata, __u32 usec, int nonblocking);
-__native sys_ipc_forward_fast(__native callid, __native phoneid,
-			      __native method, __native arg1);
-__native sys_ipc_hangup(int phoneid);
-__native sys_ipc_register_irq(int irq, irq_code_t *ucode);
-__native sys_ipc_unregister_irq(int irq);
+unative_t sys_ipc_call_async_fast(unative_t phoneid, unative_t method, 
+				 unative_t arg1, unative_t arg2);
+unative_t sys_ipc_call_async(unative_t phoneid, ipc_data_t *data);
+unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval, 
+			     unative_t arg1, unative_t arg2);
+unative_t sys_ipc_answer(unative_t callid, ipc_data_t *data);
+unative_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec, int nonblocking);
+unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid,
+			      unative_t method, unative_t arg1);
+unative_t sys_ipc_hangup(int phoneid);
+unative_t sys_ipc_register_irq(int irq, irq_code_t *ucode);
+unative_t sys_ipc_unregister_irq(int irq);
 
 #endif
Index: generic/include/macros.h
===================================================================
--- generic/include/macros.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/macros.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -47,8 +47,8 @@
 
 /** Return true if the interlvals overlap. */
-static inline int overlaps(__address s1, size_t sz1, __address s2, size_t sz2)
+static inline int overlaps(uintptr_t s1, size_t sz1, uintptr_t s2, size_t sz2)
 {
-	__address e1 = s1+sz1;
-	__address e2 = s2+sz2;
+	uintptr_t e1 = s1+sz1;
+	uintptr_t e2 = s2+sz2;
 
 	return s1 < e2 && s2 < e1;
Index: generic/include/memstr.h
===================================================================
--- generic/include/memstr.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/memstr.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -44,6 +44,6 @@
  */
 extern void *_memcpy(void *dst, const void *src, size_t cnt);
-extern void _memsetb(__address dst, size_t cnt, __u8 x);
-extern void _memsetw(__address dst, size_t cnt, __u16 x);
+extern void _memsetb(uintptr_t dst, size_t cnt, uint8_t x);
+extern void _memsetw(uintptr_t dst, size_t cnt, uint16_t x);
 
 #endif
Index: generic/include/mm/as.h
===================================================================
--- generic/include/mm/as.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/mm/as.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -124,6 +124,6 @@
 /** Address space area backend structure. */
 typedef struct {
-	int (* page_fault)(as_area_t *area, __address addr, pf_access_t access);
-	void (* frame_free)(as_area_t *area, __address page, __address frame);
+	int (* page_fault)(as_area_t *area, uintptr_t addr, pf_access_t access);
+	void (* frame_free)(as_area_t *area, uintptr_t page, uintptr_t frame);
 	void (* share)(as_area_t *area);
 } mem_backend_t;
@@ -136,5 +136,5 @@
 	};
 	struct {	/**< phys_backend members */
-		__address base;
+		uintptr_t base;
 		count_t frames;
 	};
@@ -152,5 +152,5 @@
 	int attributes;		/**< Attributes related to the address space area itself. */
 	count_t pages;		/**< Size of this area in multiples of PAGE_SIZE. */
-	__address base;		/**< Base address of this area. */
+	uintptr_t base;		/**< Base address of this area. */
 	btree_t used_space;	/**< Map of used space. */
 	share_info_t *sh_info;	/**< If the address space area has been shared, this pointer will
@@ -173,18 +173,18 @@
 extern void as_destroy(as_t *as);
 extern void as_switch(as_t *old, as_t *new);
-extern int as_page_fault(__address page, pf_access_t access, istate_t *istate);
-
-extern as_area_t *as_area_create(as_t *as, int flags, size_t size, __address base, int attrs,
+extern int as_page_fault(uintptr_t page, pf_access_t access, istate_t *istate);
+
+extern as_area_t *as_area_create(as_t *as, int flags, size_t size, uintptr_t base, int attrs,
 	mem_backend_t *backend, mem_backend_data_t *backend_data);
-extern int as_area_destroy(as_t *as, __address address);	
-extern int as_area_resize(as_t *as, __address address, size_t size, int flags);
-int as_area_share(as_t *src_as, __address src_base, size_t acc_size,
-		  as_t *dst_as, __address dst_base, int dst_flags_mask);
+extern int as_area_destroy(as_t *as, uintptr_t address);	
+extern int as_area_resize(as_t *as, uintptr_t address, size_t size, int flags);
+int as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size,
+		  as_t *dst_as, uintptr_t dst_base, int dst_flags_mask);
 
 extern int as_area_get_flags(as_area_t *area);
 extern bool as_area_check_access(as_area_t *area, pf_access_t access);
-extern size_t as_get_size(__address base);
-extern int used_space_insert(as_area_t *a, __address page, count_t count);
-extern int used_space_remove(as_area_t *a, __address page, count_t count);
+extern size_t as_get_size(uintptr_t base);
+extern int used_space_insert(as_area_t *a, uintptr_t page, count_t count);
+extern int used_space_remove(as_area_t *a, uintptr_t page, count_t count);
 
 /* Interface to be implemented by architectures. */
@@ -199,7 +199,7 @@
 
 /* Address space area related syscalls. */
-extern __native sys_as_area_create(__address address, size_t size, int flags);
-extern __native sys_as_area_resize(__address address, size_t size, int flags);
-extern __native sys_as_area_destroy(__address address);
+extern unative_t sys_as_area_create(uintptr_t address, size_t size, int flags);
+extern unative_t sys_as_area_resize(uintptr_t address, size_t size, int flags);
+extern unative_t sys_as_area_destroy(uintptr_t address);
 
 #endif /* KERNEL */
Index: generic/include/mm/buddy.h
===================================================================
--- generic/include/mm/buddy.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/mm/buddy.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -46,15 +46,15 @@
 	link_t *(* bisect)(buddy_system_t *, link_t *);			/**< Bisect the block passed as argument and return pointer to the new right-side buddy. */
 	link_t *(* coalesce)(buddy_system_t *, link_t *, link_t *);	/**< Coalesce two buddies into a bigger block. */
-	void (*set_order)(buddy_system_t *, link_t *, __u8);		/**< Set order of block passed as argument. */
-	__u8 (*get_order)(buddy_system_t *, link_t *);			/**< Return order of block passed as argument. */
+	void (*set_order)(buddy_system_t *, link_t *, uint8_t);		/**< Set order of block passed as argument. */
+	uint8_t (*get_order)(buddy_system_t *, link_t *);			/**< Return order of block passed as argument. */
 	void (*mark_busy)(buddy_system_t *, link_t *);			/**< Mark block as busy. */
 	void (*mark_available)(buddy_system_t *, link_t *);		/**< Mark block as available. */
 	/** Find parent of block that has given order  */
-	link_t *(* find_block)(buddy_system_t *, link_t *, __u8);
+	link_t *(* find_block)(buddy_system_t *, link_t *, uint8_t);
 	void (* print_id)(buddy_system_t *, link_t *);
 };
 
 struct buddy_system {
-	__u8 max_order;				/**< Maximal order of block which can be stored by buddy system. */
+	uint8_t max_order;				/**< Maximal order of block which can be stored by buddy system. */
 	link_t *order;
 	buddy_system_operations_t *op;
@@ -63,8 +63,8 @@
 
 extern void buddy_system_create(buddy_system_t *b,
-				__u8 max_order, 
+				uint8_t max_order, 
 				buddy_system_operations_t *op, void *data);
-extern link_t *buddy_system_alloc(buddy_system_t *b, __u8 i);
-extern bool buddy_system_can_alloc(buddy_system_t *b, __u8 order);
+extern link_t *buddy_system_alloc(buddy_system_t *b, uint8_t i);
+extern bool buddy_system_can_alloc(buddy_system_t *b, uint8_t order);
 extern void buddy_system_free(buddy_system_t *b, link_t *block);
 extern void buddy_system_structure_print(buddy_system_t *b, size_t elem_size);
Index: generic/include/mm/frame.h
===================================================================
--- generic/include/mm/frame.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/mm/frame.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -66,10 +66,10 @@
 #define FRAME_ERROR		2	/* frame_alloc return status */
 
-static inline __address PFN2ADDR(pfn_t frame)
+static inline uintptr_t PFN2ADDR(pfn_t frame)
 {
-	return (__address)(frame << FRAME_WIDTH);
+	return (uintptr_t)(frame << FRAME_WIDTH);
 }
 
-static inline pfn_t ADDR2PFN(__address addr)
+static inline pfn_t ADDR2PFN(uintptr_t addr)
 {
 	return (pfn_t)(addr >> FRAME_WIDTH);
@@ -83,5 +83,5 @@
 }
 
-#define IS_BUDDY_ORDER_OK(index, order)		((~(((__native) -1) << (order)) & (index)) == 0)
+#define IS_BUDDY_ORDER_OK(index, order)		((~(((unative_t) -1) << (order)) & (index)) == 0)
 #define IS_BUDDY_LEFT_BLOCK(zone, frame)	(((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0)
 #define IS_BUDDY_RIGHT_BLOCK(zone, frame)	(((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1)
@@ -92,6 +92,6 @@
 
 extern void frame_init(void);
-extern void * frame_alloc_generic(__u8 order, int flags, int *pzone);
-extern void frame_free(__address frame);
+extern void * frame_alloc_generic(uint8_t order, int flags, int *pzone);
+extern void frame_free(uintptr_t frame);
 extern void frame_reference_add(pfn_t pfn);
 
@@ -100,5 +100,5 @@
 void frame_set_parent(pfn_t frame, void *data, int hint);
 void frame_mark_unavailable(pfn_t start, count_t count);
-__address zone_conf_size(count_t count);
+uintptr_t zone_conf_size(count_t count);
 void zone_merge(int z1, int z2);
 void zone_merge_all(void);
Index: generic/include/mm/page.h
===================================================================
--- generic/include/mm/page.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/mm/page.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -77,7 +77,7 @@
 /** Operations to manipulate page mappings. */
 struct page_mapping_operations {
-	void (* mapping_insert)(as_t *as, __address page, __address frame, int flags);
-	void (* mapping_remove)(as_t *as, __address page);
-	pte_t *(* mapping_find)(as_t *as, __address page);
+	void (* mapping_insert)(as_t *as, uintptr_t page, uintptr_t frame, int flags);
+	void (* mapping_remove)(as_t *as, uintptr_t page);
+	pte_t *(* mapping_find)(as_t *as, uintptr_t page);
 };
 typedef struct page_mapping_operations page_mapping_operations_t;
@@ -88,11 +88,11 @@
 extern void page_table_lock(as_t *as, bool lock);
 extern void page_table_unlock(as_t *as, bool unlock);
-extern void page_mapping_insert(as_t *as, __address page, __address frame, int flags);
-extern void page_mapping_remove(as_t *as, __address page);
-extern pte_t *page_mapping_find(as_t *as, __address page);
+extern void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame, int flags);
+extern void page_mapping_remove(as_t *as, uintptr_t page);
+extern pte_t *page_mapping_find(as_t *as, uintptr_t page);
 extern pte_t *page_table_create(int flags);
 extern void page_table_destroy(pte_t *page_table);
-extern void map_structure(__address s, size_t size);
-extern __address hw_map(__address physaddr, size_t size);
+extern void map_structure(uintptr_t s, size_t size);
+extern uintptr_t hw_map(uintptr_t physaddr, size_t size);
 
 #endif
Index: generic/include/mm/slab.h
===================================================================
--- generic/include/mm/slab.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/mm/slab.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -91,5 +91,5 @@
 
 	/* Computed values */
-	__u8 order;        /**< Order of frames to be allocated */
+	uint8_t order;        /**< Order of frames to be allocated */
 	int objects;      /**< Number of objects that fit in */
 
Index: generic/include/mm/tlb.h
===================================================================
--- generic/include/mm/tlb.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/mm/tlb.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -59,5 +59,5 @@
 	tlb_invalidate_type_t type;	/**< Message type. */
 	asid_t asid;			/**< Address space identifier. */
-	__address page;			/**< Page address. */
+	uintptr_t page;			/**< Page address. */
 	count_t count;			/**< Number of pages to invalidate. */
 };
@@ -67,5 +67,5 @@
 
 #ifdef CONFIG_SMP
-extern void tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid, __address page, count_t count);
+extern void tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid, uintptr_t page, count_t count);
 extern void tlb_shootdown_finalize(void);
 extern void tlb_shootdown_ipi_recv(void);
@@ -84,5 +84,5 @@
 extern void tlb_invalidate_all(void);
 extern void tlb_invalidate_asid(asid_t asid);
-extern void tlb_invalidate_pages(asid_t asid, __address page, count_t cnt);
+extern void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt);
 #endif
 
Index: generic/include/proc/task.h
===================================================================
--- generic/include/proc/task.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/proc/task.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -103,5 +103,5 @@
 #endif
 
-extern __native sys_task_get_id(task_id_t *uspace_task_id);
+extern unative_t sys_task_get_id(task_id_t *uspace_task_id);
 
 #endif
Index: generic/include/proc/thread.h
===================================================================
--- generic/include/proc/thread.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/proc/thread.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -143,12 +143,12 @@
 	task_t *task;				/**< Containing task. */
 
-	__u64 ticks;				/**< Ticks before preemption. */
+	uint64_t ticks;				/**< Ticks before preemption. */
 
 	int priority;				/**< Thread's priority. Implemented as index to CPU->rq */
-	__u32 tid;				/**< Thread ID. */
+	uint32_t tid;				/**< Thread ID. */
 	
 	thread_arch_t arch;			/**< Architecture-specific data. */
 
-	__u8 *kstack;				/**< Thread's kernel stack. */
+	uint8_t *kstack;				/**< Thread's kernel stack. */
 };
 
@@ -172,9 +172,9 @@
 #endif
 
-extern void thread_sleep(__u32 sec);
-extern void thread_usleep(__u32 usec);
+extern void thread_sleep(uint32_t sec);
+extern void thread_usleep(uint32_t usec);
 
 #define thread_join(t)	thread_join_timeout((t), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
-extern int thread_join_timeout(thread_t *t, __u32 usec, int flags);
+extern int thread_join_timeout(thread_t *t, uint32_t usec, int flags);
 extern void thread_detach(thread_t *t);
 
@@ -188,6 +188,6 @@
 
 /** Thread syscall prototypes. */
-__native sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name);
-__native sys_thread_exit(int uspace_status);
+unative_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name);
+unative_t sys_thread_exit(int uspace_status);
 
 #endif
Index: generic/include/security/cap.h
===================================================================
--- generic/include/security/cap.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/security/cap.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -80,11 +80,11 @@
 #define CAP_IRQ_REG		(1<<4) 
 
-typedef __u32 cap_t;
+typedef uint32_t cap_t;
 
 extern void cap_set(task_t *t, cap_t caps);
 extern cap_t cap_get(task_t *t);
 
-extern __native sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps);
-extern __native sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps);
+extern unative_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps);
+extern unative_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps);
 
 #endif
Index: generic/include/sort.h
===================================================================
--- generic/include/sort.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/sort.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -48,7 +48,7 @@
  */
 extern int int_cmp(void * a, void * b);
-extern int __u32_cmp(void * a, void * b);
-extern int __u16_cmp(void * a, void * b);
-extern int __u8_cmp(void * a, void * b);
+extern int uint32_t_cmp(void * a, void * b);
+extern int uint16_t_cmp(void * a, void * b);
+extern int uint8_t_cmp(void * a, void * b);
 
 #endif
Index: generic/include/stackarg.h
===================================================================
--- generic/include/stackarg.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/stackarg.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -46,10 +46,10 @@
 typedef struct va_list {
 	int pos;
-	__u8 *last;
+	uint8_t *last;
 } va_list;
 
 #define va_start(ap, lst) 		\
 	(ap).pos = sizeof(lst); 			\
-	(ap).last = (__u8 *) &(lst)
+	(ap).last = (uint8_t *) &(lst)
 
 #define va_arg(ap, type) 		\
Index: generic/include/symtab.h
===================================================================
--- generic/include/symtab.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/symtab.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -41,10 +41,10 @@
 
 struct symtab_entry {
-	__u64 address_le;
+	uint64_t address_le;
 	char symbol_name[MAX_SYMBOL_NAME];
 };
 
-extern char * get_symtab_entry(__native addr);
-extern __address get_symbol_addr(const char *name);
+extern char * get_symtab_entry(unative_t addr);
+extern uintptr_t get_symbol_addr(const char *name);
 extern void symtab_print_search(const char *name);
 extern int symtab_compl(char *name);
Index: generic/include/synch/condvar.h
===================================================================
--- generic/include/synch/condvar.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/synch/condvar.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -53,5 +53,5 @@
 extern void condvar_signal(condvar_t *cv);
 extern void condvar_broadcast(condvar_t *cv);
-extern int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, __u32 usec, int flags);
+extern int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec, int flags);
 
 #endif
Index: generic/include/synch/futex.h
===================================================================
--- generic/include/synch/futex.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/synch/futex.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup sync
+/** @addtogroup sync
  * @{
  */
@@ -44,5 +44,5 @@
 /** Kernel-side futex structure. */
 struct futex {
-	__address paddr;	/**< Physical address of the status variable. */
+	uintptr_t paddr;	/**< Physical address of the status variable. */
 	waitq_t wq;		/**< Wait queue for threads waiting for futex availability. */
 	link_t ht_link;		/**< Futex hash table link. */
@@ -51,6 +51,6 @@
 
 extern void futex_init(void);
-extern __native sys_futex_sleep_timeout(__address uaddr, __u32 usec, int flags);
-extern __native sys_futex_wakeup(__address uaddr);
+extern unative_t sys_futex_sleep_timeout(uintptr_t uaddr, uint32_t usec, int flags);
+extern unative_t sys_futex_wakeup(uintptr_t uaddr);
 
 extern void futex_cleanup(void);
@@ -58,5 +58,5 @@
 #endif
 
- /** @}
+/** @}
  */
 
Index: generic/include/synch/mutex.h
===================================================================
--- generic/include/synch/mutex.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/synch/mutex.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -55,5 +55,5 @@
 
 extern void mutex_initialize(mutex_t *mtx);
-extern int _mutex_lock_timeout(mutex_t *mtx, __u32 usec, int flags);
+extern int _mutex_lock_timeout(mutex_t *mtx, uint32_t usec, int flags);
 extern void mutex_unlock(mutex_t *mtx);
 
Index: generic/include/synch/rwlock.h
===================================================================
--- generic/include/synch/rwlock.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/synch/rwlock.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -70,6 +70,6 @@
 extern void rwlock_read_unlock(rwlock_t *rwl);
 extern void rwlock_write_unlock(rwlock_t *rwl);
-extern int _rwlock_read_lock_timeout(rwlock_t *rwl, __u32 usec, int flags);
-extern int _rwlock_write_lock_timeout(rwlock_t *rwl, __u32 usec, int flags);
+extern int _rwlock_read_lock_timeout(rwlock_t *rwl, uint32_t usec, int flags);
+extern int _rwlock_write_lock_timeout(rwlock_t *rwl, uint32_t usec, int flags);
 
 #endif
Index: generic/include/synch/semaphore.h
===================================================================
--- generic/include/synch/semaphore.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/synch/semaphore.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -54,5 +54,5 @@
 
 extern void semaphore_initialize(semaphore_t *s, int val);
-extern int _semaphore_down_timeout(semaphore_t *s, __u32 usec, int flags);
+extern int _semaphore_down_timeout(semaphore_t *s, uint32_t usec, int flags);
 extern void semaphore_up(semaphore_t *s);
 
Index: generic/include/synch/waitq.h
===================================================================
--- generic/include/synch/waitq.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/synch/waitq.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -62,7 +62,7 @@
 
 extern void waitq_initialize(waitq_t *wq);
-extern int waitq_sleep_timeout(waitq_t *wq, __u32 usec, int flags);
+extern int waitq_sleep_timeout(waitq_t *wq, uint32_t usec, int flags);
 extern ipl_t waitq_sleep_prepare(waitq_t *wq);
-extern int waitq_sleep_timeout_unsafe(waitq_t *wq, __u32 usec, int flags);
+extern int waitq_sleep_timeout_unsafe(waitq_t *wq, uint32_t usec, int flags);
 extern void waitq_sleep_finish(waitq_t *wq, int rc, ipl_t ipl);
 extern void waitq_wakeup(waitq_t *wq, bool all);
Index: generic/include/syscall/syscall.h
===================================================================
--- generic/include/syscall/syscall.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/syscall/syscall.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -74,10 +74,10 @@
 #include <typedefs.h>
 
-typedef __native (*syshandler_t)();
+typedef unative_t (*syshandler_t)();
 
 extern syshandler_t syscall_table[SYSCALL_END];
-extern __native syscall_handler(__native a1, __native a2, __native a3,
-				__native a4, __native id);
-extern __native sys_tls_set(__native addr);
+extern unative_t syscall_handler(unative_t a1, unative_t a2, unative_t a3,
+				unative_t a4, unative_t id);
+extern unative_t sys_tls_set(unative_t addr);
 
 
Index: generic/include/sysinfo/sysinfo.h
===================================================================
--- generic/include/sysinfo/sysinfo.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/sysinfo/sysinfo.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -37,5 +37,5 @@
 typedef union sysinfo_item_val
 {
-	__native val;
+	unative_t val;
 	void *fn; 
 }sysinfo_item_val_t;
@@ -46,5 +46,5 @@
 	union
 	{
-		__native val;
+		unative_t val;
 		void *fn; 
 	}val;
@@ -70,14 +70,14 @@
 
 
-typedef __native (*sysinfo_val_fn_t)(sysinfo_item_t *root);
-typedef __native (*sysinfo_subinfo_fn_t)(const char *subname);
+typedef unative_t (*sysinfo_val_fn_t)(sysinfo_item_t *root);
+typedef unative_t (*sysinfo_subinfo_fn_t)(const char *subname);
 
 typedef struct sysinfo_rettype
 {
-	__native val;
-	__native valid;
+	unative_t val;
+	unative_t valid;
 }sysinfo_rettype_t;
 
-void sysinfo_set_item_val(const char *name,sysinfo_item_t **root,__native val);
+void sysinfo_set_item_val(const char *name,sysinfo_item_t **root,unative_t val);
 void sysinfo_dump(sysinfo_item_t **root,int depth);
 void sysinfo_set_item_function(const char *name,sysinfo_item_t **root,sysinfo_val_fn_t fn);
@@ -86,6 +86,6 @@
 sysinfo_rettype_t sysinfo_get_val(const char *name,sysinfo_item_t **root);
 
-__native sys_sysinfo_valid(__native ptr,__native len);
-__native sys_sysinfo_value(__native ptr,__native len);
+unative_t sys_sysinfo_valid(unative_t ptr,unative_t len);
+unative_t sys_sysinfo_value(unative_t ptr,unative_t len);
 
 
Index: generic/include/time/delay.h
===================================================================
--- generic/include/time/delay.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/time/delay.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,5 +38,5 @@
 #include <arch/types.h>
 
-extern void delay(__u32 microseconds);
+extern void delay(uint32_t microseconds);
 
 #endif
Index: generic/include/time/timeout.h
===================================================================
--- generic/include/time/timeout.h	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/include/time/timeout.h	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -41,5 +41,5 @@
 #include <adt/list.h>
 
-#define us2ticks(us)	((__u64)(((__u32) (us)/(1000000/HZ))))
+#define us2ticks(us)	((uint64_t)(((uint32_t) (us)/(1000000/HZ))))
 
 typedef void (* timeout_handler_t)(void *arg);
@@ -50,5 +50,5 @@
 	link_t link;			/**< Link to the list of active timeouts on THE->cpu */
 	
-	__u64 ticks;			/**< Timeout will be activated in this amount of clock() ticks. */
+	uint64_t ticks;			/**< Timeout will be activated in this amount of clock() ticks. */
 
 	timeout_handler_t handler;	/**< Function that will be called on timeout activation. */
@@ -61,5 +61,5 @@
 extern void timeout_initialize(timeout_t *t);
 extern void timeout_reinitialize(timeout_t *t);
-extern void timeout_register(timeout_t *t, __u64 usec, timeout_handler_t f, void *arg);
+extern void timeout_register(timeout_t *t, uint64_t usec, timeout_handler_t f, void *arg);
 extern bool timeout_unregister(timeout_t *t);
 
Index: generic/src/adt/bitmap.c
===================================================================
--- generic/src/adt/bitmap.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/adt/bitmap.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -56,5 +56,5 @@
  * @param bits Number of bits stored in bitmap.
  */
-void bitmap_initialize(bitmap_t *bitmap, __u8 *map, count_t bits)
+void bitmap_initialize(bitmap_t *bitmap, uint8_t *map, count_t bits)
 {
 	bitmap->map = map;
Index: generic/src/adt/hash_table.c
===================================================================
--- generic/src/adt/hash_table.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/adt/hash_table.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -65,5 +65,5 @@
 		panic("cannot allocate memory for hash table\n");
 	}
-	memsetb((__address) h->entry, m * sizeof(link_t), 0);
+	memsetb((uintptr_t) h->entry, m * sizeof(link_t), 0);
 	
 	for (i = 0; i < m; i++)
@@ -81,5 +81,5 @@
  * @param item Item to be inserted into the hash table.
  */
-void hash_table_insert(hash_table_t *h, __native key[], link_t *item)
+void hash_table_insert(hash_table_t *h, unative_t key[], link_t *item)
 {
 	index_t chain;
@@ -101,5 +101,5 @@
  * @return Matching item on success, NULL if there is no such item.
  */
-link_t *hash_table_find(hash_table_t *h, __native key[])
+link_t *hash_table_find(hash_table_t *h, unative_t key[])
 {
 	link_t *cur;
@@ -131,5 +131,5 @@
  * @param keys Number of keys in the key array.
  */
-void hash_table_remove(hash_table_t *h, __native key[], count_t keys)
+void hash_table_remove(hash_table_t *h, unative_t key[], count_t keys)
 {
 	index_t chain;
Index: generic/src/console/chardev.c
===================================================================
--- generic/src/console/chardev.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/console/chardev.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -60,5 +60,5 @@
  * @param ch Character being pushed.
  */
-void chardev_push_character(chardev_t *chardev, __u8 ch)
+void chardev_push_character(chardev_t *chardev, uint8_t ch)
 {
 	spinlock_lock(&chardev->lock);
Index: generic/src/console/cmd.c
===================================================================
--- generic/src/console/cmd.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/console/cmd.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -480,11 +480,11 @@
 int cmd_call0(cmd_arg_t *argv)
 {
-	__address symaddr;
+	uintptr_t symaddr;
 	char *symbol;
-	__native (*f)(void);
+	unative_t (*f)(void);
 #ifdef ia64
 	struct {
-		__native f;
-		__native gp;
+		unative_t f;
+		unative_t gp;
 	}fptr;
 #endif
@@ -493,16 +493,16 @@
 	if (!symaddr)
 		printf("Symbol %s not found.\n", argv->buffer);
-	else if (symaddr == (__address) -1) {
+	else if (symaddr == (uintptr_t) -1) {
 		symtab_print_search(argv->buffer);
 		printf("Duplicate symbol, be more specific.\n");
 	} else {
 		symbol = get_symtab_entry(symaddr);
-		printf("Calling f(): %.*p: %s\n", sizeof(__address) * 2, symaddr, symbol);
+		printf("Calling f(): %.*p: %s\n", sizeof(uintptr_t) * 2, symaddr, symbol);
 #ifdef ia64
 		fptr.f = symaddr;
-		fptr.gp = ((__native *)cmd_call2)[1];
-		f =  (__native (*)(void)) &fptr;
+		fptr.gp = ((unative_t *)cmd_call2)[1];
+		f =  (unative_t (*)(void)) &fptr;
 #else
-		f =  (__native (*)(void)) symaddr;
+		f =  (unative_t (*)(void)) symaddr;
 #endif
 		printf("Result: %#zx\n", f());
@@ -515,12 +515,12 @@
 int cmd_call1(cmd_arg_t *argv)
 {
-	__address symaddr;
+	uintptr_t symaddr;
 	char *symbol;
-	__native (*f)(__native,...);
-	__native arg1 = argv[1].intval;
+	unative_t (*f)(unative_t,...);
+	unative_t arg1 = argv[1].intval;
 #ifdef ia64
 	struct {
-		__native f;
-		__native gp;
+		unative_t f;
+		unative_t gp;
 	}fptr;
 #endif
@@ -529,5 +529,5 @@
 	if (!symaddr)
 		printf("Symbol %s not found.\n", argv->buffer);
-	else if (symaddr == (__address) -1) {
+	else if (symaddr == (uintptr_t) -1) {
 		symtab_print_search(argv->buffer);
 		printf("Duplicate symbol, be more specific.\n");
@@ -535,11 +535,11 @@
 		symbol = get_symtab_entry(symaddr);
 
-		printf("Calling f(%#zx): %.*p: %s\n", arg1, sizeof(__address) * 2, symaddr, symbol);
+		printf("Calling f(%#zx): %.*p: %s\n", arg1, sizeof(uintptr_t) * 2, symaddr, symbol);
 #ifdef ia64
 		fptr.f = symaddr;
-		fptr.gp = ((__native *)cmd_call2)[1];
-		f =  (__native (*)(__native,...)) &fptr;
+		fptr.gp = ((unative_t *)cmd_call2)[1];
+		f =  (unative_t (*)(unative_t,...)) &fptr;
 #else
-		f =  (__native (*)(__native,...)) symaddr;
+		f =  (unative_t (*)(unative_t,...)) symaddr;
 #endif
 		printf("Result: %#zx\n", f(arg1));
@@ -552,13 +552,13 @@
 int cmd_call2(cmd_arg_t *argv)
 {
-	__address symaddr;
+	uintptr_t symaddr;
 	char *symbol;
-	__native (*f)(__native,__native,...);
-	__native arg1 = argv[1].intval;
-	__native arg2 = argv[2].intval;
+	unative_t (*f)(unative_t,unative_t,...);
+	unative_t arg1 = argv[1].intval;
+	unative_t arg2 = argv[2].intval;
 #ifdef ia64
 	struct {
-		__native f;
-		__native gp;
+		unative_t f;
+		unative_t gp;
 	}fptr;
 #endif
@@ -567,5 +567,5 @@
 	if (!symaddr)
 		printf("Symbol %s not found.\n", argv->buffer);
-	else if (symaddr == (__address) -1) {
+	else if (symaddr == (uintptr_t) -1) {
 		symtab_print_search(argv->buffer);
 		printf("Duplicate symbol, be more specific.\n");
@@ -573,11 +573,11 @@
 		symbol = get_symtab_entry(symaddr);
 		printf("Calling f(0x%zx,0x%zx): %.*p: %s\n", 
-		       arg1, arg2, sizeof(__address) * 2, symaddr, symbol);
+		       arg1, arg2, sizeof(uintptr_t) * 2, symaddr, symbol);
 #ifdef ia64
 		fptr.f = symaddr;
-		fptr.gp = ((__native *)cmd_call2)[1];
-		f =  (__native (*)(__native,__native,...)) &fptr;
+		fptr.gp = ((unative_t *)cmd_call2)[1];
+		f =  (unative_t (*)(unative_t,unative_t,...)) &fptr;
 #else
-		f =  (__native (*)(__native,__native,...)) symaddr;
+		f =  (unative_t (*)(unative_t,unative_t,...)) symaddr;
 #endif
 		printf("Result: %#zx\n", f(arg1, arg2));
@@ -590,14 +590,14 @@
 int cmd_call3(cmd_arg_t *argv)
 {
-	__address symaddr;
+	uintptr_t symaddr;
 	char *symbol;
-	__native (*f)(__native,__native,__native,...);
-	__native arg1 = argv[1].intval;
-	__native arg2 = argv[2].intval;
-	__native arg3 = argv[3].intval;
+	unative_t (*f)(unative_t,unative_t,unative_t,...);
+	unative_t arg1 = argv[1].intval;
+	unative_t arg2 = argv[2].intval;
+	unative_t arg3 = argv[3].intval;
 #ifdef ia64
 	struct {
-		__native f;
-		__native gp;
+		unative_t f;
+		unative_t gp;
 	}fptr;
 #endif
@@ -606,5 +606,5 @@
 	if (!symaddr)
 		printf("Symbol %s not found.\n", argv->buffer);
-	else if (symaddr == (__address) -1) {
+	else if (symaddr == (uintptr_t) -1) {
 		symtab_print_search(argv->buffer);
 		printf("Duplicate symbol, be more specific.\n");
@@ -612,11 +612,11 @@
 		symbol = get_symtab_entry(symaddr);
 		printf("Calling f(0x%zx,0x%zx, 0x%zx): %.*p: %s\n", 
-		       arg1, arg2, arg3, sizeof(__address) * 2, symaddr, symbol);
+		       arg1, arg2, arg3, sizeof(uintptr_t) * 2, symaddr, symbol);
 #ifdef ia64
 		fptr.f = symaddr;
-		fptr.gp = ((__native *)cmd_call2)[1];
-		f =  (__native (*)(__native,__native,__native,...)) &fptr;
+		fptr.gp = ((unative_t *)cmd_call2)[1];
+		f =  (unative_t (*)(unative_t,unative_t,unative_t,...)) &fptr;
 #else
-		f =  (__native (*)(__native,__native,__native,...)) symaddr;
+		f =  (unative_t (*)(unative_t,unative_t,unative_t,...)) symaddr;
 #endif
 		printf("Result: %#zx\n", f(arg1, arg2, arg3));
@@ -660,26 +660,26 @@
 int cmd_set4(cmd_arg_t *argv)
 {
-	__u32 *addr ;
-	__u32 arg1 = argv[1].intval;
+	uint32_t *addr ;
+	uint32_t arg1 = argv[1].intval;
 	bool pointer = false;
 
 	if (((char *)argv->buffer)[0] == '*') {
-		addr = (__u32 *) get_symbol_addr(argv->buffer+1);
+		addr = (uint32_t *) get_symbol_addr(argv->buffer+1);
 		pointer = true;
 	} else if (((char *)argv->buffer)[0] >= '0' && 
 		   ((char *)argv->buffer)[0] <= '9')
-		addr = (__u32 *)atoi((char *)argv->buffer);
+		addr = (uint32_t *)atoi((char *)argv->buffer);
 	else
-		addr = (__u32 *)get_symbol_addr(argv->buffer);
+		addr = (uint32_t *)get_symbol_addr(argv->buffer);
 
 	if (!addr)
 		printf("Symbol %s not found.\n", argv->buffer);
-	else if (addr == (__u32 *) -1) {
+	else if (addr == (uint32_t *) -1) {
 		symtab_print_search(argv->buffer);
 		printf("Duplicate symbol, be more specific.\n");
 	} else {
 		if (pointer)
-			addr = (__u32 *)(*(__native *)addr);
-		printf("Writing 0x%x -> %.*p\n", arg1, sizeof(__address) * 2, addr);
+			addr = (uint32_t *)(*(unative_t *)addr);
+		printf("Writing 0x%x -> %.*p\n", arg1, sizeof(uintptr_t) * 2, addr);
 		*addr = arg1;
 		
Index: generic/src/console/console.c
===================================================================
--- generic/src/console/console.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/console/console.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -77,7 +77,7 @@
  * @return Character read.
  */
-__u8 _getc(chardev_t *chardev)
+uint8_t _getc(chardev_t *chardev)
 {
-	__u8 ch;
+	uint8_t ch;
 	ipl_t ipl;
 
@@ -151,7 +151,7 @@
 
 /** Get character from device & echo it to screen */
-__u8 getc(chardev_t *chardev)
+uint8_t getc(chardev_t *chardev)
 {
-	__u8 ch;
+	uint8_t ch;
 
 	ch = _getc(chardev);
Index: generic/src/console/kconsole.c
===================================================================
--- generic/src/console/kconsole.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/console/kconsole.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -432,8 +432,8 @@
 }
 
-static int parse_int_arg(char *text, size_t len, __native *result)
+static int parse_int_arg(char *text, size_t len, unative_t *result)
 {
 	char symname[MAX_SYMBOL_NAME];
-	__address symaddr;
+	uintptr_t symaddr;
 	bool isaddr = false;
 	bool isptr = false;
@@ -454,5 +454,5 @@
 			return -1;
 		}
-		if (symaddr == (__address) -1) {
+		if (symaddr == (uintptr_t) -1) {
 			printf("Duplicate symbol %s.\n",symname);
 			symtab_print_search(symname);
@@ -460,13 +460,13 @@
 		}
 		if (isaddr)
-			*result = (__native)symaddr;
+			*result = (unative_t)symaddr;
 		else if (isptr)
-			*result = **((__native **)symaddr);
+			*result = **((unative_t **)symaddr);
 		else
-			*result = *((__native *)symaddr);
+			*result = *((unative_t *)symaddr);
 	} else { /* It's a number - convert it */
 		*result = atoi(text);
 		if (isptr)
-			*result = *((__native *)*result);
+			*result = *((unative_t *)*result);
 	}
 
@@ -555,5 +555,5 @@
 					min((end-start), cmd->argv[i].len));
 				buf[min((end - start), cmd->argv[i].len - 1)] = '\0';
-				cmd->argv[i].intval = (__native) buf;
+				cmd->argv[i].intval = (unative_t) buf;
 				cmd->argv[i].vartype = ARG_TYPE_STRING;
 			} else if (!parse_int_arg(cmdline+start, end-start+1, 
Index: generic/src/console/klog.c
===================================================================
--- generic/src/console/klog.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/console/klog.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -64,5 +64,5 @@
 	klog = (char *)PA2KA(faddr);
 	
-	sysinfo_set_item_val("klog.faddr", NULL, (__native)faddr);
+	sysinfo_set_item_val("klog.faddr", NULL, (unative_t)faddr);
 	sysinfo_set_item_val("klog.pages", NULL, 1 << KLOG_ORDER);
 
Index: generic/src/cpu/cpu.c
===================================================================
--- generic/src/cpu/cpu.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/cpu/cpu.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -69,8 +69,8 @@
 
 		/* initialize everything */
-		memsetb((__address) cpus, sizeof(cpu_t) * config.cpu_count, 0);
+		memsetb((uintptr_t) cpus, sizeof(cpu_t) * config.cpu_count, 0);
 
 		for (i=0; i < config.cpu_count; i++) {
-			cpus[i].stack = (__u8 *) frame_alloc(STACK_FRAMES, FRAME_KA | FRAME_ATOMIC);
+			cpus[i].stack = (uint8_t *) frame_alloc(STACK_FRAMES, FRAME_KA | FRAME_ATOMIC);
 			
 			cpus[i].id = i;
Index: generic/src/ddi/ddi.c
===================================================================
--- generic/src/ddi/ddi.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/ddi/ddi.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -63,5 +63,5 @@
  *	   there was a problem in creating address space area.
  */
-static int ddi_physmem_map(__address pf, __address vp, count_t pages, int flags)
+static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, count_t pages, int flags)
 {
 	ipl_t ipl;
@@ -111,5 +111,5 @@
  *	   ENOENT if there is no task matching the specified ID.
  */
-static int ddi_iospace_enable(task_id_t id, __address ioaddr, size_t size)
+static int ddi_iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
 {
 	ipl_t ipl;
@@ -159,9 +159,9 @@
  * @return 0 on success, otherwise it returns error code found in errno.h
  */ 
-__native sys_physmem_map(__native phys_base, __native virt_base, __native pages, 
-			 __native flags)
-{
-	return (__native) ddi_physmem_map(ALIGN_DOWN((__address) phys_base, FRAME_SIZE),
-					  ALIGN_DOWN((__address) virt_base, PAGE_SIZE), (count_t) pages,
+unative_t sys_physmem_map(unative_t phys_base, unative_t virt_base, unative_t pages, 
+			 unative_t flags)
+{
+	return (unative_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base, FRAME_SIZE),
+					  ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE), (count_t) pages,
 					  (int) flags);
 }
@@ -173,5 +173,5 @@
  * @return 0 on success, otherwise it returns error code found in errno.h
  */ 
-__native sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
+unative_t sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
 {
 	ddi_ioarg_t arg;
@@ -180,7 +180,7 @@
 	rc = copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
 	if (rc != 0)
-		return (__native) rc;
+		return (unative_t) rc;
 		
-	return (__native) ddi_iospace_enable((task_id_t) arg.task_id, (__address) arg.ioaddr, (size_t) arg.size);
+	return (unative_t) ddi_iospace_enable((task_id_t) arg.task_id, (uintptr_t) arg.ioaddr, (size_t) arg.size);
 }
 
@@ -193,5 +193,5 @@
  * @return Zero on success or EPERM if callers capabilities are not sufficient.
  */ 
-__native sys_preempt_control(int enable)
+unative_t sys_preempt_control(int enable)
 {
         if (! cap_get(TASK) & CAP_PREEMPT_CONTROL)
Index: generic/src/debug/symtab.c
===================================================================
--- generic/src/debug/symtab.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/debug/symtab.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -51,13 +51,13 @@
  * @return Pointer to respective symbol string on success, NULL otherwise.
  */
-char * get_symtab_entry(__native addr)
+char * get_symtab_entry(unative_t addr)
 {
 	count_t i;
 
 	for (i=1;symbol_table[i].address_le;++i) {
-		if (addr < __u64_le2host(symbol_table[i].address_le))
+		if (addr < uint64_t_le2host(symbol_table[i].address_le))
 			break;
 	}
-	if (addr >= __u64_le2host(symbol_table[i-1].address_le))
+	if (addr >= uint64_t_le2host(symbol_table[i-1].address_le))
 		return symbol_table[i-1].symbol_name;
 	return NULL;
@@ -109,8 +109,8 @@
  * @return 0 - Not found, -1 - Duplicate symbol, other - address of symbol
  */
-__address get_symbol_addr(const char *name)
+uintptr_t get_symbol_addr(const char *name)
 {
 	count_t found = 0;
-	__address addr = NULL;
+	uintptr_t addr = NULL;
 	char *hint;
 	int i;
@@ -119,5 +119,5 @@
 	while ((hint=symtab_search_one(name, &i))) {
 		if (!strlen(hint)) {
-			addr =  __u64_le2host(symbol_table[i].address_le);
+			addr =  uint64_t_le2host(symbol_table[i].address_le);
 			found++;
 		}
@@ -125,5 +125,5 @@
 	}
 	if (found > 1)
-		return ((__address) -1);
+		return ((uintptr_t) -1);
 	return addr;
 }
@@ -133,5 +133,5 @@
 {
 	int i;
-	__address addr;
+	uintptr_t addr;
 	char *realname;
 
@@ -139,7 +139,7 @@
 	i = 0;
 	while (symtab_search_one(name, &i)) {
-		addr =  __u64_le2host(symbol_table[i].address_le);
+		addr =  uint64_t_le2host(symbol_table[i].address_le);
 		realname = symbol_table[i].symbol_name;
-		printf("%.*p: %s\n", sizeof(__address) * 2, addr, realname);
+		printf("%.*p: %s\n", sizeof(uintptr_t) * 2, addr, realname);
 		i++;
 	}
Index: generic/src/interrupt/interrupt.c
===================================================================
--- generic/src/interrupt/interrupt.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/interrupt/interrupt.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -110,9 +110,9 @@
 	printf("Exc Description Handler\n");
 	for (i=0; i < IVT_ITEMS; i++) {
-		symbol = get_symtab_entry((__native)exc_table[i].f);
+		symbol = get_symtab_entry((unative_t)exc_table[i].f);
 		if (!symbol)
 			symbol = "not found";
 		printf("%d %s %.*p(%s)\n", i + IVT_FIRST, exc_table[i].name,
-		       sizeof(__address) * 2, exc_table[i].f,symbol);		
+		       sizeof(uintptr_t) * 2, exc_table[i].f,symbol);		
 		if (!((i+1) % 20)) {
 			printf("Press any key to continue.");
Index: generic/src/ipc/ipc.c
===================================================================
--- generic/src/ipc/ipc.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/ipc/ipc.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -62,5 +62,5 @@
 static void _ipc_call_init(call_t *call)
 {
-	memsetb((__address)call, sizeof(*call), 0);
+	memsetb((uintptr_t)call, sizeof(*call), 0);
 	call->callerbox = &TASK->answerbox;
 	call->sender = TASK;
@@ -186,5 +186,5 @@
  * message and sending it as a normal answer.
  */
-void ipc_backsend_err(phone_t *phone, call_t *call, __native err)
+void ipc_backsend_err(phone_t *phone, call_t *call, unative_t err)
 {
 	call->data.phone = phone;
@@ -309,5 +309,5 @@
  * - to distinguish between call and answer, look at call->flags
  */
-call_t * ipc_wait_for_call(answerbox_t *box, __u32 usec, int flags)
+call_t * ipc_wait_for_call(answerbox_t *box, uint32_t usec, int flags)
 {
 	call_t *request;
Index: generic/src/ipc/ipcrsc.c
===================================================================
--- generic/src/ipc/ipcrsc.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/ipc/ipcrsc.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -139,5 +139,5 @@
  * @return NULL on not found, otherwise pointer to call structure
  */
-call_t * get_call(__native callid)
+call_t * get_call(unative_t callid)
 {
 	link_t *lst;
@@ -148,5 +148,5 @@
 	     lst != &TASK->answerbox.dispatched_calls; lst = lst->next) {
 		call = list_get_instance(lst, call_t, link);
-		if ((__native)call == callid) {
+		if ((unative_t)call == callid) {
 			result = call;
 			break;
Index: generic/src/ipc/irq.c
===================================================================
--- generic/src/ipc/irq.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/ipc/irq.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -73,5 +73,5 @@
 {
 	int i;
-	__native dstval = 0;
+	unative_t dstval = 0;
 	
 	if (!code)
@@ -81,26 +81,26 @@
 		switch (code->cmds[i].cmd) {
 		case CMD_MEM_READ_1:
-			dstval = *((__u8 *)code->cmds[i].addr);
+			dstval = *((uint8_t *)code->cmds[i].addr);
 			break;
 		case CMD_MEM_READ_2:
-			dstval = *((__u16 *)code->cmds[i].addr);
+			dstval = *((uint16_t *)code->cmds[i].addr);
 			break;
 		case CMD_MEM_READ_4:
-			dstval = *((__u32 *)code->cmds[i].addr);
+			dstval = *((uint32_t *)code->cmds[i].addr);
 			break;
 		case CMD_MEM_READ_8:
-			dstval = *((__u64 *)code->cmds[i].addr);
+			dstval = *((uint64_t *)code->cmds[i].addr);
 			break;
 		case CMD_MEM_WRITE_1:
-			*((__u8 *)code->cmds[i].addr) = code->cmds[i].value;
+			*((uint8_t *)code->cmds[i].addr) = code->cmds[i].value;
 			break;
 		case CMD_MEM_WRITE_2:
-			*((__u16 *)code->cmds[i].addr) = code->cmds[i].value;
+			*((uint16_t *)code->cmds[i].addr) = code->cmds[i].value;
 			break;
 		case CMD_MEM_WRITE_4:
-			*((__u32 *)code->cmds[i].addr) = code->cmds[i].value;
+			*((uint32_t *)code->cmds[i].addr) = code->cmds[i].value;
 			break;
 		case CMD_MEM_WRITE_8:
-			*((__u64 *)code->cmds[i].addr) = code->cmds[i].value;
+			*((uint64_t *)code->cmds[i].addr) = code->cmds[i].value;
 			break;
 #if defined(ia32) || defined(amd64)
@@ -235,5 +235,5 @@
  *
  */
-void ipc_irq_send_msg(int irq, __native a1, __native a2, __native a3)
+void ipc_irq_send_msg(int irq, unative_t a1, unative_t a2, unative_t a3)
 {
 	call_t *call;
Index: generic/src/ipc/sysipc.c
===================================================================
--- generic/src/ipc/sysipc.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/ipc/sysipc.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -57,5 +57,5 @@
 
 /** Return true if the method is a system method */
-static inline int is_system_method(__native method)
+static inline int is_system_method(unative_t method)
 {
 	if (method <= IPC_M_LAST_SYSTEM)
@@ -69,5 +69,5 @@
  *   it is useless
  */
-static inline int is_forwardable(__native method)
+static inline int is_forwardable(unative_t method)
 {
 	if (method == IPC_M_PHONE_HUNGUP || method == IPC_M_AS_AREA_SEND \
@@ -132,5 +132,5 @@
 			phone_connect(phoneid,&answer->sender->answerbox);
 			/* Set 'phone identification' as arg3 of response */
-			IPC_SET_ARG3(answer->data, (__native)&TASK->phones[phoneid]);
+			IPC_SET_ARG3(answer->data, (unative_t)&TASK->phones[phoneid]);
 		}
 	} else if (IPC_GET_METHOD(*olddata) == IPC_M_CONNECT_ME_TO) {
@@ -192,5 +192,5 @@
 			return ELIMIT;
 		/* Set arg3 for server */
-		IPC_SET_ARG3(call->data, (__native)&TASK->phones[newphid]);
+		IPC_SET_ARG3(call->data, (unative_t)&TASK->phones[newphid]);
 		call->flags |= IPC_CALL_CONN_ME_TO;
 		call->private = newphid;
@@ -254,6 +254,6 @@
            -2 on 'Too many async request, handle answers first
  */
-__native sys_ipc_call_sync_fast(__native phoneid, __native method, 
-				__native arg1, ipc_data_t *data)
+unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method, 
+				unative_t arg1, ipc_data_t *data)
 {
 	call_t call;
@@ -278,5 +278,5 @@
 
 /** Synchronous IPC call allowing to send whole message */
-__native sys_ipc_call_sync(__native phoneid, ipc_data_t *question, 
+unative_t sys_ipc_call_sync(unative_t phoneid, ipc_data_t *question, 
 			   ipc_data_t *reply)
 {
@@ -289,5 +289,5 @@
 	rc = copy_from_uspace(&call.data.args, &question->args, sizeof(call.data.args));
 	if (rc != 0)
-		return (__native) rc;
+		return (unative_t) rc;
 
 	GET_CHECK_PHONE(phone, phoneid, return ENOENT);
@@ -324,6 +324,6 @@
            -2 on 'Too many async request, handle answers first
  */
-__native sys_ipc_call_async_fast(__native phoneid, __native method, 
-				 __native arg1, __native arg2)
+unative_t sys_ipc_call_async_fast(unative_t phoneid, unative_t method, 
+				 unative_t arg1, unative_t arg2)
 {
 	call_t *call;
@@ -347,5 +347,5 @@
 		ipc_backsend_err(phone, call, res);
 
-	return (__native) call;
+	return (unative_t) call;
 }
 
@@ -354,5 +354,5 @@
  * @return The same as sys_ipc_call_async
  */
-__native sys_ipc_call_async(__native phoneid, ipc_data_t *data)
+unative_t sys_ipc_call_async(unative_t phoneid, ipc_data_t *data)
 {
 	call_t *call;
@@ -370,5 +370,5 @@
 	if (rc != 0) {
 		ipc_call_free(call);
-		return (__native) rc;
+		return (unative_t) rc;
 	}
 	if (!(res=request_preprocess(call)))
@@ -377,5 +377,5 @@
 		ipc_backsend_err(phone, call, res);
 
-	return (__native) call;
+	return (unative_t) call;
 }
 
@@ -387,6 +387,6 @@
  *          arg3 is not rewritten for certain system IPC
  */
-__native sys_ipc_forward_fast(__native callid, __native phoneid,
-			      __native method, __native arg1)
+unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid,
+			      unative_t method, unative_t arg1)
 {
 	call_t *call;
@@ -429,6 +429,6 @@
 
 /** Send IPC answer */
-__native sys_ipc_answer_fast(__native callid, __native retval, 
-			     __native arg1, __native arg2)
+unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval, 
+			     unative_t arg1, unative_t arg2)
 {
 	call_t *call;
@@ -460,5 +460,5 @@
 
 /** Send IPC answer */
-__native sys_ipc_answer(__native callid, ipc_data_t *data)
+unative_t sys_ipc_answer(unative_t callid, ipc_data_t *data)
 {
 	call_t *call;
@@ -494,5 +494,5 @@
  *
  */
-__native sys_ipc_hangup(int phoneid)
+unative_t sys_ipc_hangup(int phoneid)
 {
 	phone_t *phone;
@@ -514,5 +514,5 @@
  * @return Callid, if callid & 1, then the call is answer
  */
-__native sys_ipc_wait_for_call(ipc_data_t *calldata, __u32 usec, int flags)
+unative_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec, int flags)
 {
 	call_t *call;
@@ -533,5 +533,5 @@
 		ipc_call_free(call);
 		
-		return ((__native)call) | IPC_CALLID_NOTIFICATION;
+		return ((unative_t)call) | IPC_CALLID_NOTIFICATION;
 	}
 
@@ -551,5 +551,5 @@
 		ipc_call_free(call);
 
-		return ((__native)call) | IPC_CALLID_ANSWERED;
+		return ((unative_t)call) | IPC_CALLID_ANSWERED;
 	}
 
@@ -562,9 +562,9 @@
 		return 0;
 	}
-	return (__native)call;
+	return (unative_t)call;
 }
 
 /** Connect irq handler to task */
-__native sys_ipc_register_irq(int irq, irq_code_t *ucode)
+unative_t sys_ipc_register_irq(int irq, irq_code_t *ucode)
 {
 	if (!(cap_get(TASK) & CAP_IRQ_REG))
@@ -572,5 +572,5 @@
 
 	if (irq >= IRQ_COUNT || irq <= -IPC_IRQ_RESERVED_VIRTUAL)
-		return (__native) ELIMIT;
+		return (unative_t) ELIMIT;
 	
 	irq_ipc_bind_arch(irq);
@@ -580,5 +580,5 @@
 
 /* Disconnect irq handler from task */
-__native sys_ipc_unregister_irq(int irq)
+unative_t sys_ipc_unregister_irq(int irq)
 {
 	if (!(cap_get(TASK) & CAP_IRQ_REG))
@@ -586,5 +586,5 @@
 
 	if (irq >= IRQ_COUNT || irq <= -IPC_IRQ_RESERVED_VIRTUAL)
-		return (__native) ELIMIT;
+		return (unative_t) ELIMIT;
 
 	ipc_irq_unregister(&TASK->answerbox, irq);
Index: generic/src/lib/elf.c
===================================================================
--- generic/src/lib/elf.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/lib/elf.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -97,5 +97,5 @@
 	/* Walk through all segment headers and process them. */
 	for (i = 0; i < header->e_phnum; i++) {
-		rc = segment_header(&((elf_segment_header_t *)(((__u8 *) header) + header->e_phoff))[i], header, as);
+		rc = segment_header(&((elf_segment_header_t *)(((uint8_t *) header) + header->e_phoff))[i], header, as);
 		if (rc != EE_OK)
 			return rc;
@@ -104,5 +104,5 @@
 	/* Inspect all section headers and proccess them. */
 	for (i = 0; i < header->e_shnum; i++) {
-		rc = section_header(&((elf_section_header_t *)(((__u8 *) header) + header->e_shoff))[i], header, as);
+		rc = section_header(&((elf_section_header_t *)(((uint8_t *) header) + header->e_shoff))[i], header, as);
 		if (rc != EE_OK)
 			return rc;
Index: generic/src/lib/func.c
===================================================================
--- generic/src/lib/func.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/lib/func.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -149,5 +149,5 @@
 }
 
-/** Convert ascii representation to __native
+/** Convert ascii representation to unative_t
  *
  * Supports 0x for hexa & 0 for octal notation.
@@ -157,8 +157,8 @@
  * @return Converted number or 0 if no valid number ofund 
  */
-__native atoi(const char *text)
+unative_t atoi(const char *text)
 {
 	int base = 10;
-	__native result = 0;
+	unative_t result = 0;
 
 	if (text[0] == '0' && text[1] == 'x') {
Index: generic/src/lib/memstr.c
===================================================================
--- generic/src/lib/memstr.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/lib/memstr.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -62,15 +62,15 @@
 	int i, j;
 	
-	if (ALIGN_UP((__address) src, sizeof(__native)) != (__address) src ||
-		ALIGN_UP((__address) dst, sizeof(__native)) != (__address) dst) {
+	if (ALIGN_UP((uintptr_t) src, sizeof(unative_t)) != (uintptr_t) src ||
+		ALIGN_UP((uintptr_t) dst, sizeof(unative_t)) != (uintptr_t) dst) {
 		for (i = 0; i < cnt; i++)
-			((__u8 *) dst)[i] = ((__u8 *) src)[i];
+			((uint8_t *) dst)[i] = ((uint8_t *) src)[i];
 	} else { 
 	
-		for (i = 0; i < cnt/sizeof(__native); i++)
-			((__native *) dst)[i] = ((__native *) src)[i];
+		for (i = 0; i < cnt/sizeof(unative_t); i++)
+			((unative_t *) dst)[i] = ((unative_t *) src)[i];
 		
-		for (j = 0; j < cnt%sizeof(__native); j++)
-			((__u8 *)(((__native *) dst) + i))[j] = ((__u8 *)(((__native *) src) + i))[j];
+		for (j = 0; j < cnt%sizeof(unative_t); j++)
+			((uint8_t *)(((unative_t *) dst) + i))[j] = ((uint8_t *)(((unative_t *) src) + i))[j];
 	}
 		
@@ -88,8 +88,8 @@
  *
  */
-void _memsetb(__address dst, size_t cnt, __u8 x)
+void _memsetb(uintptr_t dst, size_t cnt, uint8_t x)
 {
 	int i;
-	__u8 *p = (__u8 *) dst;
+	uint8_t *p = (uint8_t *) dst;
 	
 	for(i=0; i<cnt; i++)
@@ -107,8 +107,8 @@
  *
  */
-void _memsetw(__address dst, size_t cnt, __u16 x)
+void _memsetw(uintptr_t dst, size_t cnt, uint16_t x)
 {
 	int i;
-	__u16 *p = (__u16 *) dst;
+	uint16_t *p = (uint16_t *) dst;
 	
 	for(i=0; i<cnt; i++)
Index: generic/src/lib/sort.c
===================================================================
--- generic/src/lib/sort.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/lib/sort.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -64,6 +64,6 @@
 void qsort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b))
 {
-	__u8 buf_tmp[EBUFSIZE];
-	__u8 buf_pivot[EBUFSIZE];
+	uint8_t buf_tmp[EBUFSIZE];
+	uint8_t buf_pivot[EBUFSIZE];
 	void * tmp = buf_tmp;
 	void * pivot = buf_pivot;
@@ -133,5 +133,5 @@
 void bubblesort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b))
 {
-	__u8 buf_slot[EBUFSIZE];
+	uint8_t buf_slot[EBUFSIZE];
 	void * slot = buf_slot;
 	
@@ -185,17 +185,17 @@
 }
 
-int __u8_cmp(void * a, void * b)
-{
-	return (* (__u8 *) a > * (__u8 *)b) ? 1 : (*(__u8 *)a < * (__u8 *)b) ? -1 : 0;
-}
-
-int __u16_cmp(void * a, void * b)
-{
-	return (* (__u16 *) a > * (__u16 *)b) ? 1 : (*(__u16 *)a < * (__u16 *)b) ? -1 : 0;
-}
-
-int __u32_cmp(void * a, void * b)
-{
-	return (* (__u32 *) a > * (__u32 *)b) ? 1 : (*(__u32 *)a < * (__u32 *)b) ? -1 : 0;
+int uint8_t_cmp(void * a, void * b)
+{
+	return (* (uint8_t *) a > * (uint8_t *)b) ? 1 : (*(uint8_t *)a < * (uint8_t *)b) ? -1 : 0;
+}
+
+int uint16_t_cmp(void * a, void * b)
+{
+	return (* (uint16_t *) a > * (uint16_t *)b) ? 1 : (*(uint16_t *)a < * (uint16_t *)b) ? -1 : 0;
+}
+
+int uint32_t_cmp(void * a, void * b)
+{
+	return (* (uint32_t *) a > * (uint32_t *)b) ? 1 : (*(uint32_t *)a < * (uint32_t *)b) ? -1 : 0;
 }
 
Index: generic/src/main/main.c
===================================================================
--- generic/src/main/main.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/main/main.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -102,5 +102,5 @@
  * appropriate sizes and addresses.
  */
-__address hardcoded_load_address = 0;	/**< Virtual address of where the kernel is loaded. */
+uintptr_t hardcoded_load_address = 0;	/**< Virtual address of where the kernel is loaded. */
 size_t hardcoded_ktext_size = 0;	/**< Size of the kernel code in bytes. */
 size_t hardcoded_kdata_size = 0;	/**< Size of the kernel data in bytes. */
@@ -133,5 +133,5 @@
 void main_bsp(void)
 {
-	__address stackaddr;
+	uintptr_t stackaddr;
 
 	config.cpu_count = 1;
@@ -203,5 +203,5 @@
 
 	version_print();
-	printf("%.*p: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", sizeof(__address) * 2, config.base, hardcoded_ktext_size >> 10, hardcoded_kdata_size >> 10);
+	printf("%.*p: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2, config.base, hardcoded_ktext_size >> 10, hardcoded_kdata_size >> 10);
 
 	arch_pre_smp_init();
@@ -224,5 +224,5 @@
 	
 	for (i = 0; i < init.cnt; i++)
-		printf("init[%zd].addr=%.*p, init[%zd].size=%zd\n", i, sizeof(__address) * 2, init.tasks[i].addr, i, init.tasks[i].size);
+		printf("init[%zd].addr=%.*p, init[%zd].size=%zd\n", i, sizeof(uintptr_t) * 2, init.tasks[i].addr, i, init.tasks[i].size);
 	
 	ipc_init();
@@ -298,5 +298,5 @@
 	 * switch to this cpu's private stack prior to waking kmp up.
 	 */
-	context_set(&CPU->saved_context, FADDR(main_ap_separated_stack), (__address) CPU->stack, CPU_STACK_SIZE);
+	context_set(&CPU->saved_context, FADDR(main_ap_separated_stack), (uintptr_t) CPU->stack, CPU_STACK_SIZE);
 	context_restore(&CPU->saved_context);
 	/* not reached */
Index: generic/src/mm/as.c
===================================================================
--- generic/src/mm/as.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/mm/as.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -98,6 +98,6 @@
 
 static int area_flags_to_page_flags(int aflags);
-static as_area_t *find_area_and_lock(as_t *as, __address va);
-static bool check_area_conflicts(as_t *as, __address va, size_t size, as_area_t *avoid_area);
+static as_area_t *find_area_and_lock(as_t *as, uintptr_t va);
+static bool check_area_conflicts(as_t *as, uintptr_t va, size_t size, as_area_t *avoid_area);
 static void sh_info_remove_reference(share_info_t *sh_info);
 
@@ -200,5 +200,5 @@
  * @return Address space area on success or NULL on failure.
  */
-as_area_t *as_area_create(as_t *as, int flags, size_t size, __address base, int attrs,
+as_area_t *as_area_create(as_t *as, int flags, size_t size, uintptr_t base, int attrs,
 	       mem_backend_t *backend, mem_backend_data_t *backend_data)
 {
@@ -239,5 +239,5 @@
 		a->backend_data = *backend_data;
 	else
-		memsetb((__address) &a->backend_data, sizeof(a->backend_data), 0);
+		memsetb((uintptr_t) &a->backend_data, sizeof(a->backend_data), 0);
 
 	btree_create(&a->used_space);
@@ -260,5 +260,5 @@
  * @return Zero on success or a value from @ref errno.h otherwise.
  */ 
-int as_area_resize(as_t *as, __address address, size_t size, int flags)
+int as_area_resize(as_t *as, uintptr_t address, size_t size, int flags)
 {
 	as_area_t *area;
@@ -313,5 +313,5 @@
 	if (pages < area->pages) {
 		bool cond;
-		__address start_free = area->base + pages*PAGE_SIZE;
+		uintptr_t start_free = area->base + pages*PAGE_SIZE;
 
 		/*
@@ -338,5 +338,5 @@
 			node = list_get_instance(area->used_space.leaf_head.prev, btree_node_t, leaf_link);
 			if ((cond = (bool) node->keys)) {
-				__address b = node->key[node->keys - 1];
+				uintptr_t b = node->key[node->keys - 1];
 				count_t c = (count_t) node->value[node->keys - 1];
 				int i = 0;
@@ -419,8 +419,8 @@
  * @return Zero on success or a value from @ref errno.h on failure. 
  */
-int as_area_destroy(as_t *as, __address address)
+int as_area_destroy(as_t *as, uintptr_t address)
 {
 	as_area_t *area;
-	__address base;
+	uintptr_t base;
 	link_t *cur;
 	ipl_t ipl;
@@ -452,5 +452,5 @@
 		node = list_get_instance(cur, btree_node_t, leaf_link);
 		for (i = 0; i < node->keys; i++) {
-			__address b = node->key[i];
+			uintptr_t b = node->key[i];
 			count_t j;
 			pte_t *pte;
@@ -519,6 +519,6 @@
  *	   to share non-anonymous address space area is detected.
  */
-int as_area_share(as_t *src_as, __address src_base, size_t acc_size,
-		  as_t *dst_as, __address dst_base, int dst_flags_mask)
+int as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size,
+		  as_t *dst_as, uintptr_t dst_base, int dst_flags_mask)
 {
 	ipl_t ipl;
@@ -666,5 +666,5 @@
  * 	   fault was caused by copy_to_uspace() or copy_from_uspace().
  */
-int as_page_fault(__address page, pf_access_t access, istate_t *istate)
+int as_page_fault(uintptr_t page, pf_access_t access, istate_t *istate)
 {
 	pte_t *pte;
@@ -745,8 +745,8 @@
 	if (THREAD->in_copy_from_uspace) {
 		THREAD->in_copy_from_uspace = false;
-		istate_set_retaddr(istate, (__address) &memcpy_from_uspace_failover_address);
+		istate_set_retaddr(istate, (uintptr_t) &memcpy_from_uspace_failover_address);
 	} else if (THREAD->in_copy_to_uspace) {
 		THREAD->in_copy_to_uspace = false;
-		istate_set_retaddr(istate, (__address) &memcpy_to_uspace_failover_address);
+		istate_set_retaddr(istate, (uintptr_t) &memcpy_to_uspace_failover_address);
 	} else {
 		return AS_PF_FAULT;
@@ -943,5 +943,5 @@
  * @return Locked address space area containing va on success or NULL on failure.
  */
-as_area_t *find_area_and_lock(as_t *as, __address va)
+as_area_t *find_area_and_lock(as_t *as, uintptr_t va)
 {
 	as_area_t *a;
@@ -999,5 +999,5 @@
  * @return True if there is no conflict, false otherwise.
  */
-bool check_area_conflicts(as_t *as, __address va, size_t size, as_area_t *avoid_area)
+bool check_area_conflicts(as_t *as, uintptr_t va, size_t size, as_area_t *avoid_area)
 {
 	as_area_t *a;
@@ -1072,5 +1072,5 @@
 
 /** Return size of the address space area with given base.  */
-size_t as_get_size(__address base)
+size_t as_get_size(uintptr_t base)
 {
 	ipl_t ipl;
@@ -1100,5 +1100,5 @@
  * @return 0 on failure and 1 on success.
  */
-int used_space_insert(as_area_t *a, __address page, count_t count)
+int used_space_insert(as_area_t *a, uintptr_t page, count_t count)
 {
 	btree_node_t *leaf, *node;
@@ -1124,5 +1124,5 @@
 	node = btree_leaf_node_left_neighbour(&a->used_space, leaf);
 	if (node) {
-		__address left_pg = node->key[node->keys - 1], right_pg = leaf->key[0];
+		uintptr_t left_pg = node->key[node->keys - 1], right_pg = leaf->key[0];
 		count_t left_cnt = (count_t) node->value[node->keys - 1], right_cnt = (count_t) leaf->value[0];
 		
@@ -1167,5 +1167,5 @@
 		}
 	} else if (page < leaf->key[0]) {
-		__address right_pg = leaf->key[0];
+		uintptr_t right_pg = leaf->key[0];
 		count_t right_cnt = (count_t) leaf->value[0];
 	
@@ -1198,5 +1198,5 @@
 	node = btree_leaf_node_right_neighbour(&a->used_space, leaf);
 	if (node) {
-		__address left_pg = leaf->key[leaf->keys - 1], right_pg = node->key[0];
+		uintptr_t left_pg = leaf->key[leaf->keys - 1], right_pg = node->key[0];
 		count_t left_cnt = (count_t) leaf->value[leaf->keys - 1], right_cnt = (count_t) node->value[0];
 		
@@ -1241,5 +1241,5 @@
 		}
 	} else if (page >= leaf->key[leaf->keys - 1]) {
-		__address left_pg = leaf->key[leaf->keys - 1];
+		uintptr_t left_pg = leaf->key[leaf->keys - 1];
 		count_t left_cnt = (count_t) leaf->value[leaf->keys - 1];
 	
@@ -1273,5 +1273,5 @@
 	for (i = 1; i < leaf->keys; i++) {
 		if (page < leaf->key[i]) {
-			__address left_pg = leaf->key[i - 1], right_pg = leaf->key[i];
+			uintptr_t left_pg = leaf->key[i - 1], right_pg = leaf->key[i];
 			count_t left_cnt = (count_t) leaf->value[i - 1], right_cnt = (count_t) leaf->value[i];
 
@@ -1327,5 +1327,5 @@
  * @return 0 on failure and 1 on success.
  */
-int used_space_remove(as_area_t *a, __address page, count_t count)
+int used_space_remove(as_area_t *a, uintptr_t page, count_t count)
 {
 	btree_node_t *leaf, *node;
@@ -1364,5 +1364,5 @@
 	node = btree_leaf_node_left_neighbour(&a->used_space, leaf);
 	if (node && page < leaf->key[0]) {
-		__address left_pg = node->key[node->keys - 1];
+		uintptr_t left_pg = node->key[node->keys - 1];
 		count_t left_cnt = (count_t) node->value[node->keys - 1];
 
@@ -1397,5 +1397,5 @@
 	
 	if (page > leaf->key[leaf->keys - 1]) {
-		__address left_pg = leaf->key[leaf->keys - 1];
+		uintptr_t left_pg = leaf->key[leaf->keys - 1];
 		count_t left_cnt = (count_t) leaf->value[leaf->keys - 1];
 
@@ -1433,5 +1433,5 @@
 	for (i = 1; i < leaf->keys - 1; i++) {
 		if (page < leaf->key[i]) {
-			__address left_pg = leaf->key[i - 1];
+			uintptr_t left_pg = leaf->key[i - 1];
 			count_t left_cnt = (count_t) leaf->value[i - 1];
 
@@ -1497,5 +1497,5 @@
 			node = list_get_instance(cur, btree_node_t, leaf_link);
 			for (i = 0; i < node->keys; i++) 
-				frame_free((__address) node->value[i]);
+				frame_free((uintptr_t) node->value[i]);
 		}
 		
@@ -1514,22 +1514,22 @@
 
 /** Wrapper for as_area_create(). */
-__native sys_as_area_create(__address address, size_t size, int flags)
+unative_t sys_as_area_create(uintptr_t address, size_t size, int flags)
 {
 	if (as_area_create(AS, flags | AS_AREA_CACHEABLE, size, address, AS_AREA_ATTR_NONE, &anon_backend, NULL))
-		return (__native) address;
+		return (unative_t) address;
 	else
-		return (__native) -1;
+		return (unative_t) -1;
 }
 
 /** Wrapper for as_area_resize. */
-__native sys_as_area_resize(__address address, size_t size, int flags)
-{
-	return (__native) as_area_resize(AS, address, size, 0);
+unative_t sys_as_area_resize(uintptr_t address, size_t size, int flags)
+{
+	return (unative_t) as_area_resize(AS, address, size, 0);
 }
 
 /** Wrapper for as_area_destroy. */
-__native sys_as_area_destroy(__address address)
-{
-	return (__native) as_area_destroy(AS, address);
+unative_t sys_as_area_destroy(uintptr_t address)
+{
+	return (unative_t) as_area_destroy(AS, address);
 }
 
Index: generic/src/mm/backend_anon.c
===================================================================
--- generic/src/mm/backend_anon.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/mm/backend_anon.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -52,6 +52,6 @@
 #include <arch.h>
 
-static int anon_page_fault(as_area_t *area, __address addr, pf_access_t access);
-static void anon_frame_free(as_area_t *area, __address page, __address frame);
+static int anon_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access);
+static void anon_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame);
 static void anon_share(as_area_t *area);
 
@@ -72,7 +72,7 @@
  * @return AS_PF_FAULT on failure (i.e. page fault) or AS_PF_OK on success (i.e. serviced).
  */
-int anon_page_fault(as_area_t *area, __address addr, pf_access_t access)
+int anon_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access)
 {
-	__address frame;
+	uintptr_t frame;
 
 	if (!as_area_check_access(area, access))
@@ -89,5 +89,5 @@
 		 */
 		mutex_lock(&area->sh_info->lock);
-		frame = (__address) btree_search(&area->sh_info->pagemap,
+		frame = (uintptr_t) btree_search(&area->sh_info->pagemap,
 			ALIGN_DOWN(addr, PAGE_SIZE) - area->base, &leaf);
 		if (!frame) {
@@ -106,5 +106,5 @@
 			}
 			if (allocate) {
-				frame = (__address) frame_alloc(ONE_FRAME, 0);
+				frame = (uintptr_t) frame_alloc(ONE_FRAME, 0);
 				memsetb(PA2KA(frame), FRAME_SIZE, 0);
 				
@@ -133,5 +133,5 @@
 		 *   the different causes
 		 */
-		frame = (__address)frame_alloc(ONE_FRAME, 0);
+		frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
 		memsetb(PA2KA(frame), FRAME_SIZE, 0);
 	}
@@ -157,5 +157,5 @@
  * @param frame Frame to be released.
  */
-void anon_frame_free(as_area_t *area, __address page, __address frame)
+void anon_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame)
 {
 	frame_free(frame);
@@ -185,5 +185,5 @@
 		node = list_get_instance(cur, btree_node_t, leaf_link);
 		for (i = 0; i < node->keys; i++) {
-			__address base = node->key[i];
+			uintptr_t base = node->key[i];
 			count_t count = (count_t) node->value[i];
 			int j;
Index: generic/src/mm/backend_elf.c
===================================================================
--- generic/src/mm/backend_elf.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/mm/backend_elf.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -51,6 +51,6 @@
 #include <arch.h>
 
-static int elf_page_fault(as_area_t *area, __address addr, pf_access_t access);
-static void elf_frame_free(as_area_t *area, __address page, __address frame);
+static int elf_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access);
+static void elf_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame);
 static void elf_share(as_area_t *area);
 
@@ -71,10 +71,10 @@
  * @return AS_PF_FAULT on failure (i.e. page fault) or AS_PF_OK on success (i.e. serviced).
  */
-int elf_page_fault(as_area_t *area, __address addr, pf_access_t access)
+int elf_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access)
 {
 	elf_header_t *elf = area->backend_data.elf;
 	elf_segment_header_t *entry = area->backend_data.segment;
 	btree_node_t *leaf;
-	__address base, frame;
+	uintptr_t base, frame;
 	index_t i;
 
@@ -84,5 +84,5 @@
 	ASSERT((addr >= entry->p_vaddr) && (addr < entry->p_vaddr + entry->p_memsz));
 	i = (addr - entry->p_vaddr) >> PAGE_WIDTH;
-	base = (__address) (((void *) elf) + entry->p_offset);
+	base = (uintptr_t) (((void *) elf) + entry->p_offset);
 	ASSERT(ALIGN_UP(base, FRAME_SIZE) == base);
 
@@ -95,5 +95,5 @@
 		 
 		mutex_lock(&area->sh_info->lock);
-		frame = (__address) btree_search(&area->sh_info->pagemap,
+		frame = (uintptr_t) btree_search(&area->sh_info->pagemap,
 			ALIGN_DOWN(addr, PAGE_SIZE) - area->base, &leaf);
 		if (!frame) {
@@ -135,5 +135,5 @@
 		 */
 		if (entry->p_flags & PF_W) {
-			frame = (__address)frame_alloc(ONE_FRAME, 0);
+			frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
 			memcpy((void *) PA2KA(frame), (void *) (base + i*FRAME_SIZE), FRAME_SIZE);
 			
@@ -154,5 +154,5 @@
 		 * and cleared.
 		 */
-		frame = (__address)frame_alloc(ONE_FRAME, 0);
+		frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
 		memsetb(PA2KA(frame), FRAME_SIZE, 0);
 
@@ -171,5 +171,5 @@
 		 */
 		size = entry->p_filesz - (i<<PAGE_WIDTH);
-		frame = (__address)frame_alloc(ONE_FRAME, 0);
+		frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
 		memsetb(PA2KA(frame) + size, FRAME_SIZE - size, 0);
 		memcpy((void *) PA2KA(frame), (void *) (base + i*FRAME_SIZE), size);
@@ -202,14 +202,14 @@
  *
  */
-void elf_frame_free(as_area_t *area, __address page, __address frame)
+void elf_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame)
 {
 	elf_header_t *elf = area->backend_data.elf;
 	elf_segment_header_t *entry = area->backend_data.segment;
-	__address base;
+	uintptr_t base;
 	index_t i;
 	
 	ASSERT((page >= entry->p_vaddr) && (page < entry->p_vaddr + entry->p_memsz));
 	i = (page - entry->p_vaddr) >> PAGE_WIDTH;
-	base = (__address) (((void *) elf) + entry->p_offset);
+	base = (uintptr_t) (((void *) elf) + entry->p_offset);
 	ASSERT(ALIGN_UP(base, FRAME_SIZE) == base);
 	
@@ -246,5 +246,5 @@
 	link_t *cur;
 	btree_node_t *leaf, *node;
-	__address start_anon = entry->p_vaddr + entry->p_filesz;
+	uintptr_t start_anon = entry->p_vaddr + entry->p_filesz;
 
 	/*
@@ -270,5 +270,5 @@
 		
 		for (i = 0; i < node->keys; i++) {
-			__address base = node->key[i];
+			uintptr_t base = node->key[i];
 			count_t count = (count_t) node->value[i];
 			int j;
Index: generic/src/mm/backend_phys.c
===================================================================
--- generic/src/mm/backend_phys.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/mm/backend_phys.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -47,5 +47,5 @@
 #include <align.h>
 
-static int phys_page_fault(as_area_t *area, __address addr, pf_access_t access);
+static int phys_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access);
 static void phys_share(as_area_t *area);
 
@@ -66,7 +66,7 @@
  * @return AS_PF_FAULT on failure (i.e. page fault) or AS_PF_OK on success (i.e. serviced).
  */
-int phys_page_fault(as_area_t *area, __address addr, pf_access_t access)
+int phys_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access)
 {
-	__address base = area->backend_data.base;
+	uintptr_t base = area->backend_data.base;
 
 	if (!as_area_check_access(area, access))
Index: generic/src/mm/buddy.c
===================================================================
--- generic/src/mm/buddy.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/mm/buddy.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -67,5 +67,5 @@
  */
 void buddy_system_create(buddy_system_t *b,
-			 __u8 max_order, 
+			 uint8_t max_order, 
 			 buddy_system_operations_t *op, 
 			 void *data)
@@ -102,6 +102,6 @@
  * @return True if block can be allocated
  */
-bool buddy_system_can_alloc(buddy_system_t *b, __u8 i) {
-	__u8 k;
+bool buddy_system_can_alloc(buddy_system_t *b, uint8_t i) {
+	uint8_t k;
 	
 	/*
@@ -131,5 +131,5 @@
 {
 	link_t *left,*right, *tmp;
-	__u8 order;
+	uint8_t order;
 
 	left = b->op->find_block(b, block, BUDDY_SYSTEM_INNER_BLOCK);
@@ -168,5 +168,5 @@
  * @return Block of data represented by link_t.
  */
-link_t *buddy_system_alloc(buddy_system_t *b, __u8 i)
+link_t *buddy_system_alloc(buddy_system_t *b, uint8_t i)
 {
 	link_t *res, *hlp;
@@ -231,5 +231,5 @@
 {
 	link_t *buddy, *hlp;
-	__u8 i;
+	uint8_t i;
 
 	/*
Index: generic/src/mm/frame.c
===================================================================
--- generic/src/mm/frame.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/mm/frame.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -70,5 +70,5 @@
 typedef struct {
 	count_t refcount;	/**< tracking of shared frames  */
-	__u8 buddy_order;	/**< buddy system block order */
+	uint8_t buddy_order;	/**< buddy system block order */
 	link_t buddy_link;	/**< link to the next free block inside one order */
 	void *parent;           /**< If allocated by slab, this points there */
@@ -218,5 +218,5 @@
 
 /** @return True if zone can allocate specified order */
-static int zone_can_alloc(zone_t *z, __u8 order)
+static int zone_can_alloc(zone_t *z, uint8_t order)
 {
 	return buddy_system_can_alloc(z->buddy_system, order);
@@ -231,5 +231,5 @@
  * @param pzone Pointer to preferred zone or NULL, on return contains zone number
  */
-static zone_t * find_free_zone_lock(__u8 order, int *pzone)
+static zone_t * find_free_zone_lock(uint8_t order, int *pzone)
 {
 	int i;
@@ -272,5 +272,5 @@
  */
 static link_t *zone_buddy_find_block(buddy_system_t *b, link_t *child,
-				     __u8 order)
+				     uint8_t order)
 {
 	frame_t * frame;
@@ -381,5 +381,5 @@
  * @param order Order to set
  */
-static void zone_buddy_set_order(buddy_system_t *b, link_t * block, __u8 order) {
+static void zone_buddy_set_order(buddy_system_t *b, link_t * block, uint8_t order) {
 	frame_t * frame;
 	frame = list_get_instance(block, frame_t, buddy_link);
@@ -394,5 +394,5 @@
  * @return Order of block
  */
-static __u8 zone_buddy_get_order(buddy_system_t *b, link_t * block) {
+static uint8_t zone_buddy_get_order(buddy_system_t *b, link_t * block) {
 	frame_t * frame;
 	frame = list_get_instance(block, frame_t, buddy_link);
@@ -451,5 +451,5 @@
  *
  */
-static pfn_t zone_frame_alloc(zone_t *zone, __u8 order)
+static pfn_t zone_frame_alloc(zone_t *zone, uint8_t order)
 {
 	pfn_t v;
@@ -484,5 +484,5 @@
 {
 	frame_t *frame;
-	__u8 order;
+	uint8_t order;
 
 	frame = &zone->frames[frame_idx];
@@ -538,5 +538,5 @@
 static void _zone_merge(zone_t *z, zone_t *z1, zone_t *z2)
 {
-	__u8 max_order;
+	uint8_t max_order;
 	int i, z2idx;
 	pfn_t frame_idx;
@@ -625,5 +625,5 @@
 	int i;
 
-	pfn = ADDR2PFN((__address)KA2PA(oldzone));
+	pfn = ADDR2PFN((uintptr_t)KA2PA(oldzone));
 	cframes = SIZE2FRAMES(zone_conf_size(oldzone->count));
 	
@@ -654,5 +654,5 @@
 {
 	count_t i;
-	__u8 order;
+	uint8_t order;
 	frame_t *frame;
 	
@@ -690,5 +690,5 @@
 	zone_t *zone1, *zone2, *newzone;
 	int cframes;
-	__u8 order;
+	uint8_t order;
 	int i;
 	pfn_t pfn;
@@ -780,5 +780,5 @@
 {
 	int i;
-	__u8 max_order;
+	uint8_t max_order;
 
 	spinlock_initialize(&z->lock, "zone_lock");
@@ -818,5 +818,5 @@
  * @return Size of zone configuration info (in bytes)
  */
-__address zone_conf_size(count_t count)
+uintptr_t zone_conf_size(count_t count)
 {
 	int size = sizeof(zone_t) + count*sizeof(frame_t);
@@ -846,5 +846,5 @@
 {
 	zone_t *z;
-	__address addr;
+	uintptr_t addr;
 	count_t confcount;
 	int i;
@@ -932,5 +932,5 @@
  *
  */
-void * frame_alloc_generic(__u8 order, int flags, int *pzone) 
+void * frame_alloc_generic(uint8_t order, int flags, int *pzone) 
 {
 	ipl_t ipl;
@@ -991,5 +991,5 @@
  * @param Frame Physical Address of of the frame to be freed.
  */
-void frame_free(__address frame)
+void frame_free(uintptr_t frame)
 {
 	ipl_t ipl;
@@ -1100,5 +1100,5 @@
 		zone = zones.info[i];
 		spinlock_lock(&zone->lock);
-		printf("%d: %.*p \t%10zd\t%10zd\n", i, sizeof(__address) * 2, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
+		printf("%d: %.*p \t%10zd\t%10zd\n", i, sizeof(uintptr_t) * 2, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
 		spinlock_unlock(&zone->lock);
 	}
@@ -1132,5 +1132,5 @@
 	spinlock_lock(&zone->lock);
 	printf("Memory zone information\n");
-	printf("Zone base address: %#.*p\n", sizeof(__address) * 2, PFN2ADDR(zone->base));
+	printf("Zone base address: %#.*p\n", sizeof(uintptr_t) * 2, PFN2ADDR(zone->base));
 	printf("Zone size: %zd frames (%zdK)\n", zone->count, ((zone->count) * FRAME_SIZE) >> 10);
 	printf("Allocated space: %zd frames (%zdK)\n", zone->busy_count, (zone->busy_count * FRAME_SIZE) >> 10);
Index: generic/src/mm/page.c
===================================================================
--- generic/src/mm/page.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/mm/page.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -70,5 +70,5 @@
  * @param size Size of the structure.
  */
-void map_structure(__address s, size_t size)
+void map_structure(uintptr_t s, size_t size)
 {
 	int i, cnt, length;
@@ -94,5 +94,5 @@
  * @param flags Flags to be used for mapping.
  */
-void page_mapping_insert(as_t *as, __address page, __address frame, int flags)
+void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame, int flags)
 {
 	ASSERT(page_mapping_operations);
@@ -113,5 +113,5 @@
  * @param page Virtual address of the page to be demapped.
  */
-void page_mapping_remove(as_t *as, __address page)
+void page_mapping_remove(as_t *as, uintptr_t page)
 {
 	ASSERT(page_mapping_operations);
@@ -132,5 +132,5 @@
  * @return NULL if there is no such mapping; requested mapping otherwise.
  */
-pte_t *page_mapping_find(as_t *as, __address page)
+pte_t *page_mapping_find(as_t *as, uintptr_t page)
 {
 	ASSERT(page_mapping_operations);
Index: generic/src/mm/slab.c
===================================================================
--- generic/src/mm/slab.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/mm/slab.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -550,5 +550,5 @@
 	cache->mag_cache = malloc(sizeof(slab_mag_cache_t)*config.cpu_count,0);
 	for (i=0; i < config.cpu_count; i++) {
-		memsetb((__address)&cache->mag_cache[i],
+		memsetb((uintptr_t)&cache->mag_cache[i],
 			sizeof(cache->mag_cache[i]), 0);
 		spinlock_initialize(&cache->mag_cache[i].lock, 
@@ -570,9 +570,9 @@
 	ipl_t ipl;
 
-	memsetb((__address)cache, sizeof(*cache), 0);
+	memsetb((uintptr_t)cache, sizeof(*cache), 0);
 	cache->name = name;
 
-	if (align < sizeof(__native))
-		align = sizeof(__native);
+	if (align < sizeof(unative_t))
+		align = sizeof(unative_t);
 	size = ALIGN_UP(size, align);
 		
@@ -821,5 +821,5 @@
 			   "slab_magazine",
 			   sizeof(slab_magazine_t)+SLAB_MAG_SIZE*sizeof(void*),
-			   sizeof(__address),
+			   sizeof(uintptr_t),
 			   NULL, NULL,
 			   SLAB_CACHE_NOMAGAZINE | SLAB_CACHE_SLINSIDE);
@@ -828,5 +828,5 @@
 			   "slab_cache",
 			   sizeof(slab_cache_cache),
-			   sizeof(__address),
+			   sizeof(uintptr_t),
 			   NULL, NULL,
 			   SLAB_CACHE_NOMAGAZINE | SLAB_CACHE_SLINSIDE);
Index: generic/src/mm/tlb.c
===================================================================
--- generic/src/mm/tlb.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/mm/tlb.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -79,5 +79,5 @@
  * @param count Number of pages, if required by type.
  */
-void tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid, __address page, count_t count)
+void tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid, uintptr_t page, count_t count)
 {
 	int i;
@@ -142,5 +142,5 @@
 	tlb_invalidate_type_t type;
 	asid_t asid;
-	__address page;
+	uintptr_t page;
 	count_t count;
 	int i;
Index: generic/src/printf/printf_core.c
===================================================================
--- generic/src/printf/printf_core.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/printf/printf_core.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -89,7 +89,7 @@
  * @return string length without trailing zero.
  */
-static __native strlen(const char *str) 
-{
-	__native counter = 0;
+static unative_t strlen(const char *str) 
+{
+	unative_t counter = 0;
 
 	while (str[counter] != 0) {
@@ -147,5 +147,5 @@
  * @return number of printed characters, negative value on fail
  */
-static int print_char(char c, int width, __u64 flags, struct printf_spec *ps)
+static int print_char(char c, int width, uint64_t flags, struct printf_spec *ps)
 {
 	int counter = 0;
@@ -177,5 +177,5 @@
  */
 						
-static int print_string(char *s, int width, int precision, __u64 flags, struct printf_spec *ps)
+static int print_string(char *s, int width, int precision, uint64_t flags, struct printf_spec *ps)
 {
 	int counter = 0;
@@ -237,5 +237,5 @@
  *
  */
-static int print_number(__u64 num, int width, int precision, int base , __u64 flags, struct printf_spec *ps)
+static int print_number(uint64_t num, int width, int precision, int base , uint64_t flags, struct printf_spec *ps)
 {
 	char *digits = digits_small;
@@ -428,5 +428,5 @@
  * 	- "l"	Signed or usigned long int.@n
  * 	- "ll"	Signed or usigned long long int.@n
- * 	- "z"	__native (non-standard extension).@n
+ * 	- "z"	unative_t (non-standard extension).@n
  * 
  * 
@@ -467,8 +467,8 @@
 	qualifier_t qualifier;	/* type of argument */
 	int base;	/**< base in which will be parameter (numbers only) printed */
-	__u64 number; /**< argument value */
+	uint64_t number; /**< argument value */
 	size_t	size; /**< byte size of integer parameter */
 	int width, precision;
-	__u64 flags;
+	uint64_t flags;
 	
 	counter = 0;
@@ -563,5 +563,5 @@
 					}
 					break;
-				case 'z':	/* __native */
+				case 'z':	/* unative_t */
 					qualifier = PrintfQualifierNative;
 					break;
@@ -645,29 +645,29 @@
 				case PrintfQualifierByte:
 					size = sizeof(unsigned char);
-					number = (__u64)va_arg(ap, unsigned int);
+					number = (uint64_t)va_arg(ap, unsigned int);
 					break;
 				case PrintfQualifierShort:
 					size = sizeof(unsigned short);
-					number = (__u64)va_arg(ap, unsigned int);
+					number = (uint64_t)va_arg(ap, unsigned int);
 					break;
 				case PrintfQualifierInt:
 					size = sizeof(unsigned int);
-					number = (__u64)va_arg(ap, unsigned int);
+					number = (uint64_t)va_arg(ap, unsigned int);
 					break;
 				case PrintfQualifierLong:
 					size = sizeof(unsigned long);
-					number = (__u64)va_arg(ap, unsigned long);
+					number = (uint64_t)va_arg(ap, unsigned long);
 					break;
 				case PrintfQualifierLongLong:
 					size = sizeof(unsigned long long);
-					number = (__u64)va_arg(ap, unsigned long long);
+					number = (uint64_t)va_arg(ap, unsigned long long);
 					break;
 				case PrintfQualifierPointer:
 					size = sizeof(void *);
-					number = (__u64)(unsigned long)va_arg(ap, void *);
+					number = (uint64_t)(unsigned long)va_arg(ap, void *);
 					break;
 				case PrintfQualifierNative:
-					size = sizeof(__native);
-					number = (__u64)va_arg(ap, __native);
+					size = sizeof(unative_t);
+					number = (uint64_t)va_arg(ap, unative_t);
 					break;
 				default: /* Unknown qualifier */
@@ -680,6 +680,6 @@
 					flags |= __PRINTF_FLAG_NEGATIVE;
 				
-					if (size == sizeof(__u64)) {
-						number = -((__s64)number);
+					if (size == sizeof(uint64_t)) {
+						number = -((int64_t)number);
 					} else {
 						number = ~number;
@@ -704,5 +704,5 @@
 	
 	if (i > j) {
-		if ((retval = printf_putnchars(&fmt[j], (__native)(i - j), ps)) < 0) { /* error */
+		if ((retval = printf_putnchars(&fmt[j], (unative_t)(i - j), ps)) < 0) { /* error */
 			counter = -counter;
 			goto out;
Index: generic/src/proc/scheduler.c
===================================================================
--- generic/src/proc/scheduler.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/proc/scheduler.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -350,5 +350,5 @@
 	 */
 	context_save(&CPU->saved_context);
-	context_set(&CPU->saved_context, FADDR(scheduler_separated_stack), (__address) CPU->stack, CPU_STACK_SIZE);
+	context_set(&CPU->saved_context, FADDR(scheduler_separated_stack), (uintptr_t) CPU->stack, CPU_STACK_SIZE);
 	context_restore(&CPU->saved_context);
 	/* not reached */
Index: generic/src/proc/task.c
===================================================================
--- generic/src/proc/task.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/proc/task.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -241,5 +241,5 @@
  * @return 0 on success or an error code from @ref errno.h.
  */
-__native sys_task_get_id(task_id_t *uspace_task_id)
+unative_t sys_task_get_id(task_id_t *uspace_task_id)
 {
 	/*
@@ -247,5 +247,5 @@
 	 * remains constant for the lifespan of the task.
 	 */
-	return (__native) copy_to_uspace(uspace_task_id, &TASK->taskid, sizeof(TASK->taskid));
+	return (unative_t) copy_to_uspace(uspace_task_id, &TASK->taskid, sizeof(TASK->taskid));
 }
 
Index: generic/src/proc/thread.c
===================================================================
--- generic/src/proc/thread.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/proc/thread.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -91,5 +91,5 @@
 
 SPINLOCK_INITIALIZE(tidlock);
-__u32 last_tid = 0;
+uint32_t last_tid = 0;
 
 static slab_cache_t *thread_slab;
@@ -255,5 +255,5 @@
 
 	spinlock_lock(&threads_lock);
-	btree_remove(&threads_btree, (btree_key_t) ((__address ) t), NULL);
+	btree_remove(&threads_btree, (btree_key_t) ((uintptr_t ) t), NULL);
 	spinlock_unlock(&threads_lock);
 
@@ -300,5 +300,5 @@
 	
 	/* Not needed, but good for debugging */
-	memsetb((__address)t->kstack, THREAD_STACK_SIZE * 1<<STACK_FRAMES, 0);
+	memsetb((uintptr_t)t->kstack, THREAD_STACK_SIZE * 1<<STACK_FRAMES, 0);
 	
 	ipl = interrupts_disable();
@@ -309,5 +309,5 @@
 	
 	context_save(&t->saved_context);
-	context_set(&t->saved_context, FADDR(cushion), (__address) t->kstack, THREAD_STACK_SIZE);
+	context_set(&t->saved_context, FADDR(cushion), (uintptr_t) t->kstack, THREAD_STACK_SIZE);
 	
 	the_initialize((the_t *) t->kstack);
@@ -369,5 +369,5 @@
 	 */
 	spinlock_lock(&threads_lock);
-	btree_insert(&threads_btree, (btree_key_t) ((__address) t), (void *) t, NULL);
+	btree_insert(&threads_btree, (btree_key_t) ((uintptr_t) t), (void *) t, NULL);
 	spinlock_unlock(&threads_lock);
 	
@@ -412,5 +412,5 @@
  *
  */
-void thread_sleep(__u32 sec)
+void thread_sleep(uint32_t sec)
 {
 	thread_usleep(sec*1000000);
@@ -425,5 +425,5 @@
  * @return An error code from errno.h or an error code from synch.h.
  */
-int thread_join_timeout(thread_t *t, __u32 usec, int flags)
+int thread_join_timeout(thread_t *t, uint32_t usec, int flags)
 {
 	ipl_t ipl;
@@ -485,5 +485,5 @@
  *
  */	
-void thread_usleep(__u32 usec)
+void thread_usleep(uint32_t usec)
 {
 	waitq_t wq;
@@ -565,5 +565,5 @@
 	btree_node_t *leaf;
 	
-	return btree_search(&threads_btree, (btree_key_t) ((__address) t), &leaf) != NULL;
+	return btree_search(&threads_btree, (btree_key_t) ((uintptr_t) t), &leaf) != NULL;
 }
 
@@ -571,15 +571,15 @@
  *
  */
-__native sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name)
+unative_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name)
 {
 	thread_t *t;
 	char namebuf[THREAD_NAME_BUFLEN];
 	uspace_arg_t *kernel_uarg;
-	__u32 tid;
+	uint32_t tid;
 	int rc;
 
 	rc = copy_from_uspace(namebuf, uspace_name, THREAD_NAME_BUFLEN);
 	if (rc != 0)
-		return (__native) rc;
+		return (unative_t) rc;
 
 	kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0);	
@@ -587,5 +587,5 @@
 	if (rc != 0) {
 		free(kernel_uarg);
-		return (__native) rc;
+		return (unative_t) rc;
 	}
 
@@ -593,10 +593,10 @@
 		tid = t->tid;
 		thread_ready(t);
-		return (__native) tid; 
+		return (unative_t) tid; 
 	} else {
 		free(kernel_uarg);
 	}
 
-	return (__native) ENOMEM;
+	return (unative_t) ENOMEM;
 }
 
@@ -604,5 +604,5 @@
  *
  */
-__native sys_thread_exit(int uspace_status)
+unative_t sys_thread_exit(int uspace_status)
 {
 	thread_exit();
Index: generic/src/security/cap.c
===================================================================
--- generic/src/security/cap.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/security/cap.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -95,5 +95,5 @@
  * @return Zero on success or an error code from @ref errno.h.
  */
-__native sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps)
+unative_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps)
 {
 	sysarg64_t taskid_arg;
@@ -103,9 +103,9 @@
 	
 	if (!(cap_get(TASK) & CAP_CAP))
-		return (__native) EPERM;
+		return (unative_t) EPERM;
 	
 	rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t));
 	if (rc != 0)
-		return (__native) rc;
+		return (unative_t) rc;
 		
 	ipl = interrupts_disable();
@@ -115,5 +115,5 @@
 		spinlock_unlock(&tasks_lock);
 		interrupts_restore(ipl);
-		return (__native) ENOENT;
+		return (unative_t) ENOENT;
 	}
 	
@@ -140,5 +140,5 @@
  * @return Zero on success or an error code from @ref errno.h.
  */
-__native sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps)
+unative_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps)
 {
 	sysarg64_t taskid_arg;
@@ -149,5 +149,5 @@
 	rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t));
 	if (rc != 0)
-		return (__native) rc;
+		return (unative_t) rc;
 
 	ipl = interrupts_disable();
@@ -157,5 +157,5 @@
 		spinlock_unlock(&tasks_lock);
 		interrupts_restore(ipl);
-		return (__native) ENOENT;
+		return (unative_t) ENOENT;
 	}
 
@@ -168,5 +168,5 @@
 		spinlock_unlock(&tasks_lock);
 		interrupts_restore(ipl);
-		return (__native) EPERM;
+		return (unative_t) EPERM;
 	}
 	
Index: generic/src/synch/condvar.c
===================================================================
--- generic/src/synch/condvar.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/synch/condvar.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -88,5 +88,5 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, __u32 usec, int flags)
+int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec, int flags)
 {
 	int rc;
Index: generic/src/synch/futex.c
===================================================================
--- generic/src/synch/futex.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/synch/futex.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -59,7 +59,7 @@
 static void futex_initialize(futex_t *futex);
 
-static futex_t *futex_find(__address paddr);
-static index_t futex_ht_hash(__native *key);
-static bool futex_ht_compare(__native *key, count_t keys, link_t *item);
+static futex_t *futex_find(uintptr_t paddr);
+static index_t futex_ht_hash(unative_t *key);
+static bool futex_ht_compare(unative_t *key, count_t keys, link_t *item);
 static void futex_ht_remove_callback(link_t *item);
 
@@ -109,8 +109,8 @@
  *	   If there is no physical mapping for uaddr ENOENT is returned.
  */
-__native sys_futex_sleep_timeout(__address uaddr, __u32 usec, int flags)
-{
-	futex_t *futex;
-	__address paddr;
+unative_t sys_futex_sleep_timeout(uintptr_t uaddr, uint32_t usec, int flags)
+{
+	futex_t *futex;
+	uintptr_t paddr;
 	pte_t *t;
 	ipl_t ipl;
@@ -126,5 +126,5 @@
 		page_table_unlock(AS, true);
 		interrupts_restore(ipl);
-		return (__native) ENOENT;
+		return (unative_t) ENOENT;
 	}
 	paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
@@ -135,5 +135,5 @@
 	futex = futex_find(paddr);
 	
-	return (__native) waitq_sleep_timeout(&futex->wq, usec, flags | SYNCH_FLAGS_INTERRUPTIBLE);
+	return (unative_t) waitq_sleep_timeout(&futex->wq, usec, flags | SYNCH_FLAGS_INTERRUPTIBLE);
 }
 
@@ -144,8 +144,8 @@
  * @return ENOENT if there is no physical mapping for uaddr.
  */
-__native sys_futex_wakeup(__address uaddr)
-{
-	futex_t *futex;
-	__address paddr;
+unative_t sys_futex_wakeup(uintptr_t uaddr)
+{
+	futex_t *futex;
+	uintptr_t paddr;
 	pte_t *t;
 	ipl_t ipl;
@@ -161,5 +161,5 @@
 		page_table_unlock(AS, true);
 		interrupts_restore(ipl);
-		return (__native) ENOENT;
+		return (unative_t) ENOENT;
 	}
 	paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
@@ -183,5 +183,5 @@
  * @return Address of the kernel futex structure.
  */
-futex_t *futex_find(__address paddr)
+futex_t *futex_find(uintptr_t paddr)
 {
 	link_t *item;
@@ -276,5 +276,5 @@
  * @return Index into futex hash table.
  */
-index_t futex_ht_hash(__native *key)
+index_t futex_ht_hash(unative_t *key)
 {
 	return *key & (FUTEX_HT_SIZE-1);
@@ -287,5 +287,5 @@
  * @return True if the item matches the key. False otherwise.
  */
-bool futex_ht_compare(__native *key, count_t keys, link_t *item)
+bool futex_ht_compare(unative_t *key, count_t keys, link_t *item)
 {
 	futex_t *futex;
@@ -324,5 +324,5 @@
 		for (i = 0; i < node->keys; i++) {
 			futex_t *ftx;
-			__address paddr = node->key[i];
+			uintptr_t paddr = node->key[i];
 			
 			ftx = (futex_t *) node->value[i];
Index: generic/src/synch/mutex.c
===================================================================
--- generic/src/synch/mutex.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/synch/mutex.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -65,5 +65,5 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _mutex_lock_timeout(mutex_t *mtx, __u32 usec, int flags)
+int _mutex_lock_timeout(mutex_t *mtx, uint32_t usec, int flags)
 {
 	return _semaphore_down_timeout(&mtx->sem, usec, flags);
Index: generic/src/synch/rwlock.c
===================================================================
--- generic/src/synch/rwlock.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/synch/rwlock.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -102,5 +102,5 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _rwlock_write_lock_timeout(rwlock_t *rwl, __u32 usec, int flags)
+int _rwlock_write_lock_timeout(rwlock_t *rwl, uint32_t usec, int flags)
 {
 	ipl_t ipl;
@@ -156,5 +156,5 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _rwlock_read_lock_timeout(rwlock_t *rwl, __u32 usec, int flags)
+int _rwlock_read_lock_timeout(rwlock_t *rwl, uint32_t usec, int flags)
 {
 	int rc;
Index: generic/src/synch/semaphore.c
===================================================================
--- generic/src/synch/semaphore.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/synch/semaphore.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -79,5 +79,5 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _semaphore_down_timeout(semaphore_t *s, __u32 usec, int flags)
+int _semaphore_down_timeout(semaphore_t *s, uint32_t usec, int flags)
 {
 	return waitq_sleep_timeout(&s->wq, usec, flags); 
Index: generic/src/synch/spinlock.c
===================================================================
--- generic/src/synch/spinlock.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/synch/spinlock.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -109,5 +109,5 @@
 		if (i++ > DEADLOCK_THRESHOLD) {
 			printf("cpu%d: looping on spinlock %.*p:%s, caller=%.*p",
-			       CPU->id, sizeof(__address) * 2, sl, sl->name, sizeof(__address) * 2, CALLER);
+			       CPU->id, sizeof(uintptr_t) * 2, sl, sl->name, sizeof(uintptr_t) * 2, CALLER);
 			symbol = get_symtab_entry(CALLER);
 			if (symbol)
Index: generic/src/synch/waitq.c
===================================================================
--- generic/src/synch/waitq.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/synch/waitq.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -215,5 +215,5 @@
  * attempted.
  */
-int waitq_sleep_timeout(waitq_t *wq, __u32 usec, int flags)
+int waitq_sleep_timeout(waitq_t *wq, uint32_t usec, int flags)
 {
 	ipl_t ipl;
@@ -298,5 +298,5 @@
  * @return See waitq_sleep_timeout().
  */
-int waitq_sleep_timeout_unsafe(waitq_t *wq, __u32 usec, int flags)
+int waitq_sleep_timeout_unsafe(waitq_t *wq, uint32_t usec, int flags)
 {
 	/* checks whether to go to sleep at all */
@@ -352,5 +352,5 @@
 		}
 		THREAD->timeout_pending = true;
-		timeout_register(&THREAD->sleep_timeout, (__u64) usec, waitq_timeouted_sleep, THREAD);
+		timeout_register(&THREAD->sleep_timeout, (uint64_t) usec, waitq_timeouted_sleep, THREAD);
 	}
 
Index: generic/src/syscall/copy.c
===================================================================
--- generic/src/syscall/copy.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/syscall/copy.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -68,5 +68,5 @@
 	
 	if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
-		if (overlaps((__address) uspace_src, size,
+		if (overlaps((uintptr_t) uspace_src, size,
 			KERNEL_ADDRESS_SPACE_START, KERNEL_ADDRESS_SPACE_END-KERNEL_ADDRESS_SPACE_START)) {
 			/*
@@ -109,5 +109,5 @@
 	
 	if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
-		if (overlaps((__address) uspace_dst, size,
+		if (overlaps((uintptr_t) uspace_dst, size,
 			KERNEL_ADDRESS_SPACE_START, KERNEL_ADDRESS_SPACE_END-KERNEL_ADDRESS_SPACE_START)) {
 			/*
Index: generic/src/syscall/syscall.c
===================================================================
--- generic/src/syscall/syscall.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/syscall/syscall.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -59,5 +59,5 @@
  * this syscall to facilitate it.
  */
-static __native sys_io(int fd, const void * buf, size_t count) 
+static unative_t sys_io(int fd, const void * buf, size_t count) 
 {
 	size_t i;
@@ -86,5 +86,5 @@
 
 /** Tell kernel to get keyboard/console access again */
-static __native sys_debug_enable_console(void)
+static unative_t sys_debug_enable_console(void)
 {
 	arch_grab_console();
@@ -93,8 +93,8 @@
 
 /** Dispatch system call */
-__native syscall_handler(__native a1, __native a2, __native a3,
-			 __native a4, __native id)
+unative_t syscall_handler(unative_t a1, unative_t a2, unative_t a3,
+			 unative_t a4, unative_t id)
 {
-	__native rc;
+	unative_t rc;
 
 	if (id < SYSCALL_END)
Index: generic/src/sysinfo/sysinfo.c
===================================================================
--- generic/src/sysinfo/sysinfo.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/sysinfo/sysinfo.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -168,5 +168,5 @@
 }
 
-void sysinfo_set_item_val(const char *name, sysinfo_item_t **root, __native val)
+void sysinfo_set_item_val(const char *name, sysinfo_item_t **root, unative_t val)
 {
 	if (root == NULL)
@@ -223,5 +223,5 @@
 	while (root != NULL) {
 		int i;
-		__native val = 0;
+		unative_t val = 0;
 		char *vtype = NULL;
 		
@@ -279,5 +279,5 @@
 }
 
-__native sys_sysinfo_valid(__native ptr, __native len)
+unative_t sys_sysinfo_valid(unative_t ptr, unative_t len)
 {
 	char *str;
@@ -293,5 +293,5 @@
 }
 
-__native sys_sysinfo_value(__native ptr, __native len)
+unative_t sys_sysinfo_value(unative_t ptr, unative_t len)
 {
 	char *str;
Index: generic/src/time/clock.c
===================================================================
--- generic/src/time/clock.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/time/clock.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -58,7 +58,7 @@
 /* Pointers to public variables with time */
 struct ptime {
-	__native seconds1;
-	__native useconds;
-	__native seconds2;
+	unative_t seconds1;
+	unative_t useconds;
+	unative_t seconds2;
 };
 struct ptime *public_time;
@@ -66,5 +66,5 @@
  * seconds correctly
  */
-static __native secfrag = 0;
+static unative_t secfrag = 0;
 
 /** Initialize realtime clock counter
@@ -91,5 +91,5 @@
 	public_time->useconds = 0; 
 
-	sysinfo_set_item_val("clock.faddr", NULL, (__native)faddr);
+	sysinfo_set_item_val("clock.faddr", NULL, (unative_t)faddr);
 }
 
@@ -166,5 +166,5 @@
 
 	if (THREAD) {
-		__u64 ticks;
+		uint64_t ticks;
 		
 		spinlock_lock(&CPU->lock);
Index: generic/src/time/delay.c
===================================================================
--- generic/src/time/delay.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/time/delay.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -50,5 +50,5 @@
  * @param usec Number of microseconds to sleep.
  */
-void delay(__u32 usec)
+void delay(uint32_t usec)
 {
 	ipl_t ipl;
Index: generic/src/time/timeout.c
===================================================================
--- generic/src/time/timeout.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ generic/src/time/timeout.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -104,10 +104,10 @@
  *
  */
-void timeout_register(timeout_t *t, __u64 time, timeout_handler_t f, void *arg)
+void timeout_register(timeout_t *t, uint64_t time, timeout_handler_t f, void *arg)
 {
 	timeout_t *hlp = NULL;
 	link_t *l, *m;
 	ipl_t ipl;
-	__u64 sum;
+	uint64_t sum;
 
 	ipl = interrupts_disable();
Index: test/fpu/fpu1/test.c
===================================================================
--- test/fpu/fpu1/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/fpu/fpu1/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -96,8 +96,8 @@
 
 		if((int)(100000000*e)!=E_10e8)
-			panic("tid%d: e*10e8=%zd should be %zd\n", THREAD->tid, (__native) (100000000*e),(__native) E_10e8);
+			panic("tid%d: e*10e8=%zd should be %zd\n", THREAD->tid, (unative_t) (100000000*e),(unative_t) E_10e8);
 	}
 
-	printf("tid%d: e*10e8=%zd should be %zd\n", THREAD->tid, (__native) (100000000*e),(__native) E_10e8);
+	printf("tid%d: e*10e8=%zd should be %zd\n", THREAD->tid, (unative_t) (100000000*e),(unative_t) E_10e8);
 	atomic_inc(&threads_ok);
 }
@@ -137,13 +137,13 @@
 #ifdef __ia64_ARCH_H__
 		if((int)(1000000*pi)!=PI_10e8)
-			panic("tid%d: pi*10e8=%zd should be %zd\n", THREAD->tid, (__native) (1000000*pi),(__native) (PI_10e8/100));
+			panic("tid%d: pi*10e8=%zd should be %zd\n", THREAD->tid, (unative_t) (1000000*pi),(unative_t) (PI_10e8/100));
 #else
 		if((int)(100000000*pi)!=PI_10e8)
-			panic("tid%d: pi*10e8=%zd should be %zd\n", THREAD->tid, (__native) (100000000*pi),(__native) PI_10e8);
+			panic("tid%d: pi*10e8=%zd should be %zd\n", THREAD->tid, (unative_t) (100000000*pi),(unative_t) PI_10e8);
 #endif
 
 	}
 
-	printf("tid%d: pi*10e8=%zd should be %zd\n", THREAD->tid, (__native) (100000000*pi),(__native) PI_10e8);
+	printf("tid%d: pi*10e8=%zd should be %zd\n", THREAD->tid, (unative_t) (100000000*pi),(unative_t) PI_10e8);
 	atomic_inc(&threads_ok);
 }
Index: test/fpu/mips1/test.c
===================================================================
--- test/fpu/mips1/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/fpu/mips1/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -48,5 +48,5 @@
 {
 	int i;
-	int arg __attribute__((aligned(16))) = (int)((__native) data);
+	int arg __attribute__((aligned(16))) = (int)((unative_t) data);
 	int after_arg __attribute__((aligned(16)));
 
@@ -78,5 +78,5 @@
 {
 	int i;
-	int arg __attribute__((aligned(16))) = (int)((__native) data);
+	int arg __attribute__((aligned(16))) = (int)((unative_t) data);
 	int after_arg __attribute__((aligned(16)));
 
@@ -117,8 +117,8 @@
 
 	for (i=0; i<THREADS/2; i++) {  
-		if (!(t = thread_create(testit1, (void *)((__native)i*2), TASK, 0, "testit1")))
+		if (!(t = thread_create(testit1, (void *)((unative_t)i*2), TASK, 0, "testit1")))
 			panic("could not create thread\n");
 		thread_ready(t);
-		if (!(t = thread_create(testit2, (void *)((__native)i*2+1), TASK, 0, "testit2")))
+		if (!(t = thread_create(testit2, (void *)((unative_t)i*2+1), TASK, 0, "testit2")))
 			panic("could not create thread\n");
 		thread_ready(t);
Index: test/fpu/sse1/test.c
===================================================================
--- test/fpu/sse1/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/fpu/sse1/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -48,5 +48,5 @@
 {
 	int i;
-	int arg __attribute__((aligned(16))) = (int)((__native) data);
+	int arg __attribute__((aligned(16))) = (int)((unative_t) data);
 	int after_arg __attribute__((aligned(16)));
 
@@ -78,5 +78,5 @@
 {
 	int i;
-	int arg __attribute__((aligned(16))) = (int)((__native) data);
+	int arg __attribute__((aligned(16))) = (int)((unative_t) data);
 	int after_arg __attribute__((aligned(16)));
 
@@ -117,8 +117,8 @@
 
 	for (i=0; i<THREADS/2; i++) {  
-		if (!(t = thread_create(testit1, (void *)((__native)i*2), TASK, 0, "testit1")))
+		if (!(t = thread_create(testit1, (void *)((unative_t)i*2), TASK, 0, "testit1")))
 			panic("could not create thread\n");
 		thread_ready(t);
-		if (!(t = thread_create(testit2, (void *)((__native)i*2+1), TASK, 0, "testit2")))
+		if (!(t = thread_create(testit2, (void *)((unative_t)i*2+1), TASK, 0, "testit2")))
 			panic("could not create thread\n");
 		thread_ready(t);
Index: test/mm/falloc1/test.c
===================================================================
--- test/mm/falloc1/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/mm/falloc1/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -41,5 +41,5 @@
 
 void test(void) {
-	__address * frames = (__address *) malloc(MAX_FRAMES*sizeof(__address), 0);
+	uintptr_t * frames = (uintptr_t *) malloc(MAX_FRAMES*sizeof(uintptr_t), 0);
 	int results[MAX_ORDER+1];
 	
@@ -55,5 +55,5 @@
 			allocated = 0;
 			for (i = 0; i < MAX_FRAMES >> order; i++) {
-				frames[allocated] = (__address) frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
+				frames[allocated] = (uintptr_t) frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
 				
 				if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {
Index: test/mm/falloc2/test.c
===================================================================
--- test/mm/falloc2/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/mm/falloc2/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -53,8 +53,8 @@
 {
 	int order, run, allocated, i;
-	__u8 val = THREAD->tid % THREADS;
+	uint8_t val = THREAD->tid % THREADS;
 	index_t k;
 	
-	__address * frames =  (__address *) malloc(MAX_FRAMES * sizeof(__address), FRAME_ATOMIC);
+	uintptr_t * frames =  (uintptr_t *) malloc(MAX_FRAMES * sizeof(uintptr_t), FRAME_ATOMIC);
 	ASSERT(frames != NULL);
 	
@@ -66,5 +66,5 @@
 			allocated = 0;
 			for (i = 0; i < (MAX_FRAMES >> order); i++) {
-				frames[allocated] = (__address)frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
+				frames[allocated] = (uintptr_t)frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
 				if (frames[allocated]) {
 					memsetb(frames[allocated], FRAME_SIZE << order, val);
@@ -79,5 +79,5 @@
 			for (i = 0; i < allocated; i++) {
 				for (k = 0; k <= ((FRAME_SIZE << order) - 1); k++) {
-					if (((__u8 *) frames[i])[k] != val) {
+					if (((uint8_t *) frames[i])[k] != val) {
 						printf("Thread #%d (cpu%d): Unexpected data (%d) in block %p offset %#zx\n", THREAD->tid, CPU->id, ((char *) frames[i])[k], frames[i], k);
 						failed();
Index: test/mm/mapping1/test.c
===================================================================
--- test/mm/mapping1/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/mm/mapping1/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -43,6 +43,6 @@
 void test(void)
 {
-	__address frame0, frame1;
-	__u32 v0, v1;
+	uintptr_t frame0, frame1;
+	uint32_t v0, v1;
 
 	printf("Memory management test mapping #1\n");
@@ -52,7 +52,7 @@
 
 	printf("Writing %#x to physical address %p.\n", VALUE0, KA2PA(frame0));
-	*((__u32 *) frame0) = VALUE0;
+	*((uint32_t *) frame0) = VALUE0;
 	printf("Writing %#x to physical address %p.\n", VALUE1, KA2PA(frame1));
-	*((__u32 *) frame1) = VALUE1;
+	*((uint32_t *) frame1) = VALUE1;
 	
 	printf("Mapping virtual address %p to physical address %p.\n", PAGE0, KA2PA(frame0));
@@ -61,6 +61,6 @@
 	page_mapping_insert(AS_KERNEL, PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE);
 	
-	printf("Value at virtual address %p is %#x.\n", PAGE0, v0 = *((__u32 *) PAGE0));
-	printf("Value at virtual address %p is %#x.\n", PAGE1, v1 = *((__u32 *) PAGE1));
+	printf("Value at virtual address %p is %#x.\n", PAGE0, v0 = *((uint32_t *) PAGE0));
+	printf("Value at virtual address %p is %#x.\n", PAGE1, v1 = *((uint32_t *) PAGE1));
 	
 	ASSERT(v0 == VALUE0);
@@ -68,13 +68,13 @@
 
 	printf("Writing %#x to virtual address %p.\n", 0, PAGE0);
-	*((__u32 *) PAGE0) = 0;
+	*((uint32_t *) PAGE0) = 0;
 	printf("Writing %#x to virtual address %p.\n", 0, PAGE1);
-	*((__u32 *) PAGE1) = 0;	
+	*((uint32_t *) PAGE1) = 0;	
 
-	v0 = *((__u32 *) PAGE0);
-	v1 = *((__u32 *) PAGE1);
+	v0 = *((uint32_t *) PAGE0);
+	v1 = *((uint32_t *) PAGE1);
 	
-	printf("Value at virtual address %p is %#x.\n", PAGE0, *((__u32 *) PAGE0));	
-	printf("Value at virtual address %p is %#x.\n", PAGE1, *((__u32 *) PAGE1));
+	printf("Value at virtual address %p is %#x.\n", PAGE0, *((uint32_t *) PAGE0));	
+	printf("Value at virtual address %p is %#x.\n", PAGE1, *((uint32_t *) PAGE1));
 
 	ASSERT(v0 == 0);
Index: test/mm/purge1/test.c
===================================================================
--- test/mm/purge1/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/mm/purge1/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -38,5 +38,5 @@
 
 extern void tlb_invalidate_all(void);
-extern void tlb_invalidate_pages(asid_t asid, __address va, count_t cnt);
+extern void tlb_invalidate_pages(asid_t asid, uintptr_t va, count_t cnt);
 void test(void)
 {
Index: test/mm/slab1/test.c
===================================================================
--- test/mm/slab1/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/mm/slab1/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -50,5 +50,5 @@
 	for (i=0; i < count; i++) {
 		data[i] = slab_alloc(cache, 0);
-		memsetb((__address)data[i], size, 0);
+		memsetb((uintptr_t)data[i], size, 0);
 	}
 	printf("done.\n");
@@ -62,5 +62,5 @@
 	for (i=0; i < count; i++) {
 		data[i] = slab_alloc(cache, 0);
-		memsetb((__address)data[i], size, 0);
+		memsetb((uintptr_t)data[i], size, 0);
 	}
 	printf("done.\n");
@@ -75,5 +75,5 @@
 	for (i=count/2; i < count; i++) {
 		data[i] = slab_alloc(cache, 0);
-		memsetb((__address)data[i], size, 0);
+		memsetb((uintptr_t)data[i], size, 0);
 	}
 	printf("done.\n");
@@ -111,5 +111,5 @@
 static void slabtest(void *data)
 {
-	int offs = (int)(__native) data;
+	int offs = (int)(unative_t) data;
 	int i,j;
 	
@@ -141,5 +141,5 @@
 	semaphore_initialize(&thr_sem,0);
 	for (i=0; i<THREADS; i++) {  
-		if (!(t = thread_create(slabtest, (void *)(__native)i, TASK, 0, "slabtest")))
+		if (!(t = thread_create(slabtest, (void *)(unative_t)i, TASK, 0, "slabtest")))
 			panic("could not create thread\n");
 		thread_ready(t);
Index: test/mm/slab2/test.c
===================================================================
--- test/mm/slab2/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/mm/slab2/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -68,6 +68,6 @@
 			break;
 		}
-		memsetb((__address)data1, ITEM_SIZE, 0);
-		memsetb((__address)data2, ITEM_SIZE, 0);
+		memsetb((uintptr_t)data1, ITEM_SIZE, 0);
+		memsetb((uintptr_t)data2, ITEM_SIZE, 0);
 		*((void **)data1) = olddata1;
 		*((void **)data2) = olddata2;
@@ -91,5 +91,5 @@
 			panic("Incorrect memory size - use another test.");
 		}
-		memsetb((__address)data1, ITEM_SIZE, 0);
+		memsetb((uintptr_t)data1, ITEM_SIZE, 0);
 		*((void **)data1) = olddata1;
 		olddata1 = data1;
@@ -100,5 +100,5 @@
 			break;
 		}
-		memsetb((__address)data1, ITEM_SIZE, 0);
+		memsetb((uintptr_t)data1, ITEM_SIZE, 0);
 		*((void **)data1) = olddata1;
 		olddata1 = data1;
Index: test/print/print1/test.c
===================================================================
--- test/print/print1/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/print/print1/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -34,5 +34,5 @@
 {
 	int retval;
-	__native nat = 0x12345678u;
+	unative_t nat = 0x12345678u;
 	
 	char buffer[BUFFER_SIZE];
@@ -50,5 +50,5 @@
 	printf(" 0xint: x '%#x', 5.3x '%#5.3x', -5.3x '%#-5.3x', 3.5x '%#3.5x', -3.5x '%#-3.5x' \n",17, 17, 17, 17, 17 );
 
-	printf("'%#llx' 64bit, '%#x' 32bit, '%#hhx' 8bit, '%#hx' 16bit, __native '%#zx'. '%#llx' 64bit and '%s' string.\n", 0x1234567887654321ll, 0x12345678, 0x12, 0x1234, nat, 0x1234567887654321ull, "Lovely string" );
+	printf("'%#llx' 64bit, '%#x' 32bit, '%#hhx' 8bit, '%#hx' 16bit, unative_t '%#zx'. '%#llx' 64bit and '%s' string.\n", 0x1234567887654321ll, 0x12345678, 0x12, 0x1234, nat, 0x1234567887654321ull, "Lovely string" );
 	
 	printf(" Print to NULL '%s'\n",NULL);
Index: test/synch/rwlock4/test.c
===================================================================
--- test/synch/rwlock4/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/synch/rwlock4/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -51,7 +51,7 @@
 static waitq_t can_start;
 
-__u32 seed = 0xdeadbeef;
+uint32_t seed = 0xdeadbeef;
 
-static __u32 random(__u32 max);
+static uint32_t random(uint32_t max);
 
 static void writer(void *arg);
@@ -59,7 +59,7 @@
 static void failed(void);
 
-__u32 random(__u32 max)
+uint32_t random(uint32_t max)
 {
-	__u32 rc;
+	uint32_t rc;
 
 	spinlock_lock(&lock);	
@@ -122,5 +122,5 @@
 {
 	context_t ctx;
-	__u32 i, k;
+	uint32_t i, k;
 	
 	printf("Read/write locks test #4\n");
Index: test/synch/semaphore2/test.c
===================================================================
--- test/synch/semaphore2/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/synch/semaphore2/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -46,14 +46,14 @@
 static waitq_t can_start;
 
-__u32 seed = 0xdeadbeef;
+uint32_t seed = 0xdeadbeef;
 
-static __u32 random(__u32 max);
+static uint32_t random(uint32_t max);
 
 static void consumer(void *arg);
 static void failed(void);
 
-__u32 random(__u32 max)
+uint32_t random(uint32_t max)
 {
-	__u32 rc;
+	uint32_t rc;
 
 	spinlock_lock(&lock);	
@@ -96,5 +96,5 @@
 void test(void)
 {
-	__u32 i, k;
+	uint32_t i, k;
 	
 	printf("Semaphore test #2\n");
Index: test/sysinfo/test.c
===================================================================
--- test/sysinfo/test.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ test/sysinfo/test.c	(revision 7f1c620c9e5bd00a90322b5118b47b8b033b5152)
@@ -34,7 +34,7 @@
 #include <sysinfo/sysinfo.h>
 /*
-static __native counter(sysinfo_item_t *root)
+static unative_t counter(sysinfo_item_t *root)
 {
-	static __native i=0;
+	static unative_t i=0;
 	return i++;
 }*/
Index: tools/amd64/gencontext.c
===================================================================
--- tools/amd64/gencontext.c	(revision 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ 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 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ 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 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ 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 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ 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 991779c52558b53bfcea5d5b1f7c58ecdc222841)
+++ 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__