--- Gnu-Mach/ddb/db_watch.h	2020/09/02 04:43:18	1.1.1.2
+++ Gnu-Mach/ddb/db_watch.h	2020/09/02 04:48:20	1.1.1.4
@@ -28,7 +28,6 @@
  *	Date:	10/90
  */
 
-#include "mach_kdb.h"
 #if MACH_KDB
 
 #ifndef	_DDB_DB_WATCH_
@@ -49,14 +48,28 @@ typedef struct db_watchpoint {
 	struct db_watchpoint *link;	/* link in in-use or free chain */
 } *db_watchpoint_t;
 
-extern boolean_t db_find_watchpoint(/* task_t task, db_addr_t addr,
-				     db_regs_t *regs */);
-extern void db_set_watchpoints();
-extern void db_clear_watchpoints();
-
-extern void db_set_watchpoint(/* task_t task, db_addr_t addr, vm_size_t size */);
-extern void db_delete_watchpoint(/* task_t task, db_addr_t addr */);
-extern void db_list_watchpoints();
+extern boolean_t db_find_watchpoint(vm_map_t map, db_addr_t addr,
+				    db_regs_t *regs);
+extern void db_set_watchpoints(void);
+extern void db_clear_watchpoints(void);
+
+extern void db_set_watchpoint(const task_t task, db_addr_t addr, vm_size_t size);
+extern void db_delete_watchpoint(const task_t task, db_addr_t addr);
+extern void db_list_watchpoints(void);
+
+void db_listwatch_cmd(void);
+
+void db_deletewatch_cmd(
+	db_expr_t	addr,
+	int		have_addr,
+	db_expr_t	count,
+	const char *	modif);
+
+void db_watchpoint_cmd(
+	db_expr_t	addr,
+	int		have_addr,
+	db_expr_t	count,
+	const char *	modif);
 
 #endif	/* _DDB_DB_WATCH_ */