diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a85aeace33..5b3d17669d 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-18  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* tracepoint.h (current_traceframe): Remove declaration.
+
 2018-06-18  Alan Hayward  <alan.hayward@arm.com>
 
 	* linux-aarch64-low.c (is_sve_tdesc): New function.
diff --git a/gdb/gdbserver/tracepoint.h b/gdb/gdbserver/tracepoint.h
index 9acf3e28f4..5e099255db 100644
--- a/gdb/gdbserver/tracepoint.h
+++ b/gdb/gdbserver/tracepoint.h
@@ -83,8 +83,6 @@ int tracepoint_was_hit (struct thread_info *tinfo, CORE_ADDR stop_pc);
 
 void release_while_stepping_state_list (struct thread_info *tinfo);
 
-extern int current_traceframe;
-
 int in_readonly_region (CORE_ADDR addr, ULONGEST length);
 int traceframe_read_mem (int tfnum, CORE_ADDR addr,
 			 unsigned char *buf, ULONGEST length,