diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3e413e718..685ff425a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Thu Aug 24 12:30:17 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* debug.h: Allow some debug defines for use in header files.
+
 Wed Aug 23 23:00:24 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* dcrt0.cc (dll_crt0_1): Move exception list and constructor stuff
diff --git a/winsup/cygwin/debug.cc b/winsup/cygwin/debug.cc
index 050619b55..e635c6918 100644
--- a/winsup/cygwin/debug.cc
+++ b/winsup/cygwin/debug.cc
@@ -6,7 +6,6 @@ This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
-#define NO_DEBUG_DEFINES
 #include "winsup.h"
 #include "exceptions.h"
 #include "sync.h"
@@ -14,6 +13,8 @@ details. */
 #include "pinfo.h"
 #include "perthread.h"
 
+#undef CloseHandle
+
 static muto NO_COPY *threadname_lock = NULL;
 #define lock_threadname() \
   do {if (threadname_lock) threadname_lock->acquire (INFINITE); } while (0)