diff --git a/ext/dv/gstdvdec.h b/ext/dv/gstdvdec.h
index 4031ef051e..49cec968b1 100644
--- a/ext/dv/gstdvdec.h
+++ b/ext/dv/gstdvdec.h
@@ -30,22 +30,8 @@
 
 G_BEGIN_DECLS
 
-
-#define GST_TYPE_DVDEC \
-  (gst_dvdec_get_type())
-#define GST_DVDEC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DVDEC,GstDVDec))
-#define GST_DVDEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DVDEC,GstDVDecClass))
-#define GST_IS_DVDEC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DVDEC))
-#define GST_IS_DVDEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DVDEC))
-
-
-typedef struct _GstDVDec GstDVDec;
-typedef struct _GstDVDecClass GstDVDecClass;
-
+#define GST_TYPE_DVDEC (gst_dvdec_get_type())
+G_DECLARE_FINAL_TYPE (GstDVDec, gst_dvdec, GST, DVDEC, GstElement)
 
 struct _GstDVDec {
   GstElement     element;
@@ -84,14 +70,6 @@ struct _GstDVDec {
   gboolean       need_segment;
 };
 
-struct _GstDVDecClass {
-  GstElementClass parent_class;
-};
-
-
-GType gst_dvdec_get_type (void);
-
-
 G_END_DECLS
 
 
diff --git a/ext/dv/gstdvdemux.h b/ext/dv/gstdvdemux.h
index 95c93206d8..8edb937c82 100644
--- a/ext/dv/gstdvdemux.h
+++ b/ext/dv/gstdvdemux.h
@@ -27,24 +27,11 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_DVDEMUX \
-  (gst_dvdemux_get_type())
-#define GST_DVDEMUX(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DVDEMUX,GstDVDemux))
-#define GST_DVDEMUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DVDEMUX,GstDVDemuxClass))
-#define GST_IS_DVDEMUX(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DVDEMUX))
-#define GST_IS_DVDEMUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DVDEMUX))
-
-
-typedef struct _GstDVDemux GstDVDemux;
-typedef struct _GstDVDemuxClass GstDVDemuxClass;
+#define GST_TYPE_DVDEMUX (gst_dvdemux_get_type())
+G_DECLARE_FINAL_TYPE (GstDVDemux, gst_dvdemux, GST, DVDEMUX, GstElement)
 
 typedef gboolean (*GstDVDemuxSeekHandler) (GstDVDemux *demux, GstPad * pad, GstEvent * event);
 
-
 struct _GstDVDemux {
   GstElement     element;
 
@@ -91,12 +78,6 @@ struct _GstDVDemux {
   gint16        *audio_buffers[4];
 };
 
-struct _GstDVDemuxClass {
-  GstElementClass parent_class;
-};
-
-GType gst_dvdemux_get_type (void);
-
 G_END_DECLS
 
 #endif /* __GST_DVDEMUX_H__ */