[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 caedc2e..3eff1e7 100644 (file)
--- a/reactos/hal/halx86/include/hal.h
+++ b/reactos/hal/halx86/include/hal.h
@@ -12,13 +12,14 @@
 #include <stdio.h>
 
 /* WDK HAL Compilation hack */
-#ifdef _MSC_VER
 #include <excpt.h>
 #include <ntdef.h>
-#undef _NTHAL_
-#undef DECLSPEC_IMPORT
-#define DECLSPEC_IMPORT
-#define __declspec(dllimport)
+#ifndef _MINIHAL_
+#undef NTSYSAPI
+#define NTSYSAPI __declspec(dllimport)
+#else
+#undef NTSYSAPI
+#define NTSYSAPI
 #endif
 
 /* IFS/DDK/NDK Headers */
@@ -26,16 +27,18 @@
 #include <bugcodes.h>
 #include <ntdddisk.h>
 #include <arc/arc.h>
-#include <iotypes.h>
-#include <kefuncs.h>
-#include <halfuncs.h>
-#include <iofuncs.h>
-#include <ldrtypes.h>
-#include <obfuncs.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"
@@ -46,7 +49,4 @@
 #include "mps.h"
 #include "ioapic.h"
 
-/* Helper Header */
-#include <reactos/helper.h>
-
 /* EOF */