--- Gnu-Mach/ddb/db_input.c	2020/09/02 04:36:57	1.1
+++ Gnu-Mach/ddb/db_input.c	2020/09/02 04:45:50	1.1.1.3
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1992,1991,1990 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -27,18 +27,19 @@
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
-#include "mach_kdb.h"
+
 #if MACH_KDB
 
 #include <mach/boolean.h>
 #include <machine/db_machdep.h>
+#include <device/cons.h>
+#include <ddb/db_command.h>
+#include <ddb/db_input.h>
 #include <ddb/db_output.h>
 
-
-
 #ifndef DB_HISTORY_SIZE
 #define DB_HISTORY_SIZE 4000
-#endif DB_HISTORY_SIZE
+#endif /* DB_HISTORY_SIZE */
 
 /*
  * Character input and editing.
@@ -60,7 +61,7 @@ char *  db_history_curr = db_history;	/*
 char *  db_history_last = db_history;	/* start of last line */
 char *  db_history_prev = (char *) 0;	/* start of previous line */
 #endif
-	
+
 #define	CTRL(c)		((c) & 0x1f)
 #define	isspace(c)	((c) == ' ' || (c) == '\t')
 #define	BLANK		' '
@@ -133,7 +134,7 @@ db_delete_line()
 		 db_history_size - 1; \
        } while (0)
 #endif
-		
+
 /* returns TRUE at end-of-line */
 boolean_t
 db_inputchar(c)
@@ -375,4 +376,4 @@ db_check_interrupt()
 	}
 }
 
-#endif MACH_KDB
+#endif /* MACH_KDB */