diff --git a/ChangeLog b/ChangeLog
index 870a8a8dc6..78dc760dbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystemunix.c: 
+	* gtk/gtkfilechooserbutton.c: Protect the unistd.h include
+	by HAVE_UNISTD_H.
+
 Wed Sep  1 02:38:48 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkaccellabel.c (gtk_accel_label_expose_event): Make
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 870a8a8dc6..78dc760dbf 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-09-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystemunix.c: 
+	* gtk/gtkfilechooserbutton.c: Protect the unistd.h include
+	by HAVE_UNISTD_H.
+
 Wed Sep  1 02:38:48 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkaccellabel.c (gtk_accel_label_expose_event): Make
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 870a8a8dc6..78dc760dbf 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-09-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystemunix.c: 
+	* gtk/gtkfilechooserbutton.c: Protect the unistd.h include
+	by HAVE_UNISTD_H.
+
 Wed Sep  1 02:38:48 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkaccellabel.c (gtk_accel_label_expose_event): Make
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 870a8a8dc6..78dc760dbf 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-09-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilesystemunix.c: 
+	* gtk/gtkfilechooserbutton.c: Protect the unistd.h include
+	by HAVE_UNISTD_H.
+
 Wed Sep  1 02:38:48 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkaccellabel.c (gtk_accel_label_expose_event): Make
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index a819a8d940..27bb1f47b4 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -24,7 +24,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #include <string.h>
 
diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index 4bb5c212c5..eb4b4e7492 100644
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -35,7 +35,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <pwd.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <time.h>