diff --git a/sdk/xtdk/rtltypes.h b/sdk/xtdk/rtltypes.h
index e036325..5e955d8 100644
--- a/sdk/xtdk/rtltypes.h
+++ b/sdk/xtdk/rtltypes.h
@@ -81,13 +81,6 @@ typedef struct _GUID
     UCHAR Data4[8];
 } GUID, *PGUID;
 
-/* Double linked list structure definition */
-typedef struct _LIST_ENTRY
-{
-    PLIST_ENTRY Flink;
-    PLIST_ENTRY Blink;
-} LIST_ENTRY, *PLIST_ENTRY;
-
 /* 32-bit double linked list structure definition */
 typedef struct _LIST_ENTRY32
 {
diff --git a/sdk/xtdk/xtstruct.h b/sdk/xtdk/xtstruct.h
index 4264e21..04e80f0 100644
--- a/sdk/xtdk/xtstruct.h
+++ b/sdk/xtdk/xtstruct.h
@@ -331,6 +331,7 @@ typedef struct _POOL_TRACKING_BIG_ALLOCATIONS POOL_TRACKING_BIG_ALLOCATIONS, *PP
 typedef struct _POOL_TRACKING_TABLE POOL_TRACKING_TABLE, *PPOOL_TRACKING_TABLE;
 typedef struct _PROCESSOR_IDENTITY PROCESSOR_IDENTITY, *PPROCESSOR_IDENTITY;
 typedef struct _PROCESSOR_POWER_STATE PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE;
+typedef struct _QUAD QUAD, *PQUAD;
 typedef struct _RTL_BALANCED_NODE RTL_BALANCED_NODE, *PRTL_BALANCED_NODE;
 typedef struct _RTL_BITMAP RTL_BITMAP, *PRTL_BITMAP;
 typedef struct _RTL_PRINT_CONTEXT RTL_PRINT_CONTEXT, *PRTL_PRINT_CONTEXT;
diff --git a/sdk/xtdk/xttypes.h b/sdk/xtdk/xttypes.h
index 14e6e89..02baf86 100644
--- a/sdk/xtdk/xttypes.h
+++ b/sdk/xtdk/xttypes.h
@@ -11,6 +11,7 @@
 
 #include <xttarget.h>
 #include <xtcompat.h>
+#include <xtstruct.h>
 
 
 /* C/C++ specific code */
@@ -156,6 +157,41 @@ typedef LPCUWSTR PCUTSTR, LPCUTSTR;
 /* Variadic ABI types */
 typedef __builtin_va_list VA_LIST, *PVA_LIST;
 
+/* ANSI string structure */
+typedef struct _ANSI_STRING
+{
+    USHORT Length;
+    USHORT MaximumLength;
+    PSTR Buffer;
+} ANSI_STRING, *PANSI_STRING;
+typedef const ANSI_STRING *PCANSI_STRING;
+
+/* 32-bit ANSI string structure */
+typedef struct _ANSI_STRING32
+{
+    USHORT Length;
+    USHORT MaximumLength;
+    ULONG Buffer;
+} ANSI_STRING32, *PANSI_STRING32;
+typedef const ANSI_STRING32 *PCANSI_STRING32;
+
+/* 64-bit ANSI string structure */
+typedef struct _ANSI_STRING64
+{
+    USHORT Length;
+    USHORT MaximumLength;
+    ULONGLONG Buffer;
+} ANSI_STRING64, *PANSI_STRING64;
+typedef const ANSI_STRING64 *PCANSI_STRING64;
+
+/* Constant counted string structure */
+typedef struct _CSTRING
+{
+    USHORT Length;
+    USHORT MaximumLength;
+    PCCHAR Buffer;
+} CSTRING, *PCSTRING;
+
 /* 128-bit floats structure */
 typedef struct _FLOAT128
 {
@@ -191,21 +227,18 @@ typedef union _LARGE_INTEGER
     LONGLONG QuadPart;
 } LARGE_INTEGER, *PLARGE_INTEGER;
 
-/* 64-bit unsigned integer union */
-typedef union _ULARGE_INTEGER
+/* Double linked list structure definition */
+typedef struct _LIST_ENTRY
 {
-    struct
-    {
-        ULONG LowPart;
-        ULONG HighPart;
-    };
-    struct
-    {
-        ULONG LowPart;
-        ULONG HighPart;
-    } u;
-    ULONGLONG QuadPart;
-} ULARGE_INTEGER, *PULARGE_INTEGER;
+    PLIST_ENTRY Flink;
+    PLIST_ENTRY Blink;
+} LIST_ENTRY, *PLIST_ENTRY;
+
+/* Quadruple-word alignment structure definition */
+typedef struct _QUAD
+{
+    unsigned long long Alignment;
+} QUAD, *PQUAD;
 
 /* Counted string structure */
 typedef struct _STRING
@@ -231,40 +264,21 @@ typedef struct _STRING64
     ULONGLONG Buffer;
 } STRING64, *PSTRING64;
 
-/* Constant counted string structure */
-typedef struct _CSTRING
+/* 64-bit unsigned integer union */
+typedef union _ULARGE_INTEGER
 {
-    USHORT Length;
-    USHORT MaximumLength;
-    PCCHAR Buffer;
-} CSTRING, *PCSTRING;
-
-/* ANSI string structure */
-typedef struct _ANSI_STRING
-{
-    USHORT Length;
-    USHORT MaximumLength;
-    PSTR Buffer;
-} ANSI_STRING, *PANSI_STRING;
-typedef const ANSI_STRING *PCANSI_STRING;
-
-/* 32-bit ANSI string structure */
-typedef struct _ANSI_STRING32
-{
-    USHORT Length;
-    USHORT MaximumLength;
-    ULONG Buffer;
-} ANSI_STRING32, *PANSI_STRING32;
-typedef const ANSI_STRING32 *PCANSI_STRING32;
-
-/* 64-bit ANSI string structure */
-typedef struct _ANSI_STRING64
-{
-    USHORT Length;
-    USHORT MaximumLength;
-    ULONGLONG Buffer;
-} ANSI_STRING64, *PANSI_STRING64;
-typedef const ANSI_STRING64 *PCANSI_STRING64;
+    struct
+    {
+        ULONG LowPart;
+        ULONG HighPart;
+    };
+    struct
+    {
+        ULONG LowPart;
+        ULONG HighPart;
+    } u;
+    ULONGLONG QuadPart;
+} ULARGE_INTEGER, *PULARGE_INTEGER;
 
 /* UNICODE string structure */
 typedef struct _UNICODE_STRING