diff --git a/ChangeLog b/ChangeLog
index c9ba7093df..ef8c14cb0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-14  David Schleef  <ds@schleef.org>
+
+	* gst/glib-compat.c: (g_mkdir_with_parents), (g_mkdir), (g_stat):
+	* gst/glib-compat.h:
+	  Attempt #4 to appease the buildbots.
+
 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.c b/gst/glib-compat.c
index 3d4fb752f8..7995961e06 100644
--- a/gst/glib-compat.c
+++ b/gst/glib-compat.c
@@ -28,28 +28,28 @@
 #include "config.h"
 
 #include <glib.h>
+#if GLIB_CHECK_VERSION (2, 6, 0)
 #include <glib/gstdio.h>
+#endif
 
 #include <stdio.h>
 #include <errno.h>
 
 #include "glib-compat.h"
 
-#if 0
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include <sys/types.h>
+#if 0
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #ifndef G_OS_WIN32
 #include <sys/wait.h>
 #endif
 #include <fcntl.h>
-#include <stdlib.h>
 #endif
 
 
diff --git a/gst/glib-compat.h b/gst/glib-compat.h
index dbdad048fd..d3b688a0fe 100644
--- a/gst/glib-compat.h
+++ b/gst/glib-compat.h
@@ -18,6 +18,8 @@ int g_mkdir (const gchar *filename, int          mode);
 #endif
 
 #if !GLIB_CHECK_VERSION (2, 6, 0)
+struct stat;
+
 int g_stat (const gchar *filename, struct stat *buf);
 #endif