diff --git a/ext/speex/gstspeexdec.h b/ext/speex/gstspeexdec.h
index 5e1e17173a..4a2033e8c3 100644
--- a/ext/speex/gstspeexdec.h
+++ b/ext/speex/gstspeexdec.h
@@ -31,19 +31,9 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_SPEEX_DEC \
-  (gst_speex_dec_get_type())
-#define GST_SPEEX_DEC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SPEEX_DEC,GstSpeexDec))
-#define GST_SPEEX_DEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SPEEX_DEC,GstSpeexDecClass))
-#define GST_IS_SPEEX_DEC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SPEEX_DEC))
-#define GST_IS_SPEEX_DEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SPEEX_DEC))
-
-typedef struct _GstSpeexDec GstSpeexDec;
-typedef struct _GstSpeexDecClass GstSpeexDecClass;
+#define GST_TYPE_SPEEX_DEC (gst_speex_dec_get_type())
+G_DECLARE_FINAL_TYPE (GstSpeexDec, gst_speex_dec, GST, SPEEX_DEC,
+    GstAudioDecoder)
 
 struct _GstSpeexDec {
   GstAudioDecoder   element;
@@ -65,12 +55,6 @@ struct _GstSpeexDec {
   GstBuffer             *vorbiscomment;
 };
 
-struct _GstSpeexDecClass {
-  GstAudioDecoderClass parent_class;
-};
-
-GType gst_speex_dec_get_type (void);
-
 G_END_DECLS
 
 #endif /* __GST_SPEEX_DEC_H__ */
diff --git a/ext/speex/gstspeexenc.h b/ext/speex/gstspeexenc.h
index 29fcc72a12..0ab2d5564a 100644
--- a/ext/speex/gstspeexenc.h
+++ b/ext/speex/gstspeexenc.h
@@ -30,16 +30,9 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_SPEEX_ENC \
-  (gst_speex_enc_get_type())
-#define GST_SPEEX_ENC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SPEEX_ENC,GstSpeexEnc))
-#define GST_SPEEX_ENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SPEEX_ENC,GstSpeexEncClass))
-#define GST_IS_SPEEX_ENC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SPEEX_ENC))
-#define GST_IS_SPEEX_ENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SPEEX_ENC))
+#define GST_TYPE_SPEEX_ENC (gst_speex_enc_get_type())
+G_DECLARE_FINAL_TYPE (GstSpeexEnc, gst_speex_enc, GST, SPEEX_ENC,
+    GstAudioEncoder)
 
 typedef enum
 {
@@ -49,9 +42,6 @@ typedef enum
   GST_SPEEX_ENC_MODE_NB
 } GstSpeexMode;
 
-typedef struct _GstSpeexEnc GstSpeexEnc;
-typedef struct _GstSpeexEncClass GstSpeexEncClass;
-
 struct _GstSpeexEnc {
   GstAudioEncoder   element;
 
@@ -87,12 +77,6 @@ struct _GstSpeexEnc {
   gint                  comment_len;
 };
 
-struct _GstSpeexEncClass {
-  GstAudioEncoderClass parent_class;
-};
-
-GType gst_speex_enc_get_type (void);
-
 G_END_DECLS
 
 #endif /* __GST_SPEEXENC_H__ */