diff --git a/ChangeLog b/ChangeLog
index 2613c398b9..c06295b93b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-25  Johan Dahlin  <johan@gnome.org>
+
+	* gst/interfaces.override:
+	* gst/xoverlay.override:
+
+	redefine broken implement casting macros to something saner
+	
 2004-11-23  Johan Dahlin  <johan@gnome.org>
 
 	* testsuite/*: Put test_ prefix on all test filenames
diff --git a/gst/interfaces.override b/gst/interfaces.override
index 60445a2960..42f34791e4 100644
--- a/gst/interfaces.override
+++ b/gst/interfaces.override
@@ -28,14 +28,27 @@ headers
 #include "common.h"
 
 #include <gst/gst.h>
+
+/* XXX: Remove this macros in 0.9 */
 #include <gst/colorbalance/colorbalance.h>
-#include <gst/colorbalance/colorbalancechannel.h>
-#include <gst/mixer/mixer.h>
-#include <gst/mixer/mixertrack.h>
+#undef  GST_COLOR_BALANCE
+#define GST_COLOR_BALANCE(obj)  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_COLOR_BALANCE, GstColorBalance))
+
 #include <gst/navigation/navigation.h>
+#undef  GST_NAVIGATION
+#define GST_NAVIGATION(obj)     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_NAVIGATION, GstNavigation))
+
 #include <gst/propertyprobe/propertyprobe.h>
+#undef  GST_PROPERTY_PROBE
+#define GST_PROPERTY_PROBE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PROPERTY_PROBE, GstPropertyProbe))
+
 #include <gst/tuner/tuner.h>
-#include <gst/xwindowlistener/xwindowlistener.h>
+#undef  GST_TUNER
+#define GST_TUNER(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TUNER, GstTuner))
+
+#include <gst/mixer/mixer.h>
+#undef  GST_MIXER
+#define GST_MIXER(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_MIXER, GstMixer))
 
 %%
 modulename gst.interfaces
diff --git a/gst/xoverlay.override b/gst/xoverlay.override
index 22825c9e99..377fc1b63d 100644
--- a/gst/xoverlay.override
+++ b/gst/xoverlay.override
@@ -22,3 +22,5 @@
 headers
 
 #include <gst/xoverlay/xoverlay.h>
+#undef  GST_X_OVERLAY
+#define GST_X_OVERLAY(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_X_OVERLAY, GstXOverlay))