[HEADERS]

[reactos.git] / reactos / hal / halx86 / include / hal.h

diff --git a/reactos/hal/halx86/include/hal.h b/reactos/hal/halx86/include/hal.h
index 745260b..3eff1e7 100644 (file)
--- a/reactos/hal/halx86/include/hal.h
+++ b/reactos/hal/halx86/include/hal.h
@@ -11,26 +11,42 @@
 /* C Headers */
 #include <stdio.h>
 
-/* IFS/DDK/NDK Headers */
-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
-#include <ndk/ntndk.h>
-
-/* Internal Kernel Headers */
-#include <internal/mm.h>
-#include <internal/ke.h>
+/* WDK HAL Compilation hack */
+#include <excpt.h>
+#include <ntdef.h>
+#ifndef _MINIHAL_
+#undef NTSYSAPI
+#define NTSYSAPI __declspec(dllimport)
+#else
+#undef NTSYSAPI
+#define NTSYSAPI
+#endif
 
-#define KPCR_BASE 0xFF000000 // HACK!
+/* IFS/DDK/NDK Headers */
+#include <ntifs.h>
+#include <bugcodes.h>
+#include <ntdddisk.h>
+#include <arc/arc.h>
+#include <ntndk.h>
+
+/* Internal kernel headers */
+#include "internal/pci.h"
+#define KeGetCurrentThread _KeGetCurrentThread
+#include <internal/i386/ke.h>
+#include <internal/i386/mm.h>
+#ifdef _M_AMD64
+#include "internal/amd64/intrin_i.h"
+#else
+#include "internal/i386/intrin_i.h"
+#endif
 
 /* Internal HAL Headers */
 #include "apic.h"
 #include "bus.h"
 #include "halirq.h"
+#include "haldma.h"
 #include "halp.h"
 #include "mps.h"
 #include "ioapic.h"
 
-/* Helper Header */
-#include <reactos/helper.h>
-
 /* EOF */