diff --git a/ntoskrnl/kd64/kdinit.c b/ntoskrnl/kd64/kdinit.c
index 6b8319605db..2561faefde2 100644
--- a/ntoskrnl/kd64/kdinit.c
+++ b/ntoskrnl/kd64/kdinit.c
@@ -16,6 +16,7 @@
 
 /* UTILITY FUNCTIONS *********************************************************/
 
+#ifdef _WINKD_
 /*
  * Get the total size of the memory before
  * Mm is initialized, by counting the number
@@ -92,6 +93,7 @@ KdUpdateDataBlock(VOID)
     KdDebuggerDataBlock.KeUserCallbackDispatcher =
         (ULONG_PTR)KeUserCallbackDispatcher;
 }
+#endif
 
 BOOLEAN
 NTAPI
@@ -137,6 +139,7 @@ KdRegisterDebuggerDataBlock(IN ULONG Tag,
     return TRUE;
 }
 
+#ifdef _WINKD_
 BOOLEAN
 NTAPI
 KdInitSystem(IN ULONG BootPhase,
@@ -459,3 +462,4 @@ KdInitSystem(IN ULONG BootPhase,
     /* Return initialized */
     return TRUE;
 }
+#endif
diff --git a/ntoskrnl/kd64/kdtrap.c b/ntoskrnl/kd64/kdtrap.c
index 0be83956849..7b7dd551223 100644
--- a/ntoskrnl/kd64/kdtrap.c
+++ b/ntoskrnl/kd64/kdtrap.c
@@ -47,6 +47,7 @@
 
 /* FUNCTIONS *****************************************************************/
 
+#ifdef _WINKD_
 BOOLEAN
 NTAPI
 KdpReport(IN PKTRAP_FRAME TrapFrame,
@@ -335,3 +336,5 @@ KdIsThisAKdTrap(IN PEXCEPTION_RECORD ExceptionRecord,
         return FALSE;
     }
 }
+
+#endif
diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake
index a8a97038918..cced13d1d39 100644
--- a/ntoskrnl/ntos.cmake
+++ b/ntoskrnl/ntos.cmake
@@ -400,9 +400,12 @@ if(NOT _WINKD_)
         ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdio.c
         ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c
         ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdapi.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdbreak.c
         ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kddata.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdinit.c
         ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdlock.c
-        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdprint.c)
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdprint.c
+        ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/kdtrap.c)
 
 else() # _WINKD_