1 files changed, 5 insertions, 9 deletions
diff --git a/inc/ia32/efibind.h b/inc/ia32/efibind.h
index b0b0d76..6b0e6b4 100644
--- a/inc/ia32/efibind.h
+++ b/inc/ia32/efibind.h
@@ -85,12 +85,11 @@ Revision History
 // Basic EFI types of various widths
 //
 
-#ifndef __WCHAR_TYPE__
-# define __WCHAR_TYPE__ short
-#endif
-#ifndef __CHAR16_TYPE__
-# define __CHAR16_TYPE__ unsigned short
-#endif
+#include <stddef.h>
+
+typedef wchar_t CHAR16;
+#define WCHAR CHAR16
+
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
@@ -101,15 +100,12 @@ 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
 #define VOID    void