diff --git a/reactos/drivers/base/kdcom/i386/kdbg.c b/reactos/drivers/base/kdcom/i386/kdbg.c
index b3e63edfc29..3b45f6f7229 100644
--- a/reactos/drivers/base/kdcom/i386/kdbg.c
+++ b/reactos/drivers/base/kdcom/i386/kdbg.c
@@ -231,7 +231,7 @@ KdPortInitialize(
         return FALSE;
 
     /* set global info */
-    *KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress;
+    KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress;
 
     return TRUE;
 }
diff --git a/reactos/drivers/bus/acpi/ospm/fdo.c b/reactos/drivers/bus/acpi/ospm/fdo.c
index c54e4d977b5..36d07dc80cc 100644
--- a/reactos/drivers/bus/acpi/ospm/fdo.c
+++ b/reactos/drivers/bus/acpi/ospm/fdo.c
@@ -402,7 +402,7 @@ AcpiCheckIfIsSerialDebugPort(
       case io:
       {
         IO_RESOURCE *io_data = (IO_RESOURCE*) &resource->data;
-        if (*KdComPortInUse == ULongToPtr(io_data->min_base_address))
+        if (KdComPortInUse == (PUCHAR)io_data->min_base_address)
         {
           ExFreePool(Buffer.pointer);
           return TRUE;
diff --git a/reactos/drivers/serial/serial/pnp.c b/reactos/drivers/serial/serial/pnp.c
index f0fa668d32a..530f1df2039 100644
--- a/reactos/drivers/serial/serial/pnp.c
+++ b/reactos/drivers/serial/serial/pnp.c
@@ -223,7 +223,8 @@ SerialPnpStartDevice(
 	ComPortBase = ULongToPtr(DeviceExtension->BaseAddress);
 
 	/* Test if we are trying to start the serial port used for debugging */
-	if (*KdComPortInUse == ULongToPtr(DeviceExtension->BaseAddress))
+    DPRINT1("Comparing addresses: KdComPortInUse: %p, ComPortBase: %p\n", KdComPortInUse, ComPortBase);
+	if (KdComPortInUse == ComPortBase)
 	{
 		INFO_(SERIAL, "Failing IRP_MN_START_DEVICE as this serial port is used for debugging\n");
 		return STATUS_INSUFFICIENT_RESOURCES;
diff --git a/reactos/hal/hal/hal.c b/reactos/hal/hal/hal.c
index 93190959ddf..979c0af7a95 100644
--- a/reactos/hal/hal/hal.c
+++ b/reactos/hal/hal/hal.c
@@ -27,7 +27,7 @@
 
 /* DATA **********************************************************************/
 
-ULONG _KdComPortInUse = 0;
+PUCHAR KdComPortInUse;
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/hal/hal/hal.pspec b/reactos/hal/hal/hal.pspec
index 2d5ec886f52..0b1a9bce7a1 100644
--- a/reactos/hal/hal/hal.pspec
+++ b/reactos/hal/hal/hal.pspec
@@ -78,7 +78,7 @@
 @ stdcall IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation
 @ stdcall IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable
 @ stdcall KeAcquireSpinLock(ptr ptr)
-@ extern KdComPortInUse _KdComPortInUse
+@ extern KdComPortInUse
 @ stdcall KeFlushWriteBuffer()
 @ stdcall KeGetCurrentIrql()
 @ stdcall KeLowerIrql(long)
diff --git a/reactos/hal/halarm/generic/hal.c b/reactos/hal/halarm/generic/hal.c
index 82c60f243e6..2567e0e6186 100644
--- a/reactos/hal/halarm/generic/hal.c
+++ b/reactos/hal/halarm/generic/hal.c
@@ -27,7 +27,7 @@
 /* DATA **********************************************************************/
 
 ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount;
-ULONG _KdComPortInUse = 0;
+PUCHAR KdComPortInUse;
 
 ULONG HalpIrqlTable[HIGH_LEVEL + 1] =
 {
diff --git a/reactos/hal/halarm/include/halp.h b/reactos/hal/halarm/include/halp.h
index 2351b9e5699..98507b45aad 100644
--- a/reactos/hal/halarm/include/halp.h
+++ b/reactos/hal/halarm/include/halp.h
@@ -14,9 +14,4 @@
 #include <peripherals/pl190.h>
 #include <peripherals/sp804.h>
 
-//
-// WDK Hack
-//
-#define KdComPortInUse          _KdComPortInUse
-
 #endif /* __INTERNAL_HAL_HAL_H */
diff --git a/reactos/hal/halppc/generic/sysinfo.c b/reactos/hal/halppc/generic/sysinfo.c
index b27b2bc32c7..8e1e2ad6718 100644
--- a/reactos/hal/halppc/generic/sysinfo.c
+++ b/reactos/hal/halppc/generic/sysinfo.c
@@ -12,8 +12,7 @@
 #define NDEBUG
 #include <debug.h>
 
-#define KdComPortInUse _KdComPortInUse
-ULONG KdComPortInUse = 0;
+PUCHAR KdComPortInUse;
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/hal/halppc/include/halp.h b/reactos/hal/halppc/include/halp.h
index 1c71638db65..e88eec6f214 100644
--- a/reactos/hal/halppc/include/halp.h
+++ b/reactos/hal/halppc/include/halp.h
@@ -8,9 +8,6 @@
 /* Temporary hack */
 #define KPCR_BASE   0xFF000000
 
-/* WDK Hack */
-#define KdComPortInUse          _KdComPortInUse
-
 #define HAL_APC_REQUEST         0
 #define HAL_DPC_REQUEST         1
 
diff --git a/reactos/hal/halx86/generic/sysinfo.c b/reactos/hal/halx86/generic/sysinfo.c
index 541d949eb02..ed139346469 100644
--- a/reactos/hal/halx86/generic/sysinfo.c
+++ b/reactos/hal/halx86/generic/sysinfo.c
@@ -12,12 +12,7 @@
 #define NDEBUG
 #include <debug.h>
 
-#ifdef __GNUC__
-static PUCHAR realKdComPortInUse = 0;
-PUCHAR *_KdComPortInUse = &realKdComPortInUse;
-#else
-PUCHAR _KdComPortInUse = 0;
-#endif
+PUCHAR KdComPortInUse;
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/include/ndk/haltypes.h b/reactos/include/ndk/haltypes.h
index 0599ee906d7..b1ba9d329c8 100644
--- a/reactos/include/ndk/haltypes.h
+++ b/reactos/include/ndk/haltypes.h
@@ -223,9 +223,7 @@ extern NTSYSAPI HAL_PRIVATE_DISPATCH HalPrivateDispatchTable;
 //
 // HAL Exports
 //
-#ifndef _NTHAL_
-extern NTHALAPI PUCHAR *KdComPortInUse;
-#endif
+extern PUCHAR NTHALAPI KdComPortInUse;
 
 #endif
 #endif
diff --git a/reactos/ntoskrnl/kd/kdio.c b/reactos/ntoskrnl/kd/kdio.c
index 9995550458a..10a176b5bef 100644
--- a/reactos/ntoskrnl/kd/kdio.c
+++ b/reactos/ntoskrnl/kd/kdio.c
@@ -97,7 +97,7 @@ KdpInitDebugLog(PKD_DISPATCH_TABLE DispatchTable,
 
     if (BootPhase == 0)
     {
-        *KdComPortInUse = NULL;
+        KdComPortInUse = NULL;
 
         /* Write out the functions that we support for now */
         DispatchTable->KdpInitRoutine = KdpInitDebugLog;
@@ -182,7 +182,7 @@ KdpSerialInit(PKD_DISPATCH_TABLE DispatchTable,
             KdpDebugMode.Serial = FALSE;
             return;
         }
-        *KdComPortInUse = (PUCHAR)(ULONG_PTR)SerialPortInfo.BaseAddress;
+        KdComPortInUse = (PUCHAR)(ULONG_PTR)SerialPortInfo.BaseAddress;
 
         /* Register as a Provider */
         InsertTailList(&KdProviders, &DispatchTable->KdProvidersList);