--- Gnu-Mach/ddb/db_access.c	2020/09/02 04:43:15	1.1.1.2
+++ Gnu-Mach/ddb/db_access.c	2020/09/02 04:45:46	1.1.1.3
@@ -27,11 +27,12 @@
  *	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>		/* type definitions */
+#include <machine/db_interface.h>	/* function definitions */
 #include <machine/setjmp.h>
 #include <kern/task.h>
 #include <ddb/db_access.h>
@@ -43,9 +44,6 @@
  * boundaries.
  */
 
-extern void	db_read_bytes();	/* machine-dependent */
-extern void	db_write_bytes();	/* machine-dependent */
-
 int db_access_level = DB_ACCESS_LEVEL;
 
 /*
@@ -74,7 +72,7 @@ db_get_task_value(addr, size, is_signed,
 	register db_expr_t value;
 	register int	i;
 
-	db_read_bytes((void*)addr, size, data, task);
+	db_read_bytes(addr, size, data, task);
 
 	value = 0;
 #if	BYTE_MSF
@@ -113,7 +111,7 @@ db_put_task_value(addr, size, value, tas
 	    value >>= 8;
 	}
 
-	db_write_bytes((void*)addr, size, data, task);
+	db_write_bytes(addr, size, data, task);
 }
 
 db_expr_t