diff --git a/ChangeLog b/ChangeLog
index ac4ff44c2a..1a6ea51b2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-08  Stefan Kost  <ensonic@users.sf.net>
+
+	* ext/xine/gstxine.h:
+	* gst-libs/gst/play/play.h:
+	* sys/v4l2/gstv4l2element.h:
+	* sys/ximagesrc/ximageutil.h:
+	Fix broken GObject macros
+
 2006-04-08  Wim Taymans  <wim@fluendo.com>
 
 	* gst/qtdemux/qtdemux.c: (gst_qtdemux_prepare_current_sample),
diff --git a/ext/xine/gstxine.h b/ext/xine/gstxine.h
index e222d7f1d0..5c32087221 100644
--- a/ext/xine/gstxine.h
+++ b/ext/xine/gstxine.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_XINE,GstXineClass))
 #define GST_IS_XINE(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_XINE))
-#define GST_IS_XINE_CLASS(obj) \
+#define GST_IS_XINE_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_XINE))
 
 typedef struct _GstXine      GstXine;
diff --git a/gst-libs/gst/play/play.h b/gst-libs/gst/play/play.h
index eeec9fd87a..6cbedce379 100644
--- a/gst-libs/gst/play/play.h
+++ b/gst-libs/gst/play/play.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define GST_PLAY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLAY, GstPlay))
 #define GST_PLAY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PLAY, GstPlayClass))
 #define GST_IS_PLAY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLAY))
-#define GST_IS_PLAY_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLAY))
+#define GST_IS_PLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLAY))
 #define GST_PLAY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PLAY, GstPlayClass))
 
 typedef enum
diff --git a/sys/v4l2/gstv4l2element.h b/sys/v4l2/gstv4l2element.h
index 23a6dd81fe..742950a788 100644
--- a/sys/v4l2/gstv4l2element.h
+++ b/sys/v4l2/gstv4l2element.h
@@ -55,7 +55,7 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_V4L2ELEMENT,GstV4l2ElementClass))
 #define GST_IS_V4L2ELEMENT(obj)					\
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_V4L2ELEMENT))
-#define GST_IS_V4L2ELEMENT_CLASS(obj)				\
+#define GST_IS_V4L2ELEMENT_CLASS(klass)				\
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_V4L2ELEMENT))
 #define GST_V4L2ELEMENT_GET_CLASS(obj)					\
   (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_V4L2ELEMENT, GstV4l2ElementClass))
diff --git a/sys/ximagesrc/ximageutil.h b/sys/ximagesrc/ximageutil.h
index cc9d3dbf44..517fc8e06a 100644
--- a/sys/ximagesrc/ximageutil.h
+++ b/sys/ximagesrc/ximageutil.h
@@ -170,9 +170,11 @@ void gst_ximageutil_ximage_destroy (GstXContext *xcontext,
 /* Call to manually release a buffer */
 void gst_ximage_buffer_free (GstXImageSrcBuffer *ximage);
 
-#define GST_TYPE_XIMAGESRC_BUFFER (gst_ximagesrc_buffer_get_type())
-#define GST_IS_XIMAGESRC_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_XIMAGESRC_BUFFER))
-#define GST_XIMAGESRC_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_XIMAGESRC_BUFFER, GstXImageSrcBuffer))
+#define GST_TYPE_XIMAGESRC_BUFFER            (gst_ximagesrc_buffer_get_type())
+#define GST_IS_XIMAGESRC_BUFFER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_XIMAGESRC_BUFFER))
+#define GST_IS_XIMAGESRC_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_XIMAGESRC_BUFFER))
+#define GST_XIMAGESRC_BUFFER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_XIMAGESRC_BUFFER, GstXImageSrcBuffer))
+#define GST_XIMAGESRC_BUFFER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_XIMAGESRC_BUFFER, GstXImageSrcBufferClass))
 #define GST_XIMAGESRC_BUFFER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_XIMAGESRC_BUFFER, GstXImageSrcBufferClass))
 
 G_END_DECLS