diff --git a/gst-libs/gst/vaapi/gstvaapidecoder.h b/gst-libs/gst/vaapi/gstvaapidecoder.h
index fb4b196d83..2c5e967ed4 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder.h
@@ -142,9 +142,7 @@ gst_vaapi_decoder_check_status (GstVaapiDecoder * decoder);
 gboolean
 gst_vaapi_decoder_update_caps (GstVaapiDecoder * decoder, GstCaps * caps);
 
-#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDecoder, gst_object_unref)
-#endif
 
 G_END_DECLS
 
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h264.h b/gst-libs/gst/vaapi/gstvaapidecoder_h264.h
index 04386068eb..08ce6faa34 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_h264.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_h264.h
@@ -77,6 +77,8 @@ void
 gst_vaapi_decoder_h264_set_baseline_as_constrained(GstVaapiDecoderH264 * decoder,
     gboolean baseline_as_constrained);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDecoderH264, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DECODER_H264_H */
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h265.h b/gst-libs/gst/vaapi/gstvaapidecoder_h265.h
index 619d3008db..0b5d0922e3 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_h265.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_h265.h
@@ -63,6 +63,8 @@ void
 gst_vaapi_decoder_h265_set_alignment (GstVaapiDecoderH265 *decoder,
     GstVaapiStreamAlignH265 alignment);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDecoderH265, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DECODER_H265_H */
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_jpeg.h b/gst-libs/gst/vaapi/gstvaapidecoder_jpeg.h
index 876055ea42..5c1b4afc12 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_jpeg.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_jpeg.h
@@ -43,6 +43,8 @@ gst_vaapi_decoder_jpeg_get_type (void) G_GNUC_CONST;
 GstVaapiDecoder *
 gst_vaapi_decoder_jpeg_new (GstVaapiDisplay *display, GstCaps *caps);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDecoderJpeg, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DECODER_JPEG_H */
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.h b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.h
index a996c59481..765a80cac7 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.h
@@ -43,6 +43,8 @@ gst_vaapi_decoder_mpeg2_get_type (void) G_GNUC_CONST;
 GstVaapiDecoder *
 gst_vaapi_decoder_mpeg2_new (GstVaapiDisplay *display, GstCaps *caps);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDecoderMpeg2, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DECODER_MPEG2_H */
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.h b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.h
index 99d918d09a..2efd164e0f 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.h
@@ -42,6 +42,8 @@ gst_vaapi_decoder_mpeg4_get_type (void) G_GNUC_CONST;
 GstVaapiDecoder *
 gst_vaapi_decoder_mpeg4_new (GstVaapiDisplay *display, GstCaps *caps);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDecoderMpeg4, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DECODER_MPEG4_H */
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_vc1.h b/gst-libs/gst/vaapi/gstvaapidecoder_vc1.h
index 6f9474f94c..034681f608 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_vc1.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_vc1.h
@@ -42,6 +42,8 @@ gst_vaapi_decoder_vc1_get_type (void) G_GNUC_CONST;
 GstVaapiDecoder *
 gst_vaapi_decoder_vc1_new (GstVaapiDisplay *display, GstCaps *caps);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDecoderVC1, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DECODER_VC1_H */
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_vp8.h b/gst-libs/gst/vaapi/gstvaapidecoder_vp8.h
index 816f6f02a0..9ba26470f0 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_vp8.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_vp8.h
@@ -43,6 +43,8 @@ gst_vaapi_decoder_vp8_get_type (void) G_GNUC_CONST;
 GstVaapiDecoder *
 gst_vaapi_decoder_vp8_new (GstVaapiDisplay * display, GstCaps * caps);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDecoderVp8, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DECODER_VP8_H */
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_vp9.h b/gst-libs/gst/vaapi/gstvaapidecoder_vp9.h
index de97534559..f00ce739d2 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_vp9.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_vp9.h
@@ -42,6 +42,8 @@ gst_vaapi_decoder_vp9_get_type (void) G_GNUC_CONST;
 GstVaapiDecoder *
 gst_vaapi_decoder_vp9_new (GstVaapiDisplay * display, GstCaps * caps);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDecoderVp9, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DECODER_VP9_H */
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.h b/gst-libs/gst/vaapi/gstvaapidisplay.h
index ef94f741da..e8f644bcf4 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay.h
@@ -284,9 +284,7 @@ gst_vaapi_display_reset_texture_map (GstVaapiDisplay * display);
 gboolean
 gst_vaapi_display_has_driver_quirks (GstVaapiDisplay * display, guint quirks);
 
