diff -durN gpsd-2.37.orig/cgps.c gpsd-2.37/cgps.c
--- gpsd-2.37.orig/cgps.c	2007-12-13 06:35:30.000000000 +0100
+++ gpsd-2.37/cgps.c	2008-07-22 09:56:57.000000000 +0200
@@ -96,11 +96,7 @@
 #include <signal.h>
 
 #include "gpsd_config.h"
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#else
-#include <curses.h>
-#endif /* HAVE_NCURSES_H */
+#include <ncurses/ncurses.h>
 
 #include "gps.h"
 
diff -durN gpsd-2.37.orig/configure.ac gpsd-2.37/configure.ac
--- gpsd-2.37.orig/configure.ac	2008-02-17 03:26:37.000000000 +0100
+++ gpsd-2.37/configure.ac	2008-07-22 09:56:17.000000000 +0200
@@ -88,7 +88,7 @@
 #include netinet/ip.h
 #endif
 ]])
-AC_CHECK_HEADERS(termios.h strings.h ncurses.h getopt.h netdb.h)
+AC_CHECK_HEADERS(termios.h strings.h ncurses/ncurses.h getopt.h netdb.h)
 
 AC_CHECK_FUNCS(round, roundf)
 AC_CHECK_FUNCS(strlcpy)
@@ -237,7 +237,7 @@
 fi
 dnl End of X11 checks
 
-AC_CHECK_HEADER(ncurses.h, ac_ncurses='yes', ac_ncurses='no')
+AC_CHECK_HEADER(ncurses/ncurses.h, ac_ncurses='yes', ac_ncurses='no')
 AM_CONDITIONAL([HAVE_NCURSES], [test x"$ac_ncurses" = "xyes"])
 AC_CHECK_LIB(ncurses, initscr, ac_ncurses_lib='yes', ac_ncurses_lib='no')
 if test x"$ac_ncurses_lib" = "xyes" -a x"$ac_ncurses" = "xno" ; then
diff -durN gpsd-2.37.orig/sirfmon.c gpsd-2.37/sirfmon.c
--- gpsd-2.37.orig/sirfmon.c	2007-06-26 20:54:32.000000000 +0200
+++ gpsd-2.37/sirfmon.c	2008-07-22 09:57:32.000000000 +0200
@@ -42,11 +42,8 @@
 #include <stdbool.h>
 
 #include "gpsd_config.h"
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#else
-#include <curses.h>
-#endif /* HAVE_NCURSES_H */
+#include <ncurses/ncurses.h>
+
 #include "gps.h"	/* for DEFAULT_GPSD_PORT; brings in PI as well */
 
 #define PUT_ORIGIN	-4