Index: boot/generic/include/stddef.h
===================================================================
--- boot/generic/include/stddef.h	(revision d29ae353d74375e7338981290278a5217faf5170)
+++ boot/generic/include/stddef.h	(revision 002fd5f375765c45f5e59bbc374e1418520abddf)
@@ -33,5 +33,4 @@
 #define BOOT_STDDEF_H_
 
-#include <arch/common.h>
 #include <arch/types.h>
 
Index: boot/generic/include/stdint.h
===================================================================
--- boot/generic/include/stdint.h	(revision d29ae353d74375e7338981290278a5217faf5170)
+++ boot/generic/include/stdint.h	(revision 002fd5f375765c45f5e59bbc374e1418520abddf)
@@ -33,30 +33,5 @@
 #define BOOT_STDINT_H_
 
-#include <arch/common.h>
 #include <arch/types.h>
-
-#define INT8_MIN  INT8_C(0x80)
-#define INT8_MAX  INT8_C(0x7F)
-
-#define UINT8_MIN  UINT8_C(0)
-#define UINT8_MAX  UINT8_C(0xFF)
-
-#define INT16_MIN  INT16_C(0x8000)
-#define INT16_MAX  INT16_C(0x7FFF)
-
-#define UINT16_MIN  UINT16_C(0)
-#define UINT16_MAX  UINT16_C(0xFFFF)
-
-#define INT32_MIN  INT32_C(0x80000000)
-#define INT32_MAX  INT32_C(0x7FFFFFFF)
-
-#define UINT32_MIN  UINT32_C(0)
-#define UINT32_MAX  UINT32_C(0xFFFFFFFF)
-
-#define INT64_MIN  INT64_C(0x8000000000000000)
-#define INT64_MAX  INT64_C(0x7FFFFFFFFFFFFFFF)
-
-#define UINT64_MIN  UINT64_C(0)
-#define UINT64_MAX  UINT64_C(0xFFFFFFFFFFFFFFFF)
 
 #endif
Index: boot/generic/src/str.c
===================================================================
--- boot/generic/src/str.c	(revision d29ae353d74375e7338981290278a5217faf5170)
+++ boot/generic/src/str.c	(revision 002fd5f375765c45f5e59bbc374e1418520abddf)
@@ -104,5 +104,5 @@
 
 /** Check the condition if wchar_t is signed */
-#ifdef WCHAR_IS_UNSIGNED
+#ifdef __WCHAR_UNSIGNED__
 	#define WCHAR_SIGNED_CHECK(cond)  (true)
 #else