-#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDisplay, gst_object_unref)
-#endif
 
 G_END_DECLS
 
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_drm.h b/gst-libs/gst/vaapi/gstvaapidisplay_drm.h
index 2af4d9f53e..5424b32456 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_drm.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_drm.h
@@ -49,6 +49,8 @@ gst_vaapi_display_drm_get_device_path (GstVaapiDisplayDRM *
 GType
 gst_vaapi_display_drm_get_type (void) G_GNUC_CONST;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDisplayDRM, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DISPLAY_DRM_H */
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_egl.h b/gst-libs/gst/vaapi/gstvaapidisplay_egl.h
index ccabf0f83a..07fbf83ff1 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_egl.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_egl.h
@@ -57,6 +57,8 @@ gst_vaapi_display_egl_set_current_display (GstVaapiDisplayEGL * display);
 GType
 gst_vaapi_display_egl_get_type (void) G_GNUC_CONST;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDisplayEGL, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DISPLAY_EGL_H */
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_glx.h b/gst-libs/gst/vaapi/gstvaapidisplay_glx.h
index d19a046b81..c4bdcc9ad6 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_glx.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_glx.h
@@ -44,6 +44,8 @@ gst_vaapi_display_glx_new_with_display (Display * x11_display);
 GType
 gst_vaapi_display_glx_get_type (void) G_GNUC_CONST;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDisplayGLX, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DISPLAY_GLX_H */
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_wayland.h b/gst-libs/gst/vaapi/gstvaapidisplay_wayland.h
index 7af728f736..1f9ec30a28 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_wayland.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_wayland.h
@@ -51,6 +51,8 @@ gst_vaapi_display_wayland_get_display (GstVaapiDisplayWayland * display);
 GType
 gst_vaapi_display_wayland_get_type (void) G_GNUC_CONST;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDisplayWayland, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DISPLAY_WAYLAND_H */
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_x11.h b/gst-libs/gst/vaapi/gstvaapidisplay_x11.h
index 1458ea7ad1..78b6103bb2 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_x11.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_x11.h
@@ -58,6 +58,8 @@ gst_vaapi_display_x11_set_synchronous (GstVaapiDisplayX11 * display,
 GType
 gst_vaapi_display_x11_get_type (void) G_GNUC_CONST;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDisplayX11, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_DISPLAY_X11_H */
diff --git a/gst-libs/gst/vaapi/gstvaapiencoder.h b/gst-libs/gst/vaapi/gstvaapiencoder.h
index bf89df2732..6bc9887290 100644
--- a/gst-libs/gst/vaapi/gstvaapiencoder.h
+++ b/gst-libs/gst/vaapi/gstvaapiencoder.h
@@ -195,6 +195,8 @@ gst_vaapi_encoder_get_entrypoint (GstVaapiEncoder * encoder,
 GArray *
 gst_vaapi_encoder_get_available_profiles (GstVaapiEncoder * encoder);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiEncoder, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_ENCODER_H */
diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_h264.h b/gst-libs/gst/vaapi/gstvaapiencoder_h264.h
index 8a0705b461..fc5539f8c5 100644
--- a/gst-libs/gst/vaapi/gstvaapiencoder_h264.h
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_h264.h
@@ -56,6 +56,8 @@ gst_vaapi_encoder_h264_get_profile_and_level (GstVaapiEncoderH264 * encoder,
 gboolean
 gst_vaapi_encoder_h264_supports_avc (GstVaapiEncoderH264 * encoder);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiEncoderH264, gst_object_unref)
+
 G_END_DECLS
 
 #endif /*GST_VAAPI_ENCODER_H264_H */
diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_h265.h b/gst-libs/gst/vaapi/gstvaapiencoder_h265.h
index e9ea5e2221..0944905833 100644
--- a/gst-libs/gst/vaapi/gstvaapiencoder_h265.h
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_h265.h
@@ -52,6 +52,8 @@ gboolean
 gst_vaapi_encoder_h265_get_profile_tier_level (GstVaapiEncoderH265 * encoder,
     GstVaapiProfile * out_profile_ptr, GstVaapiTierH265 *out_tier_ptr, GstVaapiLevelH265 * out_level_ptr);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiEncoderH265, gst_object_unref)
+
 G_END_DECLS
 
 #endif /*GST_VAAPI_ENCODER_H265_H */
diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.h b/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.h
index 375658215e..b3b24749f5 100644
--- a/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.h
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_jpeg.h
@@ -43,5 +43,8 @@ gst_vaapi_encoder_jpeg_get_type (void) G_GNUC_CONST;
 GstVaapiEncoder *
 gst_vaapi_encoder_jpeg_new (GstVaapiDisplay * display);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiEncoderJpeg, gst_object_unref)
+
 G_END_DECLS
+
 #endif /*GST_VAAPI_ENCODER_JPEG_H */
diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.h b/gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.h
index 6306bfd4b2..a4384ef6e0 100644
--- a/gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.h
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.h
@@ -44,6 +44,8 @@ gst_vaapi_encoder_mpeg2_get_type (void) G_GNUC_CONST;
 GstVaapiEncoder *
 gst_vaapi_encoder_mpeg2_new (GstVaapiDisplay * display);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiEncoderMpeg2, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_ENCODER_MPEG2_H */
diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_vp8.h b/gst-libs/gst/vaapi/gstvaapiencoder_vp8.h
index b798edb4df..e17c616da9 100644
--- a/gst-libs/gst/vaapi/gstvaapiencoder_vp8.h
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_vp8.h
@@ -43,5 +43,7 @@ gst_vaapi_encoder_vp8_get_type (void) G_GNUC_CONST;
 GstVaapiEncoder *
 gst_vaapi_encoder_vp8_new (GstVaapiDisplay * display);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiEncoderVP8, gst_object_unref)
