diff --git a/ChangeLog b/ChangeLog
index ef8c14cb0e..2e70713621 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-14  David Schleef  <ds@schleef.org>
+
+	* gst/glib-compat.h:
+	* gst/gstregistryxml.c:
+	  Convergence is near.  Seriously.
+
 2005-09-14  David Schleef  <ds@schleef.org>
 
 	* gst/glib-compat.c: (g_mkdir_with_parents), (g_mkdir), (g_stat):
diff --git a/gst/glib-compat.h b/gst/glib-compat.h
index d3b688a0fe..3b8e253f6a 100644
--- a/gst/glib-compat.h
+++ b/gst/glib-compat.h
@@ -6,6 +6,9 @@
  */
 
 #include <glib.h>
+#if GLIB_CHECK_VERSION (2, 6, 0)
+#include <glib/gstdio.h>
+#endif
 
 G_BEGIN_DECLS
 
diff --git a/gst/gstregistryxml.c b/gst/gstregistryxml.c
index de1951005e..fe5405c1b0 100644
--- a/gst/gstregistryxml.c
+++ b/gst/gstregistryxml.c
@@ -43,7 +43,6 @@
 #include <gst/gstinfo.h>
 #include <gst/gstenumtypes.h>
 #include <gst/gstregistry.h>
-#include <glib/gstdio.h>
 
 #include <libxml/xmlreader.h>