diff --git a/src/gdb_main.c b/src/gdb_main.c
index 06c506599a9..452b4dd48c5 100644
--- a/src/gdb_main.c
+++ b/src/gdb_main.c
@@ -910,7 +910,7 @@ void gdb_poll_target(void)
 	}
 
 	/* poll target */
-	target_addr_t watch;
+	target_addr64_t watch;
 	target_halt_reason_e reason = target_halt_poll(cur_target, &watch);
 	if (!reason)
 		return;
@@ -929,7 +929,7 @@ void gdb_poll_target(void)
 		gdb_putpacket_f("T%02Xthread:1;", GDB_SIGINT);
 		break;
 	case TARGET_HALT_WATCHPOINT:
-		gdb_putpacket_f("T%02Xwatch:%08" PRIX32 ";", GDB_SIGTRAP, watch);
+		gdb_putpacket_f("T%02Xwatch:%08" PRIX64 ";", GDB_SIGTRAP, watch);
 		break;
 	case TARGET_HALT_FAULT:
 		gdb_putpacket_f("T%02Xthread:1;", GDB_SIGSEGV);
diff --git a/src/include/target.h b/src/include/target.h
index 5b4c9a15346..182c745ce35 100644
--- a/src/include/target.h
+++ b/src/include/target.h
@@ -98,7 +98,7 @@ typedef enum target_halt_reason {
 
 void target_reset(target_s *target);
 void target_halt_request(target_s *target);
-target_halt_reason_e target_halt_poll(target_s *target, target_addr_t *watch);
+target_halt_reason_e target_halt_poll(target_s *target, target_addr64_t *watch);
 void target_halt_resume(target_s *target, bool step);
 void target_set_cmdline(target_s *target, const char *cmdline, size_t cmdline_len);
 void target_set_heapinfo(target_s *target, target_addr_t heap_base, target_addr_t heap_limit, target_addr_t stack_base,
diff --git a/src/rtt.c b/src/rtt.c
index 864953b6d25..d52f776753b 100644
--- a/src/rtt.c
+++ b/src/rtt.c
@@ -394,7 +394,7 @@ void poll_rtt(target_s *const cur_target)
 			rtt_halt = target_mem_access_needs_halt(cur_target);
 
 		bool resume_target = false;
-		target_addr_t watch;
+		target_addr64_t watch;
 		if (rtt_halt && target_halt_poll(cur_target, &watch) == TARGET_HALT_RUNNING) {
 			/* briefly halt target during target memory access */
 			target_halt_request(cur_target);
diff --git a/src/target/cortexar.c b/src/target/cortexar.c
index 3982e983454..3bb5053d980 100644
--- a/src/target/cortexar.c
+++ b/src/target/cortexar.c
@@ -393,7 +393,7 @@ static size_t cortexar_reg_read(target_s *target, uint32_t reg, void *data, size
 static size_t cortexar_reg_write(target_s *target, uint32_t reg, const void *data, size_t max);
 
 static void cortexar_reset(target_s *target);
-static target_halt_reason_e cortexar_halt_poll(target_s *target, target_addr_t *watch);
+static target_halt_reason_e cortexar_halt_poll(target_s *target, target_addr64_t *watch);
 static void cortexar_halt_request(target_s *target);
 static void cortexar_halt_resume(target_s *target, bool step);
 static bool cortexar_halt_and_wait(target_s *target);
@@ -1405,7 +1405,7 @@ static void cortexar_halt_request(target_s *const target)
 	}
 }
 
-static target_halt_reason_e cortexar_halt_poll(target_s *const target, target_addr_t *const watch)
+static target_halt_reason_e cortexar_halt_poll(target_s *const target, target_addr64_t *const watch)
 {
 	volatile uint32_t dscr = 0;
 	TRY (EXCEPTION_ALL) {
diff --git a/src/target/cortexm.c b/src/target/cortexm.c
index 77ca32c7d4c..c2a20e2ca8b 100644
--- a/src/target/cortexm.c
+++ b/src/target/cortexm.c
@@ -64,7 +64,7 @@ static size_t cortexm_reg_read(target_s *target, uint32_t reg, void *data, size_
 static size_t cortexm_reg_write(target_s *target, uint32_t reg, const void *data, size_t max);
 
 static void cortexm_reset(target_s *target);
-static target_halt_reason_e cortexm_halt_poll(target_s *target, target_addr_t *watch);
+static target_halt_reason_e cortexm_halt_poll(target_s *target, target_addr64_t *watch);
 static void cortexm_halt_request(target_s *target);
 static int cortexm_fault_unwind(target_s *target);
 
@@ -828,7 +828,7 @@ static void cortexm_halt_request(target_s *target)
 	}
 }
 
-static target_halt_reason_e cortexm_halt_poll(target_s *target, target_addr_t *watch)
+static target_halt_reason_e cortexm_halt_poll(target_s *target, target_addr64_t *watch)
 {
 	cortexm_priv_s *priv = target->priv;
 
diff --git a/src/target/riscv_debug.c b/src/target/riscv_debug.c
index 14d28b35926..e56b62a455f 100644
--- a/src/target/riscv_debug.c
+++ b/src/target/riscv_debug.c
@@ -286,7 +286,7 @@ static const char *riscv_target_description(target_s *target);
 static bool riscv_check_error(target_s *target);
 static void riscv_halt_request(target_s *target);
 static void riscv_halt_resume(target_s *target, bool step);
-static target_halt_reason_e riscv_halt_poll(target_s *target, target_addr_t *watch);
+static target_halt_reason_e riscv_halt_poll(target_s *target, target_addr64_t *watch);
 static void riscv_reset(target_s *target);
 
 void riscv_dmi_init(riscv_dmi_s *const dmi)
@@ -1033,7 +1033,7 @@ static void riscv_halt_resume(target_s *target, const bool step)
 	(void)riscv_dm_write(hart->dbg_module, RV_DM_CONTROL, hart->hartsel);
 }
 
-static target_halt_reason_e riscv_halt_poll(target_s *const target, target_addr_t *const watch)
+static target_halt_reason_e riscv_halt_poll(target_s *const target, target_addr64_t *const watch)
 {
 	(void)watch;
 	riscv_hart_s *const hart = riscv_hart_struct(target);
diff --git a/src/target/target.c b/src/target/target.c
index 3396fe3f1a7..3e4b2f3693e 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -424,7 +424,7 @@ static const char *target_halt_reason_str(const target_halt_reason_e reason)
 }
 #endif
 
-target_halt_reason_e target_halt_poll(target_s *target, target_addr_t *watch)
+target_halt_reason_e target_halt_poll(target_s *target, target_addr64_t *watch)
 {
 	if (target->halt_poll) {
 		const target_halt_reason_e reason = target->halt_poll(target, watch);
diff --git a/src/target/target_internal.h b/src/target/target_internal.h
index f7755cc94ae..feaa369442f 100644
--- a/src/target/target_internal.h
+++ b/src/target/target_internal.h
@@ -103,12 +103,11 @@ struct target_command {
 typedef struct breakwatch breakwatch_s;
 
 struct breakwatch {
-	/* XXX: This needs adjusting for 64-bit operations */
 	breakwatch_s *next;
-	target_breakwatch_e type;
-	target_addr32_t addr;
+	target_addr64_t addr;
 	size_t size;
-	uint32_t reserved[4]; /* For use by the implementing driver */
+	target_breakwatch_e type;
+	uint32_t reserved[2]; /* For use by the implementing driver */
 };
 
 #define MAX_CMDLINE 81
@@ -137,7 +136,7 @@ struct target {
 	void (*reset)(target_s *target);
 	void (*extended_reset)(target_s *target);
 	void (*halt_request)(target_s *target);
-	target_halt_reason_e (*halt_poll)(target_s *target, target_addr_t *watch);
+	target_halt_reason_e (*halt_poll)(target_s *target, target_addr64_t *watch);
 	void (*halt_resume)(target_s *target, bool step);
 
 	/* Break-/watchpoint functions */