diff -ur gdb-5.1.orig/gdb/config.in gdb-5.1/gdb/config.in
--- gdb-5.1.orig/gdb/config.in	Mon Jul 23 21:21:51 2001
+++ gdb-5.1/gdb/config.in	Wed Jan 23 00:13:15 2002
@@ -292,6 +292,9 @@
 /* Define if you have the <ncurses.h> header file.  */
 #undef HAVE_NCURSES_H
 
+/* Define if you have the <ncurses/ncurses.h> header file.  */
+#undef HAVE_NCURSES_NCURSES_H
+
 /* Define if you have the <ndir.h> header file.  */
 #undef HAVE_NDIR_H
 
diff -ur gdb-5.1.orig/gdb/configure.in gdb-5.1/gdb/configure.in
--- gdb-5.1.orig/gdb/configure.in	Thu Aug  2 23:30:22 2001
+++ gdb-5.1/gdb/configure.in	Wed Jan 23 00:12:08 2002
@@ -125,7 +125,7 @@
 	wchar.h wctype.h asm/debugreg.h sys/debugreg.h sys/select.h \
 	time.h sys/file.h sys/ioctl.h sys/user.h sys/fault.h sys/syscall.h \
 	dirent.h sys/ndir.h sys/dir.h ndir.h \
-	curses.h ncurses.h \
+	curses.h ncurses.h ncurses/ncurses.h \
 	poll.h sys/poll.h)
 AC_HEADER_STAT
 
diff -ur gdb-5.1.orig/gdb/tui/tuiData.h gdb-5.1/gdb/tui/tuiData.h
--- gdb-5.1.orig/gdb/tui/tuiData.h	Mon Jul 23 23:16:20 2001
+++ gdb-5.1/gdb/tui/tuiData.h	Wed Jan 23 00:11:53 2002
@@ -24,6 +24,8 @@
 
 #if defined (HAVE_NCURSES_H)
 #include <ncurses.h>
+#elif defined (HAVE_NCURSES_NCURSES_H)
+#include <ncurses/ncurses.h>
 #elif defined (HAVE_CURSES_H)
 #include <curses.h>
 #endif
diff -ur gdb-5.1.orig/gdb/utils.c gdb-5.1/gdb/utils.c
--- gdb-5.1.orig/gdb/utils.c	Wed Jan 23 00:01:31 2002
+++ gdb-5.1/gdb/utils.c	Wed Jan 23 00:15:07 2002
@@ -26,9 +26,14 @@
 #include "gdb_string.h"
 #include "event-top.h"
 
-#ifdef HAVE_CURSES_H
+#if defined (HAVE_NCURSES_H)
+#include <ncurses.h>
+#elif defined (HAVE_NCURSES_NCURSES_H)
+#include <ncurses/ncurses.h>
+#elif defined (HAVE_CURSES_H)
 #include <curses.h>
 #endif
+
 #ifdef HAVE_TERM_H
 #include <term.h>
 #endif