From d3a4d5586634d19b0296560d33afc8f8daefa8c5 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 12 Sep 2019 08:54:48 +0000
Subject: [PATCH] Remove usesless readline compat includes which will reinclude
 readline.h itself.

This simplifies the upcoming update to newer libedit.
---
 contrib/gdb/gdb/cli/cli-cmds.c    | 1 -
 contrib/gdb/gdb/cli/cli-setshow.c | 1 -
 contrib/gdb/gdb/event-top.c       | 1 -
 contrib/gdb/gdb/top.c             | 1 -
 contrib/gdb/gdb/tracepoint.c      | 1 -
 gnu/usr.bin/gdb/kgdb/trgt.c       | 1 -
 6 files changed, 6 deletions(-)

diff --git a/contrib/gdb/gdb/cli/cli-cmds.c b/contrib/gdb/gdb/cli/cli-cmds.c
index 9378ac87064..254ff6ca01a 100644
--- a/contrib/gdb/gdb/cli/cli-cmds.c
+++ b/contrib/gdb/gdb/cli/cli-cmds.c
@@ -21,7 +21,6 @@
 
 #include "defs.h"
 #include "readline/readline.h"
-#include "readline/tilde.h"
 #include "completer.h"
 #include "target.h"	 /* For baud_rate, remote_debug and remote_timeout */
 #include "gdb_wait.h"		/* For shell escape implementation */
diff --git a/contrib/gdb/gdb/cli/cli-setshow.c b/contrib/gdb/gdb/cli/cli-setshow.c
index 62fe36f360b..dbceee52e53 100644
--- a/contrib/gdb/gdb/cli/cli-setshow.c
+++ b/contrib/gdb/gdb/cli/cli-setshow.c
@@ -18,7 +18,6 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#include "readline/tilde.h"
 #include "value.h"
 #include <ctype.h>
 #include "gdb_string.h"
diff --git a/contrib/gdb/gdb/event-top.c b/contrib/gdb/gdb/event-top.c
index f4ba015e817..492e5c83931 100644
--- a/contrib/gdb/gdb/event-top.c
+++ b/contrib/gdb/gdb/event-top.c
@@ -34,7 +34,6 @@
 
 /* readline include files */
 #include "readline/readline.h"
-#include "readline/history.h"
 
 /* readline defines this.  */
 #undef savestring
diff --git a/contrib/gdb/gdb/top.c b/contrib/gdb/gdb/top.c
index d6bdfd09284..0ff1457eef0 100644
--- a/contrib/gdb/gdb/top.c
+++ b/contrib/gdb/gdb/top.c
@@ -48,7 +48,6 @@
 
 /* readline include files */
 #include "readline/readline.h"
-#include "readline/history.h"
 
 /* readline defines this.  */
 #undef savestring
diff --git a/contrib/gdb/gdb/tracepoint.c b/contrib/gdb/gdb/tracepoint.c
index 52fe4ca2723..4da53ad96ed 100644
--- a/contrib/gdb/gdb/tracepoint.c
+++ b/contrib/gdb/gdb/tracepoint.c
@@ -45,7 +45,6 @@
 
 /* readline include files */
 #include "readline/readline.h"
-#include "readline/history.h"
 
 /* readline defines this.  */
 #undef savestring
diff --git a/gnu/usr.bin/gdb/kgdb/trgt.c b/gnu/usr.bin/gdb/kgdb/trgt.c
index 0cf836130a6..56c64b8fe47 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 
 #include <defs.h>
 #include <readline/readline.h>
-#include <readline/tilde.h>
 #include <command.h>
 #include <exec.h>
 #include <frame-unwind.h>