Index: kernel/generic/include/adt/avl.h
===================================================================
--- kernel/generic/include/adt/avl.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/adt/avl.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,4 @@
 #define KERN_AVLTREE_H_ 
 
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/generic/include/adt/bitmap.h
===================================================================
--- kernel/generic/include/adt/bitmap.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/adt/bitmap.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_BITMAP_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define BITS2BYTES(bits)	(bits ? ((((bits)-1)>>3)+1) : 0)
Index: kernel/generic/include/adt/btree.h
===================================================================
--- kernel/generic/include/adt/btree.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/adt/btree.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_BTREE_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 
Index: kernel/generic/include/adt/hash_table.h
===================================================================
--- kernel/generic/include/adt/hash_table.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/adt/hash_table.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,5 @@
 
 #include <adt/list.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Set of operations for hash table. */
Index: kernel/generic/include/adt/list.h
===================================================================
--- kernel/generic/include/adt/list.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/adt/list.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,4 @@
 #define KERN_LIST_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/generic/include/atomic.h
===================================================================
--- kernel/generic/include/atomic.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/atomic.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,10 +36,5 @@
 #define KERN_ATOMIC_H_
 
-#include <arch/types.h>
-
-typedef struct atomic {
-	volatile atomic_count_t count;
-} atomic_t;
-
+#include <typedefs.h>
 #include <arch/atomic.h>
 
Index: kernel/generic/include/byteorder.h
===================================================================
--- kernel/generic/include/byteorder.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/byteorder.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_BYTEORDER_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #if !(defined(__BE__) ^ defined(__LE__))
Index: kernel/generic/include/config.h
===================================================================
--- kernel/generic/include/config.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/config.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_CONFIG_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/mm/page.h>
 
Index: kernel/generic/include/console/chardev.h
===================================================================
--- kernel/generic/include/console/chardev.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/console/chardev.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,5 @@
 
 #include <adt/list.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
Index: kernel/generic/include/console/console.h
===================================================================
--- kernel/generic/include/console/console.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/console/console.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_CONSOLE_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <console/chardev.h>
 
Index: kernel/generic/include/context.h
===================================================================
--- kernel/generic/include/context.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/context.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 
Index: kernel/generic/include/ddi/ddi.h
===================================================================
--- kernel/generic/include/ddi/ddi.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/ddi/ddi.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,5 @@
 
 #include <ddi/ddi_arg.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <proc/task.h>
 #include <adt/list.h>
Index: kernel/generic/include/ddi/device.h
===================================================================
--- kernel/generic/include/ddi/device.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/ddi/device.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,4 @@
 #define KERN_DEVICE_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/generic/include/ddi/irq.h
