Index: kernel/arch/amd64/include/byteorder.h
===================================================================
--- kernel/arch/amd64/include/byteorder.h	(revision 0f718abba99450e9e565ad7ebd5717886bc9f8fd)
+++ kernel/arch/amd64/include/byteorder.h	(revision e13d1febc1bf068214f559f6c427d5f7b4493786)
@@ -36,14 +36,6 @@
 #define KERN_amd64_BYTEORDER_H_
 
-#include <byteorder.h>
-
 /* AMD64 is little-endian */
-#define uint16_t_le2host(n)		(n)
-#define uint32_t_le2host(n)		(n)
-#define uint64_t_le2host(n)		(n)
-
-#define uint16_t_be2host(n)		uint16_t_byteorder_swap(n)
-#define uint32_t_be2host(n)		uint32_t_byteorder_swap(n)
-#define uint64_t_be2host(n)		uint64_t_byteorder_swap(n)
+#define ARCH_IS_LITTLE_ENDIAN
 
 #endif
Index: kernel/arch/arm32/include/byteorder.h
===================================================================
--- kernel/arch/arm32/include/byteorder.h	(revision 0f718abba99450e9e565ad7ebd5717886bc9f8fd)
+++ kernel/arch/arm32/include/byteorder.h	(revision e13d1febc1bf068214f559f6c427d5f7b4493786)
@@ -37,26 +37,8 @@
 #define KERN_arm32_BYTEORDER_H_
 
-#include <byteorder.h>
-
 #ifdef BIG_ENDIAN
-
-#define uint16_t_le2host(n)		uint16_t_byteorder_swap(n)
-#define uint32_t_le2host(n)		uint32_t_byteorder_swap(n)
-#define uint64_t_le2host(n)		uint64_t_byteorder_swap(n)
-
-#define uint16_t_be2host(n)		(n)
-#define uint32_t_be2host(n)		(n)
-#define uint64_t_be2host(n)		(n)
-
+#define ARCH_IS_BIG_ENDIAN
 #else
-
-#define uint16_t_le2host(n)		(n)
-#define uint32_t_le2host(n)		(n)
-#define uint64_t_le2host(n)		(n)
-
-#define uint16_t_be2host(n)		uint16_t_byteorder_swap(n)
-#define uint32_t_be2host(n)		uint32_t_byteorder_swap(n)
-#define uint64_t_be2host(n)		uint64_t_byteorder_swap(n)
-
+#define ARCH_IS_LITTLE_ENDIAN
 #endif
 
Index: kernel/arch/ia32/include/byteorder.h
===================================================================
--- kernel/arch/ia32/include/byteorder.h	(revision 0f718abba99450e9e565ad7ebd5717886bc9f8fd)
+++ kernel/arch/ia32/include/byteorder.h	(revision e13d1febc1bf068214f559f6c427d5f7b4493786)
@@ -36,14 +36,6 @@
 #define KERN_ia32_BYTEORDER_H_
 
-#include <byteorder.h>
-
 /* IA-32 is little-endian */
-#define uint16_t_le2host(n)		(n)
-#define uint32_t_le2host(n)		(n)
-#define uint64_t_le2host(n)		(n)
-
-#define uint16_t_be2host(n)		uint16_t_byteorder_swap(n)
-#define uint32_t_be2host(n)		uint32_t_byteorder_swap(n)
-#define uint64_t_be2host(n)		uint64_t_byteorder_swap(n)
+#define ARCH_IS_LITTLE_ENDIAN
 
 #endif
Index: kernel/arch/ia64/include/byteorder.h
===================================================================
--- kernel/arch/ia64/include/byteorder.h	(revision 0f718abba99450e9e565ad7ebd5717886bc9f8fd)
+++ kernel/arch/ia64/include/byteorder.h	(revision e13d1febc1bf068214f559f6c427d5f7b4493786)
@@ -36,14 +36,6 @@
 #define KERN_ia64_BYTEORDER_H_
 
-#include <byteorder.h>
-
 /* IA-64 is little-endian */
-#define uint16_t_le2host(n)		(n)
-#define uint32_t_le2host(n)		(n)
-#define uint64_t_le2host(n)		(n)
-
-#define uint16_t_be2host(n)		uint16_t_byteorder_swap(n)
-#define uint32_t_be2host(n)		uint32_t_byteorder_swap(n)
-#define uint64_t_be2host(n)		uint64_t_byteorder_swap(n)
+#define ARCH_IS_LITTLE_ENDIAN
 
 #endif
Index: kernel/arch/mips32/include/byteorder.h
===================================================================
--- kernel/arch/mips32/include/byteorder.h	(revision 0f718abba99450e9e565ad7ebd5717886bc9f8fd)
+++ kernel/arch/mips32/include/byteorder.h	(revision e13d1febc1bf068214f559f6c427d5f7b4493786)
@@ -36,26 +36,8 @@
 #define KERN_mips32_BYTEORDER_H_
 
