diff --git a/ChangeLog b/ChangeLog
index 81d97b5e5..3d990c806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr  7 22:51:15 2005  <yosh@gimp.org>
+
+	* glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir
+	and exe_top_share_dir only in G_OS_WIN32.
+
 2005-04-08  Tor Lillqvist  <tml@novell.com>
 
 	* glib/gutils.c (g_get_system_data_dirs): After investigating more
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 81d97b5e5..3d990c806 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Apr  7 22:51:15 2005  <yosh@gimp.org>
+
+	* glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir
+	and exe_top_share_dir only in G_OS_WIN32.
+
 2005-04-08  Tor Lillqvist  <tml@novell.com>
 
 	* glib/gutils.c (g_get_system_data_dirs): After investigating more
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 81d97b5e5..3d990c806 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Thu Apr  7 22:51:15 2005  <yosh@gimp.org>
+
+	* glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir
+	and exe_top_share_dir only in G_OS_WIN32.
+
 2005-04-08  Tor Lillqvist  <tml@novell.com>
 
 	* glib/gutils.c (g_get_system_data_dirs): After investigating more
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 81d97b5e5..3d990c806 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Apr  7 22:51:15 2005  <yosh@gimp.org>
+
+	* glib/gutils.c (g_get_system_data_dirs): Declare glib_top_share_dir
+	and exe_top_share_dir only in G_OS_WIN32.
+
 2005-04-08  Tor Lillqvist  <tml@novell.com>
 
 	* glib/gutils.c (g_get_system_data_dirs): After investigating more
diff --git a/glib/gutils.c b/glib/gutils.c
index e65a17175..ee5a954ef 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -2060,13 +2060,14 @@ g_get_user_cache_dir (void)
 G_CONST_RETURN gchar * G_CONST_RETURN * 
 g_get_system_data_dirs (void)
 {
-  gchar *data_dirs, *glib_top_share_dir, *exe_top_share_dir, **data_dir_vector;
+  gchar *data_dirs, **data_dir_vector;
 
   G_LOCK (g_utils_global);
 
   if (!g_system_data_dirs)
     {
 #ifdef G_OS_WIN32
+      gchar *glib_top_share_dir, *exe_top_share_dir;
 
       /* Documents and Settings\All Users\Application Data */
       char *appdata = get_special_folder (CSIDL_COMMON_APPDATA);