diff --git a/ChangeLog b/ChangeLog
index 25cd9acc65..9dad7f746d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-11  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+	Fix #300218:
+
+	* gdk/win32/gdkselection-win32.c (gdk_selection_convert): Fix
+	C99ism.
+
+	* gtk/updateiconcache.c: Guard inclusion of unistd.h and
+	utime.h.
+
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk/x11/gdkinput-xfree.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 25cd9acc65..9dad7f746d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2005-04-11  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+	Fix #300218:
+
+	* gdk/win32/gdkselection-win32.c (gdk_selection_convert): Fix
+	C99ism.
+
+	* gtk/updateiconcache.c: Guard inclusion of unistd.h and
+	utime.h.
+
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk/x11/gdkinput-xfree.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 25cd9acc65..9dad7f746d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2005-04-11  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+	Fix #300218:
+
+	* gdk/win32/gdkselection-win32.c (gdk_selection_convert): Fix
+	C99ism.
+
+	* gtk/updateiconcache.c: Guard inclusion of unistd.h and
+	utime.h.
+
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk/x11/gdkinput-xfree.c:
diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index d5edb2d08b..1bcdaa5497 100644
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -383,12 +383,14 @@ gdk_selection_convert (GdkWindow *requestor,
               if (GetClipboardFormatName (fmt, sFormat, 80) > 0 &&
 		  strcmp (sFormat, "UTF8_STRING"))
                 {
+		  GdkAtom atom;
+
 		  if (!has_bmp &&
 		      (!strcmp (sFormat, "image/bmp") ||
 		       !strcmp (sFormat, "image/x-bmp") ||
 		       !strcmp (sFormat, "image/x-MS-bmp")))
 		    has_bmp = TRUE;
-                  GdkAtom atom = gdk_atom_intern (sFormat, FALSE);
+                  atom = gdk_atom_intern (sFormat, FALSE);
                   data[i++] = atom;
                 }
             }
diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index 8662166659..17b488d2a0 100644
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -24,9 +24,15 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <errno.h>
+#ifdef _MSC_VER
+#include <sys/utime.h>
+#else
 #include <utime.h>
+#endif
 
 #include <glib.h>
 #include <glib/gstdio.h>