diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index ffa8d82a692..1d5db81a049 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -363,7 +363,9 @@ curses.h:	curses.h.in
 	    -e "s%@cf_cv_typeof_chtype@%${TYPEOF_CHTYPE}%g" \
 	    -e "s%@cf_cv_widec_shift@%${WIDEC_SHIFT}%g" \
 	    -e "s%@cf_cv_shift_limit@%${SHIFT_LIMIT}%g" \
-	    -e "s%@cf_cv_1UL@%${ONEUL}%g"
+	    -e "s%@cf_cv_1UL@%${ONEUL}%g" \
+	    -e "s/ _WCHAR_T/ _BSD_WCHAR_T_/g" \
+	    -e "s/ _WINT_T/ _BSD_WINT_T_/g"
 
 unctrl.h:	unctrl.h.in
 	sed <${NCURSES}/include/$@.in >$@ \
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index ffa8d82a692..1d5db81a049 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -363,7 +363,9 @@ curses.h:	curses.h.in
 	    -e "s%@cf_cv_typeof_chtype@%${TYPEOF_CHTYPE}%g" \
 	    -e "s%@cf_cv_widec_shift@%${WIDEC_SHIFT}%g" \
 	    -e "s%@cf_cv_shift_limit@%${SHIFT_LIMIT}%g" \
-	    -e "s%@cf_cv_1UL@%${ONEUL}%g"
+	    -e "s%@cf_cv_1UL@%${ONEUL}%g" \
+	    -e "s/ _WCHAR_T/ _BSD_WCHAR_T_/g" \
+	    -e "s/ _WINT_T/ _BSD_WINT_T_/g"
 
 unctrl.h:	unctrl.h.in
 	sed <${NCURSES}/include/$@.in >$@ \