diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c
index 36b95d4aa3f..92a47a9cc91 100644
--- a/ntoskrnl/kd/kdmain.c
+++ b/ntoskrnl/kd/kdmain.c
@@ -391,33 +391,6 @@ KdEnableDebugger(VOID)
     return STATUS_SUCCESS;
 }
 
-/*
- * @unimplemented
- */
-NTSTATUS
-NTAPI
-KdPowerTransition(ULONG PowerState)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-NTSTATUS
-NTAPI
-KdChangeOption(IN KD_OPTION Option,
-               IN ULONG InBufferLength OPTIONAL,
-               IN PVOID InBuffer,
-               IN ULONG OutBufferLength OPTIONAL,
-               OUT PVOID OutBuffer,
-               OUT PULONG OutBufferRequiredLength OPTIONAL)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
-
 /*
  * @unimplemented
  */
diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c
index 06c80a29668..f9205be480f 100644
--- a/ntoskrnl/kd64/kdapi.c
+++ b/ntoskrnl/kd64/kdapi.c
@@ -2205,6 +2205,7 @@ KdSystemDebugControl(
     DbgPrint("KdSystemDebugControl is unimplemented!\n");
     return STATUS_NOT_IMPLEMENTED;
 }
+#endif
 
 /*
  * @implemented
@@ -2291,6 +2292,7 @@ KdPowerTransition(IN DEVICE_POWER_STATE NewState)
     }
 }
 
+#ifdef _WINKD_
 /*
  * @implemented
  */
diff --git a/ntoskrnl/kd64/kddata.c b/ntoskrnl/kd64/kddata.c
index dd8cef7a6aa..d0acd10a2af 100644
--- a/ntoskrnl/kd64/kddata.c
+++ b/ntoskrnl/kd64/kddata.c
@@ -79,7 +79,6 @@ PKDEBUG_SWITCH_ROUTINE KiDebugSwitchRoutine;
 //
 // Debugger Configuration Settings
 //
-#ifdef _WINKD_
 BOOLEAN KdBreakAfterSymbolLoad;
 BOOLEAN KdPitchDebugger;
 BOOLEAN KdDebuggerNotPresent;
@@ -92,7 +91,6 @@ BOOLEAN KdpDebuggerStructuresInitialized;
 BOOLEAN KdEnteredDebugger;
 ULONG KdDisableCount;
 LARGE_INTEGER KdPerformanceCounterRate;
-#endif
 
 //
 // Breakpoint Data