--- Gnu-Mach/ddb/db_print.c	2020/09/02 04:43:19	1.1.1.2
+++ Gnu-Mach/ddb/db_print.c	2020/09/02 04:45:51	1.1.1.3
@@ -28,27 +28,30 @@
  *	Date:	7/90
  */
 
-#include "mach_kdb.h"
 #if MACH_KDB
 
 /*
  * Miscellaneous printing.
  */
+#include <string.h>
 #include <mach/port.h>
-#include <kern/strings.h>
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <kern/queue.h>
 #include <ipc/ipc_port.h>
 #include <ipc/ipc_space.h>
 
+#include <machine/db_interface.h>
 #include <machine/db_machdep.h>
 #include <machine/thread.h>
 
+#include <ddb/db_command.h>
+#include <ddb/db_output.h>
 #include <ddb/db_lex.h>
 #include <ddb/db_variables.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_task_thread.h>
+#include <ddb/db_print.h>
 
 extern unsigned int	db_maxoff;
 
@@ -64,7 +67,7 @@ db_show_regs(addr, have_addr, count, mod
 	db_expr_t	value;
 	db_addr_t	offset;
 	char *		name;
-	register	i;
+	register	int i;
 	struct db_var_aux_param aux_param;
 	task_t		task = TASK_NULL;