diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 836ed8acef0..0f69508ed6b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-08  Tom Tromey  <tromey@adacore.com>
+
+	* remote.c (remote_hw_watchpoint_limit)
+	(remote_hw_watchpoint_length_limit, remote_hw_breakpoint_limit):
+	Now static.
+
 2019-05-08  Tom Tromey  <tromey@adacore.com>
 
 	* maint.c (_initialize_maint_cmds): Move initialization code to
diff --git a/gdb/remote.c b/gdb/remote.c
index 0fb7404b068..81e6427a7fa 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -10378,9 +10378,9 @@ remote_target::remove_watchpoint (CORE_ADDR addr, int len,
 }
 
 
-int remote_hw_watchpoint_limit = -1;
-int remote_hw_watchpoint_length_limit = -1;
-int remote_hw_breakpoint_limit = -1;
+static int remote_hw_watchpoint_limit = -1;
+static int remote_hw_watchpoint_length_limit = -1;
+static int remote_hw_breakpoint_limit = -1;
 
 int
 remote_target::region_ok_for_hw_watchpoint (CORE_ADDR addr, int len)