sdk/xtdk/xtcompat.h

@@ -15,14 +15,26 @@
     #define XTCLINK         extern "C"
     #define NULLPTR         nullptr
 
-    /* C++ types */
+    /* C++ boolean type */
+    typedef bool BOOLEAN, *PBOOLEAN;
+    #define TRUE true
+    #define FALSE false
+
+    /* C++ widechar type */
     typedef wchar_t wchar;
 #else
     /* C definitions */
     #define XTCLINK
     #define NULLPTR         ((void *)0)
 
-    /* C types */
+    /* C boolean type */
+    typedef enum _BOOLEAN
+    {
+        FALSE = 0,
+        TRUE = 1
+    } BOOLEAN, *PBOOLEAN;
+
+    /* C widechar type */
     typedef unsigned short wchar;
 #endif
 

sdk/xtdk/xtstruct.h

@@ -14,7 +14,6 @@
 
 /* Enumeration lists forward references */
 typedef enum _ADJUST_REASON ADJUST_REASON, *PADJUST_REASON;
-typedef enum _BOOLEAN BOOLEAN, *PBOOLEAN;
 typedef enum _EXCEPTION_DISPOSITION EXCEPTION_DISPOSITION, *PEXCEPTION_DISPOSITION;
 typedef enum _EFI_ALLOCATE_TYPE EFI_ALLOCATE_TYPE, *PEFI_ALLOCATE_TYPE;
 typedef enum _EFI_FRAMEWORK_CPU_DESIGNATION EFI_FRAMEWORK_CPU_DESIGNATION, *PEFI_FRAMEWORK_CPU_DESIGNATION;

sdk/xtdk/xttypes.h

@@ -150,13 +150,6 @@ typedef LPCWSTR PCTSTR, LPCTSTR;
 typedef LPUWSTR PUTSTR, LPUTSTR;
 typedef LPCUWSTR PCUTSTR, LPCUTSTR;
 
-/* Boolean type */
-typedef enum _BOOLEAN
-{
-    FALSE = 0,
-    TRUE = 1
-} BOOLEAN, *PBOOLEAN;
-
 /* 128-bit floats structure */
 typedef struct _FLOAT128
 {