--- Gnu-Mach/ddb/db_macro.c	2020/09/02 04:43:17	1.1.1.2
+++ Gnu-Mach/ddb/db_macro.c	2020/09/02 04:45:49	1.1.1.3
@@ -23,16 +23,20 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
-#include "mach_kdb.h"
+
 #if MACH_KDB
 
+#include <string.h>
 #include <kern/thread.h>
 
 #include <machine/db_machdep.h>
 #include <ddb/db_lex.h>
 #include <ddb/db_variables.h>
 #include <ddb/db_command.h>
-
+#include <ddb/db_examine.h>
+#include <ddb/db_expr.h>
+#include <ddb/db_macro.h>
+#include <ddb/db_output.h>
 
 
 /*
@@ -72,7 +76,7 @@ void
 db_def_macro_cmd()
 {
 	register char *p;
-	register c;
+	register int c;
 	register struct db_user_macro *mp, *ep;
 
 	if (db_read_token() != tIDENT) {
@@ -140,7 +144,7 @@ db_exec_macro(name)
 	char *name;
 {
 	register struct db_user_macro *mp;
-	register n;
+	register int n;
 
 	if ((mp = db_lookup_macro(name)) == 0)
 	    return(-1);
@@ -161,7 +165,7 @@ db_exec_macro(name)
 	return(0);
 }
 
-int
+long
 /* ARGSUSED */
 db_arg_variable(vp, valuep, flag, ap)
 	struct db_variable	*vp;