-#include <byteorder.h>
-
 #ifdef BIG_ENDIAN
-
-#define uint16_t_le2host(n)		uint16_t_byteorder_swap(n)
-#define uint32_t_le2host(n)		uint32_t_byteorder_swap(n)
-#define uint64_t_le2host(n)		uint64_t_byteorder_swap(n)
-
-#define uint16_t_be2host(n)		(n)
-#define uint32_t_be2host(n)		(n)
-#define uint64_t_be2host(n)		(n)
-
+#define ARCH_IS_BIG_ENDIAN
 #else
-
-#define uint16_t_le2host(n)		(n)
-#define uint32_t_le2host(n)		(n)
-#define uint64_t_le2host(n)		(n)
-
-#define uint16_t_be2host(n)		uint16_t_byteorder_swap(n)
-#define uint32_t_be2host(n)		uint32_t_byteorder_swap(n)
-#define uint64_t_be2host(n)		uint64_t_byteorder_swap(n)
-
+#define ARCH_IS_LITTLE_ENDIAN
 #endif
 
Index: kernel/arch/mips32/src/drivers/arc.c
===================================================================
--- kernel/arch/mips32/src/drivers/arc.c	(revision 0f718abba99450e9e565ad7ebd5717886bc9f8fd)
+++ kernel/arch/mips32/src/drivers/arc.c	(revision e13d1febc1bf068214f559f6c427d5f7b4493786)
@@ -37,5 +37,5 @@
 #include <print.h>
 #include <arch.h>
-#include <arch/byteorder.h>
+#include <byteorder.h>
 #include <arch/mm/frame.h>
 #include <mm/frame.h>
Index: kernel/arch/ppc32/include/byteorder.h
===================================================================
--- kernel/arch/ppc32/include/byteorder.h	(revision 0f718abba99450e9e565ad7ebd5717886bc9f8fd)
+++ kernel/arch/ppc32/include/byteorder.h	(revision e13d1febc1bf068214f559f6c427d5f7b4493786)
@@ -36,13 +36,5 @@
 #define KERN_ppc32_BYTEORDER_H_
 
-#include <byteorder.h>
-
-#define uint16_t_le2host(n)		uint16_t_byteorder_swap(n)
-#define uint32_t_le2host(n)		uint32_t_byteorder_swap(n)
-#define uint64_t_le2host(n)		uint64_t_byteorder_swap(n)
-
-#define uint16_t_be2host(n)		(n)
-#define uint32_t_be2host(n)		(n)
-#define uint64_t_be2host(n)		(n)
+#define ARCH_IS_BIG_ENDIAN
 
 #endif
Index: kernel/arch/ppc64/include/byteorder.h
===================================================================
--- kernel/arch/ppc64/include/byteorder.h	(revision 0f718abba99450e9e565ad7ebd5717886bc9f8fd)
+++ kernel/arch/ppc64/include/byteorder.h	(revision e13d1febc1bf068214f559f6c427d5f7b4493786)
@@ -36,13 +36,5 @@
 #define KERN_ppc64_BYTEORDER_H_
 
-#include <byteorder.h>
-
-#define uint16_t_le2host(n)		uint16_t_byteorder_swap(n)
-#define uint32_t_le2host(n)		uint32_t_byteorder_swap(n)
-#define uint64_t_le2host(n)		uint64_t_byteorder_swap(n)
-
-#define uint16_t_be2host(n)		(n)
-#define uint32_t_be2host(n)		(n)
-#define uint64_t_be2host(n)		(n)
+#define ARCH_IS_BIG_ENDIAN
 
 #endif
Index: kernel/arch/sparc64/include/byteorder.h
===================================================================
--- kernel/arch/sparc64/include/byteorder.h	(revision 0f718abba99450e9e565ad7ebd5717886bc9f8fd)
+++ kernel/arch/sparc64/include/byteorder.h	(revision e13d1febc1bf068214f559f6c427d5f7b4493786)
@@ -36,13 +36,5 @@
 #define KERN_sparc64_BYTEORDER_H_
 
-#include <byteorder.h>
-
-#define uint16_t_le2host(n)		uint16_t_byteorder_swap(n)
-#define uint32_t_le2host(n)		uint32_t_byteorder_swap(n)
-#define uint64_t_le2host(n)		uint64_t_byteorder_swap(n)
-
-#define uint16_t_be2host(n)		(n)
-#define uint32_t_be2host(n)		(n)
-#define uint64_t_be2host(n)		(n)
+#define ARCH_IS_BIG_ENDIAN
 
 #endif
