diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index faf7b10b2f..da4be157cd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2020-06-17  Tom Tromey  <tom@tromey.com>
+
+	* tui/tui-win.h (tui_scroll_forward, tui_scroll_backward)
+	(tui_scroll_left, tui_scroll_right, struct tui_win_info): Don't
+	declare.
+	* tui/tui-data.h (MIN_CMD_WIN_HEIGHT): Remove.
+
 2020-06-15  Simon Marchi  <simon.marchi@efficios.com>
 
 	* dwarf2/read.c (dwarf2_initialize_objfile): Check for presence
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index abe7727229..1accf3683d 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -132,7 +132,6 @@ public:
 #define DISASSEM_NAME           "asm"
 #define STATUS_NAME		"status"
 #define MIN_WIN_HEIGHT          3
-#define MIN_CMD_WIN_HEIGHT      3
 
 /* Strings to display in the TUI status line.  */
 #define SINGLE_KEY              "(SingleKey)"
diff --git a/gdb/tui/tui-win.h b/gdb/tui/tui-win.h
index e379184630..65ad8bf348 100644
--- a/gdb/tui/tui-win.h
+++ b/gdb/tui/tui-win.h
@@ -24,12 +24,6 @@
 
 #include "tui/tui-data.h"
 
-struct tui_win_info;
-
-extern void tui_scroll_forward (struct tui_win_info *, int);
-extern void tui_scroll_backward (struct tui_win_info *, int);
-extern void tui_scroll_left (struct tui_win_info *, int);
-extern void tui_scroll_right (struct tui_win_info *, int);
 extern void tui_set_win_focus_to (struct tui_win_info *);
 extern void tui_resize_all (void);
 extern void tui_refresh_all_win (void);