diff --git a/sdk/xtdk/xtstruct.h b/sdk/xtdk/xtstruct.h
index c68d1be..d6fae34 100644
--- a/sdk/xtdk/xtstruct.h
+++ b/sdk/xtdk/xtstruct.h
@@ -16,8 +16,9 @@
 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_GRAPHICS_PIXEL_FORMAT EFI_GRAPHICS_PIXEL_FORMAT, *PEFI_GRAPHICS_PIXEL_FORMAT;
 typedef enum _EFI_GRAPHICS_OUTPUT_BLT_OPERATION EFI_GRAPHICS_OUTPUT_BLT_OPERATION, *PEFI_GRAPHICS_OUTPUT_BLT_OPERATION;
+typedef enum _EFI_GRAPHICS_PIXEL_FORMAT EFI_GRAPHICS_PIXEL_FORMAT, *PEFI_GRAPHICS_PIXEL_FORMAT;
+typedef enum _EFI_GRAPHICS_PROTOCOL EFI_GRAPHICS_PROTOCOL, *PEFI_GRAPHICS_PROTOCOL;
 typedef enum _EFI_INTERFACE_TYPE EFI_INTERFACE_TYPE, *PEFI_INTERFACE_TYPE;
 typedef enum _EFI_IO_OPERATION_TYPE EFI_IO_OPERATION_TYPE, *PEFI_IO_OPERATION_TYPE;
 typedef enum _EFI_IO_WIDTH EFI_IO_WIDTH, *PEFI_IO_WIDTH;
diff --git a/sdk/xtdk/xtuefi.h b/sdk/xtdk/xtuefi.h
index 4ad1c8c..656939c 100644
--- a/sdk/xtdk/xtuefi.h
+++ b/sdk/xtdk/xtuefi.h
@@ -367,13 +367,13 @@ typedef enum _EFI_PCI_IO_PROTOCOL_OPERATION
 /* Enumeration of EFI PCI Root Bridge I/O protocol operations */
 typedef enum _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_OPERATION
 {
-  EfiPciOperationBusMasterRead,
-  EfiPciOperationBusMasterWrite,
-  EfiPciOperationBusMasterCommonBuffer,
-  EfiPciOperationBusMasterRead64,
-  EfiPciOperationBusMasterWrite64,
-  EfiPciOperationBusMasterCommonBuffer64,
-  EfiPciOperationMaximum
+    EfiPciOperationBusMasterRead,
+    EfiPciOperationBusMasterWrite,
+    EfiPciOperationBusMasterCommonBuffer,
+    EfiPciOperationBusMasterRead64,
+    EfiPciOperationBusMasterWrite64,
+    EfiPciOperationBusMasterCommonBuffer64,
+    EfiPciOperationMaximum
 } EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_OPERATION, *PEFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_OPERATION;
 
 /* Enumeration of EFI PCI I/O protocol attribute operations */
@@ -408,16 +408,6 @@ typedef enum _EFI_IO_OPERATION_TYPE
     EfiBusMasterCommonBuffer
 } EFI_IO_OPERATION_TYPE, *PEFI_IO_OPERATION_TYPE;
 
-/* Enumeration of EFI GOP pixel formats */
-typedef enum _EFI_GRAPHICS_PIXEL_FORMAT
-{
-    PixelRedGreenBlueReserved8BitPerColor,
-    PixelBlueGreenRedReserved8BitPerColor,
-    PixelBitMask,
-    PixelBltOnly,
-    PixelFormatMax
-} EFI_GRAPHICS_PIXEL_FORMAT, *PEFI_GRAPHICS_PIXEL_FORMAT;
-
 /* Enumeration of EFI GOP output BLT operations */
 typedef enum _EFI_GRAPHICS_OUTPUT_BLT_OPERATION
 {
@@ -428,14 +418,32 @@ typedef enum _EFI_GRAPHICS_OUTPUT_BLT_OPERATION
     EfiGraphicsOutputBltOperationMax
 } EFI_GRAPHICS_OUTPUT_BLT_OPERATION, *PEFI_GRAPHICS_OUTPUT_BLT_OPERATION;
 
+/* Enumeration of EFI GOP pixel formats */
+typedef enum _EFI_GRAPHICS_PIXEL_FORMAT
+{
+    PixelRedGreenBlueReserved8BitPerColor,
+    PixelBlueGreenRedReserved8BitPerColor,
+    PixelBitMask,
+    PixelBltOnly,
+    PixelFormatMax
+} EFI_GRAPHICS_PIXEL_FORMAT, *PEFI_GRAPHICS_PIXEL_FORMAT;
+
+/* Enumeration of EGI graphics protocols */
+typedef enum _EFI_GRAPHICS_PROTOCOL
+{
+    NONE,
+    GOP,
+    UGA
+} EFI_GRAPHICS_PROTOCOL, *PEFI_GRAPHICS_PROTOCOL;
+
 /* Enumeration of EFI UGA output BLT operations */
 typedef enum _EFI_UNIVERSA_GRAPHICS_BLT_OPERATION
 {
-  EfiUgaVideoFill,
-  EfiUgaVideoToBltBuffer,
-  EfiUgaBltBufferToVideo,
-  EfiUgaVideoToVideo,
-  EfiUgaBltMax
+    EfiUgaVideoFill,
+    EfiUgaVideoToBltBuffer,
+    EfiUgaBltBufferToVideo,
+    EfiUgaVideoToVideo,
+    EfiUgaBltMax
 } EFI_UNIVERSA_GRAPHICS_BLT_OPERATION, *PEFI_UNIVERSA_GRAPHICS_BLT_OPERATION;
 
 /* Enumeration of UART parity types */