diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h
index 346dc70e5f1..7cc2ec45922 100644
--- a/ntoskrnl/include/internal/kd.h
+++ b/ntoskrnl/include/internal/kd.h
@@ -62,13 +62,6 @@ VOID
 
 /* INIT ROUTINES *************************************************************/
 
-BOOLEAN
-NTAPI
-KdInitSystem(
-    ULONG Reserved,
-    PLOADER_PARAMETER_BLOCK LoaderBlock
-);
-
 VOID
 KdpScreenAcquire(VOID);
 
diff --git a/ntoskrnl/include/internal/kd64.h b/ntoskrnl/include/internal/kd64.h
index 7e992e0b4ec..8f87c591634 100644
--- a/ntoskrnl/include/internal/kd64.h
+++ b/ntoskrnl/include/internal/kd64.h
@@ -81,8 +81,8 @@ BOOLEAN
 BOOLEAN
 NTAPI
 KdInitSystem(
-    ULONG Reserved,
-    PLOADER_PARAMETER_BLOCK LoaderBlock
+    _In_ ULONG BootPhase,
+    _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock
 );
 
 VOID
diff --git a/ntoskrnl/kd64/kdinit.c b/ntoskrnl/kd64/kdinit.c
index 6b8319605db..8ce9ba72ce7 100644
--- a/ntoskrnl/kd64/kdinit.c
+++ b/ntoskrnl/kd64/kdinit.c
@@ -139,11 +139,12 @@ KdRegisterDebuggerDataBlock(IN ULONG Tag,
 
 BOOLEAN
 NTAPI
-KdInitSystem(IN ULONG BootPhase,
-             IN PLOADER_PARAMETER_BLOCK LoaderBlock)
+KdInitSystem(
+    _In_ ULONG BootPhase,
+    _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     BOOLEAN EnableKd, DisableKdAfterInit = FALSE, BlockEnable;
-    LPSTR CommandLine, DebugLine, DebugOptionStart, DebugOptionEnd;
+    PSTR CommandLine, DebugLine, DebugOptionStart, DebugOptionEnd;
     STRING ImageName;
     PLDR_DATA_TABLE_ENTRY LdrEntry;
     PLIST_ENTRY NextEntry;