diff --git a/sdk/xtdk/amd64/hltypes.h b/sdk/xtdk/amd64/hltypes.h
index e5ae363..e317f7c 100644
--- a/sdk/xtdk/amd64/hltypes.h
+++ b/sdk/xtdk/amd64/hltypes.h
@@ -322,14 +322,4 @@ typedef union _PIC_I8259_ICW4
     UCHAR Bits;
 } PIC_I8259_ICW4, *PPIC_I8259_ICW4;
 
-/* Processor identity structure */
-typedef struct _HAL_PROCESSOR_IDENTITY
-{
-    UCHAR ProcessorId;
-    UCHAR LApicId;
-    BOOLEAN Bsp;
-    BOOLEAN Started;
-    PKPROCESSOR_BLOCK ProcessorBlock;
-} HAL_PROCESSOR_IDENTITY, *PHAL_PROCESSOR_IDENTITY;
-
 #endif /* __XTDK_AMD64_HLTYPES_H */
diff --git a/sdk/xtdk/amd64/xtstruct.h b/sdk/xtdk/amd64/xtstruct.h
index 6f56577..4ce4bc7 100644
--- a/sdk/xtdk/amd64/xtstruct.h
+++ b/sdk/xtdk/amd64/xtstruct.h
@@ -14,7 +14,9 @@
 
 /* Architecture-specific enumeration lists forward references */
 typedef enum _APIC_DSH APIC_DSH, *PAPIC_DSH;
+typedef enum _APIC_MODE APIC_MODE, *PAPIC_MODE;
 typedef enum _APIC_MT APIC_MT, *PAPIC_MT;
+typedef enum _APIC_REGISTER APIC_REGISTER, *PAPIC_REGISTER;
 typedef enum _CPU_VENDOR CPU_VENDOR, *PCPU_VENDOR;
 typedef enum _CPUID_FEATURES CPUID_FEATURES, *PCPUID_FEATURES;
 typedef enum _CPUID_REQUESTS CPUID_REQUESTS, *PCPUID_REQUESTS;
@@ -32,7 +34,6 @@ typedef struct _CPU_IDENTIFICATION CPU_IDENTIFICATION, *PCPU_IDENTIFICATION;
 typedef struct _CPUID_REGISTERS CPUID_REGISTERS, *PCPUID_REGISTERS;
 typedef struct _CPUID_SIGNATURE CPUID_SIGNATURE, *PCPUID_SIGNATURE;
 typedef struct _FLOATING_SAVE_AREA FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA;
-typedef struct _HAL_PROCESSOR_IDENTITY HAL_PROCESSOR_IDENTITY, *PHAL_PROCESSOR_IDENTITY;
 typedef struct _HARDWARE_PTE HARDWARE_PTE, *PHARDWARE_PTE;
 typedef struct _KDESCRIPTOR KDESCRIPTOR, *PKDESCRIPTOR;
 typedef struct _KEXCEPTION_FRAME KEXCEPTION_FRAME, *PKEXCEPTION_FRAME;
diff --git a/sdk/xtdk/hltypes.h b/sdk/xtdk/hltypes.h
index 2ed6112..7d7bc37 100644
--- a/sdk/xtdk/hltypes.h
+++ b/sdk/xtdk/hltypes.h
@@ -295,6 +295,7 @@ typedef struct _ACPI_MADT
     ULONG ApicTables[];
 } ACPI_MADT, *PACPI_MADT;
 
+/* ACPI Local APIC MADT subtable structure */
 typedef struct _ACPI_MADT_TABLE_LOCAL_APIC
 {
     ACPI_SUBTABLE_HEADER Header;
@@ -303,7 +304,7 @@ typedef struct _ACPI_MADT_TABLE_LOCAL_APIC
     ULONG LapicFlags;
 } ACPI_MADT_TABLE_LOCAL_APIC, *PACPI_MADT_TABLE_LOCAL_APIC;
 
-/* ACPI System Information */
+/* ACPI System Information structure */
 typedef struct _ACPI_SYSTEM_INFO
 {
     ULONG CpuCount;
@@ -359,6 +360,16 @@ typedef struct _HAL_FRAMEBUFFER_DATA
     } Pixels;
 } HAL_FRAMEBUFFER_DATA, *PHAL_FRAMEBUFFER_DATA;
 
