Index: generic/src/synch/condvar.c
===================================================================
--- generic/src/synch/condvar.c	(revision cc73a8a1c3f4258036feb316078a8f908f7bfe40)
+++ generic/src/synch/condvar.c	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -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 cc73a8a1c3f4258036feb316078a8f908f7bfe40)
+++ generic/src/synch/futex.c	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -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 cc73a8a1c3f4258036feb316078a8f908f7bfe40)
+++ generic/src/synch/mutex.c	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -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 cc73a8a1c3f4258036feb316078a8f908f7bfe40)
+++ generic/src/synch/rwlock.c	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -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 cc73a8a1c3f4258036feb316078a8f908f7bfe40)
+++ generic/src/synch/semaphore.c	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -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 cc73a8a1c3f4258036feb316078a8f908f7bfe40)
+++ generic/src/synch/spinlock.c	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -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 cc73a8a1c3f4258036feb316078a8f908f7bfe40)
+++ generic/src/synch/waitq.c	(revision 0ffa3ef51d117153ad4c8c5fdb3b525ff042ef01)
@@ -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);
 	}