Index: kernel/arch/amd64/include/asm.h
===================================================================
--- kernel/arch/amd64/include/asm.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/amd64/include/asm.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -37,4 +37,6 @@
 
 #include <config.h>
+#include <arch/types.h>
+#include <typedefs.h>
 
 extern void asm_delay_loop(uint32_t t);
Index: kernel/arch/amd64/include/types.h
===================================================================
--- kernel/arch/amd64/include/types.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/amd64/include/types.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -58,8 +58,4 @@
 typedef int64_t native_t;
 
-typedef volatile uint8_t ioport8_t;
-typedef volatile uint16_t ioport16_t;
-typedef volatile uint32_t ioport32_t;
-
 typedef struct {
 } fncptr_t;
Index: kernel/arch/arm32/include/asm.h
===================================================================
--- kernel/arch/arm32/include/asm.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/arm32/include/asm.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -37,4 +37,5 @@
 #define KERN_arm32_ASM_H_
 
+#include <typedefs.h>
 #include <arch/types.h>
 #include <arch/stack.h>
Index: kernel/arch/arm32/include/types.h
===================================================================
--- kernel/arch/arm32/include/types.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/arm32/include/types.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -65,8 +65,4 @@
 typedef int32_t native_t;
 
-typedef volatile uint8_t ioport8_t;
-typedef volatile uint16_t ioport16_t;
-typedef volatile uint32_t ioport32_t;
-
 typedef struct {
 } fncptr_t;
Index: kernel/arch/ia32/include/asm.h
===================================================================
--- kernel/arch/ia32/include/asm.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/ia32/include/asm.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -39,4 +39,5 @@
 #include <arch/pm.h>
 #include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 
Index: kernel/arch/ia32/include/types.h
===================================================================
--- kernel/arch/ia32/include/types.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/ia32/include/types.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -58,8 +58,4 @@
 typedef int32_t native_t;
 
-typedef volatile uint8_t ioport8_t;
-typedef volatile uint16_t ioport16_t;
-typedef volatile uint32_t ioport32_t;
-
 typedef struct {
 } fncptr_t;
Index: kernel/arch/ia64/include/asm.h
===================================================================
--- kernel/arch/ia64/include/asm.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/ia64/include/asm.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -37,4 +37,5 @@
 
 #include <config.h>
+#include <typedefs.h>
 #include <arch/types.h>
 #include <arch/register.h>
Index: kernel/arch/ia64/include/types.h
===================================================================
--- kernel/arch/ia64/include/types.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/ia64/include/types.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -66,8 +66,4 @@
 typedef int64_t native_t;
 
-typedef volatile uint8_t ioport8_t;
-typedef volatile uint16_t ioport16_t;
-typedef volatile uint32_t ioport32_t;
-
 typedef struct {
 	unative_t fnc;
Index: kernel/arch/mips32/include/asm.h
===================================================================
--- kernel/arch/mips32/include/asm.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/mips32/include/asm.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -37,4 +37,5 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 
Index: kernel/arch/mips32/include/types.h
===================================================================
--- kernel/arch/mips32/include/types.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/mips32/include/types.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -58,8 +58,4 @@
 typedef int32_t native_t;
 
-typedef volatile uint8_t ioport8_t;
-typedef volatile uint16_t ioport16_t;
-typedef volatile uint32_t ioport32_t;
-
 typedef struct {
 } fncptr_t;
Index: kernel/arch/ppc32/include/asm.h
===================================================================
--- kernel/arch/ppc32/include/asm.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/ppc32/include/asm.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -37,4 +37,5 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 
Index: kernel/arch/ppc32/include/types.h
===================================================================
--- kernel/arch/ppc32/include/types.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/ppc32/include/types.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -58,8 +58,4 @@
 typedef int32_t native_t;
 
-typedef volatile uint8_t ioport8_t;
-typedef volatile uint16_t ioport16_t;
-typedef volatile uint32_t ioport32_t;
-
 typedef struct {
 } fncptr_t;
Index: kernel/arch/sparc64/include/types.h
===================================================================
--- kernel/arch/sparc64/include/types.h	(revision e762b4375e99a4a33536330659ad95ea048dbf84)
+++ kernel/arch/sparc64/include/types.h	(revision c22e964a598c0c20654391f6a11e7333830cbf37)
@@ -58,8 +58,4 @@
 typedef int64_t native_t;
 
-typedef volatile uint8_t ioport8_t;
-typedef volatile uint16_t ioport16_t;
-typedef volatile uint32_t ioport32_t;
-
 typedef struct {
 } fncptr_t;