diff --git a/gdb/config.in b/gdb/config.in
index a7da88b92d7..bc562669d2c 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -568,9 +568,6 @@
 /* Define to 1 if you have the <wait.h> header file. */
 #undef HAVE_WAIT_H
 
-/* Define to 1 if you have the `wborder' function. */
-#undef HAVE_WBORDER
-
 /* Define to 1 if you have the <windows.h> header file. */
 #undef HAVE_WINDOWS_H
 
diff --git a/gdb/configure b/gdb/configure
index 5bb2a0795e5..637f9cd7296 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -23452,7 +23452,7 @@ for ac_func in getuid getgid \
 		pipe pread pread64 pwrite resize_term \
 		getpgid setsid \
 		sigaction sigsetmask socketpair \
-		ttrace wborder wresize setlocale iconvlist libiconvlist btowc \
+		ttrace wresize setlocale iconvlist libiconvlist btowc \
 		setrlimit getrlimit posix_madvise waitpid \
 		use_default_colors
 do :
diff --git a/gdb/configure.ac b/gdb/configure.ac
index fb43cd10d6c..97c6bf0ed5f 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1344,7 +1344,7 @@ AC_CHECK_FUNCS([getuid getgid \
 		pipe pread pread64 pwrite resize_term \
 		getpgid setsid \
 		sigaction sigsetmask socketpair \
-		ttrace wborder wresize setlocale iconvlist libiconvlist btowc \
+		ttrace wresize setlocale iconvlist libiconvlist btowc \
 		setrlimit getrlimit posix_madvise waitpid \
 		use_default_colors])
 AM_LANGINFO_CODESET
diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index 385e6e5d68d..2b63499683e 100644
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -98,14 +98,10 @@ box_win (struct tui_win_info *win_info,
 			   ? tui_active_border_style.style ()
 			   : tui_border_style.style ()));
   wattron (win, attrs);
-#ifdef HAVE_WBORDER
   wborder (win, tui_border_vline, tui_border_vline,
 	   tui_border_hline, tui_border_hline,
 	   tui_border_ulcorner, tui_border_urcorner,
 	   tui_border_llcorner, tui_border_lrcorner);
-#else
-  box (win, tui_border_vline, tui_border_hline);
-#endif
   if (!win_info->title.empty ())
     {
       /* Emit "+-TITLE-+" -- so 2 characters on the right and 2 on