diff --git a/inc/aarch64/efibind.h b/inc/aarch64/efibind.h
index c2c546b..da94c3b 100644
--- a/inc/aarch64/efibind.h
+++ b/inc/aarch64/efibind.h
@@ -41,6 +41,9 @@ typedef int64_t             intptr_t;
 #ifndef __WCHAR_TYPE__
 # define __WCHAR_TYPE__ short
 #endif
+#ifndef __CHAR16_TYPE__
+# define __CHAR16_TYPE__ unsigned short
+#endif
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
@@ -49,9 +52,13 @@ typedef uint32_t   UINT32;
 typedef int32_t    INT32;
 
 typedef uint16_t   UINT16;
+typedef __CHAR16_TYPE__ CHAR16;
 typedef int16_t    INT16;
+
 typedef uint8_t    UINT8;
+typedef char       CHAR8;
 typedef int8_t     INT8;
+
 typedef __WCHAR_TYPE__ WCHAR;
 
 #undef VOID
diff --git a/inc/arm/efibind.h b/inc/arm/efibind.h
index 9e2cb10..b4753a1 100644
--- a/inc/arm/efibind.h
+++ b/inc/arm/efibind.h
@@ -49,6 +49,9 @@ typedef int32_t             intptr_t;
 #ifndef __WCHAR_TYPE__
 # define __WCHAR_TYPE__ short
 #endif
+#ifndef __CHAR16_TYPE__
+# define __CHAR16_TYPE__ unsigned short
+#endif
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
@@ -57,9 +60,13 @@ typedef uint32_t   UINT32;
 typedef int32_t    INT32;
 
 typedef uint16_t   UINT16;
+typedef __CHAR16_TYPE__ CHAR16;
 typedef int16_t    INT16;
+
 typedef uint8_t    UINT8;
+typedef char       CHAR8;
 typedef int8_t     INT8;
+
 typedef __WCHAR_TYPE__ WCHAR;
 
 #undef VOID
diff --git a/inc/efidef.h b/inc/efidef.h
index 8b70051..a552c7d 100644
--- a/inc/efidef.h
+++ b/inc/efidef.h
@@ -20,9 +20,8 @@ Revision History
 
 --*/
 
-typedef UINT16          CHAR16;
-typedef UINT8           CHAR8;
-typedef UINT8           BOOLEAN;
+typedef unsigned char BOOLEAN;
+
 #ifndef CONST
    #define CONST const
 #endif
@@ -194,7 +193,7 @@ typedef struct {
 // International Language
 //
 
-typedef UINT8   ISO_639_2;
+typedef CHAR8 ISO_639_2;
 #define ISO_639_2_ENTRY_SIZE    3
 
 //
diff --git a/inc/ia32/efibind.h b/inc/ia32/efibind.h
index 27459e4..b0b0d76 100644
--- a/inc/ia32/efibind.h
+++ b/inc/ia32/efibind.h
@@ -88,6 +88,9 @@ Revision History
 #ifndef __WCHAR_TYPE__
 # define __WCHAR_TYPE__ short
 #endif
+#ifndef __CHAR16_TYPE__
+# define __CHAR16_TYPE__ unsigned short
+#endif
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
@@ -98,9 +101,13 @@ typedef int64_t    INT64;
 #endif
 
 typedef uint16_t   UINT16;
+typedef __CHAR16_TYPE__ CHAR16;
 typedef int16_t    INT16;
+
 typedef uint8_t    UINT8;
+typedef char       CHAR8;
 typedef int8_t     INT8;
+
 typedef __WCHAR_TYPE__ WCHAR;
 
 #undef VOID
diff --git a/inc/ia64/efibind.h b/inc/ia64/efibind.h
index 3ace8d5..ebe8cac 100644
--- a/inc/ia64/efibind.h
+++ b/inc/ia64/efibind.h
@@ -74,18 +74,25 @@ Revision History
 #ifndef __WCHAR_TYPE__
 # define __WCHAR_TYPE__	short
 #endif
-
+#ifndef __CHAR16_TYPE__
+# define __CHAR16_TYPE__ unsigned short
+#endif
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
+
 typedef uint32_t   UINT32;
 typedef int32_t    INT32;
-typedef uint16_t   UINT16;
-typedef int16_t    INT16;
-typedef uint8_t    UINT8;
-typedef int8_t     INT8;
-typedef __WCHAR_TYPE__ WCHAR;
 
+typedef uint16_t   UINT16;
+typedef __CHAR16_TYPE__ CHAR16;
+typedef int16_t    INT16;
+
+typedef uint8_t    UINT8;
+typedef char       CHAR8;
+typedef int8_t     INT8;
+
+typedef __WCHAR_TYPE__ WCHAR;
 
 #undef VOID
 #define VOID    void
diff --git a/inc/mips64el/efibind.h b/inc/mips64el/efibind.h
index 1f08cd3..e26c519 100644
--- a/inc/mips64el/efibind.h
+++ b/inc/mips64el/efibind.h
@@ -43,6 +43,9 @@ typedef int64_t             intptr_t;
 #ifndef __WCHAR_TYPE__
 # define __WCHAR_TYPE__ short
 #endif
+#ifndef __CHAR16_TYPE__
+# define __CHAR16_TYPE__ unsigned short
+#endif
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
@@ -51,9 +54,13 @@ typedef uint32_t   UINT32;
 typedef int32_t    INT32;
 
 typedef uint16_t   UINT16;
+typedef __CHAR16_TYPE__ CHAR16;
 typedef int16_t    INT16;
+
 typedef uint8_t    UINT8;
+typedef char       CHAR8;
 typedef int8_t     INT8;
+
 typedef __WCHAR_TYPE__ WCHAR;
 
 #undef VOID
diff --git a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h
index b8c32c3..835e0b9 100644
--- a/inc/x86_64/efibind.h
+++ b/inc/x86_64/efibind.h
@@ -109,9 +109,13 @@ typedef int64_t    INT64;
 #endif
 
 typedef uint16_t   UINT16;
+typedef __CHAR16_TYPE__ CHAR16;
 typedef int16_t    INT16;
+
 typedef uint8_t    UINT8;
+typedef char       CHAR8;
 typedef int8_t     INT8;
+
 typedef __WCHAR_TYPE__ WCHAR;
 
 #undef VOID