+
 G_END_DECLS
 #endif /*GST_VAAPI_ENCODER_VP8_H */
diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_vp9.h b/gst-libs/gst/vaapi/gstvaapiencoder_vp9.h
index ece52dac64..b66290b7a8 100644
--- a/gst-libs/gst/vaapi/gstvaapiencoder_vp9.h
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_vp9.h
@@ -43,5 +43,7 @@ gst_vaapi_encoder_vp9_get_type (void) G_GNUC_CONST;
 GstVaapiEncoder *
 gst_vaapi_encoder_vp9_new (GstVaapiDisplay * display);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiEncoderVP9, gst_object_unref)
+
 G_END_DECLS
 #endif /*GST_VAAPI_ENCODER_VP9_H */
diff --git a/gst-libs/gst/vaapi/gstvaapifilter.h b/gst-libs/gst/vaapi/gstvaapifilter.h
index 02c465b120..aacddaf845 100644
--- a/gst-libs/gst/vaapi/gstvaapifilter.h
+++ b/gst-libs/gst/vaapi/gstvaapifilter.h
@@ -308,8 +308,6 @@ gboolean
 gst_vaapi_filter_set_colorimetry (GstVaapiFilter * filter,
     GstVideoColorimetry * input, GstVideoColorimetry * output);
 
