diff --git a/gst-libs/gst/codecs/gsth264decoder.h b/gst-libs/gst/codecs/gsth264decoder.h
index 0b0e6d0de8..1dbe6abd11 100644
--- a/gst-libs/gst/codecs/gsth264decoder.h
+++ b/gst-libs/gst/codecs/gsth264decoder.h
@@ -106,6 +106,8 @@ struct _GstH264DecoderClass
   gpointer padding[GST_PADDING_LARGE];
 };
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstH264Decoder, gst_object_unref)
+
 GST_CODECS_API
 GType gst_h264_decoder_get_type (void);
 
diff --git a/gst-libs/gst/codecs/gsth264picture.h b/gst-libs/gst/codecs/gsth264picture.h
index d71eabb28a..8d3a449c52 100644
--- a/gst-libs/gst/codecs/gsth264picture.h
+++ b/gst-libs/gst/codecs/gsth264picture.h
@@ -208,6 +208,8 @@ gint  gst_h264_dpb_get_size   (GstH264Dpb * dpb);
 GST_CODECS_API
 gboolean gst_h264_dpb_is_full (GstH264Dpb * dpb);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstH264Picture, gst_h264_picture_unref)
+
 G_END_DECLS
 
 #endif /* __GST_H264_PICTURE_H__ */
diff --git a/gst-libs/gst/codecs/gsth265decoder.h b/gst-libs/gst/codecs/gsth265decoder.h
index 73aa088fca..4999a0df18 100644
--- a/gst-libs/gst/codecs/gsth265decoder.h
+++ b/gst-libs/gst/codecs/gsth265decoder.h
@@ -137,6 +137,8 @@ struct _GstH265DecoderClass
   gpointer padding[GST_PADDING_LARGE];
 };
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstH265Decoder, gst_object_unref)
+
 GST_CODECS_API
 GType gst_h265_decoder_get_type (void);
 
diff --git a/gst-libs/gst/codecs/gsth265picture.h b/gst-libs/gst/codecs/gsth265picture.h
index cb5ed16c2b..2c40badcdb 100644
--- a/gst-libs/gst/codecs/gsth265picture.h
+++ b/gst-libs/gst/codecs/gsth265picture.h
@@ -197,6 +197,8 @@ gint  gst_h265_dpb_get_size   (GstH265Dpb * dpb);
 GST_CODECS_API
 gboolean gst_h265_dpb_is_full (GstH265Dpb * dpb);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstH265Picture, gst_h265_picture_unref)
+
 G_END_DECLS
 
 #endif /* __GST_H265_PICTURE_H__ */
diff --git a/gst-libs/gst/codecs/gstvp9decoder.h b/gst-libs/gst/codecs/gstvp9decoder.h
index d84b0e9956..86007dca09 100644
--- a/gst-libs/gst/codecs/gstvp9decoder.h
+++ b/gst-libs/gst/codecs/gstvp9decoder.h
@@ -108,6 +108,8 @@ struct _GstVp9DecoderClass
   gpointer padding[GST_PADDING_LARGE];
 };
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVp9Decoder, gst_object_unref)
+
 GST_CODECS_API
 GType gst_vp9_decoder_get_type (void);
 
diff --git a/gst-libs/gst/codecs/gstvp9picture.h b/gst-libs/gst/codecs/gstvp9picture.h
index d8d94a0f76..138014519e 100644
--- a/gst-libs/gst/codecs/gstvp9picture.h
+++ b/gst-libs/gst/codecs/gstvp9picture.h
@@ -119,6 +119,8 @@ GST_CODECS_API
 void  gst_vp9_dpb_add              (GstVp9Dpb * dpb,
                                     GstVp9Picture * picture);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVp9Picture, gst_vp9_picture_unref)
+
 G_END_DECLS
 
 #endif /* __GST_VP9_PICTURE_H__ */