diff --git a/ChangeLog b/ChangeLog
index c78c8c1b28..7b7d1e49b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Oct 27 15:47:58 2003  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if
+	we have RandR support, for XRRUpdateConfiguration declaration.
+
+	* gtk/gtkfilefilter.c: #include "gtkprivate.h" for _gtk_fnmatch
+	declaration.
+
+	* gtk/gtkuimanager.c (gtk_ui_manager_add_ui_from_file): Make
+	length a gsize variable, since that's what g_file_get_contents()
+	expects.
+
 Mon Oct 27 12:18:49 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* NEWS: Fix attribution for above/below EWMH work.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c78c8c1b28..7b7d1e49b3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Mon Oct 27 15:47:58 2003  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if
+	we have RandR support, for XRRUpdateConfiguration declaration.
+
+	* gtk/gtkfilefilter.c: #include "gtkprivate.h" for _gtk_fnmatch
+	declaration.
+
+	* gtk/gtkuimanager.c (gtk_ui_manager_add_ui_from_file): Make
+	length a gsize variable, since that's what g_file_get_contents()
+	expects.
+
 Mon Oct 27 12:18:49 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* NEWS: Fix attribution for above/below EWMH work.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c78c8c1b28..7b7d1e49b3 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+Mon Oct 27 15:47:58 2003  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if
+	we have RandR support, for XRRUpdateConfiguration declaration.
+
+	* gtk/gtkfilefilter.c: #include "gtkprivate.h" for _gtk_fnmatch
+	declaration.
+
+	* gtk/gtkuimanager.c (gtk_ui_manager_add_ui_from_file): Make
+	length a gsize variable, since that's what g_file_get_contents()
+	expects.
+
 Mon Oct 27 12:18:49 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* NEWS: Fix attribution for above/below EWMH work.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c78c8c1b28..7b7d1e49b3 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Mon Oct 27 15:47:58 2003  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if
+	we have RandR support, for XRRUpdateConfiguration declaration.
+
+	* gtk/gtkfilefilter.c: #include "gtkprivate.h" for _gtk_fnmatch
+	declaration.
+
+	* gtk/gtkuimanager.c (gtk_ui_manager_add_ui_from_file): Make
+	length a gsize variable, since that's what g_file_get_contents()
+	expects.
+
 Mon Oct 27 12:18:49 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* NEWS: Fix attribution for above/below EWMH work.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c78c8c1b28..7b7d1e49b3 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Mon Oct 27 15:47:58 2003  Manish Singh  <yosh@gimp.org>
+
+	* gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if
+	we have RandR support, for XRRUpdateConfiguration declaration.
+
+	* gtk/gtkfilefilter.c: #include "gtkprivate.h" for _gtk_fnmatch
+	declaration.
+
+	* gtk/gtkuimanager.c (gtk_ui_manager_add_ui_from_file): Make
+	length a gsize variable, since that's what g_file_get_contents()
+	expects.
+
 Mon Oct 27 12:18:49 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* NEWS: Fix attribution for above/below EWMH work.
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 1def110d40..db14fb5d48 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -39,6 +39,10 @@
 #include <X11/extensions/Xinerama.h>
 #endif
 
+#ifdef HAVE_RANDR
+#include <X11/extensions/Xrandr.h>
+#endif
+
 static void         gdk_screen_x11_class_init  (GdkScreenX11Class *klass);
 static void         gdk_screen_x11_dispose     (GObject		  *object);
 static void         gdk_screen_x11_finalize    (GObject		  *object);
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 17f1347475..cfa332aaf9 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -22,6 +22,7 @@
 
 #include "gtkfilefilter.h"
 #include "gtkobject.h"
+#include "gtkprivate.h"
 
 typedef struct _GtkFileFilterClass GtkFileFilterClass;
 typedef struct _FilterRule FilterRule;
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index bb0b171aee..0d9ec632cb 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -1280,7 +1280,7 @@ gtk_ui_manager_add_ui_from_file (GtkUIManager *self,
 				 GError      **error)
 {
   gchar *buffer;
-  gint length;
+  gsize length;
   guint res;
 
   g_return_val_if_fail (GTK_IS_UI_MANAGER (self), 0);