--- Gnu-Mach/kern/xpr.c	2020/09/02 04:42:40	1.1.1.2
+++ Gnu-Mach/kern/xpr.c	2020/09/02 04:45:11	1.1.1.3
@@ -24,10 +24,12 @@
  * the rights to redistribute these changes.
  */
 
-#include <mach_kdb.h>
 /*
  * xpr silent tracing circular buffer.
  */
+#include <string.h>
+
+#include <kern/debug.h>
 #include <kern/xpr.h>
 #include <kern/lock.h>
 #include "cpu_number.h"
@@ -86,7 +88,7 @@ int arg1, arg2, arg3, arg4, arg5;
 	x->cpuinfo = cpu_number();
 }
 
-void xprbootstrap()
+void xprbootstrap(void)
 {
 	vm_offset_t addr;
 	vm_size_t size;
@@ -113,7 +115,7 @@ void xprbootstrap()
 		 *	the previous buffer contents.
 		 */
 
-		bzero((char *) addr, size);
+		memset((char *) addr, 0, size);
 	}
 
 	xprbase = (struct xprbuf *) addr;
@@ -123,7 +125,7 @@ void xprbootstrap()
 
 int		xprinitial = 0;
 
-void xprinit()
+void xprinit(void)
 {
 	xprflags |= xprinitial;
 }