diff --git a/ChangeLog b/ChangeLog
index 44663c38f..16526fd23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/gkeyfile.c: Fix includes. (#156500, #156499, 
+	Kazuki IWAMOTO)
+
 	* glib/Makefile.am (galias.h): Fix srcdir != builddir 
 	builds.  (#156447, Thomas Fitzsimmons)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 44663c38f..16526fd23 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/gkeyfile.c: Fix includes. (#156500, #156499, 
+	Kazuki IWAMOTO)
+
 	* glib/Makefile.am (galias.h): Fix srcdir != builddir 
 	builds.  (#156447, Thomas Fitzsimmons)
 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 44663c38f..16526fd23 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/gkeyfile.c: Fix includes. (#156500, #156499, 
+	Kazuki IWAMOTO)
+
 	* glib/Makefile.am (galias.h): Fix srcdir != builddir 
 	builds.  (#156447, Thomas Fitzsimmons)
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 44663c38f..16526fd23 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/gkeyfile.c: Fix includes. (#156500, #156499, 
+	Kazuki IWAMOTO)
+
 	* glib/Makefile.am (galias.h): Fix srcdir != builddir 
 	builds.  (#156447, Thomas Fitzsimmons)
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 44663c38f..16526fd23 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/gkeyfile.c: Fix includes. (#156500, #156499, 
+	Kazuki IWAMOTO)
+
 	* glib/Makefile.am (galias.h): Fix srcdir != builddir 
 	builds.  (#156447, Thomas Fitzsimmons)
 
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index acddd9f0d..399f590be 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -34,7 +34,12 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
 
 #include "gconvert.h"
 #include "gdataset.h"