Clean up kernel headers

xtoskrnl/includes/xtos.h

@@ -13,17 +13,7 @@
 #include <xtver.h>
 
 /* Kernel specific headers */
-#include "globals.h"
-#include "hli.h"
-#include "kdi.h"
 #include "kei.h"
-#include "mmi.h"
-#include "poi.h"
-#include "rtli.h"
 
-#include ARCH_HEADER(globals.h)
-#include ARCH_HEADER(ari.h)
-#include ARCH_HEADER(hli.h)
+
 #include ARCH_HEADER(kei.h)
-#include ARCH_HEADER(mmi.h)
-#include ARCH_HEADER(rtli.h)

xtoskrnl/mm/kpool.cc

@@ -68,7 +68,7 @@ MM::KernelPool::AllocateProcessorStructures(IN ULONG CpuNumber,
 
     /* Align address to page size boundary and find a space for processor block */
     Address = ROUND_UP((UINT_PTR)ProcessorStructures, MM_PAGE_SIZE);
-    ProcessorBlock = (PKPROCESSOR_BLOCK)((PUCHAR)Address + (2 * KERNEL_STACK_SIZE) + sizeof(ArInitialGdt));
+    ProcessorBlock = (PKPROCESSOR_BLOCK)((PUCHAR)Address + (2 * KERNEL_STACK_SIZE) + (GDT_ENTRIES * sizeof(KGDTENTRY)));
 
     /* Store processor number in the processor block */
     ProcessorBlock->CpuNumber = CpuNumber;