diff --git a/ntoskrnl/kd/kdps2kbd.c b/ntoskrnl/kd/kdps2kbd.c
index 7b0164732ad..2f8f6661bd0 100644
--- a/ntoskrnl/kd/kdps2kbd.c
+++ b/ntoskrnl/kd/kdps2kbd.c
@@ -1,19 +1,19 @@
 /*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            ntoskrnl/kdbg/kdb_keyboard.c
- * PURPOSE:         Keyboard driver
+ * PROJECT:     ReactOS KDBG Kernel Debugger Terminal Driver
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     PS/2 Keyboard driver
+ * COPYRIGHT:   Copyright 2001 David Welch <welch@cwcom.net>
+ *              Copyright 2004 Art Yerkes <ayerkes@speakeasy.net>
+ *              Copyright 2005 Gregor Anich <blight@blight.eu.org>
+ *              Copyright 2009-2011 Dmitry Gorbachev <gorbachev@reactos.org>
  *
- * PROGRAMMERS:     Victor Kirhenshtein (sauros@iname.com)
- *                  Jason Filby (jasonfilby@yahoo.com)
+ * NOTE: Adapted from historic PS/2 keyboard driver authored by
+ * Victor Kirhenshtein <sauros@iname.com> and Jason Filby <jasonfilby@yahoo.com>
  */
 
-/* INCLUDES ****************************************************************/
+/* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-#define NDEBUG
-#include <debug.h>
-
 
 #define KBD_STATUS_REG          0x64
 #define KBD_CNTL_REG            0x64
diff --git a/ntoskrnl/kd/kdserial.c b/ntoskrnl/kd/kdserial.c
index 38828065875..ff3ecf05274 100644
--- a/ntoskrnl/kd/kdserial.c
+++ b/ntoskrnl/kd/kdserial.c
@@ -1,19 +1,16 @@
 /*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            ntoskrnl/kdbg/kdb_serial.c
- * PURPOSE:         Serial driver
- *
- * PROGRAMMERS:     Victor Kirhenshtein (sauros@iname.com)
- *                  Jason Filby (jasonfilby@yahoo.com)
- *                  arty
+ * PROJECT:     ReactOS KDBG Kernel Debugger Terminal Driver
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     Serial driver
+ * COPYRIGHT:   Copyright 2004 Art Yerkes <ayerkes@speakeasy.net>
+ *              Copyright 2005 Gregor Anich <blight@blight.eu.org>
  */
 
-/* INCLUDES ****************************************************************/
+/* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-#define NDEBUG
-#include <debug.h>
+
+/* FUNCTIONS *****************************************************************/
 
 CHAR
 KdbpTryGetCharSerial(ULONG Retry)