--- Gnu-Mach/ddb/db_output.c	2020/09/02 04:43:15	1.1.1.2
+++ Gnu-Mach/ddb/db_output.c	2020/09/02 04:45:46	1.1.1.3
@@ -28,16 +28,18 @@
  *	Date:	7/90
  */
 
-#include "mach_kdb.h"
 #if MACH_KDB
 
 /*
  * Printf and character output for debugger.
  */
 
+#include <kern/printf.h>
 #include <stdarg.h>
 #include <mach/boolean.h>
 #include <machine/db_machdep.h>
+#include <device/cons.h>
+#include <ddb/db_command.h>
 #include <ddb/db_lex.h>
 #include <ddb/db_output.h>
 
@@ -78,7 +80,7 @@ extern void	db_check_interrupt();
  * Force pending whitespace.
  */
 void
-db_force_whitespace()
+db_force_whitespace(void)
 {
 	register int last_print, next_tab;
 
@@ -188,7 +190,7 @@ db_id_putc(char c, vm_offset_t dummy)
  * Return output position
  */
 int
-db_print_position()
+db_print_position(void)
 {
 	return (db_output_position);
 }
@@ -196,17 +198,12 @@ db_print_position()
 /*
  * End line if too long.
  */
-void db_end_line()
+void db_end_line(void)
 {
 	if (db_output_position >= db_max_width-1)
 	    db_printf("\n");
 }
 
-/*
- * Printing
- */
-extern void	_doprnt();
-
 /*VARARGS1*/
 void
 db_printf(const char *fmt, ...)
@@ -217,7 +214,7 @@ db_printf(const char *fmt, ...)
 	db_printf_enter();	/* optional multiP serialization */
 #endif
 	va_start(listp, fmt);
-	_doprnt(fmt, &listp, db_id_putc, db_radix, 0);
+	_doprnt(fmt, listp, db_id_putc, db_radix, 0);
 	va_end(listp);
 }
 
@@ -229,7 +226,7 @@ kdbprintf(const char *fmt, ...)
 {
 	va_list	listp;
 	va_start(listp, fmt);
-	_doprnt(fmt, &listp, db_id_putc, db_radix, 0);
+	_doprnt(fmt, listp, db_id_putc, db_radix, 0);
 	va_end(listp);
 }