diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h
index 69f559073fb..6436c2cce70 100644
--- a/reactos/include/ddk/winddk.h
+++ b/reactos/include/ddk/winddk.h
@@ -3016,11 +3016,6 @@ extern DECL_EXPORT HAL_DISPATCH HalDispatchTable;
 #define HalQuerySystemInformation       HALDISPATCH->HalQuerySystemInformation
 #define HalSetSystemInformation         HALDISPATCH->HalSetSystemInformation
 #define HalQueryBusSlots                HALDISPATCH->HalQueryBusSlots
-#define HalDeviceControl                HALDISPATCH->HalDeviceControl
-#define HalIoAssignDriveLetters         HALDISPATCH->HalIoAssignDriveLetters
-#define HalIoReadPartitionTable         HALDISPATCH->HalIoReadPartitionTable
-#define HalIoSetPartitionInformation    HALDISPATCH->HalIoSetPartitionInformation
-#define HalIoWritePartitionTable        HALDISPATCH->HalIoWritePartitionTable
 #define HalReferenceHandlerForBus       HALDISPATCH->HalReferenceHandlerForBus
 #define HalReferenceBusHandler          HALDISPATCH->HalReferenceBusHandler
 #define HalDereferenceBusHandler        HALDISPATCH->HalDereferenceBusHandler
@@ -3034,6 +3029,14 @@ extern DECL_EXPORT HAL_DISPATCH HalDispatchTable;
 #define HalEndOfBoot                    HALDISPATCH->HalEndOfBoot
 #define HalMirrorVerify                 HALDISPATCH->HalMirrorVerify
 
+#ifndef _NTOSKRNL_
+#define HalDeviceControl                HALDISPATCH->HalDeviceControl
+#define HalIoAssignDriveLetters         HALDISPATCH->HalIoAssignDriveLetters
+#define HalIoReadPartitionTable         HALDISPATCH->HalIoReadPartitionTable
+#define HalIoSetPartitionInformation    HALDISPATCH->HalIoSetPartitionInformation
+#define HalIoWritePartitionTable        HALDISPATCH->HalIoWritePartitionTable
+#endif
+
 typedef enum _FILE_INFORMATION_CLASS {
   FileDirectoryInformation = 1,
   FileFullDirectoryInformation,
diff --git a/reactos/ntoskrnl/fstub/disksup.c b/reactos/ntoskrnl/fstub/disksup.c
index ca283a4c423..e799d605796 100644
--- a/reactos/ntoskrnl/fstub/disksup.c
+++ b/reactos/ntoskrnl/fstub/disksup.c
@@ -2228,10 +2228,10 @@ HalExamineMBR(IN PDEVICE_OBJECT DeviceObject,
               IN ULONG MbrTypeIdentifier,
               OUT PVOID *MbrBuffer)
 {
-    HalDispatchTable.HalExamineMBR(DeviceObject,
-                                   SectorSize,
-                                   MbrTypeIdentifier,
-                                   MbrBuffer);
+    HALDISPATCH->HalExamineMBR(DeviceObject,
+                               SectorSize,
+                               MbrTypeIdentifier,
+                               MbrBuffer);
 }
 
 /*
@@ -2244,10 +2244,10 @@ IoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject,
                      IN BOOLEAN ReturnRecognizedPartitions,
                      IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer)
 {
-    return HalIoReadPartitionTable(DeviceObject,
-                                   SectorSize,
-                                   ReturnRecognizedPartitions,
-                                   PartitionBuffer);
+    return HALDISPATCH->HalIoReadPartitionTable(DeviceObject,
+                                                SectorSize,
+                                                ReturnRecognizedPartitions,
+                                                PartitionBuffer);
 }
 
 /*
@@ -2260,10 +2260,10 @@ IoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject,
                           IN ULONG PartitionNumber,
                           IN ULONG PartitionType)
 {
-    return HalIoSetPartitionInformation(DeviceObject,
-                                        SectorSize,
-                                        PartitionNumber,
-                                        PartitionType);
+    return HALDISPATCH->HalIoSetPartitionInformation(DeviceObject,
+                                                     SectorSize,
+                                                     PartitionNumber,
+                                                     PartitionType);
 }
 
 /*
@@ -2277,11 +2277,11 @@ IoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject,
                       IN ULONG NumberOfHeads,
                       IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer)
 {
-    return HalIoWritePartitionTable(DeviceObject,
-                                    SectorSize,
-                                    SectorsPerTrack,
-                                    NumberOfHeads,
-                                    PartitionBuffer);
+    return HALDISPATCH->HalIoWritePartitionTable(DeviceObject,
+                                                 SectorSize,
+                                                 SectorsPerTrack,
+                                                 NumberOfHeads,
+                                                 PartitionBuffer);
 }
 
 /*
@@ -2294,10 +2294,10 @@ IoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
                      OUT PUCHAR NtSystemPath,
                      OUT PSTRING NtSystemPathString)
 {
-    HalIoAssignDriveLetters(LoaderBlock,
-                            NtDeviceName,
-                            NtSystemPath,
-                            NtSystemPathString);
+    HALDISPATCH->HalIoAssignDriveLetters(LoaderBlock,
+                                         NtDeviceName,
+                                         NtSystemPath,
+                                         NtSystemPathString);
 }
 
 /* EOF */