Index: kernel/arch/arm32/include/asm.h
===================================================================
--- kernel/arch/arm32/include/asm.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/asm.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -38,5 +38,4 @@
 
 #include <typedefs.h>
-#include <arch/types.h>
 #include <arch/stack.h>
 #include <config.h>
Index: kernel/arch/arm32/include/context.h
===================================================================
--- kernel/arch/arm32/include/context.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/context.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -52,5 +52,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Thread context containing registers that must be preserved across function
Index: kernel/arch/arm32/include/cpu.h
===================================================================
--- kernel/arch/arm32/include/cpu.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/cpu.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -37,5 +37,5 @@
 #define KERN_arm32_CPU_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 
Index: kernel/arch/arm32/include/exception.h
===================================================================
--- kernel/arch/arm32/include/exception.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/exception.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -38,5 +38,5 @@
 #define KERN_arm32_EXCEPTION_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/regutils.h>
 
Index: kernel/arch/arm32/include/faddr.h
===================================================================
--- kernel/arch/arm32/include/faddr.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/faddr.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -37,5 +37,5 @@
 #define KERN_arm32_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Calculate absolute address of function referenced by fptr pointer.
Index: kernel/arch/arm32/include/fpu_context.h
===================================================================
--- kernel/arch/arm32/include/fpu_context.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/fpu_context.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -39,5 +39,5 @@
 #define KERN_arm32_FPU_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FPU_CONTEXT_ALIGN    0
Index: kernel/arch/arm32/include/interrupt.h
===================================================================
--- kernel/arch/arm32/include/interrupt.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/interrupt.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -37,5 +37,5 @@
 #define KERN_arm32_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/exception.h>
 
Index: kernel/arch/arm32/include/machine_func.h
===================================================================
--- kernel/arch/arm32/include/machine_func.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/machine_func.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -43,5 +43,5 @@
 
 #include <console/console.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/exception.h>
 
Index: kernel/arch/arm32/include/mm/asid.h
===================================================================
--- kernel/arch/arm32/include/mm/asid.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/mm/asid.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -39,5 +39,5 @@
 #define KERN_arm32_ASID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define ASID_MAX_ARCH		3	/* minimal required number */
Index: kernel/arch/arm32/include/mm/frame.h
===================================================================
--- kernel/arch/arm32/include/mm/frame.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/mm/frame.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -43,5 +43,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define BOOT_PAGE_TABLE_SIZE     0x4000
Index: kernel/arch/arm32/include/mm/page_fault.h
===================================================================
--- kernel/arch/arm32/include/mm/page_fault.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/mm/page_fault.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -37,5 +37,5 @@
 #define KERN_arm32_PAGE_FAULT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 
Index: kernel/arch/arm32/include/ras.h
===================================================================
--- kernel/arch/arm32/include/ras.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/ras.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -38,5 +38,5 @@
 
 #include <arch/exception.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define RAS_START	0
Index: kernel/arch/arm32/include/types.h
===================================================================
--- kernel/arch/arm32/include/types.h	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/include/types.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -43,14 +43,4 @@
 #endif
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed long int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned long uint32_t;
-typedef unsigned long long uint64_t;
-
 typedef uint32_t size_t;
 
@@ -67,24 +57,24 @@
 } fncptr_t;
 
-#define PRIp "x"	/**< Format for uintptr_t. */
-#define PRIs "u"	/**< Format for size_t. */
+#define PRIp "x"  /**< Format for uintptr_t. */
+#define PRIs "u"  /**< Format for size_t. */
 
-#define PRId8 "d"	/**< Format for int8_t. */
-#define PRId16 "d"	/**< Format for int16_t. */
-#define PRId32 "d"	/**< Format for int32_t. */
-#define PRId64 "lld"	/**< Format for int64_t. */
-#define PRIdn "d"	/**< Format for native_t. */
+#define PRId8 "d"     /**< Format for int8_t. */
+#define PRId16 "d"    /**< Format for int16_t. */
+#define PRId32 "d"    /**< Format for int32_t. */
+#define PRId64 "lld"  /**< Format for int64_t. */
+#define PRIdn "d"     /**< Format for native_t. */
 
-#define PRIu8 "u"	/**< Format for uint8_t. */
-#define PRIu16 "u"	/**< Format for uint16_t. */
-#define PRIu32 "u"	/**< Format for uint32_t. */
-#define PRIu64 "llu"	/**< Format for uint64_t. */
-#define PRIun "u"	/**< Format for unative_t. */
+#define PRIu8 "u"     /**< Format for uint8_t. */
+#define PRIu16 "u"    /**< Format for uint16_t. */
+#define PRIu32 "u"    /**< Format for uint32_t. */
+#define PRIu64 "llu"  /**< Format for uint64_t. */
+#define PRIun "u"     /**< Format for unative_t. */
 
-#define PRIx8 "x"	/**< Format for hexadecimal (u)int8_t. */
-#define PRIx16 "x"	/**< Format for hexadecimal (u)int16_t. */
-#define PRIx32 "x"	/**< Format for hexadecimal (u)uint32_t. */
-#define PRIx64 "llx"	/**< Format for hexadecimal (u)int64_t. */
-#define PRIxn "x"	/**< Format for hexadecimal (u)native_t. */
+#define PRIx8 "x"     /**< Format for hexadecimal (u)int8_t. */
+#define PRIx16 "x"    /**< Format for hexadecimal (u)int16_t. */
+#define PRIx32 "x"    /**< Format for hexadecimal (u)uint32_t. */
+#define PRIx64 "llx"  /**< Format for hexadecimal (u)int64_t. */
+#define PRIxn "x"     /**< Format for hexadecimal (u)native_t. */
 
 #endif
Index: kernel/arch/arm32/src/ddi/ddi.c
===================================================================
--- kernel/arch/arm32/src/ddi/ddi.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/src/ddi/ddi.c	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -36,5 +36,5 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Enable I/O space range for task.
Index: kernel/arch/arm32/src/debug/stacktrace.c
===================================================================
--- kernel/arch/arm32/src/debug/stacktrace.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/src/debug/stacktrace.c	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -35,5 +35,4 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/arm32/src/mm/page.c
===================================================================
--- kernel/arch/arm32/src/mm/page.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/src/mm/page.c	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -41,5 +41,4 @@
 #include <arch/exception.h>
 #include <typedefs.h>
-#include <arch/types.h>
 #include <interrupt.h>
 #include <arch/mm/frame.h>
Index: kernel/arch/arm32/src/mm/tlb.c
===================================================================
--- kernel/arch/arm32/src/mm/tlb.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/src/mm/tlb.c	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -37,5 +37,5 @@
 #include <arch/mm/asid.h>
 #include <arch/asm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/mm/page.h>
 
Index: kernel/arch/arm32/src/ras.c
===================================================================
--- kernel/arch/arm32/src/ras.c	(revision 19f857a3b361739b06d4f547174ae4ac1b99c651)
+++ kernel/arch/arm32/src/ras.c	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -44,5 +44,5 @@
 #include <arch.h>
 #include <memstr.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 uintptr_t *ras_page = NULL;