diff --git a/ntoskrnl/kd64/amd64/kdx64.c b/ntoskrnl/kd64/amd64/kdx64.c
index 26e4ecf2e9c..3bb2745d2c4 100644
--- a/ntoskrnl/kd64/amd64/kdx64.c
+++ b/ntoskrnl/kd64/amd64/kdx64.c
@@ -139,7 +139,7 @@ KdpSysReadBusData(IN ULONG BusDataType,
                   IN ULONG Length,
                   OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -153,7 +153,7 @@ KdpSysWriteBusData(IN ULONG BusDataType,
                    IN ULONG Length,
                    OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -284,7 +284,7 @@ KdpSysReadIoSpace(IN ULONG InterfaceType,
 
         default:
             /* Invalid data size */
-             *ActualDataSize = 0;
+            *ActualDataSize = 0;
             return STATUS_INVALID_PARAMETER;
     }
 
@@ -340,7 +340,7 @@ KdpSysWriteIoSpace(IN ULONG InterfaceType,
 
         default:
             /* Invalid data size */
-             *ActualDataSize = 0;
+            *ActualDataSize = 0;
             return STATUS_INVALID_PARAMETER;
     }
 
@@ -355,7 +355,7 @@ NTSTATUS
 NTAPI
 KdpSysCheckLowMemory(IN ULONG Flags)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -363,7 +363,7 @@ NTSTATUS
 NTAPI
 KdpAllowDisable(VOID)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_ACCESS_DENIED;
 }
 
diff --git a/ntoskrnl/kd64/arm/kdarm.c b/ntoskrnl/kd64/arm/kdarm.c
index 04907d3e041..a62956d1065 100644
--- a/ntoskrnl/kd64/arm/kdarm.c
+++ b/ntoskrnl/kd64/arm/kdarm.c
@@ -22,7 +22,7 @@ NTAPI
 KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State,
                   IN PCONTEXT Context)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
 }
 
 VOID
@@ -30,7 +30,7 @@ NTAPI
 KdpSetContextState(IN PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange,
                    IN PCONTEXT Context)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
 }
 
 NTSTATUS
@@ -38,7 +38,7 @@ NTAPI
 KdpSysReadMsr(IN ULONG Msr,
               OUT PLARGE_INTEGER MsrValue)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -47,7 +47,7 @@ NTAPI
 KdpSysWriteMsr(IN ULONG Msr,
                IN PLARGE_INTEGER MsrValue)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -61,7 +61,7 @@ KdpSysReadBusData(IN ULONG BusDataType,
                   IN ULONG Length,
                   OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -75,7 +75,7 @@ KdpSysWriteBusData(IN ULONG BusDataType,
                    IN ULONG Length,
                    OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -87,7 +87,7 @@ KdpSysReadControlSpace(IN ULONG Processor,
                        IN ULONG Length,
                        OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -99,7 +99,7 @@ KdpSysWriteControlSpace(IN ULONG Processor,
                         IN ULONG Length,
                         OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -113,7 +113,7 @@ KdpSysReadIoSpace(IN ULONG InterfaceType,
                   IN ULONG DataSize,
                   OUT PULONG ActualDataSize)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -127,7 +127,7 @@ KdpSysWriteIoSpace(IN ULONG InterfaceType,
                    IN ULONG DataSize,
                    OUT PULONG ActualDataSize)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -135,7 +135,7 @@ NTSTATUS
 NTAPI
 KdpSysCheckLowMemory(IN ULONG Flags)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -143,6 +143,6 @@ NTSTATUS
 NTAPI
 KdpAllowDisable(VOID)
 {
-    UNIMPLEMENTED_DBGBREAK();
+    UNIMPLEMENTED;
     return STATUS_ACCESS_DENIED;
 }