diff --git a/ext/gdk_pixbuf/gstgdkpixbufdec.h b/ext/gdk_pixbuf/gstgdkpixbufdec.h
index 4b12f48f0f..63fc6e38dd 100644
--- a/ext/gdk_pixbuf/gstgdkpixbufdec.h
+++ b/ext/gdk_pixbuf/gstgdkpixbufdec.h
@@ -27,19 +27,9 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_GDK_PIXBUF_DEC			\
-  (gst_gdk_pixbuf_dec_get_type())
-#define GST_GDK_PIXBUF_DEC(obj)						\
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDK_PIXBUF_DEC,GstGdkPixbufDec))
-#define GST_GDK_PIXBUF_DEC_CLASS(klass)					\
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDK_PIXBUF_DEC,GstGdkPixbufDecClass))
-#define GST_IS_GDK_PIXBUF_DEC(obj)					\
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDK_PIXBUF_DEC))
-#define GST_IS_GDK_PIXBUF_DEC_CLASS(klass)				\
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDK_PIXBUF_DEC))
-
-typedef struct _GstGdkPixbufDec      GstGdkPixbufDec;
-typedef struct _GstGdkPixbufDecClass GstGdkPixbufDecClass;
+#define GST_TYPE_GDK_PIXBUF_DEC (gst_gdk_pixbuf_dec_get_type())
+G_DECLARE_FINAL_TYPE (GstGdkPixbufDec, gst_gdk_pixbuf_dec, GST, GDK_PIXBUF_DEC,
+    GstElement)
 
 struct _GstGdkPixbufDec
 {
@@ -58,13 +48,6 @@ struct _GstGdkPixbufDec
   gboolean       packetized;
 };
 
-struct _GstGdkPixbufDecClass
-{
-  GstElementClass parent_class;
-};
-
-GType gst_gdk_pixbuf_dec_get_type (void);
-
 G_END_DECLS
 
 #endif /* __GST_GDK_PIXBUF_DEC_H__ */
diff --git a/ext/gdk_pixbuf/gstgdkpixbufoverlay.h b/ext/gdk_pixbuf/gstgdkpixbufoverlay.h
index 8d80b015aa..014f1e6d91 100644
--- a/ext/gdk_pixbuf/gstgdkpixbufoverlay.h
+++ b/ext/gdk_pixbuf/gstgdkpixbufoverlay.h
@@ -28,14 +28,9 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_GDK_PIXBUF_OVERLAY   (gst_gdk_pixbuf_overlay_get_type())
-#define GST_GDK_PIXBUF_OVERLAY(obj)   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDK_PIXBUF_OVERLAY,GstGdkPixbufOverlay))
-#define GST_GDK_PIXBUF_OVERLAY_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDK_PIXBUF_OVERLAY,GstGdkPixbufOverlayClass))
-#define GST_IS_GDK_PIXBUF_OVERLAY(obj)   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDK_PIXBUF_OVERLAY))
-#define GST_IS_GDK_PIXBUF_OVERLAY_CLASS(obj)   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDK_PIXBUF_OVERLAY))
-
-typedef struct _GstGdkPixbufOverlay GstGdkPixbufOverlay;
-typedef struct _GstGdkPixbufOverlayClass GstGdkPixbufOverlayClass;
+#define GST_TYPE_GDK_PIXBUF_OVERLAY (gst_gdk_pixbuf_overlay_get_type())
+G_DECLARE_FINAL_TYPE (GstGdkPixbufOverlay, gst_gdk_pixbuf_overlay,
+    GST, GDK_PIXBUF_OVERLAY, GstVideoFilter)
 
 typedef enum {
   GST_GDK_PIXBUF_POSITIONING_PIXELS_RELATIVE_TO_EDGES,
@@ -82,13 +77,6 @@ struct _GstGdkPixbufOverlay
   gboolean                     update_composition;
 };
 
-struct _GstGdkPixbufOverlayClass
-{
-  GstVideoFilterClass  videofilter_class;
-};
-
-GType gst_gdk_pixbuf_overlay_get_type (void);
-
 G_END_DECLS
 
 #endif
diff --git a/ext/gdk_pixbuf/gstgdkpixbufsink.h b/ext/gdk_pixbuf/gstgdkpixbufsink.h
index 964437aa1c..65e830832f 100644
--- a/ext/gdk_pixbuf/gstgdkpixbufsink.h
+++ b/ext/gdk_pixbuf/gstgdkpixbufsink.h
@@ -26,14 +26,9 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#define GST_TYPE_GDK_PIXBUF_SINK            (gst_gdk_pixbuf_sink_get_type())
-#define GST_GDK_PIXBUF_SINK(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDK_PIXBUF_SINK,GstGdkPixbufSink))
-#define GST_GDK_PIXBUF_SINK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDK_PIXBUF_SINK,GstGdkPixbufSinkClass))
-#define GST_IS_GDK_PIXBUF_SINK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDK_PIXBUF_SINK))
-#define GST_IS_GDK_PIXBUF_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDK_PIXBUF_SINK))
-
-typedef struct _GstGdkPixbufSink       GstGdkPixbufSink;
-typedef struct _GstGdkPixbufSinkClass  GstGdkPixbufSinkClass;
+#define GST_TYPE_GDK_PIXBUF_SINK (gst_gdk_pixbuf_sink_get_type())
+G_DECLARE_FINAL_TYPE (GstGdkPixbufSink, gst_gdk_pixbuf_sink,
+    GST, GDK_PIXBUF_SINK, GstVideoSink)
 
 /**
  * GstGdkPixbufSink:
@@ -59,17 +54,5 @@ struct _GstGdkPixbufSink
   GdkPixbuf  * last_pixbuf;
 };
 
-/**
- * GstGdkPixbufSinkClass:
- *
- * Opaque element class structure.
- */
-struct _GstGdkPixbufSinkClass 
-{
-  GstVideoSinkClass  basesinkclass;
-};
-
-GType   gst_gdk_pixbuf_sink_get_type (void);
-
 #endif /* GST_GDK_PIXBUF_SINK_H */