diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 80caa43..7a90ea5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2017-11-06  Pedro Alves  <palves@redhat.com>
 
+	* common/common.m4 (GDB_AC_COMMON): No longer check termio.h nor
+	sgtty.h.
+	* config.in, configure: Regenerate.
+
+2017-11-06  Pedro Alves  <palves@redhat.com>
+
 	* event-top.c: Check SIGTSTP instead of STOP_SIGNAL thoughout.
 	(async_init_signals): Adjust.
 	(handle_stop_sig): Rename to ...
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index cb2e4d0..eaf6a68 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2017-11-06  Pedro Alves  <palves@redhat.com>
+
+	* config.in, configure: Regenerate.
+
 2017-10-27  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* target.c (struct thread_search): Remove.
diff --git a/gdb/common/common.m4 b/gdb/common/common.m4
index 45726ab..7e701b6 100644
--- a/gdb/common/common.m4
+++ b/gdb/common/common.m4
@@ -29,7 +29,7 @@ AC_DEFUN([GDB_AC_COMMON], [
 		   sys/resource.h sys/socket.h sys/syscall.h dnl
 		   sys/un.h sys/wait.h dnl
 		   thread_db.h wait.h dnl
-		   termios.h termio.h sgtty.h)
+		   termios.h)
 
   AC_CHECK_FUNCS([fdwalk getrlimit pipe pipe2 socketpair sigaction])
 
diff --git a/gdb/config.in b/gdb/config.in
index 3f8ee38..904c604 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -414,9 +414,6 @@
 /* Define to 1 if you have the `setsid' function. */
 #undef HAVE_SETSID
 
-/* Define to 1 if you have the <sgtty.h> header file. */
-#undef HAVE_SGTTY_H
-
 /* Define to 1 if you have the `sigaction' function. */
 #undef HAVE_SIGACTION
 
@@ -555,9 +552,6 @@
 /* Define to 1 if you have the <termios.h> header file. */
 #undef HAVE_TERMIOS_H
 
-/* Define to 1 if you have the <termio.h> header file. */
-#undef HAVE_TERMIO_H
-
 /* Define to 1 if you have the <term.h> header file. */
 #undef HAVE_TERM_H
 
diff --git a/gdb/configure b/gdb/configure
index c638652..def194d 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -13068,7 +13068,7 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
   fi
 
 
-  for ac_header in linux/perf_event.h locale.h memory.h signal.h 		   sys/resource.h sys/socket.h sys/syscall.h 		   sys/un.h sys/wait.h 		   thread_db.h wait.h 		   termios.h termio.h sgtty.h
+  for ac_header in linux/perf_event.h locale.h memory.h signal.h 		   sys/resource.h sys/socket.h sys/syscall.h 		   sys/un.h sys/wait.h 		   thread_db.h wait.h 		   termios.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in
index 5dacbac..4a2e778 100644
--- a/gdb/gdbserver/config.in
+++ b/gdb/gdbserver/config.in
@@ -205,9 +205,6 @@
 /* Define to 1 if you have the `setns' function. */
 #undef HAVE_SETNS
 
-/* Define to 1 if you have the <sgtty.h> header file. */
-#undef HAVE_SGTTY_H
-
 /* Define to 1 if you have the `sigaction' function. */
 #undef HAVE_SIGACTION
 
@@ -292,9 +289,6 @@
 /* Define to 1 if you have the <termios.h> header file. */
 #undef HAVE_TERMIOS_H
 
-/* Define to 1 if you have the <termio.h> header file. */
-#undef HAVE_TERMIO_H
-
 /* Define to 1 if you have the <thread_db.h> header file. */
 #undef HAVE_THREAD_DB_H
 
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index d5c62fb..ec032bc 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -6769,7 +6769,7 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
   fi
 
 
-  for ac_header in linux/perf_event.h locale.h memory.h signal.h 		   sys/resource.h sys/socket.h sys/syscall.h 		   sys/un.h sys/wait.h 		   thread_db.h wait.h 		   termios.h termio.h sgtty.h
+  for ac_header in linux/perf_event.h locale.h memory.h signal.h 		   sys/resource.h sys/socket.h sys/syscall.h 		   sys/un.h sys/wait.h 		   thread_db.h wait.h 		   termios.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