===================================================================
--- kernel/generic/include/ddi/irq.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/ddi/irq.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -81,5 +81,5 @@
 #ifdef KERNEL
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <adt/hash_table.h>
Index: kernel/generic/include/func.h
===================================================================
--- kernel/generic/include/func.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/func.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup generic
  * @{
  */
@@ -36,5 +36,5 @@
 #define KERN_FUNC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <atomic.h>
 
Index: kernel/generic/include/interrupt.h
===================================================================
--- kernel/generic/include/interrupt.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/interrupt.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,5 @@
 
 #include <arch/interrupt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <proc/task.h>
 #include <proc/thread.h>
Index: kernel/generic/include/ipc/event.h
===================================================================
--- kernel/generic/include/ipc/event.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/ipc/event.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,5 @@
 
 #include <ipc/event_types.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <ipc/ipc.h>
Index: kernel/generic/include/ipc/irq.h
===================================================================
--- kernel/generic/include/ipc/irq.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/ipc/irq.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -41,5 +41,5 @@
 #include <ipc/ipc.h>
 #include <ddi/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 
Index: kernel/generic/include/ipc/sysipc.h
===================================================================
--- kernel/generic/include/ipc/sysipc.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/ipc/sysipc.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -38,5 +38,5 @@
 #include <ipc/ipc.h>
 #include <ipc/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method, 
Index: kernel/generic/include/lib/elf.h
===================================================================
--- kernel/generic/include/lib/elf.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/lib/elf.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,13 +37,13 @@
 
 #include <arch/elf.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /**
  * current ELF version
  */
-#define	EV_CURRENT	1
-
-/** 
- * ELF types 
+#define EV_CURRENT	1
+
+/**
+ * ELF types
  */
 #define ET_NONE		0	/* No type */
Index: kernel/generic/include/lib/rd.h
===================================================================
--- kernel/generic/include/lib/rd.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/lib/rd.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,10 +36,10 @@
 #define KERN_RD_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /**
  * RAM disk version
  */
-#define	RD_VERSION	1
+#define RD_VERSION	1
 
 /**
Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/macros.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -38,5 +38,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Return true if the intervals overlap.
Index: kernel/generic/include/main/main.h
===================================================================
--- kernel/generic/include/main/main.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/main/main.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_MAIN_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern size_t hardcoded_kdata_size;
Index: kernel/generic/include/main/uinit.h
===================================================================
--- kernel/generic/include/main/uinit.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/main/uinit.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,6 +36,4 @@
 #define KERN_UINIT_H_
 
-#include <arch/types.h>
-
 extern void uinit(void *arg);
 
Index: kernel/generic/include/memstr.h
===================================================================
--- kernel/generic/include/memstr.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/memstr.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup generic
  * @{
  */
@@ -36,5 +36,5 @@
 #define KERN_MEMSTR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/memstr.h>
 
Index: kernel/generic/include/mm/as.h
===================================================================
--- kernel/generic/include/mm/as.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/mm/as.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,7 +37,7 @@
 
 #ifdef KERNEL
-#include <arch/types.h>
+	#include <typedefs.h>
 #else
-#include <sys/types.h>
+	#include <sys/types.h>
 #endif
 
@@ -65,5 +65,5 @@
 #include <arch/mm/as.h>
 #include <arch/mm/asid.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
Index: kernel/generic/include/mm/buddy.h
===================================================================
--- kernel/generic/include/mm/buddy.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/mm/buddy.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_BUDDY_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 
Index: kernel/generic/include/mm/frame.h
===================================================================
--- kernel/generic/include/mm/frame.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/mm/frame.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,5 @@
 #define KERN_FRAME_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <mm/buddy.h>
Index: kernel/generic/include/mm/page.h
===================================================================
--- kernel/generic/include/mm/page.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/mm/page.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_PAGE_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
 #include <memstr.h>
Index: kernel/generic/include/mm/tlb.h
===================================================================
--- kernel/generic/include/mm/tlb.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/mm/tlb.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,5 @@
 
 #include <arch/mm/asid.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /**
Index: kernel/generic/include/print.h
===================================================================
--- kernel/generic/include/print.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/print.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_PRINT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <stdarg.h>
 
Index: kernel/generic/include/proc/program.h
===================================================================
--- kernel/generic/include/proc/program.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/proc/program.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_PROGRAM_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 struct task;
Index: kernel/generic/include/proc/scheduler.h
===================================================================
--- kernel/generic/include/proc/scheduler.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/proc/scheduler.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,16 +37,17 @@
 
 #include <synch/spinlock.h>
-#include <time/clock.h>		/* HZ */
+#include <time/clock.h>
+#include <typedefs.h>
 #include <atomic.h>
 #include <adt/list.h>
 
-#define RQ_COUNT 		16
-#define NEEDS_RELINK_MAX	(HZ)
+#define RQ_COUNT          16
+#define NEEDS_RELINK_MAX  (HZ)
 
 /** Scheduler run queue structure. */
 typedef struct {
 	SPINLOCK_DECLARE(lock);
-	link_t rq_head;		/**< List of ready threads. */
-	size_t n;		/**< Number of threads in rq_ready. */
+	link_t rq_head;          /**< List of ready threads. */
+	size_t n;                /**< Number of threads in rq_ready. */
 } runq_t;
 
@@ -61,5 +62,5 @@
 
 /*
- * To be defined by architectures:
+ * To be defined by architectures.
  */
 extern void before_task_runs_arch(void);
Index: kernel/generic/include/security/cap.h
===================================================================
--- kernel/generic/include/security/cap.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/security/cap.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -49,5 +49,5 @@
 
 #include <syscall/sysarg64.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /**
Index: kernel/generic/include/sort.h
===================================================================
--- kernel/generic/include/sort.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/sort.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup generic
  * @{
  */
@@ -36,5 +36,5 @@
 #define KERN_SORT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /* 
Index: kernel/generic/include/stacktrace.h
===================================================================
--- kernel/generic/include/stacktrace.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/stacktrace.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genericdebug 
+/** @addtogroup genericdebug
  * @{
  */
@@ -36,5 +36,4 @@
 #define KERN_STACKTRACE_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/generic/include/symtab.h
===================================================================
--- kernel/generic/include/symtab.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/symtab.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_SYMTAB_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define MAX_SYMBOL_NAME 64
Index: kernel/generic/include/synch/condvar.h
===================================================================
--- kernel/generic/include/synch/condvar.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/synch/condvar.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_CONDVAR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/waitq.h>
 #include <synch/mutex.h>
Index: kernel/generic/include/synch/futex.h
===================================================================
--- kernel/generic/include/synch/futex.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/synch/futex.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_FUTEX_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/waitq.h>
 
Index: kernel/generic/include/synch/mutex.h
===================================================================
--- kernel/generic/include/synch/mutex.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/synch/mutex.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_MUTEX_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/semaphore.h>
 #include <synch/synch.h>
Index: kernel/generic/include/synch/rwlock.h
===================================================================
--- kernel/generic/include/synch/rwlock.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/synch/rwlock.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_RWLOCK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/mutex.h>
 #include <synch/synch.h>
Index: kernel/generic/include/synch/semaphore.h
===================================================================
--- kernel/generic/include/synch/semaphore.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/synch/semaphore.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_SEMAPHORE_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/waitq.h>
 #include <synch/synch.h>
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/synch/spinlock.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_SPINLOCK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/barrier.h>
 #include <preemption.h>
Index: kernel/generic/include/synch/waitq.h
===================================================================
--- kernel/generic/include/synch/waitq.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/synch/waitq.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_WAITQ_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <synch/synch.h>
Index: kernel/generic/include/syscall/copy.h
===================================================================
--- kernel/generic/include/syscall/copy.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/syscall/copy.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_COPY_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Label within memcpy_from_uspace() that contains return -1. */
Index: kernel/generic/include/syscall/syscall.h
===================================================================
--- kernel/generic/include/syscall/syscall.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/syscall/syscall.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -93,5 +93,5 @@
 #ifdef KERNEL
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef unative_t (*syshandler_t)(unative_t, unative_t, unative_t, unative_t,
Index: kernel/generic/include/sysinfo/sysinfo.h
===================================================================
--- kernel/generic/include/sysinfo/sysinfo.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/sysinfo/sysinfo.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_SYSINFO_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <str.h>
 
Index: kernel/generic/include/time/clock.h
===================================================================
--- kernel/generic/include/time/clock.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/time/clock.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_CLOCK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define HZ		100
Index: kernel/generic/include/time/delay.h
===================================================================
--- kernel/generic/include/time/delay.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/time/delay.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_DELAY_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern void delay(uint32_t microseconds);
Index: kernel/generic/include/time/timeout.h
===================================================================
--- kernel/generic/include/time/timeout.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/time/timeout.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_TIMEOUT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <cpu.h>
Index: kernel/generic/include/typedefs.h
===================================================================
--- kernel/generic/include/typedefs.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/typedefs.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,9 +36,25 @@
 #define KERN_TYPEDEFS_H_
 
+#include <arch/common.h>
 #include <arch/types.h>
 
-#define NULL 0
-#define false 0
-#define true 1
+#define NULL  0
+
+#define false  0
+#define true   1
+
+typedef struct {
+	uint64_t lo;
+	int64_t hi;
+} int128_t;
+
+typedef struct {
+	uint64_t lo;
+	uint64_t hi;
+} uint128_t;
+
+typedef struct {
+	volatile atomic_count_t count;
+} atomic_t;
 
 typedef void (* function)();
Index: kernel/generic/include/userspace.h
===================================================================
--- kernel/generic/include/userspace.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/include/userspace.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup generic
  * @{
  */
@@ -37,5 +37,5 @@
 
 #include <proc/thread.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Switch to user-space (CPU user priviledge level) */
Index: kernel/generic/src/adt/bitmap.c
===================================================================
--- kernel/generic/src/adt/bitmap.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/adt/bitmap.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -39,5 +39,5 @@
 
 #include <adt/bitmap.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <debug.h>
Index: kernel/generic/src/adt/hash_table.c
===================================================================
--- kernel/generic/src/adt/hash_table.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/adt/hash_table.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -40,5 +40,5 @@
 #include <adt/hash_table.h>
 #include <adt/list.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <mm/slab.h>
Index: kernel/generic/src/console/cmd.c
===================================================================
--- kernel/generic/src/console/cmd.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/console/cmd.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -46,5 +46,5 @@
 #include <print.h>
 #include <panic.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <arch.h>
Index: kernel/generic/src/console/console.c
===================================================================
--- kernel/generic/src/console/console.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/console/console.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -39,5 +39,5 @@
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/irq.h>
 #include <ddi/ddi.h>
Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/console/kconsole.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -45,5 +45,5 @@
 #include <print.h>
 #include <panic.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <arch.h>
Index: kernel/generic/src/cpu/cpu.c
===================================================================
--- kernel/generic/src/cpu/cpu.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/cpu/cpu.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -42,5 +42,5 @@
 #include <mm/page.h>
 #include <mm/frame.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <panic.h>
Index: kernel/generic/src/ddi/device.c
===================================================================
--- kernel/generic/src/ddi/device.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/ddi/device.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -35,5 +35,5 @@
  */
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/device.h>
 #include <atomic.h>
Index: kernel/generic/src/ddi/irq.c
===================================================================
--- kernel/generic/src/ddi/irq.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/ddi/irq.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -71,5 +71,5 @@
 #include <adt/hash_table.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <console/console.h>
Index: kernel/generic/src/debug/stacktrace.c
===================================================================
--- kernel/generic/src/debug/stacktrace.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/debug/stacktrace.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -35,5 +35,5 @@
 #include <stacktrace.h>
 #include <interrupt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <symtab.h>
 
Index: kernel/generic/src/debug/symtab.c
===================================================================
--- kernel/generic/src/debug/symtab.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/debug/symtab.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -40,5 +40,5 @@
 #include <str.h>
 #include <print.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <typedefs.h>
 #include <errno.h>
Index: kernel/generic/src/ipc/event.c
===================================================================
--- kernel/generic/src/ipc/event.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/ipc/event.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -38,5 +38,5 @@
 #include <ipc/event_types.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <console/console.h>
Index: kernel/generic/src/lib/elf.c
===================================================================
--- kernel/generic/src/lib/elf.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/lib/elf.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -39,5 +39,5 @@
 #include <lib/elf.h>
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
 #include <mm/frame.h>
Index: kernel/generic/src/lib/memstr.c
===================================================================
--- kernel/generic/src/lib/memstr.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/lib/memstr.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -43,5 +43,5 @@
 
 #include <memstr.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 
Index: kernel/generic/src/main/uinit.c
===================================================================
--- kernel/generic/src/main/uinit.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/main/uinit.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -42,5 +42,5 @@
  
 #include <main/uinit.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <proc/thread.h>
 #include <userspace.h>
Index: kernel/generic/src/mm/as.c
===================================================================
--- kernel/generic/src/mm/as.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/mm/as.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -75,5 +75,5 @@
 #include <config.h>
 #include <align.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <syscall/copy.h>
 #include <arch/interrupt.h>
Index: kernel/generic/src/mm/backend_anon.c
===================================================================
--- kernel/generic/src/mm/backend_anon.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/mm/backend_anon.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -47,5 +47,5 @@
 #include <adt/btree.h>
 #include <errno.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <arch.h>
Index: kernel/generic/src/mm/backend_elf.c
===================================================================
--- kernel/generic/src/mm/backend_elf.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/mm/backend_elf.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -38,5 +38,5 @@
 #include <lib/elf.h>
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
 #include <mm/frame.h>
Index: kernel/generic/src/mm/backend_phys.c
===================================================================
--- kernel/generic/src/mm/backend_phys.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/mm/backend_phys.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -38,5 +38,5 @@
 
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
 #include <mm/page.h>
Index: kernel/generic/src/mm/buddy.c
===================================================================
--- kernel/generic/src/mm/buddy.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/mm/buddy.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -41,5 +41,5 @@
 #include <mm/buddy.h>
 #include <mm/frame.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <print.h>
Index: kernel/generic/src/mm/frame.c
===================================================================
--- kernel/generic/src/mm/frame.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/mm/frame.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -43,5 +43,5 @@
  */
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/frame.h>
 #include <mm/as.h>
Index: kernel/generic/src/mm/page.c
===================================================================
--- kernel/generic/src/mm/page.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/mm/page.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -63,5 +63,5 @@
 #include <mm/frame.h>
 #include <arch/barrier.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 #include <memstr.h>
Index: kernel/generic/src/printf/vprintf.c
===================================================================
--- kernel/generic/src/printf/vprintf.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/printf/vprintf.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -38,5 +38,5 @@
 #include <synch/spinlock.h>
 #include <arch/asm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <typedefs.h>
 #include <str.h>
Index: kernel/generic/src/synch/waitq.c
===================================================================
--- kernel/generic/src/synch/waitq.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/synch/waitq.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -49,5 +49,5 @@
 #include <proc/scheduler.h>
 #include <arch/asm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <time/timeout.h>
 #include <arch.h>
Index: kernel/generic/src/time/delay.c
===================================================================
--- kernel/generic/src/time/delay.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/time/delay.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,5 @@
  
 #include <time/delay.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <cpu.h>
 #include <arch/asm.h>
Index: kernel/generic/src/time/timeout.c
===================================================================
--- kernel/generic/src/time/timeout.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/generic/src/time/timeout.c	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,5 @@
 
 #include <time/timeout.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <panic.h>