diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9bbfb3ffb..19baa9b04 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-19  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* cygerrno.h: Protect use of NTSTATUS for only when we need it.
+
+2010-04-19  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* lib/_cygwin_crt0_common.cc: Remove unneeded declarations.
+
 2010-04-19  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_tty.cc (fhandler_tty_slave::fch_set_sd): Remove commented out
diff --git a/winsup/cygwin/cygerrno.h b/winsup/cygwin/cygerrno.h
index e1a1af07d..d1a6c6a63 100644
--- a/winsup/cygwin/cygerrno.h
+++ b/winsup/cygwin/cygerrno.h
@@ -13,7 +13,9 @@ details. */
 #include <errno.h>
 
 void __stdcall seterrno_from_win_error (const char *file, int line, DWORD code) __attribute__ ((regparm(3)));
+#ifdef _NTDLL_H
 void __stdcall seterrno_from_nt_status (const char *file, int line, NTSTATUS status) __attribute__ ((regparm(3)));
+#endif
 void __stdcall seterrno (const char *, int line) __attribute__ ((regparm(2)));
 int __stdcall geterrno_from_win_error (DWORD code = GetLastError (), int deferrno = 13 /*EACCESS*/) __attribute__ ((regparm(2)));