diff --git a/reactos/include/ndk/amd64/ketypes.h b/reactos/include/ndk/amd64/ketypes.h
index 990f84be4e8..e7afc9d7df3 100644
--- a/reactos/include/ndk/amd64/ketypes.h
+++ b/reactos/include/ndk/amd64/ketypes.h
@@ -253,7 +253,6 @@ typedef enum
 // HAL Variables
 //
 #define INITIAL_STALL_COUNT     100
-#define HYPERSPACE_BASE         0xfffff70000000000ULL
 #define MM_HAL_VA_START         0xFFFFFFFFFFC00000ULL /* This is Vista+ */
 #define MM_HAL_VA_END           0xFFFFFFFFFFFFFFFFULL
 #define APIC_BASE               0xFFFFFFFFFFFE0000ULL
diff --git a/reactos/include/ndk/arm/ketypes.h b/reactos/include/ndk/arm/ketypes.h
index a670d28bb20..8ea3126f497 100644
--- a/reactos/include/ndk/arm/ketypes.h
+++ b/reactos/include/ndk/arm/ketypes.h
@@ -142,6 +142,8 @@ extern "C" {
 // HAL Variables
 //
 #define INITIAL_STALL_COUNT     100
+#define MM_HAL_VA_START         0xFFC00000
+#define MM_HAL_VA_END           0xFFFFFFFF
 
 //
 // Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual)
diff --git a/reactos/include/ndk/i386/ketypes.h b/reactos/include/ndk/i386/ketypes.h
index be595a00c41..cd005d7700f 100644
--- a/reactos/include/ndk/i386/ketypes.h
+++ b/reactos/include/ndk/i386/ketypes.h
@@ -166,11 +166,6 @@ typedef enum
 // HAL Variables
 //
 #define INITIAL_STALL_COUNT     100
-#ifdef PAE
-#define HYPERSPACE_BASE         0xc0400000
-#else
-#define HYPERSPACE_BASE         0xc0800000
-#endif
 #define MM_HAL_VA_START         0xFFC00000
 #define MM_HAL_VA_END           0xFFFFFFFF
 #define APIC_BASE               0xFFFE0000
diff --git a/reactos/ntoskrnl/include/internal/i386/mm.h b/reactos/ntoskrnl/include/internal/i386/mm.h
index 240ce0a2381..935e731bd2f 100644
--- a/reactos/ntoskrnl/include/internal/i386/mm.h
+++ b/reactos/ntoskrnl/include/internal/i386/mm.h
@@ -12,8 +12,13 @@
 /* Memory layout base addresses */
 #define MI_USER_PROBE_ADDRESS                   (PVOID)0x7FFF0000
 #define MI_DEFAULT_SYSTEM_RANGE_START           (PVOID)0x80000000
+#ifndef PAE
 #define HYPER_SPACE                                    0xC0400000
 #define HYPER_SPACE_END                                0xC07FFFFF
+#else
+#define HYPER_SPACE                                    0xC0800000
+#define HYPER_SPACE_END                                0xC0BFFFFF
+#endif
 #define MI_SYSTEM_CACHE_WS_START                (PVOID)0xC0C00000
 #define MI_PAGED_POOL_START                     (PVOID)0xE1000000
 #define MI_NONPAGED_POOL_END                    (PVOID)0xFFBE0000