diff --git a/reactos/include/reactos/windbgkd.h b/reactos/include/reactos/windbgkd.h
index 97a6a7696da..19e804d52ee 100644
--- a/reactos/include/reactos/windbgkd.h
+++ b/reactos/include/reactos/windbgkd.h
@@ -195,13 +195,12 @@
 #define DBGKD_PARTITION_ALTERNATE           0x01
 
 //
-// Control Space types
+// AMD64 Control Space types
 //
-#define DEBUG_CONTROL_SPACE_KPCR 0
-#define DEBUG_CONTROL_SPACE_KPRCB 1
-#define DEBUG_CONTROL_SPACE_KSPECIAL 2
-#define DEBUG_CONTROL_SPACE_KTHREAD 3
-#define X86_DEBUG_CONTROL_SPACE_KSPECIAL    716
+#define AMD64_DEBUG_CONTROL_SPACE_KPCR 0
+#define AMD64_DEBUG_CONTROL_SPACE_KPRCB 1
+#define AMD64_DEBUG_CONTROL_SPACE_KSPECIAL 2
+#define AMD64_DEBUG_CONTROL_SPACE_KTHREAD 3
 
 
 //
diff --git a/reactos/ntoskrnl/kd64/amd64/kdsup.c b/reactos/ntoskrnl/kd64/amd64/kdsup.c
index 2f293d7e04b..2a3dcacdd3c 100644
--- a/reactos/ntoskrnl/kd64/amd64/kdsup.c
+++ b/reactos/ntoskrnl/kd64/amd64/kdsup.c
@@ -185,25 +185,25 @@ KdpSysReadControlSpace(IN ULONG Processor,
 
         switch ((ULONG_PTR)BaseAddress)
         {
-            case DEBUG_CONTROL_SPACE_KPCR:
+            case AMD64_DEBUG_CONTROL_SPACE_KPCR:
                 /* Copy a pointer to the Pcr */
                 ControlStart = &Pcr;
                 RealLength = sizeof(PVOID);
                 break;
 
-            case DEBUG_CONTROL_SPACE_KPRCB:
+            case AMD64_DEBUG_CONTROL_SPACE_KPRCB:
                 /* Copy a pointer to the Prcb */
                 ControlStart = &Prcb;
                 RealLength = sizeof(PVOID);
                 break;
 
-            case DEBUG_CONTROL_SPACE_KSPECIAL:
+            case AMD64_DEBUG_CONTROL_SPACE_KSPECIAL:
                 /* Copy SpecialRegisters */
                 ControlStart = &Prcb->ProcessorState.SpecialRegisters;
                 RealLength = sizeof(KSPECIAL_REGISTERS);
                 break;
 
-            case DEBUG_CONTROL_SPACE_KTHREAD:
+            case AMD64_DEBUG_CONTROL_SPACE_KTHREAD:
                 /* Copy a pointer to the current Thread */
                 ControlStart = &Prcb->CurrentThread;
                 RealLength = sizeof(PVOID);