Index: uspace/lib/libc/include/byteorder.h
===================================================================
--- uspace/lib/libc/include/byteorder.h	(revision 953769ff5f13f913fbf03e6f1b8aac2f414094f6)
+++ uspace/lib/libc/include/byteorder.h	(revision cc531be1fa318880c0c47de3b0e1dbf0d95cab9e)
@@ -36,46 +36,45 @@
 #define LIBC_BYTEORDER_H_
 
-#include <libarch/byteorder.h>
 #include <stdint.h>
 
-#if !(defined(ARCH_IS_BIG_ENDIAN) ^ defined(ARCH_IS_LITTLE_ENDIAN))
-#error The architecture must be either big-endian or little-endian.
+#if !(defined(__BE__) ^ defined(__LE__))
+	#error The architecture must be either big-endian or little-endian.
 #endif
 
-#ifdef ARCH_IS_BIG_ENDIAN
+#ifdef __BE__
 
-#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_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 uint16_t_be2host(n)  (n)
+#define uint32_t_be2host(n)  (n)
+#define uint64_t_be2host(n)  (n)
 
-#define host2uint16_t_le(n)		uint16_t_byteorder_swap(n)
-#define host2uint32_t_le(n)		uint32_t_byteorder_swap(n)
-#define host2uint64_t_le(n)		uint64_t_byteorder_swap(n)
+#define host2uint16_t_le(n)  (uint16_t_byteorder_swap(n))
+#define host2uint32_t_le(n)  (uint32_t_byteorder_swap(n))
+#define host2uint64_t_le(n)  (uint64_t_byteorder_swap(n))
 
-#define host2uint16_t_be(n)		(n)
-#define host2uint32_t_be(n)		(n)
-#define host2uint64_t_be(n)		(n)
+#define host2uint16_t_be(n)  (n)
+#define host2uint32_t_be(n)  (n)
+#define host2uint64_t_be(n)  (n)
 
 #else
 
-#define uint16_t_le2host(n)		(n)
-#define uint32_t_le2host(n)		(n)
-#define uint64_t_le2host(n)		(n)
+#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 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 host2uint16_t_le(n)		(n)
-#define host2uint32_t_le(n)		(n)
-#define host2uint64_t_le(n)		(n)
+#define host2uint16_t_le(n)  (n)
+#define host2uint32_t_le(n)  (n)
+#define host2uint64_t_le(n)  (n)
 
-#define host2uint16_t_be(n)		uint16_t_byteorder_swap(n)
-#define host2uint32_t_be(n)		uint32_t_byteorder_swap(n)
-#define host2uint64_t_be(n)		uint64_t_byteorder_swap(n)
+#define host2uint16_t_be(n)  (uint16_t_byteorder_swap(n))
+#define host2uint32_t_be(n)  (uint32_t_byteorder_swap(n))
+#define host2uint64_t_be(n)  (uint64_t_byteorder_swap(n))
 
 #endif
Index: uspace/lib/libc/include/string.h
===================================================================
--- uspace/lib/libc/include/string.h	(revision 953769ff5f13f913fbf03e6f1b8aac2f414094f6)
+++ uspace/lib/libc/include/string.h	(revision cc531be1fa318880c0c47de3b0e1dbf0d95cab9e)
@@ -41,5 +41,4 @@
 
 #define U_SPECIAL  '?'
-#define U_BOM      0xfeff
 
 /** No size limit constant */