diff --git a/src/ChangeLog b/src/ChangeLog
index 502f607a0ea..43efd8fc05e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-03  Richard M. Stallman  <rms@gnu.org>
+
+	* xfns.c: Include unistd.h, if it exists.
+
+	* editfns.c: Move the include of ctype.h after unistd.h.
+
+	* gmalloc.c: Test BROKEN_PROTOTYPES.
+
 2001-11-03  Ken Raeburn  <raeburn@gnu.org>
 
 	* lisp.h (CHECK_STRING_CAR): New macro.
diff --git a/src/xfns.c b/src/xfns.c
index fe1f0b0f449..8f7e13311f8 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -24,6 +24,10 @@ Boston, MA 02111-1307, USA.  */
 #include <stdio.h>
 #include <math.h>
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 /* This makes the fields of a Display accessible, in Xlib header files.  */
 
 #define XLIB_ILLEGAL_ACCESS