diff --git a/gir b/gir
index 61d2f713d..ba0ee13f6 160000
--- a/gir
+++ b/gir
@@ -1 +1 @@
-Subproject commit 61d2f713d84d670690c6918541d398463023c8b2
+Subproject commit ba0ee13f6f1eade812d0c05640d8fb37754db54b
diff --git a/gstreamer-app/src/auto/mod.rs b/gstreamer-app/src/auto/mod.rs
index 655dc936b..eb374173f 100644
--- a/gstreamer-app/src/auto/mod.rs
+++ b/gstreamer-app/src/auto/mod.rs
@@ -14,6 +14,3 @@ mod enums;
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_20")))]
 pub use self::enums::AppLeakyType;
 pub use self::enums::AppStreamType;
-
-#[doc(hidden)]
-pub mod traits {}
diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-app/src/auto/versions.txt
+++ b/gstreamer-app/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-app/sys/build.rs b/gstreamer-app/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-app/sys/build.rs
+++ b/gstreamer-app/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-app/sys/src/lib.rs b/gstreamer-app/sys/src/lib.rs
index b990d6741..8922282b5 100644
--- a/gstreamer-app/sys/src/lib.rs
+++ b/gstreamer-app/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-app/sys/tests/abi.rs b/gstreamer-app/sys/tests/abi.rs
index 98cebc1f8..330372222 100644
--- a/gstreamer-app/sys/tests/abi.rs
+++ b/gstreamer-app/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-app/sys/tests/constant.c b/gstreamer-app/sys/tests/constant.c
index 22f2dedcc..ada465cb1 100644
--- a/gstreamer-app/sys/tests/constant.c
+++ b/gstreamer-app/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-app/sys/tests/layout.c b/gstreamer-app/sys/tests/layout.c
index 75a555481..a8ba189b0 100644
--- a/gstreamer-app/sys/tests/layout.c
+++ b/gstreamer-app/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-audio/src/auto/audio_base_sink.rs b/gstreamer-audio/src/auto/audio_base_sink.rs
index e500ba024..b9e248a9a 100644
--- a/gstreamer-audio/src/auto/audio_base_sink.rs
+++ b/gstreamer-audio/src/auto/audio_base_sink.rs
@@ -22,13 +22,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for AudioBaseSink {}
-unsafe impl Sync for AudioBaseSink {}
-
 impl AudioBaseSink {
     pub const NONE: Option<&'static AudioBaseSink> = None;
 }
 
+unsafe impl Send for AudioBaseSink {}
+unsafe impl Sync for AudioBaseSink {}
+
 pub trait AudioBaseSinkExt: 'static {
     //#[doc(alias = "gst_audio_base_sink_create_ringbuffer")]
     //fn create_ringbuffer(&self) -> /*Ignored*/Option<AudioRingBuffer>;
diff --git a/gstreamer-audio/src/auto/audio_base_src.rs b/gstreamer-audio/src/auto/audio_base_src.rs
index fe6f42eb5..5b168496f 100644
--- a/gstreamer-audio/src/auto/audio_base_src.rs
+++ b/gstreamer-audio/src/auto/audio_base_src.rs
@@ -22,13 +22,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for AudioBaseSrc {}
-unsafe impl Sync for AudioBaseSrc {}
-
 impl AudioBaseSrc {
     pub const NONE: Option<&'static AudioBaseSrc> = None;
 }
 
+unsafe impl Send for AudioBaseSrc {}
+unsafe impl Sync for AudioBaseSrc {}
+
 pub trait AudioBaseSrcExt: 'static {
     //#[doc(alias = "gst_audio_base_src_create_ringbuffer")]
     //fn create_ringbuffer(&self) -> /*Ignored*/Option<AudioRingBuffer>;
diff --git a/gstreamer-audio/src/auto/audio_decoder.rs b/gstreamer-audio/src/auto/audio_decoder.rs
index 6a38f998e..66be663a8 100644
--- a/gstreamer-audio/src/auto/audio_decoder.rs
+++ b/gstreamer-audio/src/auto/audio_decoder.rs
@@ -22,13 +22,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for AudioDecoder {}
-unsafe impl Sync for AudioDecoder {}
-
 impl AudioDecoder {
     pub const NONE: Option<&'static AudioDecoder> = None;
 }
 
+unsafe impl Send for AudioDecoder {}
+unsafe impl Sync for AudioDecoder {}
+
 pub trait AudioDecoderExt: 'static {
     #[doc(alias = "gst_audio_decoder_allocate_output_buffer")]
     fn allocate_output_buffer(&self, size: usize) -> Result<gst::Buffer, glib::BoolError>;
diff --git a/gstreamer-audio/src/auto/audio_encoder.rs b/gstreamer-audio/src/auto/audio_encoder.rs
index eb6d6fbd6..7e0f06956 100644
--- a/gstreamer-audio/src/auto/audio_encoder.rs
+++ b/gstreamer-audio/src/auto/audio_encoder.rs
@@ -22,13 +22,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for AudioEncoder {}
-unsafe impl Sync for AudioEncoder {}
-
 impl AudioEncoder {
     pub const NONE: Option<&'static AudioEncoder> = None;
 }
 
+unsafe impl Send for AudioEncoder {}
+unsafe impl Sync for AudioEncoder {}
+
 pub trait AudioEncoderExt: 'static {
     #[doc(alias = "gst_audio_encoder_allocate_output_buffer")]
     fn allocate_output_buffer(&self, size: usize) -> Result<gst::Buffer, glib::BoolError>;
diff --git a/gstreamer-audio/src/auto/audio_sink.rs b/gstreamer-audio/src/auto/audio_sink.rs
index 7d8d92b10..e9a6e250f 100644
--- a/gstreamer-audio/src/auto/audio_sink.rs
+++ b/gstreamer-audio/src/auto/audio_sink.rs
@@ -14,11 +14,9 @@ glib::wrapper! {
     }
 }
 
-impl AudioSink {}
-
-unsafe impl Send for AudioSink {}
-unsafe impl Sync for AudioSink {}
-
 impl AudioSink {
     pub const NONE: Option<&'static AudioSink> = None;
 }
+
+unsafe impl Send for AudioSink {}
+unsafe impl Sync for AudioSink {}
diff --git a/gstreamer-audio/src/auto/audio_src.rs b/gstreamer-audio/src/auto/audio_src.rs
index 162cbd099..d487d1cf8 100644
--- a/gstreamer-audio/src/auto/audio_src.rs
+++ b/gstreamer-audio/src/auto/audio_src.rs
@@ -14,11 +14,9 @@ glib::wrapper! {
     }
 }
 
-impl AudioSrc {}
-
-unsafe impl Send for AudioSrc {}
-unsafe impl Sync for AudioSrc {}
-
 impl AudioSrc {
     pub const NONE: Option<&'static AudioSrc> = None;
 }