-#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiFilter, gst_object_unref)
-#endif
 
 #endif /* GST_VAAPI_FILTER_H */
diff --git a/gst-libs/gst/vaapi/gstvaapitexturemap.h b/gst-libs/gst/vaapi/gstvaapitexturemap.h
index e74fedf8f5..0e869bb446 100644
--- a/gst-libs/gst/vaapi/gstvaapitexturemap.h
+++ b/gst-libs/gst/vaapi/gstvaapitexturemap.h
@@ -53,6 +53,8 @@ gst_vaapi_texture_map_reset (GstVaapiTextureMap * map);
 GType
 gst_vaapi_texture_map_get_type (void) G_GNUC_CONST;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiTextureMap, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_TEXTURE_MAP_H */
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow.h b/gst-libs/gst/vaapi/gstvaapiwindow.h
index a53850107f..563443966f 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow.h
+++ b/gst-libs/gst/vaapi/gstvaapiwindow.h
@@ -99,9 +99,7 @@ gst_vaapi_window_unblock (GstVaapiWindow * window);
 gboolean
 gst_vaapi_window_unblock_cancel (GstVaapiWindow * window);
 
-#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiWindow, gst_object_unref)
-#endif
 
 G_END_DECLS
 
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_drm.h b/gst-libs/gst/vaapi/gstvaapiwindow_drm.h
index 7fe0c4ede4..48accb8634 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow_drm.h
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_drm.h
@@ -43,9 +43,7 @@ gst_vaapi_window_drm_get_type (void) G_GNUC_CONST;
 GstVaapiWindow *
 gst_vaapi_window_drm_new (GstVaapiDisplay * display, guint width, guint height);
 
-#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiWindowDRM, gst_object_unref)
-#endif
 
 G_END_DECLS
 
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_egl.h b/gst-libs/gst/vaapi/gstvaapiwindow_egl.h
index 820a105737..ac6db5157a 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow_egl.h
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_egl.h
@@ -43,9 +43,7 @@ gst_vaapi_window_egl_get_type (void) G_GNUC_CONST;
 GstVaapiWindow *
 gst_vaapi_window_egl_new (GstVaapiDisplay * display, guint width, guint height);
 
-#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiWindowEGL, gst_object_unref)
-#endif
 
 G_END_DECLS
 
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_glx.h b/gst-libs/gst/vaapi/gstvaapiwindow_glx.h
index d7c4252def..d3ff9a4772 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow_glx.h
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_glx.h
@@ -68,9 +68,7 @@ gst_vaapi_window_glx_put_texture (GstVaapiWindowGLX * window,
     GstVaapiTexture * texture, const GstVaapiRectangle * src_rect,
     const GstVaapiRectangle * dst_rect);
 
-#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiWindowGLX, gst_object_unref)
-#endif
 
 G_END_DECLS
 
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_wayland.h b/gst-libs/gst/vaapi/gstvaapiwindow_wayland.h
index 3e13052afd..d4eb427a94 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow_wayland.h
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_wayland.h
@@ -45,9 +45,7 @@ GstVaapiWindow *
 gst_vaapi_window_wayland_new (GstVaapiDisplay * display, guint width,
     guint height);
 
-#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiWindowWayland, gst_object_unref)
-#endif
 
 G_END_DECLS
 
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_x11.h b/gst-libs/gst/vaapi/gstvaapiwindow_x11.h
index 8626cb98e7..672e1ff9a4 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow_x11.h
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_x11.h
@@ -64,6 +64,8 @@ gst_vaapi_window_x11_get_xid (GstVaapiWindowX11 * window);
 gboolean
 gst_vaapi_window_x11_is_foreign_xid (GstVaapiWindowX11 * window);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiWindowX11, gst_object_unref)
+
 G_END_DECLS
 
 #endif /* GST_VAAPI_WINDOW_X11_H */