diff --git a/sdk/xtdk/amd64/ketypes.h b/sdk/xtdk/amd64/ketypes.h
index c177871..8bd514b 100644
--- a/sdk/xtdk/amd64/ketypes.h
+++ b/sdk/xtdk/amd64/ketypes.h
@@ -241,7 +241,7 @@ typedef struct _KSWITCH_FRAME
     ULONG64 P4Home;
     ULONG64 P5Home;
     ULONG MxCsr;
-    KIRQL ApcBypass;
+    UCHAR ApcBypass;
     UCHAR Fill1[3];
     ULONG64 Rbp;
     ULONG64 Return;
@@ -255,8 +255,8 @@ typedef struct _KTRAP_FRAME
     ULONG64 P3Home;
     ULONG64 P4Home;
     ULONG64 P5;
-    KPROCESSOR_MODE PreviousMode;
-    KIRQL PreviousIrql;
+    CHAR PreviousMode;
+    UCHAR PreviousIrql;
     UCHAR FaultIndicator;
     UCHAR ExceptionActive;
     ULONG MxCsr;
diff --git a/sdk/xtdk/iotypes.h b/sdk/xtdk/iotypes.h
index b5b8164..b322c67 100644
--- a/sdk/xtdk/iotypes.h
+++ b/sdk/xtdk/iotypes.h
@@ -59,7 +59,8 @@
 #define PCI_STATUS_DETECTED_PARITY_ERROR        0x8000
 
 /* PCI and PCI-E common header structure */
-typedef struct _PCI_COMMON_HEADER {
+typedef struct _PCI_COMMON_HEADER
+{
     USHORT VendorId;
     USHORT DeviceId;
     USHORT Command;
diff --git a/sdk/xtdk/xtbase.h b/sdk/xtdk/xtbase.h
index 429edfc..b430ec8 100644
--- a/sdk/xtdk/xtbase.h
+++ b/sdk/xtdk/xtbase.h
@@ -14,12 +14,6 @@
 #include <xttypes.h>
 
 
-/* Interrupt Request Level (IRQL) */
-typedef UCHAR KIRQL, *PKIRQL;
-
-/* Processor modes */
-typedef CHAR KPROCESSOR_MODE, *PKPROCESSOR_MODE;
-
 /* 128-bit buffer containing a unique identifier value */
 typedef struct _GUID
 {