diff --git a/reactos/drivers/base/directory.rbuild b/reactos/drivers/base/directory.rbuild
index e24305d669c..659f8e69357 100644
--- a/reactos/drivers/base/directory.rbuild
+++ b/reactos/drivers/base/directory.rbuild
@@ -7,12 +7,16 @@
 <directory name="bootvid">
 	<xi:include href="bootvid/bootvid.rbuild" />
 </directory>
-<!--directory name="kdcom">
-    <xi:include href="kdcom/kdcom.rbuild" />
-</directory-->
-<directory name="kddll">
-    <xi:include href="kddll/kddll.rbuild" />
-</directory>
+<ifnot property="_WINKD_" value="1">
+	<directory name="kdcom">
+		<xi:include href="kdcom/kdcom.rbuild" />
+	</directory>
+</if>
+<if property="_WINKD_" value="1">
+	<directory name="kddll">
+		<xi:include href="kddll/kddll.rbuild" />
+	</directory>
+</if>
 <directory name="null">
 	<xi:include href="null/null.rbuild" />
 </directory>
diff --git a/reactos/drivers/base/kddll/kddll.c b/reactos/drivers/base/kddll/kddll.c
index 94def8352b5..4e4c1ebccb1 100644
--- a/reactos/drivers/base/kddll/kddll.c
+++ b/reactos/drivers/base/kddll/kddll.c
@@ -59,16 +59,7 @@ KdpSendControlPacket(
 }
 
 
-/** Public exported functions *************************************************/
-
-NTSTATUS
-NTAPI
-DriverEntry(
-    IN PDRIVER_OBJECT DriverObject,
-    IN PUNICODE_STRING RegistryPath)
-{
-    return STATUS_SUCCESS;
-}
+/* PUBLIC FUNCTIONS ***********************************************************/
 
 NTSTATUS
 NTAPI