diff --git a/ChangeLog b/ChangeLog
index 4ef51e4ded..80e02357e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-10  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	Patch by: Luis Menina <liberforce at freeside dot fr>
+
+	* gst-libs/gst/floatcast/floatcast.h:
+	* gst/typefind/gsttypefindfunctions.c:
+	Include glib.h instead of a specific GLib header. Including single
+	GLib headers is deprecated. Fixes bug #563904.
+
 2008-12-09  Julien Moutte  <julien@fluendo.com>
 
 	* gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps): 
diff --git a/gst-libs/gst/floatcast/floatcast.h b/gst-libs/gst/floatcast/floatcast.h
index 1db21b741c..279af28225 100644
--- a/gst-libs/gst/floatcast/floatcast.h
+++ b/gst-libs/gst/floatcast/floatcast.h
@@ -40,8 +40,7 @@
 #define __FLOATCAST_H__
 
 #include <string.h>
-#include <glib/gtypes.h>
-#include <glib/gutils.h>  /* to make sure inline is defined properly */
+#include <glib.h>
 
 #if defined (_MSC_VER) && !defined (inline)
 #define inline __inline
diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index a0e8bd06af..686937f854 100644
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 #include <gst/gsttypefind.h>
 #include <gst/gstelement.h>