+
+unsafe impl Send for AudioSrc {}
+unsafe impl Sync for AudioSrc {}
diff --git a/gstreamer-audio/src/auto/stream_volume.rs b/gstreamer-audio/src/auto/stream_volume.rs
index 8adec654b..40fd97a3e 100644
--- a/gstreamer-audio/src/auto/stream_volume.rs
+++ b/gstreamer-audio/src/auto/stream_volume.rs
@@ -22,6 +22,8 @@ glib::wrapper! {
 }
 
 impl StreamVolume {
+    pub const NONE: Option<&'static StreamVolume> = None;
+
     #[doc(alias = "gst_stream_volume_convert_volume")]
     pub fn convert_volume(from: StreamVolumeFormat, to: StreamVolumeFormat, val: f64) -> f64 {
         assert_initialized_main_thread!();
@@ -32,10 +34,6 @@ impl StreamVolume {
 unsafe impl Send for StreamVolume {}
 unsafe impl Sync for StreamVolume {}
 
-impl StreamVolume {
-    pub const NONE: Option<&'static StreamVolume> = None;
-}
-
 pub trait StreamVolumeExt: 'static {
     #[doc(alias = "gst_stream_volume_get_mute")]
     #[doc(alias = "get_mute")]
diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-audio/src/auto/versions.txt
+++ b/gstreamer-audio/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-audio/sys/build.rs b/gstreamer-audio/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-audio/sys/build.rs
+++ b/gstreamer-audio/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-audio/sys/src/lib.rs b/gstreamer-audio/sys/src/lib.rs
index ab77e4aee..78ee77d58 100644
--- a/gstreamer-audio/sys/src/lib.rs
+++ b/gstreamer-audio/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-audio/sys/tests/abi.rs b/gstreamer-audio/sys/tests/abi.rs
index 3b2bb310e..c6b9eed49 100644
--- a/gstreamer-audio/sys/tests/abi.rs
+++ b/gstreamer-audio/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-audio/sys/tests/constant.c b/gstreamer-audio/sys/tests/constant.c
index 522cd88f7..fa3acfe21 100644
--- a/gstreamer-audio/sys/tests/constant.c
+++ b/gstreamer-audio/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-audio/sys/tests/layout.c b/gstreamer-audio/sys/tests/layout.c
index 00d04d867..5a63b76ba 100644
--- a/gstreamer-audio/sys/tests/layout.c
+++ b/gstreamer-audio/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-base/src/auto/aggregator.rs b/gstreamer-base/src/auto/aggregator.rs
index 8d6fcb4d5..c575d92f8 100644
--- a/gstreamer-base/src/auto/aggregator.rs
+++ b/gstreamer-base/src/auto/aggregator.rs
@@ -28,13 +28,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for Aggregator {}
-unsafe impl Sync for Aggregator {}
-
 impl Aggregator {
     pub const NONE: Option<&'static Aggregator> = None;
 }
 
+unsafe impl Send for Aggregator {}
+unsafe impl Sync for Aggregator {}
+
 pub trait AggregatorExt: 'static {
     #[doc(alias = "gst_aggregator_get_buffer_pool")]
     #[doc(alias = "get_buffer_pool")]
diff --git a/gstreamer-base/src/auto/aggregator_pad.rs b/gstreamer-base/src/auto/aggregator_pad.rs
index 73f83aca6..588d5996c 100644
--- a/gstreamer-base/src/auto/aggregator_pad.rs
+++ b/gstreamer-base/src/auto/aggregator_pad.rs
@@ -26,13 +26,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for AggregatorPad {}
-unsafe impl Sync for AggregatorPad {}
-
 impl AggregatorPad {
     pub const NONE: Option<&'static AggregatorPad> = None;
 }
 
+unsafe impl Send for AggregatorPad {}
+unsafe impl Sync for AggregatorPad {}
+
 pub trait AggregatorPadExt: 'static {
     #[doc(alias = "gst_aggregator_pad_drop_buffer")]
     fn drop_buffer(&self) -> bool;
diff --git a/gstreamer-base/src/auto/base_parse.rs b/gstreamer-base/src/auto/base_parse.rs
index 29cf55fb7..1e7b2600d 100644
--- a/gstreamer-base/src/auto/base_parse.rs
+++ b/gstreamer-base/src/auto/base_parse.rs
@@ -22,13 +22,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for BaseParse {}
-unsafe impl Sync for BaseParse {}
-
 impl BaseParse {
     pub const NONE: Option<&'static BaseParse> = None;
 }
 
+unsafe impl Send for BaseParse {}
+unsafe impl Sync for BaseParse {}
+
 pub trait BaseParseExt: 'static {
     #[doc(alias = "gst_base_parse_add_index_entry")]
     fn add_index_entry(&self, offset: u64, ts: gst::ClockTime, key: bool, force: bool) -> bool;
diff --git a/gstreamer-base/src/auto/base_sink.rs b/gstreamer-base/src/auto/base_sink.rs
index 3b7e3995f..d87e58b21 100644
--- a/gstreamer-base/src/auto/base_sink.rs
+++ b/gstreamer-base/src/auto/base_sink.rs
@@ -23,13 +23,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for BaseSink {}
-unsafe impl Sync for BaseSink {}
-
 impl BaseSink {
     pub const NONE: Option<&'static BaseSink> = None;
 }
 
+unsafe impl Send for BaseSink {}
+unsafe impl Sync for BaseSink {}
+
 pub trait BaseSinkExt: 'static {
     //#[doc(alias = "gst_base_sink_do_preroll")]
     //fn do_preroll(&self, obj: /*Ignored*/&gst::MiniObject) -> Result<gst::FlowSuccess, gst::FlowError>;
diff --git a/gstreamer-base/src/auto/base_src.rs b/gstreamer-base/src/auto/base_src.rs
index c5005cd72..90df856bb 100644
--- a/gstreamer-base/src/auto/base_src.rs
+++ b/gstreamer-base/src/auto/base_src.rs
@@ -22,13 +22,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for BaseSrc {}
-unsafe impl Sync for BaseSrc {}
-
 impl BaseSrc {
     pub const NONE: Option<&'static BaseSrc> = None;
 }
 
+unsafe impl Send for BaseSrc {}
+unsafe impl Sync for BaseSrc {}
+
 pub trait BaseSrcExt: 'static {
     #[doc(alias = "gst_base_src_get_blocksize")]
     #[doc(alias = "get_blocksize")]
diff --git a/gstreamer-base/src/auto/base_transform.rs b/gstreamer-base/src/auto/base_transform.rs
index 148e24031..3df80456f 100644
--- a/gstreamer-base/src/auto/base_transform.rs
+++ b/gstreamer-base/src/auto/base_transform.rs
@@ -22,13 +22,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for BaseTransform {}
-unsafe impl Sync for BaseTransform {}
-
 impl BaseTransform {
     pub const NONE: Option<&'static BaseTransform> = None;
 }
 
+unsafe impl Send for BaseTransform {}
+unsafe impl Sync for BaseTransform {}
+
 pub trait BaseTransformExt: 'static {
     #[doc(alias = "gst_base_transform_get_buffer_pool")]
     #[doc(alias = "get_buffer_pool")]
diff --git a/gstreamer-base/src/auto/push_src.rs b/gstreamer-base/src/auto/push_src.rs
index 695a6521f..6e9edd0a4 100644
--- a/gstreamer-base/src/auto/push_src.rs
+++ b/gstreamer-base/src/auto/push_src.rs
@@ -14,11 +14,9 @@ glib::wrapper! {
     }
 }
 
-impl PushSrc {}
-
-unsafe impl Send for PushSrc {}
-unsafe impl Sync for PushSrc {}
-
 impl PushSrc {
     pub const NONE: Option<&'static PushSrc> = None;
 }
+
+unsafe impl Send for PushSrc {}
+unsafe impl Sync for PushSrc {}
diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-base/src/auto/versions.txt
+++ b/gstreamer-base/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-base/sys/build.rs b/gstreamer-base/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-base/sys/build.rs
+++ b/gstreamer-base/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-base/sys/src/lib.rs b/gstreamer-base/sys/src/lib.rs
index d4b1b1cb8..596047cb6 100644
--- a/gstreamer-base/sys/src/lib.rs
+++ b/gstreamer-base/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-base/sys/tests/abi.rs b/gstreamer-base/sys/tests/abi.rs
index efe081ba9..f1931404c 100644
--- a/gstreamer-base/sys/tests/abi.rs
+++ b/gstreamer-base/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-base/sys/tests/constant.c b/gstreamer-base/sys/tests/constant.c
index 030c04dca..6bd6bc95e 100644
--- a/gstreamer-base/sys/tests/constant.c
+++ b/gstreamer-base/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-base/sys/tests/layout.c b/gstreamer-base/sys/tests/layout.c
index 29f899804..19b67d6c4 100644
--- a/gstreamer-base/sys/tests/layout.c
+++ b/gstreamer-base/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-check/src/auto/mod.rs b/gstreamer-check/src/auto/mod.rs
index c08a9943d..06f7fd98a 100644
--- a/gstreamer-check/src/auto/mod.rs
+++ b/gstreamer-check/src/auto/mod.rs
@@ -5,6 +5,3 @@
 
 mod test_clock;
 pub use self::test_clock::TestClock;
-
-#[doc(hidden)]
-pub mod traits {}
diff --git a/gstreamer-check/src/auto/versions.txt b/gstreamer-check/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-check/src/auto/versions.txt
+++ b/gstreamer-check/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-check/sys/build.rs b/gstreamer-check/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-check/sys/build.rs
+++ b/gstreamer-check/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-check/sys/src/lib.rs b/gstreamer-check/sys/src/lib.rs
index c61e7f859..a548a3bda 100644
--- a/gstreamer-check/sys/src/lib.rs
+++ b/gstreamer-check/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-check/sys/tests/abi.rs b/gstreamer-check/sys/tests/abi.rs
index 374205330..081075951 100644
--- a/gstreamer-check/sys/tests/abi.rs
+++ b/gstreamer-check/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-check/sys/tests/constant.c b/gstreamer-check/sys/tests/constant.c
index 879922c29..a5e17650e 100644
--- a/gstreamer-check/sys/tests/constant.c
+++ b/gstreamer-check/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-check/sys/tests/layout.c b/gstreamer-check/sys/tests/layout.c
index f10cabc17..24da2d248 100644
--- a/gstreamer-check/sys/tests/layout.c
+++ b/gstreamer-check/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-controller/src/auto/argb_control_binding.rs b/gstreamer-controller/src/auto/argb_control_binding.rs
index 3cf8b287a..dda28d932 100644
--- a/gstreamer-controller/src/auto/argb_control_binding.rs
+++ b/gstreamer-controller/src/auto/argb_control_binding.rs
@@ -23,6 +23,8 @@ glib::wrapper! {
 }
 
 impl ARGBControlBinding {
+    pub const NONE: Option<&'static ARGBControlBinding> = None;
+
     #[doc(alias = "gst_argb_control_binding_new")]
     pub fn new(
         object: &impl IsA<gst::Object>,
@@ -50,10 +52,6 @@ impl ARGBControlBinding {
 unsafe impl Send for ARGBControlBinding {}
 unsafe impl Sync for ARGBControlBinding {}
 
-impl ARGBControlBinding {
-    pub const NONE: Option<&'static ARGBControlBinding> = None;
-}
-
 pub trait ARGBControlBindingExt: 'static {
     #[doc(alias = "control-source-a")]
     fn control_source_a(&self) -> Option<gst::ControlSource>;
diff --git a/gstreamer-controller/src/auto/direct_control_binding.rs b/gstreamer-controller/src/auto/direct_control_binding.rs
index a8db9ce2f..9d43cbc64 100644
--- a/gstreamer-controller/src/auto/direct_control_binding.rs
+++ b/gstreamer-controller/src/auto/direct_control_binding.rs
@@ -23,6 +23,8 @@ glib::wrapper! {
 }
 
 impl DirectControlBinding {
+    pub const NONE: Option<&'static DirectControlBinding> = None;
+
     #[doc(alias = "gst_direct_control_binding_new")]
     pub fn new(
         object: &impl IsA<gst::Object>,
@@ -61,10 +63,6 @@ impl DirectControlBinding {
 unsafe impl Send for DirectControlBinding {}
 unsafe impl Sync for DirectControlBinding {}
 
-impl DirectControlBinding {
-    pub const NONE: Option<&'static DirectControlBinding> = None;
-}
-
 pub trait DirectControlBindingExt: 'static {
     fn is_absolute(&self) -> bool;
 
diff --git a/gstreamer-controller/src/auto/interpolation_control_source.rs b/gstreamer-controller/src/auto/interpolation_control_source.rs
index c542a268c..c87688623 100644
--- a/gstreamer-controller/src/auto/interpolation_control_source.rs
+++ b/gstreamer-controller/src/auto/interpolation_control_source.rs
@@ -25,6 +25,8 @@ glib::wrapper! {
 }
 
 impl InterpolationControlSource {
+    pub const NONE: Option<&'static InterpolationControlSource> = None;
+
     #[doc(alias = "gst_interpolation_control_source_new")]
     pub fn new() -> InterpolationControlSource {
         assert_initialized_main_thread!();
@@ -44,10 +46,6 @@ impl Default for InterpolationControlSource {
 unsafe impl Send for InterpolationControlSource {}
 unsafe impl Sync for InterpolationControlSource {}
 
-impl InterpolationControlSource {
-    pub const NONE: Option<&'static InterpolationControlSource> = None;
-}
-
 pub trait InterpolationControlSourceExt: 'static {
     fn mode(&self) -> InterpolationMode;
 
diff --git a/gstreamer-controller/src/auto/lfo_control_source.rs b/gstreamer-controller/src/auto/lfo_control_source.rs
index 7ae94ff91..324084f79 100644
--- a/gstreamer-controller/src/auto/lfo_control_source.rs
+++ b/gstreamer-controller/src/auto/lfo_control_source.rs
@@ -24,6 +24,8 @@ glib::wrapper! {
 }
 
 impl LFOControlSource {
+    pub const NONE: Option<&'static LFOControlSource> = None;
+
     #[doc(alias = "gst_lfo_control_source_new")]
     pub fn new() -> LFOControlSource {
         assert_initialized_main_thread!();
@@ -42,10 +44,6 @@ impl Default for LFOControlSource {
 unsafe impl Send for LFOControlSource {}
 unsafe impl Sync for LFOControlSource {}
 
-impl LFOControlSource {
-    pub const NONE: Option<&'static LFOControlSource> = None;
-}
-
 pub trait LFOControlSourceExt: 'static {
     fn amplitude(&self) -> f64;
 
diff --git a/gstreamer-controller/src/auto/proxy_control_binding.rs b/gstreamer-controller/src/auto/proxy_control_binding.rs
index 8b1eed500..b31bfd1b0 100644
--- a/gstreamer-controller/src/auto/proxy_control_binding.rs
+++ b/gstreamer-controller/src/auto/proxy_control_binding.rs
@@ -17,6 +17,8 @@ glib::wrapper! {
 }
 
 impl ProxyControlBinding {
+    pub const NONE: Option<&'static ProxyControlBinding> = None;
+
     #[doc(alias = "gst_proxy_control_binding_new")]
     pub fn new(
         object: &impl IsA<gst::Object>,
@@ -39,7 +41,3 @@ impl ProxyControlBinding {
 
 unsafe impl Send for ProxyControlBinding {}
 unsafe impl Sync for ProxyControlBinding {}
-
-impl ProxyControlBinding {
-    pub const NONE: Option<&'static ProxyControlBinding> = None;
-}
diff --git a/gstreamer-controller/src/auto/timed_value_control_source.rs b/gstreamer-controller/src/auto/timed_value_control_source.rs
index 8b2ea8a19..4dcf94f31 100644
--- a/gstreamer-controller/src/auto/timed_value_control_source.rs
+++ b/gstreamer-controller/src/auto/timed_value_control_source.rs
@@ -21,13 +21,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for TimedValueControlSource {}
-unsafe impl Sync for TimedValueControlSource {}
-
 impl TimedValueControlSource {
     pub const NONE: Option<&'static TimedValueControlSource> = None;
 }
 
+unsafe impl Send for TimedValueControlSource {}
+unsafe impl Sync for TimedValueControlSource {}
+
 pub trait TimedValueControlSourceExt: 'static {
     //#[doc(alias = "gst_timed_value_control_source_find_control_point_iter")]
     //fn find_control_point_iter(&self, timestamp: impl Into<Option<gst::ClockTime>>) -> /*Ignored*/Option<glib::SequenceIter>;
diff --git a/gstreamer-controller/src/auto/trigger_control_source.rs b/gstreamer-controller/src/auto/trigger_control_source.rs
index 9bc8d59b8..7e9a2b194 100644
--- a/gstreamer-controller/src/auto/trigger_control_source.rs
+++ b/gstreamer-controller/src/auto/trigger_control_source.rs
@@ -24,6 +24,8 @@ glib::wrapper! {
 }
 
 impl TriggerControlSource {
+    pub const NONE: Option<&'static TriggerControlSource> = None;
+
     #[doc(alias = "gst_trigger_control_source_new")]
     pub fn new() -> TriggerControlSource {
         assert_initialized_main_thread!();
@@ -42,10 +44,6 @@ impl Default for TriggerControlSource {
 unsafe impl Send for TriggerControlSource {}
 unsafe impl Sync for TriggerControlSource {}
 
-impl TriggerControlSource {
-    pub const NONE: Option<&'static TriggerControlSource> = None;
-}
-
 pub trait TriggerControlSourceExt: 'static {
     fn tolerance(&self) -> i64;
 
diff --git a/gstreamer-controller/src/auto/versions.txt b/gstreamer-controller/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-controller/src/auto/versions.txt
+++ b/gstreamer-controller/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-controller/sys/build.rs b/gstreamer-controller/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-controller/sys/build.rs
+++ b/gstreamer-controller/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-controller/sys/src/lib.rs b/gstreamer-controller/sys/src/lib.rs
index 013f2df6f..bd4bf0ae6 100644
--- a/gstreamer-controller/sys/src/lib.rs
+++ b/gstreamer-controller/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-controller/sys/tests/abi.rs b/gstreamer-controller/sys/tests/abi.rs
index f698494ff..f5da03e21 100644
--- a/gstreamer-controller/sys/tests/abi.rs
+++ b/gstreamer-controller/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-controller/sys/tests/constant.c b/gstreamer-controller/sys/tests/constant.c
index 13853f7df..3dd9f8187 100644
--- a/gstreamer-controller/sys/tests/constant.c
+++ b/gstreamer-controller/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-controller/sys/tests/layout.c b/gstreamer-controller/sys/tests/layout.c
index 831c1836a..52ad7e867 100644
--- a/gstreamer-controller/sys/tests/layout.c
+++ b/gstreamer-controller/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-editing-services/src/auto/asset.rs b/gstreamer-editing-services/src/auto/asset.rs
index ad1e64ec3..a7f676fd6 100644
--- a/gstreamer-editing-services/src/auto/asset.rs
+++ b/gstreamer-editing-services/src/auto/asset.rs
@@ -25,6 +25,8 @@ glib::wrapper! {
 }
 
 impl Asset {
+    pub const NONE: Option<&'static Asset> = None;
+
     #[doc(alias = "ges_asset_needs_reload")]
     pub fn needs_reload(extractable_type: glib::types::Type, id: Option<&str>) -> bool {
         assert_initialized_main_thread!();
@@ -114,10 +116,6 @@ impl Asset {
     }
 }
 
-impl Asset {
-    pub const NONE: Option<&'static Asset> = None;
-}
-
 pub trait AssetExt: 'static {
     #[doc(alias = "ges_asset_extract")]
     fn extract(&self) -> Result<Extractable, glib::Error>;
diff --git a/gstreamer-editing-services/src/auto/audio_source.rs b/gstreamer-editing-services/src/auto/audio_source.rs
index df0f79efe..3a8b2aee8 100644
--- a/gstreamer-editing-services/src/auto/audio_source.rs
+++ b/gstreamer-editing-services/src/auto/audio_source.rs
@@ -18,8 +18,6 @@ glib::wrapper! {
     }
 }
 
-impl AudioSource {}
-
 impl AudioSource {
     pub const NONE: Option<&'static AudioSource> = None;
 }
diff --git a/gstreamer-editing-services/src/auto/audio_track.rs b/gstreamer-editing-services/src/auto/audio_track.rs
index 88239aa2a..a2fe20d49 100644
--- a/gstreamer-editing-services/src/auto/audio_track.rs
+++ b/gstreamer-editing-services/src/auto/audio_track.rs
@@ -17,6 +17,8 @@ glib::wrapper! {
 }
 
 impl AudioTrack {
+    pub const NONE: Option<&'static AudioTrack> = None;
+
     #[doc(alias = "ges_audio_track_new")]
     pub fn new() -> AudioTrack {
         assert_initialized_main_thread!();
@@ -29,7 +31,3 @@ impl Default for AudioTrack {
         Self::new()
     }
 }
-
-impl AudioTrack {
-    pub const NONE: Option<&'static AudioTrack> = None;
-}
diff --git a/gstreamer-editing-services/src/auto/audio_transition.rs b/gstreamer-editing-services/src/auto/audio_transition.rs
index 40a95e4f5..58eb0d5c6 100644
--- a/gstreamer-editing-services/src/auto/audio_transition.rs
+++ b/gstreamer-editing-services/src/auto/audio_transition.rs
@@ -21,6 +21,8 @@ glib::wrapper! {
 }
 
 impl AudioTransition {
+    pub const NONE: Option<&'static AudioTransition> = None;
+
     #[cfg_attr(feature = "v1_18", deprecated = "Since 1.18")]
     #[doc(alias = "ges_audio_transition_new")]
     pub fn new() -> AudioTransition {
@@ -34,7 +36,3 @@ impl Default for AudioTransition {
         Self::new()
     }
 }
-
-impl AudioTransition {
-    pub const NONE: Option<&'static AudioTransition> = None;
-}
diff --git a/gstreamer-editing-services/src/auto/base_effect_clip.rs b/gstreamer-editing-services/src/auto/base_effect_clip.rs
index 0d6dc157e..1c3eadc04 100644
--- a/gstreamer-editing-services/src/auto/base_effect_clip.rs
+++ b/gstreamer-editing-services/src/auto/base_effect_clip.rs
@@ -19,8 +19,6 @@ glib::wrapper! {
     }
 }
 
-impl BaseEffectClip {}
-
 impl BaseEffectClip {
     pub const NONE: Option<&'static BaseEffectClip> = None;
 }
diff --git a/gstreamer-editing-services/src/auto/base_transition_clip.rs b/gstreamer-editing-services/src/auto/base_transition_clip.rs
index f63e54aca..bbf8de0f3 100644
--- a/gstreamer-editing-services/src/auto/base_transition_clip.rs
+++ b/gstreamer-editing-services/src/auto/base_transition_clip.rs
@@ -19,8 +19,6 @@ glib::wrapper! {
     }
 }
 
-impl BaseTransitionClip {}
-
 impl BaseTransitionClip {
     pub const NONE: Option<&'static BaseTransitionClip> = None;
 }
diff --git a/gstreamer-editing-services/src/auto/base_xml_formatter.rs b/gstreamer-editing-services/src/auto/base_xml_formatter.rs
index 5e5bd2bf6..1e76e7b91 100644
--- a/gstreamer-editing-services/src/auto/base_xml_formatter.rs
+++ b/gstreamer-editing-services/src/auto/base_xml_formatter.rs
@@ -15,8 +15,6 @@ glib::wrapper! {
     }
 }
 
-impl BaseXmlFormatter {}
-
 impl BaseXmlFormatter {
     pub const NONE: Option<&'static BaseXmlFormatter> = None;
 }
diff --git a/gstreamer-editing-services/src/auto/command_line_formatter.rs b/gstreamer-editing-services/src/auto/command_line_formatter.rs
index 12143705c..1d6ff8e4a 100644
--- a/gstreamer-editing-services/src/auto/command_line_formatter.rs
+++ b/gstreamer-editing-services/src/auto/command_line_formatter.rs
@@ -25,6 +25,8 @@ glib::wrapper! {
 }
 
 impl CommandLineFormatter {
+    pub const NONE: Option<&'static CommandLineFormatter> = None;
+
     #[cfg(any(feature = "v1_10", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))]
     #[doc(alias = "ges_command_line_formatter_get_help")]
@@ -53,7 +55,3 @@ impl CommandLineFormatter {
         }
     }
 }
-
-impl CommandLineFormatter {
-    pub const NONE: Option<&'static CommandLineFormatter> = None;
-}
diff --git a/gstreamer-editing-services/src/auto/container.rs b/gstreamer-editing-services/src/auto/container.rs
index 17aaff633..cd73e34b7 100644
--- a/gstreamer-editing-services/src/auto/container.rs
+++ b/gstreamer-editing-services/src/auto/container.rs
@@ -28,6 +28,8 @@ glib::wrapper! {
 }
 
 impl Container {
+    pub const NONE: Option<&'static Container> = None;
+
     #[doc(alias = "ges_container_group")]
     pub fn group(containers: &[Container]) -> Option<Container> {
         assert_initialized_main_thread!();
@@ -35,10 +37,6 @@ impl Container {
     }
 }
 
-impl Container {
-    pub const NONE: Option<&'static Container> = None;
-}
-
 pub trait GESContainerExt: 'static {
     #[doc(alias = "ges_container_add")]
     fn add(&self, child: &impl IsA<TimelineElement>) -> Result<(), glib::error::BoolError>;
diff --git a/gstreamer-editing-services/src/auto/effect.rs b/gstreamer-editing-services/src/auto/effect.rs
index 9f22aaa79..3a8b740a4 100644
--- a/gstreamer-editing-services/src/auto/effect.rs
+++ b/gstreamer-editing-services/src/auto/effect.rs
@@ -23,6 +23,8 @@ glib::wrapper! {
 }
 
 impl Effect {
+    pub const NONE: Option<&'static Effect> = None;
+
     #[doc(alias = "ges_effect_new")]
     pub fn new(bin_description: &str) -> Result<Effect, glib::BoolError> {
         assert_initialized_main_thread!();
@@ -33,10 +35,6 @@ impl Effect {
     }
 }
 
-impl Effect {
-    pub const NONE: Option<&'static Effect> = None;
-}
-
 pub trait EffectExt: 'static {
     #[doc(alias = "bin-description")]
     fn bin_description(&self) -> Option<glib::GString>;
diff --git a/gstreamer-editing-services/src/auto/effect_asset.rs b/gstreamer-editing-services/src/auto/effect_asset.rs
index 99a531ff0..90f32f3ef 100644
--- a/gstreamer-editing-services/src/auto/effect_asset.rs
+++ b/gstreamer-editing-services/src/auto/effect_asset.rs
@@ -16,8 +16,6 @@ glib::wrapper! {
     }
 }
 
-impl EffectAsset {}
-
 impl EffectAsset {
     pub const NONE: Option<&'static EffectAsset> = None;
 }
diff --git a/gstreamer-editing-services/src/auto/effect_clip.rs b/gstreamer-editing-services/src/auto/effect_clip.rs
index 0707d59ec..4cb032c32 100644
--- a/gstreamer-editing-services/src/auto/effect_clip.rs
+++ b/gstreamer-editing-services/src/auto/effect_clip.rs
@@ -24,6 +24,8 @@ glib::wrapper! {
 }
 
 impl EffectClip {
+    pub const NONE: Option<&'static EffectClip> = None;
+
     #[doc(alias = "ges_effect_clip_new")]
     pub fn new(
         video_bin_description: Option<&str>,
@@ -39,10 +41,6 @@ impl EffectClip {
     }
 }
 
-impl EffectClip {
-    pub const NONE: Option<&'static EffectClip> = None;
-}
-
 pub trait EffectClipExt: 'static {
     #[doc(alias = "audio-bin-description")]
     fn audio_bin_description(&self) -> Option<glib::GString>;
diff --git a/gstreamer-editing-services/src/auto/formatter.rs b/gstreamer-editing-services/src/auto/formatter.rs
index 8c7de40d2..4d52f38bd 100644
--- a/gstreamer-editing-services/src/auto/formatter.rs
+++ b/gstreamer-editing-services/src/auto/formatter.rs
@@ -20,6 +20,8 @@ glib::wrapper! {
 }
 
 impl Formatter {
+    pub const NONE: Option<&'static Formatter> = None;
+
     #[doc(alias = "ges_formatter_can_load_uri")]
     pub fn can_load_uri(uri: &str) -> Result<(), glib::Error> {
         assert_initialized_main_thread!();
@@ -56,10 +58,6 @@ impl Formatter {
     }
 }
 
-impl Formatter {
-    pub const NONE: Option<&'static Formatter> = None;
-}
-
 pub trait FormatterExt: 'static {
     #[cfg_attr(feature = "v1_18", deprecated = "Since 1.18")]
     #[doc(alias = "ges_formatter_load_from_uri")]
diff --git a/gstreamer-editing-services/src/auto/group.rs b/gstreamer-editing-services/src/auto/group.rs
index 19b30cae0..92ae6ae67 100644
--- a/gstreamer-editing-services/src/auto/group.rs
+++ b/gstreamer-editing-services/src/auto/group.rs
@@ -27,6 +27,8 @@ glib::wrapper! {
 }
 
 impl Group {
+    pub const NONE: Option<&'static Group> = None;
+
     #[doc(alias = "ges_group_new")]
     pub fn new() -> Group {
         assert_initialized_main_thread!();
@@ -40,10 +42,6 @@ impl Default for Group {
     }
 }
 
-impl Group {
-    pub const NONE: Option<&'static Group> = None;
-}
-
 pub trait GroupExt: 'static {
     fn duration(&self) -> u64;
 
diff --git a/gstreamer-editing-services/src/auto/layer.rs b/gstreamer-editing-services/src/auto/layer.rs
index e9ba87cf8..55400111c 100644
--- a/gstreamer-editing-services/src/auto/layer.rs
+++ b/gstreamer-editing-services/src/auto/layer.rs
@@ -33,6 +33,8 @@ glib::wrapper! {
 }
 
 impl Layer {
+    pub const NONE: Option<&'static Layer> = None;
+
     #[doc(alias = "ges_layer_new")]
     pub fn new() -> Layer {
         assert_initialized_main_thread!();
@@ -46,10 +48,6 @@ impl Default for Layer {
     }
 }
 
-impl Layer {
-    pub const NONE: Option<&'static Layer> = None;
-}
-
 pub trait LayerExt: 'static {
     #[doc(alias = "ges_layer_add_asset")]
     fn add_asset(
diff --git a/gstreamer-editing-services/src/auto/multi_file_source.rs b/gstreamer-editing-services/src/auto/multi_file_source.rs
index 497f8c349..b58d965b9 100644
--- a/gstreamer-editing-services/src/auto/multi_file_source.rs
+++ b/gstreamer-editing-services/src/auto/multi_file_source.rs
@@ -23,6 +23,8 @@ glib::wrapper! {
 }
 
 impl MultiFileSource {
+    pub const NONE: Option<&'static MultiFileSource> = None;
+
     #[doc(alias = "ges_multi_file_source_new")]
     pub fn new(uri: &str) -> MultiFileSource {
         assert_initialized_main_thread!();
@@ -30,10 +32,6 @@ impl MultiFileSource {
     }
 }
 
-impl MultiFileSource {
-    pub const NONE: Option<&'static MultiFileSource> = None;
-}
-
 pub trait MultiFileSourceExt: 'static {
     fn uri(&self) -> Option<glib::GString>;
 }
diff --git a/gstreamer-editing-services/src/auto/operation.rs b/gstreamer-editing-services/src/auto/operation.rs
index 1be0cf957..82005d028 100644
--- a/gstreamer-editing-services/src/auto/operation.rs
+++ b/gstreamer-editing-services/src/auto/operation.rs
@@ -17,8 +17,6 @@ glib::wrapper! {
     }
 }
 
-impl Operation {}
-
 impl Operation {
     pub const NONE: Option<&'static Operation> = None;
 }
diff --git a/gstreamer-editing-services/src/auto/operation_clip.rs b/gstreamer-editing-services/src/auto/operation_clip.rs
index 6ff8398f0..046d20c9b 100644
--- a/gstreamer-editing-services/src/auto/operation_clip.rs
+++ b/gstreamer-editing-services/src/auto/operation_clip.rs
@@ -18,8 +18,6 @@ glib::wrapper! {
     }
 }
 
-impl OperationClip {}
-
 impl OperationClip {
     pub const NONE: Option<&'static OperationClip> = None;
 }
diff --git a/gstreamer-editing-services/src/auto/overlay_clip.rs b/gstreamer-editing-services/src/auto/overlay_clip.rs
index ea7de737e..d41e23916 100644
--- a/gstreamer-editing-services/src/auto/overlay_clip.rs
+++ b/gstreamer-editing-services/src/auto/overlay_clip.rs
@@ -19,8 +19,6 @@ glib::wrapper! {
     }
 }
 
-impl OverlayClip {}
-
 impl OverlayClip {
     pub const NONE: Option<&'static OverlayClip> = None;
 }
diff --git a/gstreamer-editing-services/src/auto/pipeline.rs b/gstreamer-editing-services/src/auto/pipeline.rs
index 6907f432a..039bd44c2 100644
--- a/gstreamer-editing-services/src/auto/pipeline.rs
+++ b/gstreamer-editing-services/src/auto/pipeline.rs
@@ -26,6 +26,8 @@ glib::wrapper! {
 }
 
 impl Pipeline {
+    pub const NONE: Option<&'static Pipeline> = None;
+
     #[doc(alias = "ges_pipeline_new")]
     pub fn new() -> Pipeline {
         assert_initialized_main_thread!();
@@ -39,10 +41,6 @@ impl Default for Pipeline {
     }
 }
 
-impl Pipeline {
-    pub const NONE: Option<&'static Pipeline> = None;
-}
-
 pub trait GESPipelineExt: 'static {
     #[doc(alias = "ges_pipeline_get_mode")]
     #[doc(alias = "get_mode")]
diff --git a/gstreamer-editing-services/src/auto/project.rs b/gstreamer-editing-services/src/auto/project.rs
index 87c9e9b7a..c1ca78576 100644
--- a/gstreamer-editing-services/src/auto/project.rs
+++ b/gstreamer-editing-services/src/auto/project.rs
@@ -28,6 +28,8 @@ glib::wrapper! {
 }
 
 impl Project {
+    pub const NONE: Option<&'static Project> = None;
+
     #[doc(alias = "ges_project_new")]
     pub fn new(uri: Option<&str>) -> Project {
         assert_initialized_main_thread!();
@@ -35,10 +37,6 @@ impl Project {
     }
 }
 
-impl Project {
-    pub const NONE: Option<&'static Project> = None;
-}
-
 pub trait ProjectExt: 'static {
     #[doc(alias = "ges_project_add_asset")]
     fn add_asset(&self, asset: &impl IsA<Asset>) -> bool;
diff --git a/gstreamer-editing-services/src/auto/source.rs b/gstreamer-editing-services/src/auto/source.rs
index f095a42dd..0b5af4d0a 100644
--- a/gstreamer-editing-services/src/auto/source.rs
+++ b/gstreamer-editing-services/src/auto/source.rs
@@ -17,8 +17,6 @@ glib::wrapper! {
     }
 }
 
-impl Source {}
-
 impl Source {
     pub const NONE: Option<&'static Source> = None;
 }
diff --git a/gstreamer-editing-services/src/auto/source_clip.rs b/gstreamer-editing-services/src/auto/source_clip.rs
index 72094097e..1237dfcab 100644
--- a/gstreamer-editing-services/src/auto/source_clip.rs
+++ b/gstreamer-editing-services/src/auto/source_clip.rs
@@ -22,6 +22,8 @@ glib::wrapper! {
 }
 
 impl SourceClip {
+    pub const NONE: Option<&'static SourceClip> = None;
+
     #[cfg(any(feature = "v1_18", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
     #[doc(alias = "ges_source_clip_new_time_overlay")]
@@ -30,7 +32,3 @@ impl SourceClip {
         unsafe { from_glib_none(ffi::ges_source_clip_new_time_overlay()) }
     }
 }
-
-impl SourceClip {
-    pub const NONE: Option<&'static SourceClip> = None;
-}
diff --git a/gstreamer-editing-services/src/auto/source_clip_asset.rs b/gstreamer-editing-services/src/auto/source_clip_asset.rs
index d6170a131..a057830ec 100644
--- a/gstreamer-editing-services/src/auto/source_clip_asset.rs
+++ b/gstreamer-editing-services/src/auto/source_clip_asset.rs
@@ -16,8 +16,6 @@ glib::wrapper! {
     }
 }
 
-impl SourceClipAsset {}
-
 impl SourceClipAsset {
     pub const NONE: Option<&'static SourceClipAsset> = None;
 }
diff --git a/gstreamer-editing-services/src/auto/test_clip.rs b/gstreamer-editing-services/src/auto/test_clip.rs
index 2df455419..390a61304 100644
--- a/gstreamer-editing-services/src/auto/test_clip.rs
+++ b/gstreamer-editing-services/src/auto/test_clip.rs
@@ -30,6 +30,8 @@ glib::wrapper! {
 }
 
 impl TestClip {
+    pub const NONE: Option<&'static TestClip> = None;
+
     #[doc(alias = "ges_test_clip_new")]
     pub fn new() -> Option<TestClip> {
         assert_initialized_main_thread!();
@@ -44,10 +46,6 @@ impl TestClip {
     }
 }
 
-impl TestClip {
-    pub const NONE: Option<&'static TestClip> = None;
-}
-
 pub trait TestClipExt: 'static {
     #[doc(alias = "ges_test_clip_get_frequency")]
     #[doc(alias = "get_frequency")]
diff --git a/gstreamer-editing-services/src/auto/text_overlay.rs b/gstreamer-editing-services/src/auto/text_overlay.rs
index 900721653..5e5f2bcc9 100644
--- a/gstreamer-editing-services/src/auto/text_overlay.rs
+++ b/gstreamer-editing-services/src/auto/text_overlay.rs
@@ -23,6 +23,8 @@ glib::wrapper! {
 }
 
 impl TextOverlay {
+    pub const NONE: Option<&'static TextOverlay> = None;
+
     #[cfg_attr(feature = "v1_18", deprecated = "Since 1.18")]
     #[doc(alias = "ges_text_overlay_new")]
     pub fn new() -> Option<TextOverlay> {
@@ -31,10 +33,6 @@ impl TextOverlay {
     }
 }
 
-impl TextOverlay {
-    pub const NONE: Option<&'static TextOverlay> = None;
-}
-
 pub trait TextOverlayExt: 'static {
     #[doc(alias = "ges_text_overlay_get_color")]
     #[doc(alias = "get_color")]
diff --git a/gstreamer-editing-services/src/auto/text_overlay_clip.rs b/gstreamer-editing-services/src/auto/text_overlay_clip.rs
index d651d1f7d..75819fc99 100644
--- a/gstreamer-editing-services/src/auto/text_overlay_clip.rs
+++ b/gstreamer-editing-services/src/auto/text_overlay_clip.rs
@@ -31,6 +31,8 @@ glib::wrapper! {
 }
 
 impl TextOverlayClip {
+    pub const NONE: Option<&'static TextOverlayClip> = None;
+
     #[doc(alias = "ges_text_overlay_clip_new")]
     pub fn new() -> Option<TextOverlayClip> {
         assert_initialized_main_thread!();
@@ -38,10 +40,6 @@ impl TextOverlayClip {
     }
 }
 
-impl TextOverlayClip {
-    pub const NONE: Option<&'static TextOverlayClip> = None;
-}
-
 pub trait TextOverlayClipExt: 'static {
     #[doc(alias = "ges_text_overlay_clip_get_color")]
     #[doc(alias = "get_color")]
diff --git a/gstreamer-editing-services/src/auto/timeline.rs b/gstreamer-editing-services/src/auto/timeline.rs
index 05316200d..7c449aa10 100644
--- a/gstreamer-editing-services/src/auto/timeline.rs
+++ b/gstreamer-editing-services/src/auto/timeline.rs
@@ -36,6 +36,8 @@ glib::wrapper! {
 }
 
 impl Timeline {
+    pub const NONE: Option<&'static Timeline> = None;
+
     #[doc(alias = "ges_timeline_new")]
     pub fn new() -> Timeline {
         assert_initialized_main_thread!();
@@ -70,10 +72,6 @@ impl Default for Timeline {
     }
 }
 
-impl Timeline {
-    pub const NONE: Option<&'static Timeline> = None;
-}
-
 pub trait TimelineExt: 'static {
     #[cfg_attr(feature = "v1_18", deprecated = "Since 1.18")]
     #[doc(alias = "ges_timeline_add_layer")]
diff --git a/gstreamer-editing-services/src/auto/title_clip.rs b/gstreamer-editing-services/src/auto/title_clip.rs
index b677fc35f..0aeb396d5 100644
--- a/gstreamer-editing-services/src/auto/title_clip.rs
+++ b/gstreamer-editing-services/src/auto/title_clip.rs
@@ -30,6 +30,8 @@ glib::wrapper! {
 }
 
 impl TitleClip {
+    pub const NONE: Option<&'static TitleClip> = None;
+
     #[doc(alias = "ges_title_clip_new")]
     pub fn new() -> Option<TitleClip> {
         assert_initialized_main_thread!();
@@ -37,10 +39,6 @@ impl TitleClip {
     }
 }
 
-impl TitleClip {
-    pub const NONE: Option<&'static TitleClip> = None;
-}
-
 pub trait TitleClipExt: 'static {
     #[deprecated = "Since 1.6"]
     #[doc(alias = "ges_title_clip_get_background_color")]
diff --git a/gstreamer-editing-services/src/auto/track.rs b/gstreamer-editing-services/src/auto/track.rs
index 5b3c90843..02c9583db 100644
--- a/gstreamer-editing-services/src/auto/track.rs
+++ b/gstreamer-editing-services/src/auto/track.rs
@@ -32,6 +32,8 @@ glib::wrapper! {
 }
 
 impl Track {
+    pub const NONE: Option<&'static Track> = None;
+
     #[doc(alias = "ges_track_new")]
     pub fn new(type_: TrackType, caps: &gst::Caps) -> Track {
         assert_initialized_main_thread!();
@@ -39,10 +41,6 @@ impl Track {
     }
 }
 
-impl Track {
-    pub const NONE: Option<&'static Track> = None;
-}
-
 pub trait GESTrackExt: 'static {
     #[doc(alias = "ges_track_add_element")]
     fn add_element(&self, object: &impl IsA<TrackElement>) -> Result<(), glib::error::BoolError>;
diff --git a/gstreamer-editing-services/src/auto/transition.rs b/gstreamer-editing-services/src/auto/transition.rs
index 4c86809cc..c34a826c9 100644
--- a/gstreamer-editing-services/src/auto/transition.rs
+++ b/gstreamer-editing-services/src/auto/transition.rs
@@ -18,8 +18,6 @@ glib::wrapper! {
     }
 }
 
-impl Transition {}
-
 impl Transition {
     pub const NONE: Option<&'static Transition> = None;
 }
diff --git a/gstreamer-editing-services/src/auto/transition_clip.rs b/gstreamer-editing-services/src/auto/transition_clip.rs
index 55dc499e9..336b9b650 100644
--- a/gstreamer-editing-services/src/auto/transition_clip.rs
+++ b/gstreamer-editing-services/src/auto/transition_clip.rs
@@ -31,6 +31,8 @@ glib::wrapper! {
 }
 
 impl TransitionClip {
+    pub const NONE: Option<&'static TransitionClip> = None;
+
     #[doc(alias = "ges_transition_clip_new")]
     pub fn new(vtype: VideoStandardTransitionType) -> Option<TransitionClip> {
         assert_initialized_main_thread!();
@@ -45,10 +47,6 @@ impl TransitionClip {
     }
 }
 
-impl TransitionClip {
-    pub const NONE: Option<&'static TransitionClip> = None;
-}
-
 pub trait TransitionClipExt: 'static {
     fn vtype(&self) -> VideoStandardTransitionType;
 
diff --git a/gstreamer-editing-services/src/auto/uri_clip.rs b/gstreamer-editing-services/src/auto/uri_clip.rs
index 0eb4e74c7..9ecda9fbf 100644
--- a/gstreamer-editing-services/src/auto/uri_clip.rs
+++ b/gstreamer-editing-services/src/auto/uri_clip.rs
@@ -27,6 +27,8 @@ glib::wrapper! {
 }
 
 impl UriClip {
+    pub const NONE: Option<&'static UriClip> = None;
+
     #[doc(alias = "ges_uri_clip_new")]
     pub fn new(uri: &str) -> Result<UriClip, glib::BoolError> {
         assert_initialized_main_thread!();
@@ -37,10 +39,6 @@ impl UriClip {
     }
 }
 
-impl UriClip {
-    pub const NONE: Option<&'static UriClip> = None;
-}
-
 pub trait UriClipExt: 'static {
     #[doc(alias = "ges_uri_clip_get_uri")]
     #[doc(alias = "get_uri")]
diff --git a/gstreamer-editing-services/src/auto/uri_clip_asset.rs b/gstreamer-editing-services/src/auto/uri_clip_asset.rs
index f9ae26854..33bd18db9 100644
--- a/gstreamer-editing-services/src/auto/uri_clip_asset.rs
+++ b/gstreamer-editing-services/src/auto/uri_clip_asset.rs
@@ -45,6 +45,8 @@ glib::wrapper! {
 }
 
 impl UriClipAsset {
+    pub const NONE: Option<&'static UriClipAsset> = None;
+
     //#[cfg(any(feature = "v1_16", feature = "dox"))]
     //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))]
     //#[doc(alias = "ges_uri_clip_asset_finish")]
@@ -72,10 +74,6 @@ impl UriClipAsset {
     }
 }
 
-impl UriClipAsset {
-    pub const NONE: Option<&'static UriClipAsset> = None;
-}
-
 pub trait UriClipAssetExt: 'static {
     #[doc(alias = "ges_uri_clip_asset_get_duration")]
     #[doc(alias = "get_duration")]
diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-editing-services/src/auto/versions.txt
+++ b/gstreamer-editing-services/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-editing-services/src/auto/video_track.rs b/gstreamer-editing-services/src/auto/video_track.rs
index 13906e0f7..ff7bc0c59 100644
--- a/gstreamer-editing-services/src/auto/video_track.rs
+++ b/gstreamer-editing-services/src/auto/video_track.rs
@@ -17,6 +17,8 @@ glib::wrapper! {
 }
 
 impl VideoTrack {
+    pub const NONE: Option<&'static VideoTrack> = None;
+
     #[doc(alias = "ges_video_track_new")]
     pub fn new() -> VideoTrack {
         assert_initialized_main_thread!();
@@ -29,7 +31,3 @@ impl Default for VideoTrack {
         Self::new()
     }
 }
-
-impl VideoTrack {
-    pub const NONE: Option<&'static VideoTrack> = None;
-}
diff --git a/gstreamer-editing-services/src/auto/video_transition.rs b/gstreamer-editing-services/src/auto/video_transition.rs
index 7356882d7..78a9e6ec6 100644
--- a/gstreamer-editing-services/src/auto/video_transition.rs
+++ b/gstreamer-editing-services/src/auto/video_transition.rs
@@ -30,6 +30,8 @@ glib::wrapper! {
 }
 
 impl VideoTransition {
+    pub const NONE: Option<&'static VideoTransition> = None;
+
     #[doc(alias = "ges_video_transition_new")]
     pub fn new() -> VideoTransition {
         assert_initialized_main_thread!();
@@ -43,10 +45,6 @@ impl Default for VideoTransition {
     }
 }
 
-impl VideoTransition {
-    pub const NONE: Option<&'static VideoTransition> = None;
-}
-
 pub trait VideoTransitionExt: 'static {
     #[cfg_attr(feature = "v1_20", deprecated = "Since 1.20")]
     #[doc(alias = "ges_video_transition_get_border")]
diff --git a/gstreamer-editing-services/src/auto/xml_formatter.rs b/gstreamer-editing-services/src/auto/xml_formatter.rs
index 2c0884c31..bce6add65 100644
--- a/gstreamer-editing-services/src/auto/xml_formatter.rs
+++ b/gstreamer-editing-services/src/auto/xml_formatter.rs
@@ -16,8 +16,6 @@ glib::wrapper! {
     }
 }
 
-impl XmlFormatter {}
-
 impl XmlFormatter {
     pub const NONE: Option<&'static XmlFormatter> = None;
 }
diff --git a/gstreamer-editing-services/sys/build.rs b/gstreamer-editing-services/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-editing-services/sys/build.rs
+++ b/gstreamer-editing-services/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-editing-services/sys/src/lib.rs b/gstreamer-editing-services/sys/src/lib.rs
index 72f052eee..0491e4e5b 100644
--- a/gstreamer-editing-services/sys/src/lib.rs
+++ b/gstreamer-editing-services/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-editing-services/sys/tests/abi.rs b/gstreamer-editing-services/sys/tests/abi.rs
index 2db955fc3..4bd9dd448 100644
--- a/gstreamer-editing-services/sys/tests/abi.rs
+++ b/gstreamer-editing-services/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-editing-services/sys/tests/constant.c b/gstreamer-editing-services/sys/tests/constant.c
index bb13f15f1..04338067e 100644
--- a/gstreamer-editing-services/sys/tests/constant.c
+++ b/gstreamer-editing-services/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-editing-services/sys/tests/layout.c b/gstreamer-editing-services/sys/tests/layout.c
index 1d10bf25f..63981da39 100644
--- a/gstreamer-editing-services/sys/tests/layout.c
+++ b/gstreamer-editing-services/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/egl/src/auto/gl_display_egl.rs b/gstreamer-gl/egl/src/auto/gl_display_egl.rs
index 7b5c11d41..e801f3a43 100644
--- a/gstreamer-gl/egl/src/auto/gl_display_egl.rs
+++ b/gstreamer-gl/egl/src/auto/gl_display_egl.rs
@@ -16,6 +16,8 @@ glib::wrapper! {
 }
 
 impl GLDisplayEGL {
+    pub const NONE: Option<&'static GLDisplayEGL> = None;
+
     #[doc(alias = "gst_gl_display_egl_new")]
     pub fn new() -> GLDisplayEGL {
         assert_initialized_main_thread!();
@@ -53,7 +55,3 @@ impl Default for GLDisplayEGL {
 
 unsafe impl Send for GLDisplayEGL {}
 unsafe impl Sync for GLDisplayEGL {}
-
-impl GLDisplayEGL {
-    pub const NONE: Option<&'static GLDisplayEGL> = None;
-}
diff --git a/gstreamer-gl/egl/src/auto/mod.rs b/gstreamer-gl/egl/src/auto/mod.rs
index f869ff39f..07708725e 100644
--- a/gstreamer-gl/egl/src/auto/mod.rs
+++ b/gstreamer-gl/egl/src/auto/mod.rs
@@ -5,6 +5,3 @@
 
 mod gl_display_egl;
 pub use self::gl_display_egl::GLDisplayEGL;
-
-#[doc(hidden)]
-pub mod traits {}
diff --git a/gstreamer-gl/egl/src/auto/versions.txt b/gstreamer-gl/egl/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-gl/egl/src/auto/versions.txt
+++ b/gstreamer-gl/egl/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-gl/egl/sys/build.rs b/gstreamer-gl/egl/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-gl/egl/sys/build.rs
+++ b/gstreamer-gl/egl/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/egl/sys/src/lib.rs b/gstreamer-gl/egl/sys/src/lib.rs
index 16ae5e2e9..9992e0ca2 100644
--- a/gstreamer-gl/egl/sys/src/lib.rs
+++ b/gstreamer-gl/egl/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/egl/sys/tests/abi.rs b/gstreamer-gl/egl/sys/tests/abi.rs
index a160dd595..ae629cb30 100644
--- a/gstreamer-gl/egl/sys/tests/abi.rs
+++ b/gstreamer-gl/egl/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/egl/sys/tests/constant.c b/gstreamer-gl/egl/sys/tests/constant.c
index d7b2e2130..2c7382432 100644
--- a/gstreamer-gl/egl/sys/tests/constant.c
+++ b/gstreamer-gl/egl/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/egl/sys/tests/layout.c b/gstreamer-gl/egl/sys/tests/layout.c
index 2de089588..74a105034 100644
--- a/gstreamer-gl/egl/sys/tests/layout.c
+++ b/gstreamer-gl/egl/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/src/auto/gl_base_filter.rs b/gstreamer-gl/src/auto/gl_base_filter.rs
index 3b38a6f94..8b9e0f780 100644
--- a/gstreamer-gl/src/auto/gl_base_filter.rs
+++ b/gstreamer-gl/src/auto/gl_base_filter.rs
@@ -22,13 +22,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for GLBaseFilter {}
-unsafe impl Sync for GLBaseFilter {}
-
 impl GLBaseFilter {
     pub const NONE: Option<&'static GLBaseFilter> = None;
 }
 
+unsafe impl Send for GLBaseFilter {}
+unsafe impl Sync for GLBaseFilter {}
+
 pub trait GLBaseFilterExt: 'static {
     #[cfg(any(feature = "v1_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))]
diff --git a/gstreamer-gl/src/auto/gl_base_memory_allocator.rs b/gstreamer-gl/src/auto/gl_base_memory_allocator.rs
index cb1903250..50c812f1a 100644
--- a/gstreamer-gl/src/auto/gl_base_memory_allocator.rs
+++ b/gstreamer-gl/src/auto/gl_base_memory_allocator.rs
@@ -12,11 +12,9 @@ glib::wrapper! {
     }
 }
 
-impl GLBaseMemoryAllocator {}
-
-unsafe impl Send for GLBaseMemoryAllocator {}
-unsafe impl Sync for GLBaseMemoryAllocator {}
-
 impl GLBaseMemoryAllocator {
     pub const NONE: Option<&'static GLBaseMemoryAllocator> = None;
 }
+
+unsafe impl Send for GLBaseMemoryAllocator {}
+unsafe impl Sync for GLBaseMemoryAllocator {}
diff --git a/gstreamer-gl/src/auto/gl_base_src.rs b/gstreamer-gl/src/auto/gl_base_src.rs
index 6285749f5..78775ff9b 100644
--- a/gstreamer-gl/src/auto/gl_base_src.rs
+++ b/gstreamer-gl/src/auto/gl_base_src.rs
@@ -22,13 +22,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for GLBaseSrc {}
-unsafe impl Sync for GLBaseSrc {}
-
 impl GLBaseSrc {
     pub const NONE: Option<&'static GLBaseSrc> = None;
 }
 
+unsafe impl Send for GLBaseSrc {}
+unsafe impl Sync for GLBaseSrc {}
+
 pub trait GLBaseSrcExt: 'static {
     #[doc(alias = "timestamp-offset")]
     fn timestamp_offset(&self) -> i64;
diff --git a/gstreamer-gl/src/auto/gl_context.rs b/gstreamer-gl/src/auto/gl_context.rs
index 34579d879..ee0a22760 100644
--- a/gstreamer-gl/src/auto/gl_context.rs
+++ b/gstreamer-gl/src/auto/gl_context.rs
@@ -24,6 +24,8 @@ glib::wrapper! {
 }
 
 impl GLContext {
+    pub const NONE: Option<&'static GLContext> = None;
+
     #[doc(alias = "gst_gl_context_new")]
     pub fn new(display: &impl IsA<GLDisplay>) -> GLContext {
         skip_assert_initialized!();
@@ -59,10 +61,6 @@ impl GLContext {
 unsafe impl Send for GLContext {}
 unsafe impl Sync for GLContext {}
 
-impl GLContext {
-    pub const NONE: Option<&'static GLContext> = None;
-}
-
 pub trait GLContextExt: 'static {
     #[doc(alias = "gst_gl_context_activate")]
     fn activate(&self, activate: bool) -> Result<(), glib::error::BoolError>;
diff --git a/gstreamer-gl/src/auto/gl_display.rs b/gstreamer-gl/src/auto/gl_display.rs
index 7fc271ca2..658702373 100644
--- a/gstreamer-gl/src/auto/gl_display.rs
+++ b/gstreamer-gl/src/auto/gl_display.rs
@@ -26,6 +26,8 @@ glib::wrapper! {
 }
 
 impl GLDisplay {
+    pub const NONE: Option<&'static GLDisplay> = None;
+
     #[doc(alias = "gst_gl_display_new")]
     pub fn new() -> GLDisplay {
         assert_initialized_main_thread!();
@@ -51,10 +53,6 @@ impl Default for GLDisplay {
 unsafe impl Send for GLDisplay {}
 unsafe impl Sync for GLDisplay {}
 
-impl GLDisplay {
-    pub const NONE: Option<&'static GLDisplay> = None;
-}
-
 pub trait GLDisplayExt: 'static {
     #[doc(alias = "gst_gl_display_add_context")]
     fn add_context(&self, context: &impl IsA<GLContext>) -> Result<(), glib::error::BoolError>;
diff --git a/gstreamer-gl/src/auto/gl_filter.rs b/gstreamer-gl/src/auto/gl_filter.rs
index 5729319b4..a0fd88214 100644
--- a/gstreamer-gl/src/auto/gl_filter.rs
+++ b/gstreamer-gl/src/auto/gl_filter.rs
@@ -18,13 +18,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for GLFilter {}
-unsafe impl Sync for GLFilter {}
-
 impl GLFilter {
     pub const NONE: Option<&'static GLFilter> = None;
 }
 
+unsafe impl Send for GLFilter {}
+unsafe impl Sync for GLFilter {}
+
 pub trait GLFilterExt: 'static {
     #[doc(alias = "gst_gl_filter_draw_fullscreen_quad")]
     fn draw_fullscreen_quad(&self);
diff --git a/gstreamer-gl/src/auto/gl_framebuffer.rs b/gstreamer-gl/src/auto/gl_framebuffer.rs
index 6900829f5..57a9f9187 100644
--- a/gstreamer-gl/src/auto/gl_framebuffer.rs
+++ b/gstreamer-gl/src/auto/gl_framebuffer.rs
@@ -19,6 +19,8 @@ glib::wrapper! {
 }
 
 impl GLFramebuffer {
+    pub const NONE: Option<&'static GLFramebuffer> = None;
+
     #[doc(alias = "gst_gl_framebuffer_new")]
     pub fn new(context: &impl IsA<GLContext>) -> GLFramebuffer {
         skip_assert_initialized!();
@@ -50,10 +52,6 @@ impl GLFramebuffer {
 unsafe impl Send for GLFramebuffer {}
 unsafe impl Sync for GLFramebuffer {}
 
-impl GLFramebuffer {
-    pub const NONE: Option<&'static GLFramebuffer> = None;
-}
-
 pub trait GLFramebufferExt: 'static {
     #[doc(alias = "gst_gl_framebuffer_attach")]
     unsafe fn attach(&self, attachment_point: u32, mem: &mut GLBaseMemory);
diff --git a/gstreamer-gl/src/auto/gl_memory_allocator.rs b/gstreamer-gl/src/auto/gl_memory_allocator.rs
index 37d3313b8..12d4a3823 100644
--- a/gstreamer-gl/src/auto/gl_memory_allocator.rs
+++ b/gstreamer-gl/src/auto/gl_memory_allocator.rs
@@ -18,6 +18,8 @@ glib::wrapper! {
 }
 
 impl GLMemoryAllocator {
+    pub const NONE: Option<&'static GLMemoryAllocator> = None;
+
     #[doc(alias = "gst_gl_memory_allocator_get_default")]
     #[doc(alias = "get_default")]
     pub fn default(context: &impl IsA<GLContext>) -> Option<GLMemoryAllocator> {
@@ -32,7 +34,3 @@ impl GLMemoryAllocator {
 
 unsafe impl Send for GLMemoryAllocator {}
 unsafe impl Sync for GLMemoryAllocator {}
-
-impl GLMemoryAllocator {
-    pub const NONE: Option<&'static GLMemoryAllocator> = None;
-}
diff --git a/gstreamer-gl/src/auto/gl_window.rs b/gstreamer-gl/src/auto/gl_window.rs
index 46c1be0fe..8b0712467 100644
--- a/gstreamer-gl/src/auto/gl_window.rs
+++ b/gstreamer-gl/src/auto/gl_window.rs
@@ -24,6 +24,8 @@ glib::wrapper! {
 }
 
 impl GLWindow {
+    pub const NONE: Option<&'static GLWindow> = None;
+
     #[doc(alias = "gst_gl_window_new")]
     pub fn new(display: &impl IsA<GLDisplay>) -> GLWindow {
         skip_assert_initialized!();
@@ -34,10 +36,6 @@ impl GLWindow {
 unsafe impl Send for GLWindow {}
 unsafe impl Sync for GLWindow {}
 
-impl GLWindow {
-    pub const NONE: Option<&'static GLWindow> = None;
-}
-
 pub trait GLWindowExt: 'static {
     #[cfg(any(feature = "v1_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))]
diff --git a/gstreamer-gl/src/auto/versions.txt b/gstreamer-gl/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-gl/src/auto/versions.txt
+++ b/gstreamer-gl/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-gl/sys/build.rs b/gstreamer-gl/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-gl/sys/build.rs
+++ b/gstreamer-gl/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/sys/src/lib.rs b/gstreamer-gl/sys/src/lib.rs
index 357cf4d6f..42ea6c063 100644
--- a/gstreamer-gl/sys/src/lib.rs
+++ b/gstreamer-gl/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/sys/tests/abi.rs b/gstreamer-gl/sys/tests/abi.rs
index c0c7bc97d..90b7567e3 100644
--- a/gstreamer-gl/sys/tests/abi.rs
+++ b/gstreamer-gl/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/sys/tests/constant.c b/gstreamer-gl/sys/tests/constant.c
index 32fd7a6ec..d8fc58fb3 100644
--- a/gstreamer-gl/sys/tests/constant.c
+++ b/gstreamer-gl/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/sys/tests/layout.c b/gstreamer-gl/sys/tests/layout.c
index 4afe90dab..ec830388d 100644
--- a/gstreamer-gl/sys/tests/layout.c
+++ b/gstreamer-gl/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/wayland/src/auto/gl_display_wayland.rs b/gstreamer-gl/wayland/src/auto/gl_display_wayland.rs
index bc38f4fb8..ae201c8bf 100644
--- a/gstreamer-gl/wayland/src/auto/gl_display_wayland.rs
+++ b/gstreamer-gl/wayland/src/auto/gl_display_wayland.rs
@@ -15,6 +15,8 @@ glib::wrapper! {
 }
 
 impl GLDisplayWayland {
+    pub const NONE: Option<&'static GLDisplayWayland> = None;
+
     #[doc(alias = "gst_gl_display_wayland_new")]
     pub fn new(name: Option<&str>) -> GLDisplayWayland {
         assert_initialized_main_thread!();
@@ -30,7 +32,3 @@ impl GLDisplayWayland {
 
 unsafe impl Send for GLDisplayWayland {}
 unsafe impl Sync for GLDisplayWayland {}
-
-impl GLDisplayWayland {
-    pub const NONE: Option<&'static GLDisplayWayland> = None;
-}
diff --git a/gstreamer-gl/wayland/src/auto/mod.rs b/gstreamer-gl/wayland/src/auto/mod.rs
index 5a5826597..0ce42582c 100644
--- a/gstreamer-gl/wayland/src/auto/mod.rs
+++ b/gstreamer-gl/wayland/src/auto/mod.rs
@@ -5,6 +5,3 @@
 
 mod gl_display_wayland;
 pub use self::gl_display_wayland::GLDisplayWayland;
-
-#[doc(hidden)]
-pub mod traits {}
diff --git a/gstreamer-gl/wayland/src/auto/versions.txt b/gstreamer-gl/wayland/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-gl/wayland/src/auto/versions.txt
+++ b/gstreamer-gl/wayland/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-gl/wayland/sys/build.rs b/gstreamer-gl/wayland/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-gl/wayland/sys/build.rs
+++ b/gstreamer-gl/wayland/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/wayland/sys/src/lib.rs b/gstreamer-gl/wayland/sys/src/lib.rs
index 5a81d28ae..d2d7bcb5a 100644
--- a/gstreamer-gl/wayland/sys/src/lib.rs
+++ b/gstreamer-gl/wayland/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/wayland/sys/tests/abi.rs b/gstreamer-gl/wayland/sys/tests/abi.rs
index 9cd3994b7..e150dc97e 100644
--- a/gstreamer-gl/wayland/sys/tests/abi.rs
+++ b/gstreamer-gl/wayland/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/wayland/sys/tests/constant.c b/gstreamer-gl/wayland/sys/tests/constant.c
index 879922c29..a5e17650e 100644
--- a/gstreamer-gl/wayland/sys/tests/constant.c
+++ b/gstreamer-gl/wayland/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/wayland/sys/tests/layout.c b/gstreamer-gl/wayland/sys/tests/layout.c
index 175df8fa9..af072393d 100644
--- a/gstreamer-gl/wayland/sys/tests/layout.c
+++ b/gstreamer-gl/wayland/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/x11/src/auto/gl_display_x11.rs b/gstreamer-gl/x11/src/auto/gl_display_x11.rs
index 3c33bd6b2..e919ab5f0 100644
--- a/gstreamer-gl/x11/src/auto/gl_display_x11.rs
+++ b/gstreamer-gl/x11/src/auto/gl_display_x11.rs
@@ -15,6 +15,8 @@ glib::wrapper! {
 }
 
 impl GLDisplayX11 {
+    pub const NONE: Option<&'static GLDisplayX11> = None;
+
     #[doc(alias = "gst_gl_display_x11_new")]
     pub fn new(name: Option<&str>) -> GLDisplayX11 {
         assert_initialized_main_thread!();
@@ -30,7 +32,3 @@ impl GLDisplayX11 {
 
 unsafe impl Send for GLDisplayX11 {}
 unsafe impl Sync for GLDisplayX11 {}
-
-impl GLDisplayX11 {
-    pub const NONE: Option<&'static GLDisplayX11> = None;
-}
diff --git a/gstreamer-gl/x11/src/auto/mod.rs b/gstreamer-gl/x11/src/auto/mod.rs
index 7725a8e42..2eb1fad99 100644
--- a/gstreamer-gl/x11/src/auto/mod.rs
+++ b/gstreamer-gl/x11/src/auto/mod.rs
@@ -5,6 +5,3 @@
 
 mod gl_display_x11;
 pub use self::gl_display_x11::GLDisplayX11;
-
-#[doc(hidden)]
-pub mod traits {}
diff --git a/gstreamer-gl/x11/src/auto/versions.txt b/gstreamer-gl/x11/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-gl/x11/src/auto/versions.txt
+++ b/gstreamer-gl/x11/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-gl/x11/sys/build.rs b/gstreamer-gl/x11/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-gl/x11/sys/build.rs
+++ b/gstreamer-gl/x11/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/x11/sys/src/lib.rs b/gstreamer-gl/x11/sys/src/lib.rs
index 87fe33a35..9f57f281b 100644
--- a/gstreamer-gl/x11/sys/src/lib.rs
+++ b/gstreamer-gl/x11/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/x11/sys/tests/abi.rs b/gstreamer-gl/x11/sys/tests/abi.rs
index 12080ea7f..72c76c384 100644
--- a/gstreamer-gl/x11/sys/tests/abi.rs
+++ b/gstreamer-gl/x11/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/x11/sys/tests/constant.c b/gstreamer-gl/x11/sys/tests/constant.c
index 879922c29..a5e17650e 100644
--- a/gstreamer-gl/x11/sys/tests/constant.c
+++ b/gstreamer-gl/x11/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-gl/x11/sys/tests/layout.c b/gstreamer-gl/x11/sys/tests/layout.c
index 4de58cdfe..72cf665b2 100644
--- a/gstreamer-gl/x11/sys/tests/layout.c
+++ b/gstreamer-gl/x11/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-mpegts/sys/build.rs b/gstreamer-mpegts/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-mpegts/sys/build.rs
+++ b/gstreamer-mpegts/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-mpegts/sys/src/lib.rs b/gstreamer-mpegts/sys/src/lib.rs
index 2130a9672..0a8976111 100644
--- a/gstreamer-mpegts/sys/src/lib.rs
+++ b/gstreamer-mpegts/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-mpegts/sys/tests/abi.rs b/gstreamer-mpegts/sys/tests/abi.rs
index 1c0157c8e..6fce80ebf 100644
--- a/gstreamer-mpegts/sys/tests/abi.rs
+++ b/gstreamer-mpegts/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-mpegts/sys/tests/constant.c b/gstreamer-mpegts/sys/tests/constant.c
index 02ddf0e4c..8b0411ae0 100644
--- a/gstreamer-mpegts/sys/tests/constant.c
+++ b/gstreamer-mpegts/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-mpegts/sys/tests/layout.c b/gstreamer-mpegts/sys/tests/layout.c
index 1dedf10d0..8c0c6b3ff 100644
--- a/gstreamer-mpegts/sys/tests/layout.c
+++ b/gstreamer-mpegts/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-net/src/auto/mod.rs b/gstreamer-net/src/auto/mod.rs
index 511c0235c..85678f811 100644
--- a/gstreamer-net/src/auto/mod.rs
+++ b/gstreamer-net/src/auto/mod.rs
@@ -14,6 +14,3 @@ pub use self::ntp_clock::NtpClock;
 
 mod ptp_clock;
 pub use self::ptp_clock::PtpClock;
-
-#[doc(hidden)]
-pub mod traits {}
diff --git a/gstreamer-net/src/auto/ntp_clock.rs b/gstreamer-net/src/auto/ntp_clock.rs
index a1a4819c5..3c2ac2551 100644
--- a/gstreamer-net/src/auto/ntp_clock.rs
+++ b/gstreamer-net/src/auto/ntp_clock.rs
@@ -14,7 +14,5 @@ glib::wrapper! {
     }
 }
 
-impl NtpClock {}
-
 unsafe impl Send for NtpClock {}
 unsafe impl Sync for NtpClock {}
diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-net/src/auto/versions.txt
+++ b/gstreamer-net/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-net/sys/build.rs b/gstreamer-net/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-net/sys/build.rs
+++ b/gstreamer-net/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-net/sys/src/lib.rs b/gstreamer-net/sys/src/lib.rs
index 544300820..1ba996ddd 100644
--- a/gstreamer-net/sys/src/lib.rs
+++ b/gstreamer-net/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-net/sys/tests/abi.rs b/gstreamer-net/sys/tests/abi.rs
index 260b7b80e..4c4e0b1db 100644
--- a/gstreamer-net/sys/tests/abi.rs
+++ b/gstreamer-net/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-net/sys/tests/constant.c b/gstreamer-net/sys/tests/constant.c
index 50bd7f300..a1badd555 100644
--- a/gstreamer-net/sys/tests/constant.c
+++ b/gstreamer-net/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-net/sys/tests/layout.c b/gstreamer-net/sys/tests/layout.c
index e7c80ea9c..083c6e63d 100644
--- a/gstreamer-net/sys/tests/layout.c
+++ b/gstreamer-net/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-pbutils/src/auto/discoverer_stream_info.rs b/gstreamer-pbutils/src/auto/discoverer_stream_info.rs
index 2d1c565e3..460b084e0 100644
--- a/gstreamer-pbutils/src/auto/discoverer_stream_info.rs
+++ b/gstreamer-pbutils/src/auto/discoverer_stream_info.rs
@@ -15,13 +15,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for DiscovererStreamInfo {}
-unsafe impl Sync for DiscovererStreamInfo {}
-
 impl DiscovererStreamInfo {
     pub const NONE: Option<&'static DiscovererStreamInfo> = None;
 }
 
+unsafe impl Send for DiscovererStreamInfo {}
+unsafe impl Sync for DiscovererStreamInfo {}
+
 pub trait DiscovererStreamInfoExt: 'static {
     #[doc(alias = "gst_discoverer_stream_info_get_caps")]
     #[doc(alias = "get_caps")]
diff --git a/gstreamer-pbutils/src/auto/encoding_audio_profile.rs b/gstreamer-pbutils/src/auto/encoding_audio_profile.rs
index 402b11102..e9bc131f8 100644
--- a/gstreamer-pbutils/src/auto/encoding_audio_profile.rs
+++ b/gstreamer-pbutils/src/auto/encoding_audio_profile.rs
@@ -14,7 +14,5 @@ glib::wrapper! {
     }
 }
 
-impl EncodingAudioProfile {}
-
 unsafe impl Send for EncodingAudioProfile {}
 unsafe impl Sync for EncodingAudioProfile {}
diff --git a/gstreamer-pbutils/src/auto/encoding_profile.rs b/gstreamer-pbutils/src/auto/encoding_profile.rs
index 92ed586e1..4d848e514 100644
--- a/gstreamer-pbutils/src/auto/encoding_profile.rs
+++ b/gstreamer-pbutils/src/auto/encoding_profile.rs
@@ -32,6 +32,8 @@ glib::wrapper! {
 }
 
 impl EncodingProfile {
+    pub const NONE: Option<&'static EncodingProfile> = None;
+
     #[doc(alias = "gst_encoding_profile_find")]
     pub fn find(
         targetname: &str,
@@ -65,10 +67,6 @@ impl EncodingProfile {
 unsafe impl Send for EncodingProfile {}
 unsafe impl Sync for EncodingProfile {}
 
-impl EncodingProfile {
-    pub const NONE: Option<&'static EncodingProfile> = None;
-}
-
 pub trait EncodingProfileExt: 'static {
     #[cfg(any(feature = "v1_12", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))]
diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-pbutils/src/auto/versions.txt
+++ b/gstreamer-pbutils/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-pbutils/sys/build.rs b/gstreamer-pbutils/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-pbutils/sys/build.rs
+++ b/gstreamer-pbutils/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-pbutils/sys/src/lib.rs b/gstreamer-pbutils/sys/src/lib.rs
index a4a59b8b3..b592a0473 100644
--- a/gstreamer-pbutils/sys/src/lib.rs
+++ b/gstreamer-pbutils/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-pbutils/sys/tests/abi.rs b/gstreamer-pbutils/sys/tests/abi.rs
index d853b6e54..7149daae9 100644
--- a/gstreamer-pbutils/sys/tests/abi.rs
+++ b/gstreamer-pbutils/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-pbutils/sys/tests/constant.c b/gstreamer-pbutils/sys/tests/constant.c
index 37d697cc7..cccdc4d1b 100644
--- a/gstreamer-pbutils/sys/tests/constant.c
+++ b/gstreamer-pbutils/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-pbutils/sys/tests/layout.c b/gstreamer-pbutils/sys/tests/layout.c
index a4104727f..b5ca4060d 100644
--- a/gstreamer-pbutils/sys/tests/layout.c
+++ b/gstreamer-pbutils/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-player/src/auto/player_signal_dispatcher.rs b/gstreamer-player/src/auto/player_signal_dispatcher.rs
index 8ee4734a4..efb0b6adc 100644
--- a/gstreamer-player/src/auto/player_signal_dispatcher.rs
+++ b/gstreamer-player/src/auto/player_signal_dispatcher.rs
@@ -14,13 +14,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for PlayerSignalDispatcher {}
-unsafe impl Sync for PlayerSignalDispatcher {}
-
 impl PlayerSignalDispatcher {
     pub const NONE: Option<&'static PlayerSignalDispatcher> = None;
 }
 
+unsafe impl Send for PlayerSignalDispatcher {}
+unsafe impl Sync for PlayerSignalDispatcher {}
+
 pub trait PlayerSignalDispatcherExt: 'static {}
 
 impl<O: IsA<PlayerSignalDispatcher>> PlayerSignalDispatcherExt for O {}
diff --git a/gstreamer-player/src/auto/player_stream_info.rs b/gstreamer-player/src/auto/player_stream_info.rs
index c459c650a..a16a1f106 100644
--- a/gstreamer-player/src/auto/player_stream_info.rs
+++ b/gstreamer-player/src/auto/player_stream_info.rs
@@ -15,13 +15,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for PlayerStreamInfo {}
-unsafe impl Sync for PlayerStreamInfo {}
-
 impl PlayerStreamInfo {
     pub const NONE: Option<&'static PlayerStreamInfo> = None;
 }
 
+unsafe impl Send for PlayerStreamInfo {}
+unsafe impl Sync for PlayerStreamInfo {}
+
 pub trait PlayerStreamInfoExt: 'static {
     #[doc(alias = "gst_player_stream_info_get_caps")]
     #[doc(alias = "get_caps")]
diff --git a/gstreamer-player/src/auto/player_video_renderer.rs b/gstreamer-player/src/auto/player_video_renderer.rs
index 7539aeaba..2a7ddac27 100644
--- a/gstreamer-player/src/auto/player_video_renderer.rs
+++ b/gstreamer-player/src/auto/player_video_renderer.rs
@@ -14,13 +14,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for PlayerVideoRenderer {}
-unsafe impl Sync for PlayerVideoRenderer {}
-
 impl PlayerVideoRenderer {
     pub const NONE: Option<&'static PlayerVideoRenderer> = None;
 }
 
+unsafe impl Send for PlayerVideoRenderer {}
+unsafe impl Sync for PlayerVideoRenderer {}
+
 pub trait PlayerVideoRendererExt: 'static {}
 
 impl<O: IsA<PlayerVideoRenderer>> PlayerVideoRendererExt for O {}
diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-player/src/auto/versions.txt
+++ b/gstreamer-player/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-player/sys/build.rs b/gstreamer-player/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-player/sys/build.rs
+++ b/gstreamer-player/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-player/sys/src/lib.rs b/gstreamer-player/sys/src/lib.rs
index 0244125c4..7199bae7a 100644
--- a/gstreamer-player/sys/src/lib.rs
+++ b/gstreamer-player/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-player/sys/tests/abi.rs b/gstreamer-player/sys/tests/abi.rs
index 10ba204ca..8dc38d99e 100644
--- a/gstreamer-player/sys/tests/abi.rs
+++ b/gstreamer-player/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-player/sys/tests/constant.c b/gstreamer-player/sys/tests/constant.c
index 724c0b828..d36dbe3aa 100644
--- a/gstreamer-player/sys/tests/constant.c
+++ b/gstreamer-player/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-player/sys/tests/layout.c b/gstreamer-player/sys/tests/layout.c
index 90288ea47..67ea30356 100644
--- a/gstreamer-player/sys/tests/layout.c
+++ b/gstreamer-player/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtp/src/auto/rtp_header_extension.rs b/gstreamer-rtp/src/auto/rtp_header_extension.rs
index f21c648ad..773d2c7c6 100644
--- a/gstreamer-rtp/src/auto/rtp_header_extension.rs
+++ b/gstreamer-rtp/src/auto/rtp_header_extension.rs
@@ -18,6 +18,8 @@ glib::wrapper! {
 }
 
 impl RTPHeaderExtension {
+    pub const NONE: Option<&'static RTPHeaderExtension> = None;
+
     #[doc(alias = "gst_rtp_header_extension_create_from_uri")]
     pub fn create_from_uri(uri: &str) -> Option<RTPHeaderExtension> {
         assert_initialized_main_thread!();
@@ -32,10 +34,6 @@ impl RTPHeaderExtension {
 unsafe impl Send for RTPHeaderExtension {}
 unsafe impl Sync for RTPHeaderExtension {}
 
-impl RTPHeaderExtension {
-    pub const NONE: Option<&'static RTPHeaderExtension> = None;
-}
-
 pub trait RTPHeaderExtensionExt: 'static {
     #[doc(alias = "gst_rtp_header_extension_get_direction")]
     #[doc(alias = "get_direction")]
diff --git a/gstreamer-rtp/src/auto/versions.txt b/gstreamer-rtp/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-rtp/src/auto/versions.txt
+++ b/gstreamer-rtp/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-rtp/sys/build.rs b/gstreamer-rtp/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-rtp/sys/build.rs
+++ b/gstreamer-rtp/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtp/sys/src/lib.rs b/gstreamer-rtp/sys/src/lib.rs
index 6b9eda973..ff3ddbfa4 100644
--- a/gstreamer-rtp/sys/src/lib.rs
+++ b/gstreamer-rtp/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtp/sys/tests/abi.rs b/gstreamer-rtp/sys/tests/abi.rs
index 0ce5f263b..121e40431 100644
--- a/gstreamer-rtp/sys/tests/abi.rs
+++ b/gstreamer-rtp/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtp/sys/tests/constant.c b/gstreamer-rtp/sys/tests/constant.c
index 241de0821..271636cd0 100644
--- a/gstreamer-rtp/sys/tests/constant.c
+++ b/gstreamer-rtp/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtp/sys/tests/layout.c b/gstreamer-rtp/sys/tests/layout.c
index 701f31799..6be2a9174 100644
--- a/gstreamer-rtp/sys/tests/layout.c
+++ b/gstreamer-rtp/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_address_pool.rs b/gstreamer-rtsp-server/src/auto/rtsp_address_pool.rs
index 8ec4e09e1..c18a7317e 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_address_pool.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_address_pool.rs
@@ -18,6 +18,8 @@ glib::wrapper! {
 }
 
 impl RTSPAddressPool {
+    pub const NONE: Option<&'static RTSPAddressPool> = None;
+
     #[doc(alias = "gst_rtsp_address_pool_new")]
     pub fn new() -> RTSPAddressPool {
         assert_initialized_main_thread!();
@@ -34,10 +36,6 @@ impl Default for RTSPAddressPool {
 unsafe impl Send for RTSPAddressPool {}
 unsafe impl Sync for RTSPAddressPool {}
 
-impl RTSPAddressPool {
-    pub const NONE: Option<&'static RTSPAddressPool> = None;
-}
-
 pub trait RTSPAddressPoolExt: 'static {
     #[doc(alias = "gst_rtsp_address_pool_acquire_address")]
     fn acquire_address(
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs
index 1dda24f0a..ce34efe2a 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs
@@ -22,6 +22,8 @@ glib::wrapper! {
 }
 
 impl RTSPAuth {
+    pub const NONE: Option<&'static RTSPAuth> = None;
+
     #[doc(alias = "gst_rtsp_auth_new")]
     pub fn new() -> RTSPAuth {
         assert_initialized_main_thread!();
@@ -60,10 +62,6 @@ impl Default for RTSPAuth {
 unsafe impl Send for RTSPAuth {}
 unsafe impl Sync for RTSPAuth {}
 
-impl RTSPAuth {
-    pub const NONE: Option<&'static RTSPAuth> = None;
-}
-
 pub trait RTSPAuthExt: 'static {
     #[doc(alias = "gst_rtsp_auth_add_basic")]
     fn add_basic(&self, basic: &str, token: &RTSPToken);
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_client.rs b/gstreamer-rtsp-server/src/auto/rtsp_client.rs
index c7ed2f3aa..3b5a81796 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_client.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_client.rs
@@ -33,6 +33,8 @@ glib::wrapper! {
 }
 
 impl RTSPClient {
+    pub const NONE: Option<&'static RTSPClient> = None;
+
     #[doc(alias = "gst_rtsp_client_new")]
     pub fn new() -> RTSPClient {
         assert_initialized_main_thread!();
@@ -49,10 +51,6 @@ impl Default for RTSPClient {
 unsafe impl Send for RTSPClient {}
 unsafe impl Sync for RTSPClient {}
 
-impl RTSPClient {
-    pub const NONE: Option<&'static RTSPClient> = None;
-}
-
 pub trait RTSPClientExt: 'static {
     #[doc(alias = "gst_rtsp_client_close")]
     fn close(&self);
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_media.rs
index 83dbb0e6c..832049ad1 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_media.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_media.rs
@@ -34,6 +34,8 @@ glib::wrapper! {
 }
 
 impl RTSPMedia {
+    pub const NONE: Option<&'static RTSPMedia> = None;
+
     #[doc(alias = "gst_rtsp_media_new")]
     pub fn new(element: &impl IsA<gst::Element>) -> RTSPMedia {
         assert_initialized_main_thread!();
@@ -44,10 +46,6 @@ impl RTSPMedia {
 unsafe impl Send for RTSPMedia {}
 unsafe impl Sync for RTSPMedia {}
 
-impl RTSPMedia {
-    pub const NONE: Option<&'static RTSPMedia> = None;
-}
-
 pub trait RTSPMediaExt: 'static {
     #[doc(alias = "gst_rtsp_media_collect_streams")]
     fn collect_streams(&self);
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs b/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs
index adc4ba2aa..718b66800 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs
@@ -28,6 +28,8 @@ glib::wrapper! {
 }
 
 impl RTSPMediaFactory {
+    pub const NONE: Option<&'static RTSPMediaFactory> = None;
+
     #[doc(alias = "gst_rtsp_media_factory_new")]
     pub fn new() -> RTSPMediaFactory {
         assert_initialized_main_thread!();
@@ -44,10 +46,6 @@ impl Default for RTSPMediaFactory {
 unsafe impl Send for RTSPMediaFactory {}
 unsafe impl Sync for RTSPMediaFactory {}
 
-impl RTSPMediaFactory {
-    pub const NONE: Option<&'static RTSPMediaFactory> = None;
-}
-
 pub trait RTSPMediaFactoryExt: 'static {
     //#[doc(alias = "gst_rtsp_media_factory_add_role")]
     //fn add_role(&self, role: &str, fieldname: &str, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs);
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs b/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs
index 9adc92a27..5be326295 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs
@@ -24,6 +24,8 @@ glib::wrapper! {
 }
 
 impl RTSPMediaFactoryURI {
+    pub const NONE: Option<&'static RTSPMediaFactoryURI> = None;
+
     #[doc(alias = "gst_rtsp_media_factory_uri_new")]
     pub fn new() -> RTSPMediaFactoryURI {
         assert_initialized_main_thread!();
@@ -40,10 +42,6 @@ impl Default for RTSPMediaFactoryURI {
 unsafe impl Send for RTSPMediaFactoryURI {}
 unsafe impl Sync for RTSPMediaFactoryURI {}
 
-impl RTSPMediaFactoryURI {
-    pub const NONE: Option<&'static RTSPMediaFactoryURI> = None;
-}
-
 pub trait RTSPMediaFactoryURIExt: 'static {
     #[doc(alias = "gst_rtsp_media_factory_uri_get_uri")]
     #[doc(alias = "get_uri")]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_mount_points.rs b/gstreamer-rtsp-server/src/auto/rtsp_mount_points.rs
index 12e51128a..eddc45723 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_mount_points.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_mount_points.rs
@@ -18,6 +18,8 @@ glib::wrapper! {
 }
 
 impl RTSPMountPoints {
+    pub const NONE: Option<&'static RTSPMountPoints> = None;
+
     #[doc(alias = "gst_rtsp_mount_points_new")]
     pub fn new() -> RTSPMountPoints {
         assert_initialized_main_thread!();
@@ -34,10 +36,6 @@ impl Default for RTSPMountPoints {
 unsafe impl Send for RTSPMountPoints {}
 unsafe impl Sync for RTSPMountPoints {}
 
-impl RTSPMountPoints {
-    pub const NONE: Option<&'static RTSPMountPoints> = None;
-}
-
 pub trait RTSPMountPointsExt: 'static {
     #[doc(alias = "gst_rtsp_mount_points_add_factory")]
     fn add_factory(&self, path: &str, factory: &impl IsA<RTSPMediaFactory>);
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_server.rs b/gstreamer-rtsp-server/src/auto/rtsp_server.rs
index 15cca7e72..5ff4813cb 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_server.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_server.rs
@@ -30,6 +30,8 @@ glib::wrapper! {
 }
 
 impl RTSPServer {
+    pub const NONE: Option<&'static RTSPServer> = None;
+
     #[doc(alias = "gst_rtsp_server_new")]
     pub fn new() -> RTSPServer {
         assert_initialized_main_thread!();
@@ -65,10 +67,6 @@ impl Default for RTSPServer {
 unsafe impl Send for RTSPServer {}
 unsafe impl Sync for RTSPServer {}
 
-impl RTSPServer {
-    pub const NONE: Option<&'static RTSPServer> = None;
-}
-
 pub trait RTSPServerExt: 'static {
     #[doc(alias = "gst_rtsp_server_client_filter")]
     fn client_filter(
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session.rs b/gstreamer-rtsp-server/src/auto/rtsp_session.rs
index d79e8b0de..8342f983b 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_session.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_session.rs
@@ -27,6 +27,8 @@ glib::wrapper! {
 }
 
 impl RTSPSession {
+    pub const NONE: Option<&'static RTSPSession> = None;
+
     #[doc(alias = "gst_rtsp_session_new")]
     pub fn new(sessionid: &str) -> RTSPSession {
         assert_initialized_main_thread!();
@@ -37,10 +39,6 @@ impl RTSPSession {
 unsafe impl Send for RTSPSession {}
 unsafe impl Sync for RTSPSession {}
 
-impl RTSPSession {
-    pub const NONE: Option<&'static RTSPSession> = None;
-}
-
 pub trait RTSPSessionExt: 'static {
     #[doc(alias = "gst_rtsp_session_allow_expire")]
     fn allow_expire(&self);
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs
index dde6cfbdb..94bffb3d0 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs
@@ -19,6 +19,8 @@ glib::wrapper! {
 }
 
 impl RTSPSessionMedia {
+    pub const NONE: Option<&'static RTSPSessionMedia> = None;
+
     #[doc(alias = "gst_rtsp_session_media_new")]
     pub fn new(path: &str, media: &impl IsA<RTSPMedia>) -> RTSPSessionMedia {
         skip_assert_initialized!();
@@ -34,10 +36,6 @@ impl RTSPSessionMedia {
 unsafe impl Send for RTSPSessionMedia {}
 unsafe impl Sync for RTSPSessionMedia {}
 
-impl RTSPSessionMedia {
-    pub const NONE: Option<&'static RTSPSessionMedia> = None;
-}
-
 pub trait RTSPSessionMediaExt: 'static {
     //#[doc(alias = "gst_rtsp_session_media_alloc_channels")]
     //fn alloc_channels(&self, range: /*Ignored*/gst_rtsp::RTSPRange) -> bool;
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs b/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs
index 3e82e8534..27d346b13 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs
@@ -23,6 +23,8 @@ glib::wrapper! {
 }
 
 impl RTSPSessionPool {
+    pub const NONE: Option<&'static RTSPSessionPool> = None;
+
     #[doc(alias = "gst_rtsp_session_pool_new")]
     pub fn new() -> RTSPSessionPool {
         assert_initialized_main_thread!();
@@ -39,10 +41,6 @@ impl Default for RTSPSessionPool {
 unsafe impl Send for RTSPSessionPool {}
 unsafe impl Sync for RTSPSessionPool {}
 
-impl RTSPSessionPool {
-    pub const NONE: Option<&'static RTSPSessionPool> = None;
-}
-
 pub trait RTSPSessionPoolExt: 'static {
     #[doc(alias = "gst_rtsp_session_pool_cleanup")]
     fn cleanup(&self) -> u32;
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_stream.rs b/gstreamer-rtsp-server/src/auto/rtsp_stream.rs
index 6da97663a..dd9fee3eb 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_stream.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_stream.rs
@@ -27,6 +27,8 @@ glib::wrapper! {
 }
 
 impl RTSPStream {
+    pub const NONE: Option<&'static RTSPStream> = None;
+
     #[doc(alias = "gst_rtsp_stream_new")]
     pub fn new(
         idx: u32,
@@ -47,10 +49,6 @@ impl RTSPStream {
 unsafe impl Send for RTSPStream {}
 unsafe impl Sync for RTSPStream {}
 
-impl RTSPStream {
-    pub const NONE: Option<&'static RTSPStream> = None;
-}
-
 pub trait RTSPStreamExt: 'static {
     #[cfg(any(feature = "v1_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs b/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs
index 21d33d3c4..cff3be472 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs
@@ -18,16 +18,14 @@ glib::wrapper! {
 }
 
 impl RTSPStreamTransport {
+    pub const NONE: Option<&'static RTSPStreamTransport> = None;
+
     //#[doc(alias = "gst_rtsp_stream_transport_new")]
     //pub fn new(stream: &impl IsA<RTSPStream>, tr: /*Ignored*/&mut gst_rtsp::RTSPTransport) -> RTSPStreamTransport {
     //    unsafe { TODO: call ffi:gst_rtsp_stream_transport_new() }
     //}
 }
 
-impl RTSPStreamTransport {
-    pub const NONE: Option<&'static RTSPStreamTransport> = None;
-}
-
 pub trait RTSPStreamTransportExt: 'static {
     #[doc(alias = "gst_rtsp_stream_transport_get_rtpinfo")]
     #[doc(alias = "get_rtpinfo")]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs b/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs
index afe6ecde9..96d88a7ff 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs
@@ -24,6 +24,8 @@ glib::wrapper! {
 }
 
 impl RTSPThreadPool {
+    pub const NONE: Option<&'static RTSPThreadPool> = None;
+
     #[doc(alias = "gst_rtsp_thread_pool_new")]
     pub fn new() -> RTSPThreadPool {
         assert_initialized_main_thread!();
@@ -48,10 +50,6 @@ impl Default for RTSPThreadPool {
 unsafe impl Send for RTSPThreadPool {}
 unsafe impl Sync for RTSPThreadPool {}
 
-impl RTSPThreadPool {
-    pub const NONE: Option<&'static RTSPThreadPool> = None;
-}
-
 pub trait RTSPThreadPoolExt: 'static {
     #[doc(alias = "gst_rtsp_thread_pool_get_max_threads")]
     #[doc(alias = "get_max_threads")]
diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-rtsp-server/src/auto/versions.txt
+++ b/gstreamer-rtsp-server/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-rtsp-server/sys/build.rs b/gstreamer-rtsp-server/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-rtsp-server/sys/build.rs
+++ b/gstreamer-rtsp-server/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtsp-server/sys/src/lib.rs b/gstreamer-rtsp-server/sys/src/lib.rs
index 81e0f15ad..6c7fb12c9 100644
--- a/gstreamer-rtsp-server/sys/src/lib.rs
+++ b/gstreamer-rtsp-server/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtsp-server/sys/tests/abi.rs b/gstreamer-rtsp-server/sys/tests/abi.rs
index 2b9c15431..3859402e6 100644
--- a/gstreamer-rtsp-server/sys/tests/abi.rs
+++ b/gstreamer-rtsp-server/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtsp-server/sys/tests/constant.c b/gstreamer-rtsp-server/sys/tests/constant.c
index e7d192aed..3bb5258fb 100644
--- a/gstreamer-rtsp-server/sys/tests/constant.c
+++ b/gstreamer-rtsp-server/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtsp-server/sys/tests/layout.c b/gstreamer-rtsp-server/sys/tests/layout.c
index eff50e54c..faafe7a36 100644
--- a/gstreamer-rtsp-server/sys/tests/layout.c
+++ b/gstreamer-rtsp-server/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtsp/src/auto/mod.rs b/gstreamer-rtsp/src/auto/mod.rs
index 28f695768..6d50ff4c5 100644
--- a/gstreamer-rtsp/src/auto/mod.rs
+++ b/gstreamer-rtsp/src/auto/mod.rs
@@ -30,6 +30,3 @@ pub use self::flags::RTSPLowerTrans;
 pub use self::flags::RTSPMethod;
 pub use self::flags::RTSPProfile;
 pub use self::flags::RTSPTransMode;
-
-#[doc(hidden)]
-pub mod traits {}
diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-rtsp/src/auto/versions.txt
+++ b/gstreamer-rtsp/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-rtsp/sys/build.rs b/gstreamer-rtsp/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-rtsp/sys/build.rs
+++ b/gstreamer-rtsp/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtsp/sys/src/lib.rs b/gstreamer-rtsp/sys/src/lib.rs
index a407fb42b..a19a60b81 100644
--- a/gstreamer-rtsp/sys/src/lib.rs
+++ b/gstreamer-rtsp/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtsp/sys/tests/abi.rs b/gstreamer-rtsp/sys/tests/abi.rs
index 2e41da616..3d97ec6d3 100644
--- a/gstreamer-rtsp/sys/tests/abi.rs
+++ b/gstreamer-rtsp/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtsp/sys/tests/constant.c b/gstreamer-rtsp/sys/tests/constant.c
index 86750780e..6393fc507 100644
--- a/gstreamer-rtsp/sys/tests/constant.c
+++ b/gstreamer-rtsp/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-rtsp/sys/tests/layout.c b/gstreamer-rtsp/sys/tests/layout.c
index d2a7bfeee..d03af5916 100644
--- a/gstreamer-rtsp/sys/tests/layout.c
+++ b/gstreamer-rtsp/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-sdp/src/auto/mod.rs b/gstreamer-sdp/src/auto/mod.rs
index 7ba01003c..1f6b72f92 100644
--- a/gstreamer-sdp/src/auto/mod.rs
+++ b/gstreamer-sdp/src/auto/mod.rs
@@ -2,6 +2,3 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git)
 // DO NOT EDIT
-
-#[doc(hidden)]
-pub mod traits {}
diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-sdp/src/auto/versions.txt
+++ b/gstreamer-sdp/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-sdp/sys/build.rs b/gstreamer-sdp/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-sdp/sys/build.rs
+++ b/gstreamer-sdp/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-sdp/sys/src/lib.rs b/gstreamer-sdp/sys/src/lib.rs
index a8fa91580..d43613cb4 100644
--- a/gstreamer-sdp/sys/src/lib.rs
+++ b/gstreamer-sdp/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-sdp/sys/tests/abi.rs b/gstreamer-sdp/sys/tests/abi.rs
index 59fa05d22..89a666bd2 100644
--- a/gstreamer-sdp/sys/tests/abi.rs
+++ b/gstreamer-sdp/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-sdp/sys/tests/constant.c b/gstreamer-sdp/sys/tests/constant.c
index 713a5673f..f13c9d0d7 100644
--- a/gstreamer-sdp/sys/tests/constant.c
+++ b/gstreamer-sdp/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-sdp/sys/tests/layout.c b/gstreamer-sdp/sys/tests/layout.c
index 082edb19f..c7d38e51a 100644
--- a/gstreamer-sdp/sys/tests/layout.c
+++ b/gstreamer-sdp/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-tag/sys/build.rs b/gstreamer-tag/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-tag/sys/build.rs
+++ b/gstreamer-tag/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-tag/sys/src/lib.rs b/gstreamer-tag/sys/src/lib.rs
index 47fd90469..fb4672fd3 100644
--- a/gstreamer-tag/sys/src/lib.rs
+++ b/gstreamer-tag/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-tag/sys/tests/abi.rs b/gstreamer-tag/sys/tests/abi.rs
index 74d226aae..07b3e7875 100644
--- a/gstreamer-tag/sys/tests/abi.rs
+++ b/gstreamer-tag/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-tag/sys/tests/constant.c b/gstreamer-tag/sys/tests/constant.c
index be69a8558..88722d1fd 100644
--- a/gstreamer-tag/sys/tests/constant.c
+++ b/gstreamer-tag/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-tag/sys/tests/layout.c b/gstreamer-tag/sys/tests/layout.c
index ad23f598a..0ea492ce4 100644
--- a/gstreamer-tag/sys/tests/layout.c
+++ b/gstreamer-tag/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-video/src/auto/color_balance.rs b/gstreamer-video/src/auto/color_balance.rs
index 6b2520bc2..1aa73dfbf 100644
--- a/gstreamer-video/src/auto/color_balance.rs
+++ b/gstreamer-video/src/auto/color_balance.rs
@@ -22,13 +22,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for ColorBalance {}
-unsafe impl Sync for ColorBalance {}
-
 impl ColorBalance {
     pub const NONE: Option<&'static ColorBalance> = None;
 }
 
+unsafe impl Send for ColorBalance {}
+unsafe impl Sync for ColorBalance {}
+
 pub trait ColorBalanceExt: 'static {
     #[doc(alias = "gst_color_balance_get_balance_type")]
     #[doc(alias = "get_balance_type")]
diff --git a/gstreamer-video/src/auto/color_balance_channel.rs b/gstreamer-video/src/auto/color_balance_channel.rs
index e423a83f3..dcd01889b 100644
--- a/gstreamer-video/src/auto/color_balance_channel.rs
+++ b/gstreamer-video/src/auto/color_balance_channel.rs
@@ -20,13 +20,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for ColorBalanceChannel {}
-unsafe impl Sync for ColorBalanceChannel {}
-
 impl ColorBalanceChannel {
     pub const NONE: Option<&'static ColorBalanceChannel> = None;
 }
 
+unsafe impl Send for ColorBalanceChannel {}
+unsafe impl Sync for ColorBalanceChannel {}
+
 pub trait ColorBalanceChannelExt: 'static {
     #[doc(alias = "value-changed")]
     fn connect_value_changed<F: Fn(&Self, i32) + Send + Sync + 'static>(
diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-video/src/auto/versions.txt
+++ b/gstreamer-video/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-video/src/auto/video_aggregator_parallel_convert_pad.rs b/gstreamer-video/src/auto/video_aggregator_parallel_convert_pad.rs
index 6604bab11..878658ce0 100644
--- a/gstreamer-video/src/auto/video_aggregator_parallel_convert_pad.rs
+++ b/gstreamer-video/src/auto/video_aggregator_parallel_convert_pad.rs
@@ -12,11 +12,9 @@ glib::wrapper! {
     }
 }
 
-impl VideoAggregatorParallelConvertPad {}
-
-unsafe impl Send for VideoAggregatorParallelConvertPad {}
-unsafe impl Sync for VideoAggregatorParallelConvertPad {}
-
 impl VideoAggregatorParallelConvertPad {
     pub const NONE: Option<&'static VideoAggregatorParallelConvertPad> = None;
 }
+
+unsafe impl Send for VideoAggregatorParallelConvertPad {}
+unsafe impl Sync for VideoAggregatorParallelConvertPad {}
diff --git a/gstreamer-video/src/auto/video_buffer_pool.rs b/gstreamer-video/src/auto/video_buffer_pool.rs
index b93f77b0d..5c4cc835c 100644
--- a/gstreamer-video/src/auto/video_buffer_pool.rs
+++ b/gstreamer-video/src/auto/video_buffer_pool.rs
@@ -16,6 +16,8 @@ glib::wrapper! {
 }
 
 impl VideoBufferPool {
+    pub const NONE: Option<&'static VideoBufferPool> = None;
+
     #[doc(alias = "gst_video_buffer_pool_new")]
     pub fn new() -> VideoBufferPool {
         assert_initialized_main_thread!();
@@ -31,7 +33,3 @@ impl Default for VideoBufferPool {
 
 unsafe impl Send for VideoBufferPool {}
 unsafe impl Sync for VideoBufferPool {}
-
-impl VideoBufferPool {
-    pub const NONE: Option<&'static VideoBufferPool> = None;
-}
diff --git a/gstreamer-video/src/auto/video_decoder.rs b/gstreamer-video/src/auto/video_decoder.rs
index 8b2b5d77b..8dc7a1857 100644
--- a/gstreamer-video/src/auto/video_decoder.rs
+++ b/gstreamer-video/src/auto/video_decoder.rs
@@ -40,13 +40,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for VideoDecoder {}
-unsafe impl Sync for VideoDecoder {}
-
 impl VideoDecoder {
     pub const NONE: Option<&'static VideoDecoder> = None;
 }
 
+unsafe impl Send for VideoDecoder {}
+unsafe impl Sync for VideoDecoder {}
+
 pub trait VideoDecoderExt: 'static {
     #[doc(alias = "gst_video_decoder_add_to_frame")]
     fn add_to_frame(&self, n_bytes: i32);
diff --git a/gstreamer-video/src/auto/video_encoder.rs b/gstreamer-video/src/auto/video_encoder.rs
index c3f9dc761..839612191 100644
--- a/gstreamer-video/src/auto/video_encoder.rs
+++ b/gstreamer-video/src/auto/video_encoder.rs
@@ -25,13 +25,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for VideoEncoder {}
-unsafe impl Sync for VideoEncoder {}
-
 impl VideoEncoder {
     pub const NONE: Option<&'static VideoEncoder> = None;
 }
 
+unsafe impl Send for VideoEncoder {}
+unsafe impl Sync for VideoEncoder {}
+
 pub trait VideoEncoderExt: 'static {
     #[doc(alias = "gst_video_encoder_allocate_output_buffer")]
     fn allocate_output_buffer(&self, size: usize) -> Result<gst::Buffer, glib::BoolError>;
diff --git a/gstreamer-video/src/auto/video_filter.rs b/gstreamer-video/src/auto/video_filter.rs
index f98180e47..a1d552be6 100644
--- a/gstreamer-video/src/auto/video_filter.rs
+++ b/gstreamer-video/src/auto/video_filter.rs
@@ -12,11 +12,9 @@ glib::wrapper! {
     }
 }
 
-impl VideoFilter {}
-
-unsafe impl Send for VideoFilter {}
-unsafe impl Sync for VideoFilter {}
-
 impl VideoFilter {
     pub const NONE: Option<&'static VideoFilter> = None;
 }
+
+unsafe impl Send for VideoFilter {}
+unsafe impl Sync for VideoFilter {}
diff --git a/gstreamer-video/src/auto/video_orientation.rs b/gstreamer-video/src/auto/video_orientation.rs
index eb31384c3..1884c1fa8 100644
--- a/gstreamer-video/src/auto/video_orientation.rs
+++ b/gstreamer-video/src/auto/video_orientation.rs
@@ -20,6 +20,8 @@ glib::wrapper! {
 }
 
 impl VideoOrientation {
+    pub const NONE: Option<&'static VideoOrientation> = None;
+
     #[cfg(any(feature = "v1_20", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_20")))]
     #[doc(alias = "gst_video_orientation_from_tag")]
@@ -44,10 +46,6 @@ impl VideoOrientation {
 unsafe impl Send for VideoOrientation {}
 unsafe impl Sync for VideoOrientation {}
 
-impl VideoOrientation {
-    pub const NONE: Option<&'static VideoOrientation> = None;
-}
-
 pub trait VideoOrientationExt: 'static {
     #[doc(alias = "gst_video_orientation_get_hcenter")]
     #[doc(alias = "get_hcenter")]
diff --git a/gstreamer-video/src/auto/video_overlay.rs b/gstreamer-video/src/auto/video_overlay.rs
index 83b2c0af6..0fd40d47b 100644
--- a/gstreamer-video/src/auto/video_overlay.rs
+++ b/gstreamer-video/src/auto/video_overlay.rs
@@ -16,6 +16,8 @@ glib::wrapper! {
 }
 
 impl VideoOverlay {
+    pub const NONE: Option<&'static VideoOverlay> = None;
+
     //#[cfg(any(feature = "v1_14", feature = "dox"))]
     //#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))]
     //#[doc(alias = "gst_video_overlay_install_properties")]
@@ -27,10 +29,6 @@ impl VideoOverlay {
 unsafe impl Send for VideoOverlay {}
 unsafe impl Sync for VideoOverlay {}
 
-impl VideoOverlay {
-    pub const NONE: Option<&'static VideoOverlay> = None;
-}
-
 pub trait VideoOverlayExt: 'static {
     #[doc(alias = "gst_video_overlay_expose")]
     fn expose(&self);
diff --git a/gstreamer-video/src/auto/video_sink.rs b/gstreamer-video/src/auto/video_sink.rs
index c04052f8d..2e46961b6 100644
--- a/gstreamer-video/src/auto/video_sink.rs
+++ b/gstreamer-video/src/auto/video_sink.rs
@@ -22,13 +22,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for VideoSink {}
-unsafe impl Sync for VideoSink {}
-
 impl VideoSink {
     pub const NONE: Option<&'static VideoSink> = None;
 }
 
+unsafe impl Send for VideoSink {}
+unsafe impl Sync for VideoSink {}
+
 pub trait VideoSinkExt: 'static {
     #[doc(alias = "show-preroll-frame")]
     fn shows_preroll_frame(&self) -> bool;
diff --git a/gstreamer-video/sys/build.rs b/gstreamer-video/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-video/sys/build.rs
+++ b/gstreamer-video/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-video/sys/src/lib.rs b/gstreamer-video/sys/src/lib.rs
index c341569c4..cd7f3317d 100644
--- a/gstreamer-video/sys/src/lib.rs
+++ b/gstreamer-video/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-video/sys/tests/abi.rs b/gstreamer-video/sys/tests/abi.rs
index 96951d974..479129359 100644
--- a/gstreamer-video/sys/tests/abi.rs
+++ b/gstreamer-video/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-video/sys/tests/constant.c b/gstreamer-video/sys/tests/constant.c
index 7b570878d..bc1ad47c4 100644
--- a/gstreamer-video/sys/tests/constant.c
+++ b/gstreamer-video/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-video/sys/tests/layout.c b/gstreamer-video/sys/tests/layout.c
index f25bffd05..6a8f4a9ee 100644
--- a/gstreamer-video/sys/tests/layout.c
+++ b/gstreamer-video/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-webrtc/src/auto/mod.rs b/gstreamer-webrtc/src/auto/mod.rs
index 38c8fc7e6..d6b849659 100644
--- a/gstreamer-webrtc/src/auto/mod.rs
+++ b/gstreamer-webrtc/src/auto/mod.rs
@@ -68,6 +68,3 @@ pub use self::enums::WebRTCSCTPTransportState;
 pub use self::enums::WebRTCSDPType;
 pub use self::enums::WebRTCSignalingState;
 pub use self::enums::WebRTCStatsType;
-
-#[doc(hidden)]
-pub mod traits {}
diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer-webrtc/src/auto/versions.txt
+++ b/gstreamer-webrtc/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer-webrtc/sys/build.rs b/gstreamer-webrtc/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer-webrtc/sys/build.rs
+++ b/gstreamer-webrtc/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-webrtc/sys/src/lib.rs b/gstreamer-webrtc/sys/src/lib.rs
index a8dbd2050..7f0aa6742 100644
--- a/gstreamer-webrtc/sys/src/lib.rs
+++ b/gstreamer-webrtc/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-webrtc/sys/tests/abi.rs b/gstreamer-webrtc/sys/tests/abi.rs
index 7fa65e444..b0af424d1 100644
--- a/gstreamer-webrtc/sys/tests/abi.rs
+++ b/gstreamer-webrtc/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-webrtc/sys/tests/constant.c b/gstreamer-webrtc/sys/tests/constant.c
index 0bfeb0e8b..e95ffa8c5 100644
--- a/gstreamer-webrtc/sys/tests/constant.c
+++ b/gstreamer-webrtc/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer-webrtc/sys/tests/layout.c b/gstreamer-webrtc/sys/tests/layout.c
index 803df434b..6afeb2706 100644
--- a/gstreamer-webrtc/sys/tests/layout.c
+++ b/gstreamer-webrtc/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer/src/auto/allocator.rs b/gstreamer/src/auto/allocator.rs
index 29ecb0b2f..07da22f1b 100644
--- a/gstreamer/src/auto/allocator.rs
+++ b/gstreamer/src/auto/allocator.rs
@@ -19,6 +19,8 @@ glib::wrapper! {
 }
 
 impl Allocator {
+    pub const NONE: Option<&'static Allocator> = None;
+
     #[doc(alias = "gst_allocator_find")]
     pub fn find(name: Option<&str>) -> Option<Allocator> {
         assert_initialized_main_thread!();
@@ -37,10 +39,6 @@ impl Allocator {
 unsafe impl Send for Allocator {}
 unsafe impl Sync for Allocator {}
 
-impl Allocator {
-    pub const NONE: Option<&'static Allocator> = None;
-}
-
 pub trait AllocatorExt: 'static {
     #[doc(alias = "gst_allocator_alloc")]
     fn alloc(
diff --git a/gstreamer/src/auto/bin.rs b/gstreamer/src/auto/bin.rs
index f236cda83..16aceebab 100644
--- a/gstreamer/src/auto/bin.rs
+++ b/gstreamer/src/auto/bin.rs
@@ -31,6 +31,8 @@ glib::wrapper! {
 }
 
 impl Bin {
+    pub const NONE: Option<&'static Bin> = None;
+
     #[doc(alias = "gst_bin_new")]
     pub fn new(name: Option<&str>) -> Bin {
         assert_initialized_main_thread!();
@@ -41,10 +43,6 @@ impl Bin {
 unsafe impl Send for Bin {}
 unsafe impl Sync for Bin {}
 
-impl Bin {
-    pub const NONE: Option<&'static Bin> = None;
-}
-
 pub trait GstBinExt: 'static {
     #[doc(alias = "gst_bin_add")]
     fn add(&self, element: &impl IsA<Element>) -> Result<(), glib::error::BoolError>;
diff --git a/gstreamer/src/auto/buffer_pool.rs b/gstreamer/src/auto/buffer_pool.rs
index 0c62ab05b..ef3d624cd 100644
--- a/gstreamer/src/auto/buffer_pool.rs
+++ b/gstreamer/src/auto/buffer_pool.rs
@@ -16,13 +16,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for BufferPool {}
-unsafe impl Sync for BufferPool {}
-
 impl BufferPool {
     pub const NONE: Option<&'static BufferPool> = None;
 }
 
+unsafe impl Send for BufferPool {}
+unsafe impl Sync for BufferPool {}
+
 pub trait BufferPoolExt: 'static {
     #[doc(alias = "gst_buffer_pool_get_options")]
     #[doc(alias = "get_options")]
diff --git a/gstreamer/src/auto/child_proxy.rs b/gstreamer/src/auto/child_proxy.rs
index 84f2118a5..45284df84 100644
--- a/gstreamer/src/auto/child_proxy.rs
+++ b/gstreamer/src/auto/child_proxy.rs
@@ -20,13 +20,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for ChildProxy {}
-unsafe impl Sync for ChildProxy {}
-
 impl ChildProxy {
     pub const NONE: Option<&'static ChildProxy> = None;
 }
 
+unsafe impl Send for ChildProxy {}
+unsafe impl Sync for ChildProxy {}
+
 pub trait ChildProxyExt: 'static {
     #[doc(alias = "gst_child_proxy_child_added")]
     fn child_added(&self, child: &impl IsA<glib::Object>, name: &str);
diff --git a/gstreamer/src/auto/clock.rs b/gstreamer/src/auto/clock.rs
index 6d98a2eb6..eafeda16b 100644
--- a/gstreamer/src/auto/clock.rs
+++ b/gstreamer/src/auto/clock.rs
@@ -26,6 +26,8 @@ glib::wrapper! {
 }
 
 impl Clock {
+    pub const NONE: Option<&'static Clock> = None;
+
     //#[doc(alias = "gst_clock_id_compare_func")]
     //pub fn id_compare_func(id1: /*Unimplemented*/Option<Fundamental: Pointer>, id2: /*Unimplemented*/Option<Fundamental: Pointer>) -> i32 {
     //    unsafe { TODO: call ffi:gst_clock_id_compare_func() }
@@ -79,10 +81,6 @@ impl Clock {
 unsafe impl Send for Clock {}
 unsafe impl Sync for Clock {}
 
-impl Clock {
-    pub const NONE: Option<&'static Clock> = None;
-}
-
 pub trait ClockExt: 'static {
     #[doc(alias = "gst_clock_add_observation")]
     fn add_observation(&self, slave: ClockTime, master: ClockTime) -> Option<f64>;
diff --git a/gstreamer/src/auto/control_binding.rs b/gstreamer/src/auto/control_binding.rs
index 1e2341d55..412b6c065 100644
--- a/gstreamer/src/auto/control_binding.rs
+++ b/gstreamer/src/auto/control_binding.rs
@@ -18,13 +18,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for ControlBinding {}
-unsafe impl Sync for ControlBinding {}
-
 impl ControlBinding {
     pub const NONE: Option<&'static ControlBinding> = None;
 }
 
+unsafe impl Send for ControlBinding {}
+unsafe impl Sync for ControlBinding {}
+
 pub trait ControlBindingExt: 'static {
     #[doc(alias = "gst_control_binding_get_value")]
     #[doc(alias = "get_value")]
diff --git a/gstreamer/src/auto/control_source.rs b/gstreamer/src/auto/control_source.rs
index 6cfbb7c35..fd79b705d 100644
--- a/gstreamer/src/auto/control_source.rs
+++ b/gstreamer/src/auto/control_source.rs
@@ -18,13 +18,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for ControlSource {}
-unsafe impl Sync for ControlSource {}
-
 impl ControlSource {
     pub const NONE: Option<&'static ControlSource> = None;
 }
 
+unsafe impl Send for ControlSource {}
+unsafe impl Sync for ControlSource {}
+
 pub trait ControlSourceExt: 'static {
     #[doc(alias = "gst_control_source_get_value")]
     #[doc(alias = "control_source_get_value")]
diff --git a/gstreamer/src/auto/device.rs b/gstreamer/src/auto/device.rs
index 3af685d98..280ca6cfb 100644
--- a/gstreamer/src/auto/device.rs
+++ b/gstreamer/src/auto/device.rs
@@ -24,13 +24,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for Device {}
-unsafe impl Sync for Device {}
-
 impl Device {
     pub const NONE: Option<&'static Device> = None;
 }
 
+unsafe impl Send for Device {}
+unsafe impl Sync for Device {}
+
 pub trait DeviceExt: 'static {
     #[doc(alias = "gst_device_create_element")]
     fn create_element(&self, name: Option<&str>) -> Result<Element, glib::BoolError>;
diff --git a/gstreamer/src/auto/device_monitor.rs b/gstreamer/src/auto/device_monitor.rs
index 62a2bf6c5..3cb9daf20 100644
--- a/gstreamer/src/auto/device_monitor.rs
+++ b/gstreamer/src/auto/device_monitor.rs
@@ -25,13 +25,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for DeviceMonitor {}
-unsafe impl Sync for DeviceMonitor {}
-
 impl DeviceMonitor {
     pub const NONE: Option<&'static DeviceMonitor> = None;
 }
 
+unsafe impl Send for DeviceMonitor {}
+unsafe impl Sync for DeviceMonitor {}
+
 pub trait DeviceMonitorExt: 'static {
     #[doc(alias = "gst_device_monitor_get_bus")]
     #[doc(alias = "get_bus")]
diff --git a/gstreamer/src/auto/device_provider.rs b/gstreamer/src/auto/device_provider.rs
index 1a5f90e50..3528970bd 100644
--- a/gstreamer/src/auto/device_provider.rs
+++ b/gstreamer/src/auto/device_provider.rs
@@ -24,13 +24,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for DeviceProvider {}
-unsafe impl Sync for DeviceProvider {}
-
 impl DeviceProvider {
     pub const NONE: Option<&'static DeviceProvider> = None;
 }
 
+unsafe impl Send for DeviceProvider {}
+unsafe impl Sync for DeviceProvider {}
+
 pub trait DeviceProviderExt: 'static {
     #[doc(alias = "gst_device_provider_can_monitor")]
     fn can_monitor(&self) -> bool;
diff --git a/gstreamer/src/auto/element.rs b/gstreamer/src/auto/element.rs
index c3004c1f7..1eca04bbd 100644
--- a/gstreamer/src/auto/element.rs
+++ b/gstreamer/src/auto/element.rs
@@ -39,6 +39,8 @@ glib::wrapper! {
 }
 
 impl Element {
+    pub const NONE: Option<&'static Element> = None;
+
     #[doc(alias = "gst_element_make_from_uri")]
     pub fn make_from_uri(
         type_: URIType,
@@ -66,10 +68,6 @@ impl Element {
 unsafe impl Send for Element {}
 unsafe impl Sync for Element {}
 
-impl Element {
-    pub const NONE: Option<&'static Element> = None;
-}
-
 pub trait ElementExt: 'static {
     #[doc(alias = "gst_element_abort_state")]
     fn abort_state(&self);
diff --git a/gstreamer/src/auto/ghost_pad.rs b/gstreamer/src/auto/ghost_pad.rs
index ea28641ab..95e5a62be 100644
--- a/gstreamer/src/auto/ghost_pad.rs
+++ b/gstreamer/src/auto/ghost_pad.rs
@@ -18,13 +18,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for GhostPad {}
-unsafe impl Sync for GhostPad {}
-
 impl GhostPad {
     pub const NONE: Option<&'static GhostPad> = None;
 }
 
+unsafe impl Send for GhostPad {}
+unsafe impl Sync for GhostPad {}
+
 pub trait GhostPadExt: 'static {
     #[doc(alias = "gst_ghost_pad_get_target")]
     #[doc(alias = "get_target")]
diff --git a/gstreamer/src/auto/object.rs b/gstreamer/src/auto/object.rs
index 20ba03a44..367a8fda7 100644
--- a/gstreamer/src/auto/object.rs
+++ b/gstreamer/src/auto/object.rs
@@ -24,6 +24,8 @@ glib::wrapper! {
 }
 
 impl Object {
+    pub const NONE: Option<&'static Object> = None;
+
     #[doc(alias = "gst_object_check_uniqueness")]
     pub fn check_uniqueness(list: &[Object], name: &str) -> bool {
         assert_initialized_main_thread!();
@@ -56,10 +58,6 @@ impl fmt::Display for Object {
 unsafe impl Send for Object {}
 unsafe impl Sync for Object {}
 
-impl Object {
-    pub const NONE: Option<&'static Object> = None;
-}
-
 pub trait GstObjectExt: 'static {
     #[doc(alias = "gst_object_add_control_binding")]
     fn add_control_binding(
diff --git a/gstreamer/src/auto/pad.rs b/gstreamer/src/auto/pad.rs
index 825ea4879..76e9da8d7 100644
--- a/gstreamer/src/auto/pad.rs
+++ b/gstreamer/src/auto/pad.rs
@@ -39,13 +39,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for Pad {}
-unsafe impl Sync for Pad {}
-
 impl Pad {
     pub const NONE: Option<&'static Pad> = None;
 }
 
+unsafe impl Send for Pad {}
+unsafe impl Sync for Pad {}
+
 pub trait PadExt: 'static {
     #[doc(alias = "gst_pad_activate_mode")]
     fn activate_mode(&self, mode: PadMode, active: bool) -> Result<(), glib::error::BoolError>;
diff --git a/gstreamer/src/auto/pipeline.rs b/gstreamer/src/auto/pipeline.rs
index f05cbbdfe..a9df35073 100644
--- a/gstreamer/src/auto/pipeline.rs
+++ b/gstreamer/src/auto/pipeline.rs
@@ -27,6 +27,8 @@ glib::wrapper! {
 }
 
 impl Pipeline {
+    pub const NONE: Option<&'static Pipeline> = None;
+
     #[doc(alias = "gst_pipeline_new")]
     pub fn new(name: Option<&str>) -> Pipeline {
         assert_initialized_main_thread!();
@@ -39,10 +41,6 @@ impl Pipeline {
 unsafe impl Send for Pipeline {}
 unsafe impl Sync for Pipeline {}
 
-impl Pipeline {
-    pub const NONE: Option<&'static Pipeline> = None;
-}
-
 pub trait PipelineExt: 'static {
     #[doc(alias = "gst_pipeline_auto_clock")]
     fn auto_clock(&self);
diff --git a/gstreamer/src/auto/plugin_feature.rs b/gstreamer/src/auto/plugin_feature.rs
index 0209bd9a5..4827d7049 100644
--- a/gstreamer/src/auto/plugin_feature.rs
+++ b/gstreamer/src/auto/plugin_feature.rs
@@ -17,13 +17,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for PluginFeature {}
-unsafe impl Sync for PluginFeature {}
-
 impl PluginFeature {
     pub const NONE: Option<&'static PluginFeature> = None;
 }
 
+unsafe impl Send for PluginFeature {}
+unsafe impl Sync for PluginFeature {}
+
 pub trait PluginFeatureExt: 'static {
     #[doc(alias = "gst_plugin_feature_check_version")]
     fn check_version(&self, min_major: u32, min_minor: u32, min_micro: u32) -> bool;
diff --git a/gstreamer/src/auto/preset.rs b/gstreamer/src/auto/preset.rs
index 2bd84e4f8..58fef7bf8 100644
--- a/gstreamer/src/auto/preset.rs
+++ b/gstreamer/src/auto/preset.rs
@@ -17,6 +17,8 @@ glib::wrapper! {
 }
 
 impl Preset {
+    pub const NONE: Option<&'static Preset> = None;
+
     #[doc(alias = "gst_preset_get_app_dir")]
     #[doc(alias = "get_app_dir")]
     pub fn app_dir() -> Option<std::path::PathBuf> {
@@ -39,10 +41,6 @@ impl Preset {
 unsafe impl Send for Preset {}
 unsafe impl Sync for Preset {}
 
-impl Preset {
-    pub const NONE: Option<&'static Preset> = None;
-}
-
 pub trait PresetExt: 'static {
     #[doc(alias = "gst_preset_delete_preset")]
     fn delete_preset(&self, name: &str) -> Result<(), glib::error::BoolError>;
diff --git a/gstreamer/src/auto/proxy_pad.rs b/gstreamer/src/auto/proxy_pad.rs
index 4ca8f2804..9ea07f350 100644
--- a/gstreamer/src/auto/proxy_pad.rs
+++ b/gstreamer/src/auto/proxy_pad.rs
@@ -18,6 +18,8 @@ glib::wrapper! {
 }
 
 impl ProxyPad {
+    pub const NONE: Option<&'static ProxyPad> = None;
+
     //#[doc(alias = "gst_proxy_pad_iterate_internal_links_default")]
     //pub fn iterate_internal_links_default(pad: &impl IsA<Pad>, parent: Option<&impl IsA<Object>>) -> /*Ignored*/Option<Iterator> {
     //    unsafe { TODO: call ffi:gst_proxy_pad_iterate_internal_links_default() }
@@ -27,10 +29,6 @@ impl ProxyPad {
 unsafe impl Send for ProxyPad {}
 unsafe impl Sync for ProxyPad {}
 
-impl ProxyPad {
-    pub const NONE: Option<&'static ProxyPad> = None;
-}
-
 pub trait ProxyPadExt: 'static {
     #[doc(alias = "gst_proxy_pad_get_internal")]
     #[doc(alias = "get_internal")]
diff --git a/gstreamer/src/auto/system_clock.rs b/gstreamer/src/auto/system_clock.rs
index c931e815c..2884c4f02 100644
--- a/gstreamer/src/auto/system_clock.rs
+++ b/gstreamer/src/auto/system_clock.rs
@@ -26,6 +26,8 @@ glib::wrapper! {
 }
 
 impl SystemClock {
+    pub const NONE: Option<&'static SystemClock> = None;
+
     #[doc(alias = "gst_system_clock_obtain")]
     pub fn obtain() -> Clock {
         assert_initialized_main_thread!();
@@ -44,10 +46,6 @@ impl SystemClock {
 unsafe impl Send for SystemClock {}
 unsafe impl Sync for SystemClock {}
 
-impl SystemClock {
-    pub const NONE: Option<&'static SystemClock> = None;
-}
-
 pub trait SystemClockExt: 'static {
     #[doc(alias = "clock-type")]
     fn clock_type(&self) -> ClockType;
diff --git a/gstreamer/src/auto/tag_setter.rs b/gstreamer/src/auto/tag_setter.rs
index 2e91258c2..44cb6980b 100644
--- a/gstreamer/src/auto/tag_setter.rs
+++ b/gstreamer/src/auto/tag_setter.rs
@@ -19,13 +19,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for TagSetter {}
-unsafe impl Sync for TagSetter {}
-
 impl TagSetter {
     pub const NONE: Option<&'static TagSetter> = None;
 }
 
+unsafe impl Send for TagSetter {}
+unsafe impl Sync for TagSetter {}
+
 pub trait TagSetterExt: 'static {
     //#[doc(alias = "gst_tag_setter_add_tag_valist")]
     //fn add_tag_valist(&self, mode: TagMergeMode, tag: &str, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported);
diff --git a/gstreamer/src/auto/toc_setter.rs b/gstreamer/src/auto/toc_setter.rs
index cbb850e0c..2092a29b2 100644
--- a/gstreamer/src/auto/toc_setter.rs
+++ b/gstreamer/src/auto/toc_setter.rs
@@ -18,13 +18,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for TocSetter {}
-unsafe impl Sync for TocSetter {}
-
 impl TocSetter {
     pub const NONE: Option<&'static TocSetter> = None;
 }
 
+unsafe impl Send for TocSetter {}
+unsafe impl Sync for TocSetter {}
+
 pub trait TocSetterExt: 'static {
     #[doc(alias = "gst_toc_setter_get_toc")]
     #[doc(alias = "get_toc")]
diff --git a/gstreamer/src/auto/tracer.rs b/gstreamer/src/auto/tracer.rs
index 24bc8d8df..f91c461b8 100644
--- a/gstreamer/src/auto/tracer.rs
+++ b/gstreamer/src/auto/tracer.rs
@@ -23,13 +23,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for Tracer {}
-unsafe impl Sync for Tracer {}
-
 impl Tracer {
     pub const NONE: Option<&'static Tracer> = None;
 }
 
+unsafe impl Send for Tracer {}
+unsafe impl Sync for Tracer {}
+
 pub trait TracerExt: 'static {
     fn params(&self) -> Option<glib::GString>;
 
diff --git a/gstreamer/src/auto/uri_handler.rs b/gstreamer/src/auto/uri_handler.rs
index 4ba04c9aa..cdee53d7f 100644
--- a/gstreamer/src/auto/uri_handler.rs
+++ b/gstreamer/src/auto/uri_handler.rs
@@ -17,13 +17,13 @@ glib::wrapper! {
     }
 }
 
-unsafe impl Send for URIHandler {}
-unsafe impl Sync for URIHandler {}
-
 impl URIHandler {
     pub const NONE: Option<&'static URIHandler> = None;
 }
 
+unsafe impl Send for URIHandler {}
+unsafe impl Sync for URIHandler {}
+
 pub trait URIHandlerExt: 'static {
     #[doc(alias = "gst_uri_handler_get_protocols")]
     #[doc(alias = "get_protocols")]
diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt
index 2f7c7414c..475346e61 100644
--- a/gstreamer/src/auto/versions.txt
+++ b/gstreamer/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
diff --git a/gstreamer/sys/build.rs b/gstreamer/sys/build.rs
index 254ab7cee..f84c2220b 100644
--- a/gstreamer/sys/build.rs
+++ b/gstreamer/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer/sys/src/lib.rs b/gstreamer/sys/src/lib.rs
index 13896b3b4..58d4d7edf 100644
--- a/gstreamer/sys/src/lib.rs
+++ b/gstreamer/sys/src/lib.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer/sys/tests/abi.rs b/gstreamer/sys/tests/abi.rs
index 80aa9ddef..285678b2f 100644
--- a/gstreamer/sys/tests/abi.rs
+++ b/gstreamer/sys/tests/abi.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer/sys/tests/constant.c b/gstreamer/sys/tests/constant.c
index d204e8860..a79a82bbe 100644
--- a/gstreamer/sys/tests/constant.c
+++ b/gstreamer/sys/tests/constant.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT
diff --git a/gstreamer/sys/tests/layout.c b/gstreamer/sys/tests/layout.c
index dad0071bd..6aa76962f 100644
--- a/gstreamer/sys/tests/layout.c
+++ b/gstreamer/sys/tests/layout.c
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
+// Generated by gir (https://github.com/gtk-rs/gir @ ba0ee13f6f1e)
 // from gir-files (https://github.com/gtk-rs/gir-files @ b827978e7d18)
 // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ f8c393377c4e)
 // DO NOT EDIT