+/* Processor identity structure */
+typedef struct _PROCESSOR_IDENTITY
+{
+    UCHAR Id;
+    UCHAR CpuId;
+    BOOLEAN Bsp;
+    BOOLEAN Started;
+    PKPROCESSOR_BLOCK ProcessorBlock;
+} PROCESSOR_IDENTITY, *PPROCESSOR_IDENTITY;
+
 /* SMBIOS table header structure */
 typedef struct _SMBIOS_TABLE_HEADER
 {
diff --git a/sdk/xtdk/i686/hltypes.h b/sdk/xtdk/i686/hltypes.h
index 8d9c7f0..ab2bf7b 100644
--- a/sdk/xtdk/i686/hltypes.h
+++ b/sdk/xtdk/i686/hltypes.h
@@ -329,14 +329,4 @@ typedef union _PIC_I8259_ICW4
     UCHAR Bits;
 } PIC_I8259_ICW4, *PPIC_I8259_ICW4;
 
-/* Processor identity structure */
-typedef struct _HAL_PROCESSOR_IDENTITY
-{
-    UCHAR ProcessorId;
-    UCHAR LApicId;
-    BOOLEAN Bsp;
-    BOOLEAN Started;
-    PKPROCESSOR_BLOCK ProcessorBlock;
-} HAL_PROCESSOR_IDENTITY, *PHAL_PROCESSOR_IDENTITY;
-
 #endif /* __XTDK_I686_HLTYPES_H */
diff --git a/sdk/xtdk/i686/xtstruct.h b/sdk/xtdk/i686/xtstruct.h
index 9f149f0..23aad41 100644
--- a/sdk/xtdk/i686/xtstruct.h
+++ b/sdk/xtdk/i686/xtstruct.h
@@ -14,7 +14,9 @@
 
 /* Architecture-specific enumeration lists forward references */
 typedef enum _APIC_DSH APIC_DSH, *PAPIC_DSH;
+typedef enum _APIC_MODE APIC_MODE, *PAPIC_MODE;
 typedef enum _APIC_MT APIC_MT, *PAPIC_MT;
+typedef enum _APIC_REGISTER APIC_REGISTER, *PAPIC_REGISTER;
 typedef enum _CPU_VENDOR CPU_VENDOR, *PCPU_VENDOR;
 typedef enum _CPUID_FEATURES CPUID_FEATURES, *PCPUID_FEATURES;
 typedef enum _CPUID_REQUESTS CPUID_REQUESTS, *PCPUID_REQUESTS;
@@ -34,7 +36,6 @@ typedef struct _CPUID_SIGNATURE CPUID_SIGNATURE, *PCPUID_SIGNATURE;
 typedef struct _FN_SAVE_FORMAT FN_SAVE_FORMAT, *PFN_SAVE_FORMAT;
 typedef struct _FX_SAVE_AREA FX_SAVE_AREA, *PFX_SAVE_AREA;
 typedef struct _FX_SAVE_FORMAT FX_SAVE_FORMAT, *PFX_SAVE_FORMAT;
-typedef struct _HAL_PROCESSOR_IDENTITY HAL_PROCESSOR_IDENTITY, *PHAL_PROCESSOR_IDENTITY;
 typedef struct _HARDWARE_LEGACY_PTE HARDWARE_LEGACY_PTE, *PHARDWARE_LEGACY_PTE;
 typedef struct _HARDWARE_PTE HARDWARE_PTE, *PHARDWARE_PTE;
 typedef struct _KDESCRIPTOR KDESCRIPTOR, *PKDESCRIPTOR;
diff --git a/sdk/xtdk/xtstruct.h b/sdk/xtdk/xtstruct.h
index b9fb4e0..28206f1 100644
--- a/sdk/xtdk/xtstruct.h
+++ b/sdk/xtdk/xtstruct.h
@@ -14,7 +14,6 @@
 
 /* Enumeration lists forward references */
 typedef enum _ADJUST_REASON ADJUST_REASON, *PADJUST_REASON;
-typedef enum _APIC_REGISTER APIC_REGISTER, *PAPIC_REGISTER;
 typedef enum _BOOLEAN BOOLEAN, *PBOOLEAN;
 typedef enum _EXCEPTION_DISPOSITION EXCEPTION_DISPOSITION, *PEXCEPTION_DISPOSITION;
 typedef enum _EFI_ALLOCATE_TYPE EFI_ALLOCATE_TYPE, *PEFI_ALLOCATE_TYPE;
