--- Gnu-Mach/ddb/db_cond.c	2020/09/02 04:43:20	1.1.1.2
+++ Gnu-Mach/ddb/db_cond.c	2020/09/02 04:45:52	1.1.1.3
@@ -24,7 +24,6 @@
  * the rights to redistribute these changes.
  */
 
-#include "mach_kdb.h"
 #if MACH_KDB
 
 #include <machine/db_machdep.h>
@@ -33,7 +32,11 @@
 #include <ddb/db_lex.h>
 #include <ddb/db_break.h>
 #include <ddb/db_command.h>
+#include <ddb/db_cond.h>
+#include <ddb/db_expr.h>
+#include <ddb/db_output.h>
 
+#include <kern/debug.h>
 
 
 #define DB_MAX_COND	10		/* maximum conditions to be set */
@@ -122,7 +125,7 @@ db_cond_print(bkpt)
 void
 db_cond_cmd()
 {
-	register  c;
+	register  int c;
 	register  struct db_cond *cp;
 	register  char *p;
 	db_expr_t value;