diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d257b4451..f8ff92e3a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-13  Christopher Faylor  <cgf@timesys.com>
+
+	* ntdll.h (STATUS_INVALID_INFO_CLASS): Conditionalize.
+
 2006-05-10  Brian Dessent  <brian@dessent.net>
 
 	* Makefile.in (clean): Also delete *.dbg.
diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h
index 265f308f6..ff5f0c93a 100644
--- a/winsup/cygwin/ntdll.h
+++ b/winsup/cygwin/ntdll.h
@@ -8,7 +8,11 @@
    Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
    details. */
 
+#ifndef STATUS_INVALID_INFO_CLASS
+/* Some w32api header file defines this so we need to conditionalize this
+   define to avoid warnings. */
 #define STATUS_INVALID_INFO_CLASS   ((NTSTATUS) 0xc0000003)
+#endif
 #define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS) 0xc0000004)
 #define STATUS_INVALID_PARAMETER    ((NTSTATUS) 0xc000000d)
 #define STATUS_BUFFER_TOO_SMALL     ((NTSTATUS) 0xc0000023)