@@ -57,8 +56,13 @@ typedef enum _WAIT_TYPE WAIT_TYPE, *PWAIT_TYPE;
 typedef struct _ACPI_CACHE_LIST ACPI_CACHE_LIST, *PACPI_CACHE_LIST;
 typedef struct _ACPI_DESCRIPTION_HEADER ACPI_DESCRIPTION_HEADER, *PACPI_DESCRIPTION_HEADER;
 typedef struct _ACPI_FADT ACPI_FADT, *PACPI_FADT;
+typedef struct _ACPI_MADT ACPI_MADT, *PACPI_MADT;
+typedef struct _ACPI_MADT_TABLE_LOCAL_APIC ACPI_MADT_TABLE_LOCAL_APIC, *PACPI_MADT_TABLE_LOCAL_APIC;
 typedef struct _ACPI_RSDP ACPI_RSDP, *PACPI_RSDP;
 typedef struct _ACPI_RSDT ACPI_RSDT, *PACPI_RSDT;
+typedef struct _ACPI_SUBTABLE_HEADER ACPI_SUBTABLE_HEADER, *PACPI_SUBTABLE_HEADER;
+typedef struct _ACPI_SYSTEM_INFO ACPI_SYSTEM_INFO, *PACPI_SYSTEM_INFO;
+typedef struct _ACPI_TIMER_INFO ACPI_TIMER_INFO, *PACPI_TIMER_INFO;
 typedef struct _ACPI_XSDT ACPI_XSDT, *PACPI_XSDT;
 typedef struct _ANSI_STRING ANSI_STRING, *PANSI_STRING;
 typedef struct _ANSI_STRING32 ANSI_STRING32, *PANSI_STRING32;
@@ -283,6 +287,7 @@ typedef struct _PECOFF_IMAGE_ROM_HEADER PECOFF_IMAGE_ROM_HEADER, *PPECOFF_IMAGE_
 typedef struct _PECOFF_IMAGE_ROM_OPTIONAL_HEADER PECOFF_IMAGE_ROM_OPTIONAL_HEADER, *PPECOFF_IMAGE_ROM_OPTIONAL_HEADER;
 typedef struct _PECOFF_IMAGE_SECTION_HEADER PECOFF_IMAGE_SECTION_HEADER, *PPECOFF_IMAGE_SECTION_HEADER;
 typedef struct _PECOFF_IMAGE_VXD_HEADER PECOFF_IMAGE_VXD_HEADER, *PPECOFF_IMAGE_VXD_HEADER;
+typedef struct _PROCESSOR_IDENTITY PROCESSOR_IDENTITY, *PPROCESSOR_IDENTITY;
 typedef struct _PROCESSOR_POWER_STATE PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE;
 typedef struct _SINGLE_LIST_ENTRY SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY;
 typedef struct _SMBIOS_TABLE_HEADER SMBIOS_TABLE_HEADER, *PSMBIOS_TABLE_HEADER;
diff --git a/xtoskrnl/hl/globals.c b/xtoskrnl/hl/globals.c
index a7bf5c0..ed7eaef 100644
--- a/xtoskrnl/hl/globals.c
+++ b/xtoskrnl/hl/globals.c
@@ -31,4 +31,4 @@ APIC_MODE HlpApicMode;
 HAL_FRAMEBUFFER_DATA HlpFrameBufferData;
 
 /* Processors identity table */
-HAL_PROCESSOR_IDENTITY HlpProcessorsIdentity[MAXIMUM_PROCESSORS] = {{0}};
+PROCESSOR_IDENTITY HlpProcessorsIdentity[MAXIMUM_PROCESSORS] = {{0}};
diff --git a/xtoskrnl/includes/globals.h b/xtoskrnl/includes/globals.h
index 7d2997c..2939a5d 100644
--- a/xtoskrnl/includes/globals.h
+++ b/xtoskrnl/includes/globals.h
@@ -34,7 +34,7 @@ EXTERN APIC_MODE HlpApicMode;
 EXTERN HAL_FRAMEBUFFER_DATA HlpFrameBufferData;
 
 /* Processors identity table */
-EXTERN HAL_PROCESSOR_IDENTITY HlpProcessorsIdentity[MAXIMUM_PROCESSORS];
+EXTERN PROCESSOR_IDENTITY HlpProcessorsIdentity[MAXIMUM_PROCESSORS];
 
 /* Pointer to boot loader provided DbgPrint() routine */
 EXTERN VOID (*KeDbgPrint)(IN PWCHAR Format, IN ...);