--- Python-2.7.1/Modules/_cursesmodule.c	2011-03-13 23:34:27.000000000 -0700
+++ Python-2.7.1/Modules/_cursesmodule.c.1	2011-03-14 00:33:09.000000000 -0700
@@ -322,13 +322,13 @@
 
 Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
 Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) && !defined(HAVE_NCURSES_H)
 Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)")
 #else
 Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)")
 #endif
 Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)")
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) && !defined(HAVE_NCURSES_H)
 Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)")
 #else
 Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)")
@@ -891,7 +891,7 @@
         return Py_BuildValue("c", rtn);
     } else {
         const char *knp;
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) && !defined(HAVE_NCURSES_H)
         knp = unctrl(rtn);
 #else
         knp = keyname(rtn);
@@ -2108,7 +2108,7 @@
 }
 #endif /* HAVE_CURSES_IS_TERM_RESIZED */
 
-#if !defined(__NetBSD__)
+#if !defined(__NetBSD__) || defined(HAVE_NCURSES_H)
 static PyObject *
 PyCurses_KeyName(PyObject *self, PyObject *args)
 {
@@ -2672,7 +2672,7 @@
 #ifdef HAVE_CURSES_IS_TERM_RESIZED
     {"is_term_resized",     (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
 #endif
-#if !defined(__NetBSD__)
+#if !defined(__NetBSD__) || defined(HAVE_NCURSES_H)
     {"keyname",             (PyCFunction)PyCurses_KeyName, METH_VARARGS},
 #endif
     {"killchar",            (PyCFunction)PyCurses_KillChar, METH_NOARGS},
@@ -2783,7 +2783,7 @@
     SetDictInt("A_DIM",                 A_DIM);
     SetDictInt("A_BOLD",                A_BOLD);
     SetDictInt("A_ALTCHARSET",          A_ALTCHARSET);
-#if !defined(__NetBSD__)
+#if !defined(__NetBSD__) || defined(HAVE_NCURSES_H)
     SetDictInt("A_INVIS",           A_INVIS);
 #endif
     SetDictInt("A_PROTECT",         A_PROTECT);
@@ -2857,7 +2857,7 @@
         int key;
         char *key_n;
         char *key_n2;
-#if !defined(__NetBSD__)
+#if !defined(__NetBSD__) || defined(HAVE_NCURSES_H)
         for (key=KEY_MIN;key < KEY_MAX; key++) {
             key_n = (char *)keyname(key);
             if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)