diff --git a/ext/libcaca/gstcacasink.h b/ext/libcaca/gstcacasink.h
index 327a6a8a00..53c9d180e3 100644
--- a/ext/libcaca/gstcacasink.h
+++ b/ext/libcaca/gstcacasink.h
@@ -32,19 +32,8 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_CACASINK \
-  (gst_cacasink_get_type())
-#define GST_CACASINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CACASINK,GstCACASink))
-#define GST_CACASINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CACASINK,GstCACASinkClass))
-#define GST_IS_CACASINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CACASINK))
-#define GST_IS_CACASINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CACASINK))
-
-typedef struct _GstCACASink GstCACASink;
-typedef struct _GstCACASinkClass GstCACASinkClass;
+#define GST_TYPE_CACASINK (gst_cacasink_get_type())
+G_DECLARE_FINAL_TYPE (GstCACASink, gst_cacasink, GST, CACASINK, GstBaseSink)
 
 struct _GstCACASink {
   GstBaseSink parent;
@@ -58,14 +47,6 @@ struct _GstCACASink {
   struct caca_bitmap *bitmap;
 };
 
-struct _GstCACASinkClass {
-  GstBaseSinkClass parent_class;
-
-  /* signals */
-};
-
-GType gst_cacasink_get_type(void);
-
 G_END_DECLS
 
 #endif /* __GST_CACASINK_H__ */
diff --git a/ext/libcaca/gstcacatv.h b/ext/libcaca/gstcacatv.h
index d24454430c..5a574dc8ab 100644
--- a/ext/libcaca/gstcacatv.h
+++ b/ext/libcaca/gstcacatv.h
@@ -32,19 +32,8 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_CACATV \
-  (gst_cacatv_get_type())
-#define GST_CACATV(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CACATV,GstCACATv))
-#define GST_CACATV_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CACATV,GstCACATvClass))
-#define GST_IS_CACATV(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CACATV))
-#define GST_IS_CACATV_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CACATV))
-
-typedef struct _GstCACATv GstCACATv;
-typedef struct _GstCACATvClass GstCACATvClass;
+#define GST_TYPE_CACATV (gst_cacatv_get_type())
+G_DECLARE_FINAL_TYPE (GstCACATv, gst_cacatv, GST, CACATV, GstVideoFilter)
 
 struct _GstCACATv {
   GstVideoFilter videofilter;
@@ -63,14 +52,6 @@ struct _GstCACATv {
   caca_font_t *font;
 };
 
-struct _GstCACATvClass {
-  GstVideoFilterClass parent_class;
-
-  /* signals */
-};
-
-GType gst_cacatv_get_type(void);
-
 G_END_DECLS
 
 #endif /* __GST_CACATV_H__ */