diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 33deafe89..d02829d74 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 51793d99e..8df5fafd9 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 e881221a5..997f990ad 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 a0d0180ca..d1f7f479e 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 94552068b..d802756e9 100644
--- a/gstreamer-audio/src/auto/audio_base_sink.rs
+++ b/gstreamer-audio/src/auto/audio_base_sink.rs
@@ -25,7 +25,9 @@ glib::wrapper! {
 unsafe impl Send for AudioBaseSink {}
 unsafe impl Sync for AudioBaseSink {}
 
-pub const NONE_AUDIO_BASE_SINK: Option<&AudioBaseSink> = None;
+impl AudioBaseSink {
+    pub const NONE: Option<&'static AudioBaseSink> = None;
+}
 
 pub trait AudioBaseSinkExt: 'static {
     //#[doc(alias = "gst_audio_base_sink_create_ringbuffer")]
diff --git a/gstreamer-audio/src/auto/audio_base_src.rs b/gstreamer-audio/src/auto/audio_base_src.rs
index 397bbedbd..9f5ec0c75 100644
--- a/gstreamer-audio/src/auto/audio_base_src.rs
+++ b/gstreamer-audio/src/auto/audio_base_src.rs
@@ -25,7 +25,9 @@ glib::wrapper! {
 unsafe impl Send for AudioBaseSrc {}
 unsafe impl Sync for AudioBaseSrc {}
 
-pub const NONE_AUDIO_BASE_SRC: Option<&AudioBaseSrc> = None;
+impl AudioBaseSrc {
+    pub const NONE: Option<&'static AudioBaseSrc> = None;
+}
 
 pub trait AudioBaseSrcExt: 'static {
     //#[doc(alias = "gst_audio_base_src_create_ringbuffer")]
diff --git a/gstreamer-audio/src/auto/audio_decoder.rs b/gstreamer-audio/src/auto/audio_decoder.rs
index 240dc7a12..6a38f998e 100644
--- a/gstreamer-audio/src/auto/audio_decoder.rs
+++ b/gstreamer-audio/src/auto/audio_decoder.rs
@@ -25,7 +25,9 @@ glib::wrapper! {
 unsafe impl Send for AudioDecoder {}
 unsafe impl Sync for AudioDecoder {}
 
-pub const NONE_AUDIO_DECODER: Option<&AudioDecoder> = None;
+impl AudioDecoder {
+    pub const NONE: Option<&'static AudioDecoder> = None;
+}
 
 pub trait AudioDecoderExt: 'static {
     #[doc(alias = "gst_audio_decoder_allocate_output_buffer")]
diff --git a/gstreamer-audio/src/auto/audio_encoder.rs b/gstreamer-audio/src/auto/audio_encoder.rs
index 7b898f5e7..eb6d6fbd6 100644
--- a/gstreamer-audio/src/auto/audio_encoder.rs
+++ b/gstreamer-audio/src/auto/audio_encoder.rs
@@ -25,7 +25,9 @@ glib::wrapper! {
 unsafe impl Send for AudioEncoder {}
 unsafe impl Sync for AudioEncoder {}
 
-pub const NONE_AUDIO_ENCODER: Option<&AudioEncoder> = None;
+impl AudioEncoder {
+    pub const NONE: Option<&'static AudioEncoder> = None;
+}
 
 pub trait AudioEncoderExt: 'static {
     #[doc(alias = "gst_audio_encoder_allocate_output_buffer")]
diff --git a/gstreamer-audio/src/auto/audio_sink.rs b/gstreamer-audio/src/auto/audio_sink.rs
index 7cccc0765..7d8d92b10 100644
--- a/gstreamer-audio/src/auto/audio_sink.rs
+++ b/gstreamer-audio/src/auto/audio_sink.rs
@@ -19,4 +19,6 @@ impl AudioSink {}
 unsafe impl Send for AudioSink {}
 unsafe impl Sync for AudioSink {}
 
-pub const NONE_AUDIO_SINK: Option<&AudioSink> = None;
+impl AudioSink {
+    pub const NONE: Option<&'static AudioSink> = None;
+}
diff --git a/gstreamer-audio/src/auto/audio_src.rs b/gstreamer-audio/src/auto/audio_src.rs
index 21cd70659..162cbd099 100644
--- a/gstreamer-audio/src/auto/audio_src.rs
+++ b/gstreamer-audio/src/auto/audio_src.rs
@@ -19,4 +19,6 @@ impl AudioSrc {}
 unsafe impl Send for AudioSrc {}
 unsafe impl Sync for AudioSrc {}
 
-pub const NONE_AUDIO_SRC: Option<&AudioSrc> = None;
+impl AudioSrc {
+    pub const NONE: Option<&'static AudioSrc> = None;
+}
diff --git a/gstreamer-audio/src/auto/mod.rs b/gstreamer-audio/src/auto/mod.rs
index 1e4a5d973..4db9bb57e 100644
--- a/gstreamer-audio/src/auto/mod.rs
+++ b/gstreamer-audio/src/auto/mod.rs
@@ -4,25 +4,25 @@
 // DO NOT EDIT
 
 mod audio_base_sink;
-pub use self::audio_base_sink::{AudioBaseSink, NONE_AUDIO_BASE_SINK};
+pub use self::audio_base_sink::AudioBaseSink;
 
 mod audio_base_src;
-pub use self::audio_base_src::{AudioBaseSrc, NONE_AUDIO_BASE_SRC};
+pub use self::audio_base_src::AudioBaseSrc;
 
 mod audio_decoder;
-pub use self::audio_decoder::{AudioDecoder, NONE_AUDIO_DECODER};
+pub use self::audio_decoder::AudioDecoder;
 
 mod audio_encoder;
-pub use self::audio_encoder::{AudioEncoder, NONE_AUDIO_ENCODER};
+pub use self::audio_encoder::AudioEncoder;
 
 mod audio_sink;
-pub use self::audio_sink::{AudioSink, NONE_AUDIO_SINK};
+pub use self::audio_sink::AudioSink;
 
 mod audio_src;
-pub use self::audio_src::{AudioSrc, NONE_AUDIO_SRC};
+pub use self::audio_src::AudioSrc;
 
 mod stream_volume;
-pub use self::stream_volume::{StreamVolume, NONE_STREAM_VOLUME};
+pub use self::stream_volume::StreamVolume;
 
 #[cfg(any(feature = "v1_14", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))]
diff --git a/gstreamer-audio/src/auto/stream_volume.rs b/gstreamer-audio/src/auto/stream_volume.rs
index 2ab04048c..8adec654b 100644
--- a/gstreamer-audio/src/auto/stream_volume.rs
+++ b/gstreamer-audio/src/auto/stream_volume.rs
@@ -32,7 +32,9 @@ impl StreamVolume {
 unsafe impl Send for StreamVolume {}
 unsafe impl Sync for StreamVolume {}
 
-pub const NONE_STREAM_VOLUME: Option<&StreamVolume> = None;
+impl StreamVolume {
+    pub const NONE: Option<&'static StreamVolume> = None;
+}
 
 pub trait StreamVolumeExt: 'static {
     #[doc(alias = "gst_stream_volume_get_mute")]
diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 e62870e56..6f274fa5c 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 3527f5a17..9e0b7c825 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 3a441b14b..614dd2afd 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 882c9c36e..79a356c2a 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 fa30de282..cdf6e4246 100644
--- a/gstreamer-base/src/auto/aggregator.rs
+++ b/gstreamer-base/src/auto/aggregator.rs
@@ -31,7 +31,9 @@ glib::wrapper! {
 unsafe impl Send for Aggregator {}
 unsafe impl Sync for Aggregator {}
 
-pub const NONE_AGGREGATOR: Option<&Aggregator> = None;
+impl Aggregator {
+    pub const NONE: Option<&'static Aggregator> = None;
+}
 
 pub trait AggregatorExt: 'static {
     #[doc(alias = "gst_aggregator_get_buffer_pool")]
diff --git a/gstreamer-base/src/auto/aggregator_pad.rs b/gstreamer-base/src/auto/aggregator_pad.rs
index 4f93e26c3..2acb8250e 100644
--- a/gstreamer-base/src/auto/aggregator_pad.rs
+++ b/gstreamer-base/src/auto/aggregator_pad.rs
@@ -29,7 +29,9 @@ glib::wrapper! {
 unsafe impl Send for AggregatorPad {}
 unsafe impl Sync for AggregatorPad {}
 
-pub const NONE_AGGREGATOR_PAD: Option<&AggregatorPad> = None;
+impl AggregatorPad {
+    pub const NONE: Option<&'static AggregatorPad> = None;
+}
 
 pub trait AggregatorPadExt: 'static {
     #[doc(alias = "gst_aggregator_pad_drop_buffer")]
diff --git a/gstreamer-base/src/auto/base_parse.rs b/gstreamer-base/src/auto/base_parse.rs
index 39e59767b..d00479f3e 100644
--- a/gstreamer-base/src/auto/base_parse.rs
+++ b/gstreamer-base/src/auto/base_parse.rs
@@ -25,7 +25,9 @@ glib::wrapper! {
 unsafe impl Send for BaseParse {}
 unsafe impl Sync for BaseParse {}
 
-pub const NONE_BASE_PARSE: Option<&BaseParse> = None;
+impl BaseParse {
+    pub const NONE: Option<&'static BaseParse> = None;
+}
 
 pub trait BaseParseExt: 'static {
     #[doc(alias = "gst_base_parse_add_index_entry")]
diff --git a/gstreamer-base/src/auto/base_sink.rs b/gstreamer-base/src/auto/base_sink.rs
index b4dc88b7a..1b465aa67 100644
--- a/gstreamer-base/src/auto/base_sink.rs
+++ b/gstreamer-base/src/auto/base_sink.rs
@@ -26,7 +26,9 @@ glib::wrapper! {
 unsafe impl Send for BaseSink {}
 unsafe impl Sync for BaseSink {}
 
-pub const NONE_BASE_SINK: Option<&BaseSink> = None;
+impl BaseSink {
+    pub const NONE: Option<&'static BaseSink> = None;
+}
 
 pub trait BaseSinkExt: 'static {
     //#[doc(alias = "gst_base_sink_do_preroll")]
diff --git a/gstreamer-base/src/auto/base_src.rs b/gstreamer-base/src/auto/base_src.rs
index 509766be8..716c66e96 100644
--- a/gstreamer-base/src/auto/base_src.rs
+++ b/gstreamer-base/src/auto/base_src.rs
@@ -25,7 +25,9 @@ glib::wrapper! {
 unsafe impl Send for BaseSrc {}
 unsafe impl Sync for BaseSrc {}
 
-pub const NONE_BASE_SRC: Option<&BaseSrc> = None;
+impl BaseSrc {
+    pub const NONE: Option<&'static BaseSrc> = None;
+}
 
 pub trait BaseSrcExt: 'static {
     #[doc(alias = "gst_base_src_get_blocksize")]
diff --git a/gstreamer-base/src/auto/base_transform.rs b/gstreamer-base/src/auto/base_transform.rs
index 2cb63fea5..771a6f0d6 100644
--- a/gstreamer-base/src/auto/base_transform.rs
+++ b/gstreamer-base/src/auto/base_transform.rs
@@ -25,7 +25,9 @@ glib::wrapper! {
 unsafe impl Send for BaseTransform {}
 unsafe impl Sync for BaseTransform {}
 
-pub const NONE_BASE_TRANSFORM: Option<&BaseTransform> = None;
+impl BaseTransform {
+    pub const NONE: Option<&'static BaseTransform> = None;
+}
 
 pub trait BaseTransformExt: 'static {
     #[doc(alias = "gst_base_transform_get_buffer_pool")]
diff --git a/gstreamer-base/src/auto/mod.rs b/gstreamer-base/src/auto/mod.rs
index b600b6722..907eaf1a8 100644
--- a/gstreamer-base/src/auto/mod.rs
+++ b/gstreamer-base/src/auto/mod.rs
@@ -11,29 +11,29 @@ pub use self::adapter::Adapter;
 mod aggregator;
 #[cfg(any(feature = "v1_14", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))]
-pub use self::aggregator::{Aggregator, NONE_AGGREGATOR};
+pub use self::aggregator::Aggregator;
 
 #[cfg(any(feature = "v1_14", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))]
 mod aggregator_pad;
 #[cfg(any(feature = "v1_14", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))]
-pub use self::aggregator_pad::{AggregatorPad, NONE_AGGREGATOR_PAD};
+pub use self::aggregator_pad::AggregatorPad;
 
 mod base_parse;
-pub use self::base_parse::{BaseParse, NONE_BASE_PARSE};
+pub use self::base_parse::BaseParse;
 
 mod base_sink;
-pub use self::base_sink::{BaseSink, NONE_BASE_SINK};
+pub use self::base_sink::BaseSink;
 
 mod base_src;
-pub use self::base_src::{BaseSrc, NONE_BASE_SRC};
+pub use self::base_src::BaseSrc;
 
 mod base_transform;
-pub use self::base_transform::{BaseTransform, NONE_BASE_TRANSFORM};
+pub use self::base_transform::BaseTransform;
 
 mod push_src;
-pub use self::push_src::{PushSrc, NONE_PUSH_SRC};
+pub use self::push_src::PushSrc;
 
 mod enums;
 #[cfg(any(feature = "v1_18", feature = "dox"))]
diff --git a/gstreamer-base/src/auto/push_src.rs b/gstreamer-base/src/auto/push_src.rs
index 433a57e54..695a6521f 100644
--- a/gstreamer-base/src/auto/push_src.rs
+++ b/gstreamer-base/src/auto/push_src.rs
@@ -19,4 +19,6 @@ impl PushSrc {}
 unsafe impl Send for PushSrc {}
 unsafe impl Sync for PushSrc {}
 
-pub const NONE_PUSH_SRC: Option<&PushSrc> = None;
+impl PushSrc {
+    pub const NONE: Option<&'static PushSrc> = None;
+}
diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 d809aa4a6..abde1b962 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 69c18b692..9f8e14a33 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 34cca9319..e3a31b974 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 ee2d556e8..42b6fbb57 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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/versions.txt b/gstreamer-check/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 9cd34c4a7..83b4dcb2b 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 60ff5f8b1..a5223a134 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 e80dfc8e2..04ebaccec 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 463d1ba52..04ad58e67 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 f709d4ed0..2a7c17ef1 100644
--- a/gstreamer-controller/src/auto/argb_control_binding.rs
+++ b/gstreamer-controller/src/auto/argb_control_binding.rs
@@ -50,7 +50,9 @@ impl ARGBControlBinding {
 unsafe impl Send for ARGBControlBinding {}
 unsafe impl Sync for ARGBControlBinding {}
 
-pub const NONE_ARGB_CONTROL_BINDING: Option<&ARGBControlBinding> = None;
+impl ARGBControlBinding {
+    pub const NONE: Option<&'static ARGBControlBinding> = None;
+}
 
 pub trait ARGBControlBindingExt: 'static {
     #[doc(alias = "control-source-a")]
diff --git a/gstreamer-controller/src/auto/direct_control_binding.rs b/gstreamer-controller/src/auto/direct_control_binding.rs
index 7ee3dc37d..18dcbe7ec 100644
--- a/gstreamer-controller/src/auto/direct_control_binding.rs
+++ b/gstreamer-controller/src/auto/direct_control_binding.rs
@@ -61,7 +61,9 @@ impl DirectControlBinding {
 unsafe impl Send for DirectControlBinding {}
 unsafe impl Sync for DirectControlBinding {}
 
-pub const NONE_DIRECT_CONTROL_BINDING: Option<&DirectControlBinding> = None;
+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 ead3948ab..02995fdb1 100644
--- a/gstreamer-controller/src/auto/interpolation_control_source.rs
+++ b/gstreamer-controller/src/auto/interpolation_control_source.rs
@@ -44,7 +44,9 @@ impl Default for InterpolationControlSource {
 unsafe impl Send for InterpolationControlSource {}
 unsafe impl Sync for InterpolationControlSource {}
 
-pub const NONE_INTERPOLATION_CONTROL_SOURCE: Option<&InterpolationControlSource> = None;
+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 d8612202b..31142907a 100644
--- a/gstreamer-controller/src/auto/lfo_control_source.rs
+++ b/gstreamer-controller/src/auto/lfo_control_source.rs
@@ -42,7 +42,9 @@ impl Default for LFOControlSource {
 unsafe impl Send for LFOControlSource {}
 unsafe impl Sync for LFOControlSource {}
 
-pub const NONE_LFO_CONTROL_SOURCE: Option<&LFOControlSource> = None;
+impl LFOControlSource {
+    pub const NONE: Option<&'static LFOControlSource> = None;
+}
 
 pub trait LFOControlSourceExt: 'static {
     fn amplitude(&self) -> f64;
diff --git a/gstreamer-controller/src/auto/mod.rs b/gstreamer-controller/src/auto/mod.rs
index 1d035ffa4..a9c106559 100644
--- a/gstreamer-controller/src/auto/mod.rs
+++ b/gstreamer-controller/src/auto/mod.rs
@@ -4,33 +4,29 @@
 // DO NOT EDIT
 
 mod argb_control_binding;
-pub use self::argb_control_binding::{ARGBControlBinding, NONE_ARGB_CONTROL_BINDING};
+pub use self::argb_control_binding::ARGBControlBinding;
 
 mod direct_control_binding;
-pub use self::direct_control_binding::{DirectControlBinding, NONE_DIRECT_CONTROL_BINDING};
+pub use self::direct_control_binding::DirectControlBinding;
 
 mod interpolation_control_source;
-pub use self::interpolation_control_source::{
-    InterpolationControlSource, NONE_INTERPOLATION_CONTROL_SOURCE,
-};
+pub use self::interpolation_control_source::InterpolationControlSource;
 
 mod lfo_control_source;
-pub use self::lfo_control_source::{LFOControlSource, NONE_LFO_CONTROL_SOURCE};
+pub use self::lfo_control_source::LFOControlSource;
 
 #[cfg(any(feature = "v1_12", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))]
 mod proxy_control_binding;
 #[cfg(any(feature = "v1_12", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))]
-pub use self::proxy_control_binding::{ProxyControlBinding, NONE_PROXY_CONTROL_BINDING};
+pub use self::proxy_control_binding::ProxyControlBinding;
 
 mod timed_value_control_source;
-pub use self::timed_value_control_source::{
-    TimedValueControlSource, NONE_TIMED_VALUE_CONTROL_SOURCE,
-};
+pub use self::timed_value_control_source::TimedValueControlSource;
 
 mod trigger_control_source;
-pub use self::trigger_control_source::{TriggerControlSource, NONE_TRIGGER_CONTROL_SOURCE};
+pub use self::trigger_control_source::TriggerControlSource;
 
 mod enums;
 pub use self::enums::InterpolationMode;
diff --git a/gstreamer-controller/src/auto/proxy_control_binding.rs b/gstreamer-controller/src/auto/proxy_control_binding.rs
index cefac8cb7..8b1eed500 100644
--- a/gstreamer-controller/src/auto/proxy_control_binding.rs
+++ b/gstreamer-controller/src/auto/proxy_control_binding.rs
@@ -40,4 +40,6 @@ impl ProxyControlBinding {
 unsafe impl Send for ProxyControlBinding {}
 unsafe impl Sync for ProxyControlBinding {}
 
-pub const NONE_PROXY_CONTROL_BINDING: Option<&ProxyControlBinding> = None;
+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 a1b196517..8b2ea8a19 100644
--- a/gstreamer-controller/src/auto/timed_value_control_source.rs
+++ b/gstreamer-controller/src/auto/timed_value_control_source.rs
@@ -24,7 +24,9 @@ glib::wrapper! {
 unsafe impl Send for TimedValueControlSource {}
 unsafe impl Sync for TimedValueControlSource {}
 
-pub const NONE_TIMED_VALUE_CONTROL_SOURCE: Option<&TimedValueControlSource> = None;
+impl TimedValueControlSource {
+    pub const NONE: Option<&'static TimedValueControlSource> = None;
+}
 
 pub trait TimedValueControlSourceExt: 'static {
     //#[doc(alias = "gst_timed_value_control_source_find_control_point_iter")]
diff --git a/gstreamer-controller/src/auto/trigger_control_source.rs b/gstreamer-controller/src/auto/trigger_control_source.rs
index fec7ba1a6..4395a0485 100644
--- a/gstreamer-controller/src/auto/trigger_control_source.rs
+++ b/gstreamer-controller/src/auto/trigger_control_source.rs
@@ -42,7 +42,9 @@ impl Default for TriggerControlSource {
 unsafe impl Send for TriggerControlSource {}
 unsafe impl Sync for TriggerControlSource {}
 
-pub const NONE_TRIGGER_CONTROL_SOURCE: Option<&TriggerControlSource> = None;
+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 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 8c6e5a6cc..930d0768e 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 dff016ecb..ca2c0ed98 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 a4d6ec647..df3800ec4 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 d0da16f0f..9cba0e78d 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 8f5bed30e..ad1e64ec3 100644
--- a/gstreamer-editing-services/src/auto/asset.rs
+++ b/gstreamer-editing-services/src/auto/asset.rs
@@ -114,7 +114,9 @@ impl Asset {
     }
 }
 
-pub const NONE_ASSET: Option<&Asset> = None;
+impl Asset {
+    pub const NONE: Option<&'static Asset> = None;
+}
 
 pub trait AssetExt: 'static {
     #[doc(alias = "ges_asset_extract")]
diff --git a/gstreamer-editing-services/src/auto/audio_source.rs b/gstreamer-editing-services/src/auto/audio_source.rs
index 638291f20..df0f79efe 100644
--- a/gstreamer-editing-services/src/auto/audio_source.rs
+++ b/gstreamer-editing-services/src/auto/audio_source.rs
@@ -20,4 +20,6 @@ glib::wrapper! {
 
 impl AudioSource {}
 
-pub const NONE_AUDIO_SOURCE: Option<&AudioSource> = None;
+impl AudioSource {
+    pub const NONE: Option<&'static AudioSource> = None;
+}
diff --git a/gstreamer-editing-services/src/auto/audio_test_source.rs b/gstreamer-editing-services/src/auto/audio_test_source.rs
index 01ca508fd..30b60b999 100644
--- a/gstreamer-editing-services/src/auto/audio_test_source.rs
+++ b/gstreamer-editing-services/src/auto/audio_test_source.rs
@@ -21,7 +21,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_AUDIO_TEST_SOURCE: Option<&AudioTestSource> = None;
+impl AudioTestSource {
+    pub const NONE: Option<&'static AudioTestSource> = None;
+}
 
 pub trait AudioTestSourceExt: 'static {
     #[doc(alias = "ges_audio_test_source_get_freq")]
diff --git a/gstreamer-editing-services/src/auto/audio_track.rs b/gstreamer-editing-services/src/auto/audio_track.rs
index 237b202ab..88239aa2a 100644
--- a/gstreamer-editing-services/src/auto/audio_track.rs
+++ b/gstreamer-editing-services/src/auto/audio_track.rs
@@ -30,4 +30,6 @@ impl Default for AudioTrack {
     }
 }
 
-pub const NONE_AUDIO_TRACK: Option<&AudioTrack> = None;
+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 2d2571788..40a95e4f5 100644
--- a/gstreamer-editing-services/src/auto/audio_transition.rs
+++ b/gstreamer-editing-services/src/auto/audio_transition.rs
@@ -35,4 +35,6 @@ impl Default for AudioTransition {
     }
 }
 
-pub const NONE_AUDIO_TRANSITION: Option<&AudioTransition> = None;
+impl AudioTransition {
+    pub const NONE: Option<&'static AudioTransition> = None;
+}
diff --git a/gstreamer-editing-services/src/auto/audio_uri_source.rs b/gstreamer-editing-services/src/auto/audio_uri_source.rs
index b775ac903..e63b10dfc 100644
--- a/gstreamer-editing-services/src/auto/audio_uri_source.rs
+++ b/gstreamer-editing-services/src/auto/audio_uri_source.rs
@@ -22,7 +22,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_AUDIO_URI_SOURCE: Option<&AudioUriSource> = None;
+impl AudioUriSource {
+    pub const NONE: Option<&'static AudioUriSource> = None;
+}
 
 pub trait AudioUriSourceExt: 'static {
     fn uri(&self) -> Option<glib::GString>;
diff --git a/gstreamer-editing-services/src/auto/base_effect.rs b/gstreamer-editing-services/src/auto/base_effect.rs
index bce864c3d..5f2647383 100644
--- a/gstreamer-editing-services/src/auto/base_effect.rs
+++ b/gstreamer-editing-services/src/auto/base_effect.rs
@@ -22,7 +22,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_BASE_EFFECT: Option<&BaseEffect> = None;
+impl BaseEffect {
+    pub const NONE: Option<&'static BaseEffect> = None;
+}
 
 pub trait BaseEffectExt: 'static {
     #[cfg(any(feature = "v1_18", feature = "dox"))]
diff --git a/gstreamer-editing-services/src/auto/base_effect_clip.rs b/gstreamer-editing-services/src/auto/base_effect_clip.rs
index b521f9228..0d6dc157e 100644
--- a/gstreamer-editing-services/src/auto/base_effect_clip.rs
+++ b/gstreamer-editing-services/src/auto/base_effect_clip.rs
@@ -21,4 +21,6 @@ glib::wrapper! {
 
 impl BaseEffectClip {}
 
-pub const NONE_BASE_EFFECT_CLIP: Option<&BaseEffectClip> = None;
+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 d9ae31557..f63e54aca 100644
--- a/gstreamer-editing-services/src/auto/base_transition_clip.rs
+++ b/gstreamer-editing-services/src/auto/base_transition_clip.rs
@@ -21,4 +21,6 @@ glib::wrapper! {
 
 impl BaseTransitionClip {}
 
-pub const NONE_BASE_TRANSITION_CLIP: Option<&BaseTransitionClip> = None;
+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 d42dddc2d..5e5bd2bf6 100644
--- a/gstreamer-editing-services/src/auto/base_xml_formatter.rs
+++ b/gstreamer-editing-services/src/auto/base_xml_formatter.rs
@@ -17,4 +17,6 @@ glib::wrapper! {
 
 impl BaseXmlFormatter {}
 
-pub const NONE_BASE_XML_FORMATTER: Option<&BaseXmlFormatter> = None;
+impl BaseXmlFormatter {
+    pub const NONE: Option<&'static BaseXmlFormatter> = None;
+}
diff --git a/gstreamer-editing-services/src/auto/clip.rs b/gstreamer-editing-services/src/auto/clip.rs
index 9d8f0cf09..86ce00b83 100644
--- a/gstreamer-editing-services/src/auto/clip.rs
+++ b/gstreamer-editing-services/src/auto/clip.rs
@@ -36,7 +36,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_CLIP: Option<&Clip> = None;
+impl Clip {
+    pub const NONE: Option<&'static Clip> = None;
+}
 
 pub trait ClipExt: 'static {
     #[doc(alias = "ges_clip_add_asset")]
diff --git a/gstreamer-editing-services/src/auto/clip_asset.rs b/gstreamer-editing-services/src/auto/clip_asset.rs
index b1abfaaac..51c383475 100644
--- a/gstreamer-editing-services/src/auto/clip_asset.rs
+++ b/gstreamer-editing-services/src/auto/clip_asset.rs
@@ -29,7 +29,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_CLIP_ASSET: Option<&ClipAsset> = None;
+impl ClipAsset {
+    pub const NONE: Option<&'static ClipAsset> = None;
+}
 
 pub trait ClipAssetExt: 'static {
     #[cfg(any(feature = "v1_18", feature = "dox"))]
diff --git a/gstreamer-editing-services/src/auto/command_line_formatter.rs b/gstreamer-editing-services/src/auto/command_line_formatter.rs
index 9f1a9ee37..12143705c 100644
--- a/gstreamer-editing-services/src/auto/command_line_formatter.rs
+++ b/gstreamer-editing-services/src/auto/command_line_formatter.rs
@@ -54,4 +54,6 @@ impl CommandLineFormatter {
     }
 }
 
-pub const NONE_COMMAND_LINE_FORMATTER: Option<&CommandLineFormatter> = None;
+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 74ed9faf6..3c8cf2d5f 100644
--- a/gstreamer-editing-services/src/auto/container.rs
+++ b/gstreamer-editing-services/src/auto/container.rs
@@ -35,7 +35,9 @@ impl Container {
     }
 }
 
-pub const NONE_CONTAINER: Option<&Container> = None;
+impl Container {
+    pub const NONE: Option<&'static Container> = None;
+}
 
 pub trait GESContainerExt: 'static {
     #[doc(alias = "ges_container_add")]
diff --git a/gstreamer-editing-services/src/auto/effect.rs b/gstreamer-editing-services/src/auto/effect.rs
index b58fd9392..06f755dc9 100644
--- a/gstreamer-editing-services/src/auto/effect.rs
+++ b/gstreamer-editing-services/src/auto/effect.rs
@@ -33,7 +33,9 @@ impl Effect {
     }
 }
 
-pub const NONE_EFFECT: Option<&Effect> = None;
+impl Effect {
+    pub const NONE: Option<&'static Effect> = None;
+}
 
 pub trait EffectExt: 'static {
     #[doc(alias = "bin-description")]
diff --git a/gstreamer-editing-services/src/auto/effect_asset.rs b/gstreamer-editing-services/src/auto/effect_asset.rs
index 08b7fc26c..99a531ff0 100644
--- a/gstreamer-editing-services/src/auto/effect_asset.rs
+++ b/gstreamer-editing-services/src/auto/effect_asset.rs
@@ -18,4 +18,6 @@ glib::wrapper! {
 
 impl EffectAsset {}
 
-pub const NONE_EFFECT_ASSET: Option<&EffectAsset> = None;
+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 d86e4ae4f..a84de2b00 100644
--- a/gstreamer-editing-services/src/auto/effect_clip.rs
+++ b/gstreamer-editing-services/src/auto/effect_clip.rs
@@ -39,7 +39,9 @@ impl EffectClip {
     }
 }
 
-pub const NONE_EFFECT_CLIP: Option<&EffectClip> = None;
+impl EffectClip {
+    pub const NONE: Option<&'static EffectClip> = None;
+}
 
 pub trait EffectClipExt: 'static {
     #[doc(alias = "audio-bin-description")]
diff --git a/gstreamer-editing-services/src/auto/extractable.rs b/gstreamer-editing-services/src/auto/extractable.rs
index d5380e0aa..a6011f614 100644
--- a/gstreamer-editing-services/src/auto/extractable.rs
+++ b/gstreamer-editing-services/src/auto/extractable.rs
@@ -16,7 +16,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_EXTRACTABLE: Option<&Extractable> = None;
+impl Extractable {
+    pub const NONE: Option<&'static Extractable> = None;
+}
 
 pub trait ExtractableExt: 'static {
     #[doc(alias = "ges_extractable_get_asset")]
diff --git a/gstreamer-editing-services/src/auto/formatter.rs b/gstreamer-editing-services/src/auto/formatter.rs
index b2086fac7..8c7de40d2 100644
--- a/gstreamer-editing-services/src/auto/formatter.rs
+++ b/gstreamer-editing-services/src/auto/formatter.rs
@@ -56,7 +56,9 @@ impl Formatter {
     }
 }
 
-pub const NONE_FORMATTER: Option<&Formatter> = None;
+impl Formatter {
+    pub const NONE: Option<&'static Formatter> = None;
+}
 
 pub trait FormatterExt: 'static {
     #[cfg_attr(feature = "v1_18", deprecated = "Since 1.18")]
diff --git a/gstreamer-editing-services/src/auto/group.rs b/gstreamer-editing-services/src/auto/group.rs
index 7ff7fd4f3..d37fa7a98 100644
--- a/gstreamer-editing-services/src/auto/group.rs
+++ b/gstreamer-editing-services/src/auto/group.rs
@@ -40,7 +40,9 @@ impl Default for Group {
     }
 }
 
-pub const NONE_GROUP: Option<&Group> = None;
+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/image_source.rs b/gstreamer-editing-services/src/auto/image_source.rs
index 470dc5f01..62dcaa23e 100644
--- a/gstreamer-editing-services/src/auto/image_source.rs
+++ b/gstreamer-editing-services/src/auto/image_source.rs
@@ -22,7 +22,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_IMAGE_SOURCE: Option<&ImageSource> = None;
+impl ImageSource {
+    pub const NONE: Option<&'static ImageSource> = None;
+}
 
 pub trait ImageSourceExt: 'static {
     fn uri(&self) -> Option<glib::GString>;
diff --git a/gstreamer-editing-services/src/auto/layer.rs b/gstreamer-editing-services/src/auto/layer.rs
index d2ff6f9f7..e9ba87cf8 100644
--- a/gstreamer-editing-services/src/auto/layer.rs
+++ b/gstreamer-editing-services/src/auto/layer.rs
@@ -46,7 +46,9 @@ impl Default for Layer {
     }
 }
 
-pub const NONE_LAYER: Option<&Layer> = None;
+impl Layer {
+    pub const NONE: Option<&'static Layer> = None;
+}
 
 pub trait LayerExt: 'static {
     #[doc(alias = "ges_layer_add_asset")]
diff --git a/gstreamer-editing-services/src/auto/meta_container.rs b/gstreamer-editing-services/src/auto/meta_container.rs
index 7b0498448..8dbbdb718 100644
--- a/gstreamer-editing-services/src/auto/meta_container.rs
+++ b/gstreamer-editing-services/src/auto/meta_container.rs
@@ -26,7 +26,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_META_CONTAINER: Option<&MetaContainer> = None;
+impl MetaContainer {
+    pub const NONE: Option<&'static MetaContainer> = None;
+}
 
 pub trait MetaContainerExt: 'static {
     #[doc(alias = "ges_meta_container_add_metas_from_string")]
diff --git a/gstreamer-editing-services/src/auto/mod.rs b/gstreamer-editing-services/src/auto/mod.rs
index 3683f40c3..384d89477 100644
--- a/gstreamer-editing-services/src/auto/mod.rs
+++ b/gstreamer-editing-services/src/auto/mod.rs
@@ -4,72 +4,72 @@
 // DO NOT EDIT
 
 mod asset;
-pub use self::asset::{Asset, NONE_ASSET};
+pub use self::asset::Asset;
 
 mod audio_source;
-pub use self::audio_source::{AudioSource, NONE_AUDIO_SOURCE};
+pub use self::audio_source::AudioSource;
 
 mod audio_test_source;
-pub use self::audio_test_source::{AudioTestSource, NONE_AUDIO_TEST_SOURCE};
+pub use self::audio_test_source::AudioTestSource;
 
 mod audio_track;
-pub use self::audio_track::{AudioTrack, NONE_AUDIO_TRACK};
+pub use self::audio_track::AudioTrack;
 
 mod audio_transition;
-pub use self::audio_transition::{AudioTransition, NONE_AUDIO_TRANSITION};
+pub use self::audio_transition::AudioTransition;
 
 mod audio_uri_source;
-pub use self::audio_uri_source::{AudioUriSource, NONE_AUDIO_URI_SOURCE};
+pub use self::audio_uri_source::AudioUriSource;
 
 mod base_effect;
-pub use self::base_effect::{BaseEffect, NONE_BASE_EFFECT};
+pub use self::base_effect::BaseEffect;
 
 mod base_effect_clip;
-pub use self::base_effect_clip::{BaseEffectClip, NONE_BASE_EFFECT_CLIP};
+pub use self::base_effect_clip::BaseEffectClip;
 
 mod base_transition_clip;
-pub use self::base_transition_clip::{BaseTransitionClip, NONE_BASE_TRANSITION_CLIP};
+pub use self::base_transition_clip::BaseTransitionClip;
 
 mod base_xml_formatter;
-pub use self::base_xml_formatter::{BaseXmlFormatter, NONE_BASE_XML_FORMATTER};
+pub use self::base_xml_formatter::BaseXmlFormatter;
 
 mod clip;
-pub use self::clip::{Clip, NONE_CLIP};
+pub use self::clip::Clip;
 
 mod clip_asset;
-pub use self::clip_asset::{ClipAsset, NONE_CLIP_ASSET};
+pub use self::clip_asset::ClipAsset;
 
 mod command_line_formatter;
-pub use self::command_line_formatter::{CommandLineFormatter, NONE_COMMAND_LINE_FORMATTER};
+pub use self::command_line_formatter::CommandLineFormatter;
 
 mod container;
-pub use self::container::{Container, NONE_CONTAINER};
+pub use self::container::Container;
 
 mod effect;
-pub use self::effect::{Effect, NONE_EFFECT};
+pub use self::effect::Effect;
 
 mod effect_asset;
-pub use self::effect_asset::{EffectAsset, NONE_EFFECT_ASSET};
+pub use self::effect_asset::EffectAsset;
 
 mod effect_clip;
-pub use self::effect_clip::{EffectClip, NONE_EFFECT_CLIP};
+pub use self::effect_clip::EffectClip;
 
 mod extractable;
-pub use self::extractable::{Extractable, NONE_EXTRACTABLE};
+pub use self::extractable::Extractable;
 
 mod formatter;
-pub use self::formatter::{Formatter, NONE_FORMATTER};
+pub use self::formatter::Formatter;
 
 mod group;
-pub use self::group::{Group, NONE_GROUP};
+pub use self::group::Group;
 
 #[cfg_attr(feature = "v1_18", deprecated = "Since 1.18")]
 mod image_source;
 #[cfg_attr(feature = "v1_18", deprecated = "Since 1.18")]
-pub use self::image_source::{ImageSource, NONE_IMAGE_SOURCE};
+pub use self::image_source::ImageSource;
 
 mod layer;
-pub use self::layer::{Layer, NONE_LAYER};
+pub use self::layer::Layer;
 
 #[cfg(any(feature = "v1_18", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
@@ -86,103 +86,103 @@ mod marker_list;
 pub use self::marker_list::MarkerList;
 
 mod meta_container;
-pub use self::meta_container::{MetaContainer, NONE_META_CONTAINER};
+pub use self::meta_container::MetaContainer;
 
 #[cfg_attr(feature = "v1_18", deprecated = "Since 1.18")]
 mod multi_file_source;
 #[cfg_attr(feature = "v1_18", deprecated = "Since 1.18")]
-pub use self::multi_file_source::{MultiFileSource, NONE_MULTI_FILE_SOURCE};
+pub use self::multi_file_source::MultiFileSource;
 
 mod operation;
-pub use self::operation::{Operation, NONE_OPERATION};
+pub use self::operation::Operation;
 
 mod operation_clip;
-pub use self::operation_clip::{OperationClip, NONE_OPERATION_CLIP};
+pub use self::operation_clip::OperationClip;
 
 mod overlay_clip;
-pub use self::overlay_clip::{OverlayClip, NONE_OVERLAY_CLIP};
+pub use self::overlay_clip::OverlayClip;
 
 mod pipeline;
-pub use self::pipeline::{Pipeline, NONE_PIPELINE};
+pub use self::pipeline::Pipeline;
 
 mod project;
-pub use self::project::{Project, NONE_PROJECT};
+pub use self::project::Project;
 
 mod source;
-pub use self::source::{Source, NONE_SOURCE};
+pub use self::source::Source;
 
 mod source_clip;
-pub use self::source_clip::{SourceClip, NONE_SOURCE_CLIP};
+pub use self::source_clip::SourceClip;
 
 #[cfg(any(feature = "v1_18", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
 mod source_clip_asset;
 #[cfg(any(feature = "v1_18", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
-pub use self::source_clip_asset::{SourceClipAsset, NONE_SOURCE_CLIP_ASSET};
+pub use self::source_clip_asset::SourceClipAsset;
 
 mod test_clip;
-pub use self::test_clip::{TestClip, NONE_TEST_CLIP};
+pub use self::test_clip::TestClip;
 
 mod text_overlay;
-pub use self::text_overlay::{TextOverlay, NONE_TEXT_OVERLAY};
+pub use self::text_overlay::TextOverlay;
 
 mod text_overlay_clip;
-pub use self::text_overlay_clip::{TextOverlayClip, NONE_TEXT_OVERLAY_CLIP};
+pub use self::text_overlay_clip::TextOverlayClip;
 
 mod timeline;
-pub use self::timeline::{Timeline, NONE_TIMELINE};
+pub use self::timeline::Timeline;
 
 mod timeline_element;
-pub use self::timeline_element::{TimelineElement, NONE_TIMELINE_ELEMENT};
+pub use self::timeline_element::TimelineElement;
 
 mod title_clip;
-pub use self::title_clip::{TitleClip, NONE_TITLE_CLIP};
+pub use self::title_clip::TitleClip;
 
 mod title_source;
-pub use self::title_source::{TitleSource, NONE_TITLE_SOURCE};
+pub use self::title_source::TitleSource;
 
 mod track;
-pub use self::track::{Track, NONE_TRACK};
+pub use self::track::Track;
 
 mod track_element;
-pub use self::track_element::{TrackElement, NONE_TRACK_ELEMENT};
+pub use self::track_element::TrackElement;
 
 mod track_element_asset;
-pub use self::track_element_asset::{TrackElementAsset, NONE_TRACK_ELEMENT_ASSET};
+pub use self::track_element_asset::TrackElementAsset;
 
 mod transition;
-pub use self::transition::{Transition, NONE_TRANSITION};
+pub use self::transition::Transition;
 
 mod transition_clip;
-pub use self::transition_clip::{TransitionClip, NONE_TRANSITION_CLIP};
+pub use self::transition_clip::TransitionClip;
 
 mod uri_clip;
-pub use self::uri_clip::{UriClip, NONE_URI_CLIP};
+pub use self::uri_clip::UriClip;
 
 mod uri_clip_asset;
-pub use self::uri_clip_asset::{UriClipAsset, NONE_URI_CLIP_ASSET};
+pub use self::uri_clip_asset::UriClipAsset;
 
 mod uri_source_asset;
-pub use self::uri_source_asset::{UriSourceAsset, NONE_URI_SOURCE_ASSET};
+pub use self::uri_source_asset::UriSourceAsset;
 
 mod video_source;
-pub use self::video_source::{VideoSource, NONE_VIDEO_SOURCE};
+pub use self::video_source::VideoSource;
 
 mod video_test_source;
-pub use self::video_test_source::{VideoTestSource, NONE_VIDEO_TEST_SOURCE};
+pub use self::video_test_source::VideoTestSource;
 
 mod video_track;
-pub use self::video_track::{VideoTrack, NONE_VIDEO_TRACK};
+pub use self::video_track::VideoTrack;
 
 mod video_transition;
-pub use self::video_transition::{VideoTransition, NONE_VIDEO_TRANSITION};
+pub use self::video_transition::VideoTransition;
 
 mod video_uri_source;
-pub use self::video_uri_source::{VideoUriSource, NONE_VIDEO_URI_SOURCE};
+pub use self::video_uri_source::VideoUriSource;
 
 mod xml_formatter;
-pub use self::xml_formatter::{XmlFormatter, NONE_XML_FORMATTER};
+pub use self::xml_formatter::XmlFormatter;
 
 mod enums;
 pub use self::enums::AssetLoadingReturn;
diff --git a/gstreamer-editing-services/src/auto/multi_file_source.rs b/gstreamer-editing-services/src/auto/multi_file_source.rs
index 4ce4f441d..1a1a0ceda 100644
--- a/gstreamer-editing-services/src/auto/multi_file_source.rs
+++ b/gstreamer-editing-services/src/auto/multi_file_source.rs
@@ -30,7 +30,9 @@ impl MultiFileSource {
     }
 }
 
-pub const NONE_MULTI_FILE_SOURCE: Option<&MultiFileSource> = None;
+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 24b440e3c..1be0cf957 100644
--- a/gstreamer-editing-services/src/auto/operation.rs
+++ b/gstreamer-editing-services/src/auto/operation.rs
@@ -19,4 +19,6 @@ glib::wrapper! {
 
 impl Operation {}
 
-pub const NONE_OPERATION: Option<&Operation> = None;
+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 630eecc17..6ff8398f0 100644
--- a/gstreamer-editing-services/src/auto/operation_clip.rs
+++ b/gstreamer-editing-services/src/auto/operation_clip.rs
@@ -20,4 +20,6 @@ glib::wrapper! {
 
 impl OperationClip {}
 
-pub const NONE_OPERATION_CLIP: Option<&OperationClip> = None;
+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 912c4c74f..ea7de737e 100644
--- a/gstreamer-editing-services/src/auto/overlay_clip.rs
+++ b/gstreamer-editing-services/src/auto/overlay_clip.rs
@@ -21,4 +21,6 @@ glib::wrapper! {
 
 impl OverlayClip {}
 
-pub const NONE_OVERLAY_CLIP: Option<&OverlayClip> = None;
+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 f18be9112..cef18de8b 100644
--- a/gstreamer-editing-services/src/auto/pipeline.rs
+++ b/gstreamer-editing-services/src/auto/pipeline.rs
@@ -39,7 +39,9 @@ impl Default for Pipeline {
     }
 }
 
-pub const NONE_PIPELINE: Option<&Pipeline> = None;
+impl Pipeline {
+    pub const NONE: Option<&'static Pipeline> = None;
+}
 
 pub trait GESPipelineExt: 'static {
     #[doc(alias = "ges_pipeline_get_mode")]
diff --git a/gstreamer-editing-services/src/auto/project.rs b/gstreamer-editing-services/src/auto/project.rs
index aaa7df827..87c9e9b7a 100644
--- a/gstreamer-editing-services/src/auto/project.rs
+++ b/gstreamer-editing-services/src/auto/project.rs
@@ -35,7 +35,9 @@ impl Project {
     }
 }
 
-pub const NONE_PROJECT: Option<&Project> = None;
+impl Project {
+    pub const NONE: Option<&'static Project> = None;
+}
 
 pub trait ProjectExt: 'static {
     #[doc(alias = "ges_project_add_asset")]
diff --git a/gstreamer-editing-services/src/auto/source.rs b/gstreamer-editing-services/src/auto/source.rs
index f47f4de42..f095a42dd 100644
--- a/gstreamer-editing-services/src/auto/source.rs
+++ b/gstreamer-editing-services/src/auto/source.rs
@@ -19,4 +19,6 @@ glib::wrapper! {
 
 impl Source {}
 
-pub const NONE_SOURCE: Option<&Source> = None;
+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 56cd5da9a..72094097e 100644
--- a/gstreamer-editing-services/src/auto/source_clip.rs
+++ b/gstreamer-editing-services/src/auto/source_clip.rs
@@ -31,4 +31,6 @@ impl SourceClip {
     }
 }
 
-pub const NONE_SOURCE_CLIP: Option<&SourceClip> = None;
+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 7ef4faee7..d6170a131 100644
--- a/gstreamer-editing-services/src/auto/source_clip_asset.rs
+++ b/gstreamer-editing-services/src/auto/source_clip_asset.rs
@@ -18,4 +18,6 @@ glib::wrapper! {
 
 impl SourceClipAsset {}
 
-pub const NONE_SOURCE_CLIP_ASSET: Option<&SourceClipAsset> = None;
+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 8c5325750..a61a5a430 100644
--- a/gstreamer-editing-services/src/auto/test_clip.rs
+++ b/gstreamer-editing-services/src/auto/test_clip.rs
@@ -44,7 +44,9 @@ impl TestClip {
     }
 }
 
-pub const NONE_TEST_CLIP: Option<&TestClip> = None;
+impl TestClip {
+    pub const NONE: Option<&'static TestClip> = None;
+}
 
 pub trait TestClipExt: 'static {
     #[doc(alias = "ges_test_clip_get_frequency")]
diff --git a/gstreamer-editing-services/src/auto/text_overlay.rs b/gstreamer-editing-services/src/auto/text_overlay.rs
index 0b18ce322..900721653 100644
--- a/gstreamer-editing-services/src/auto/text_overlay.rs
+++ b/gstreamer-editing-services/src/auto/text_overlay.rs
@@ -31,7 +31,9 @@ impl TextOverlay {
     }
 }
 
-pub const NONE_TEXT_OVERLAY: Option<&TextOverlay> = None;
+impl TextOverlay {
+    pub const NONE: Option<&'static TextOverlay> = None;
+}
 
 pub trait TextOverlayExt: 'static {
     #[doc(alias = "ges_text_overlay_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 9d54bf344..692caee0b 100644
--- a/gstreamer-editing-services/src/auto/text_overlay_clip.rs
+++ b/gstreamer-editing-services/src/auto/text_overlay_clip.rs
@@ -38,7 +38,9 @@ impl TextOverlayClip {
     }
 }
 
-pub const NONE_TEXT_OVERLAY_CLIP: Option<&TextOverlayClip> = None;
+impl TextOverlayClip {
+    pub const NONE: Option<&'static TextOverlayClip> = None;
+}
 
 pub trait TextOverlayClipExt: 'static {
     #[doc(alias = "ges_text_overlay_clip_get_color")]
diff --git a/gstreamer-editing-services/src/auto/timeline.rs b/gstreamer-editing-services/src/auto/timeline.rs
index d9d320466..05316200d 100644
--- a/gstreamer-editing-services/src/auto/timeline.rs
+++ b/gstreamer-editing-services/src/auto/timeline.rs
@@ -70,7 +70,9 @@ impl Default for Timeline {
     }
 }
 
-pub const NONE_TIMELINE: Option<&Timeline> = None;
+impl Timeline {
+    pub const NONE: Option<&'static Timeline> = None;
+}
 
 pub trait TimelineExt: 'static {
     #[cfg_attr(feature = "v1_18", deprecated = "Since 1.18")]
diff --git a/gstreamer-editing-services/src/auto/timeline_element.rs b/gstreamer-editing-services/src/auto/timeline_element.rs
index b79df8f15..ed8bdadf2 100644
--- a/gstreamer-editing-services/src/auto/timeline_element.rs
+++ b/gstreamer-editing-services/src/auto/timeline_element.rs
@@ -41,7 +41,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_TIMELINE_ELEMENT: Option<&TimelineElement> = None;
+impl TimelineElement {
+    pub const NONE: Option<&'static TimelineElement> = None;
+}
 
 pub trait TimelineElementExt: 'static {
     //#[doc(alias = "ges_timeline_element_add_child_property")]
diff --git a/gstreamer-editing-services/src/auto/title_clip.rs b/gstreamer-editing-services/src/auto/title_clip.rs
index 4d5792621..f3778421e 100644
--- a/gstreamer-editing-services/src/auto/title_clip.rs
+++ b/gstreamer-editing-services/src/auto/title_clip.rs
@@ -37,7 +37,9 @@ impl TitleClip {
     }
 }
 
-pub const NONE_TITLE_CLIP: Option<&TitleClip> = None;
+impl TitleClip {
+    pub const NONE: Option<&'static TitleClip> = None;
+}
 
 pub trait TitleClipExt: 'static {
     #[deprecated = "Since 1.6"]
diff --git a/gstreamer-editing-services/src/auto/title_source.rs b/gstreamer-editing-services/src/auto/title_source.rs
index a30b64dc0..4011ad050 100644
--- a/gstreamer-editing-services/src/auto/title_source.rs
+++ b/gstreamer-editing-services/src/auto/title_source.rs
@@ -23,7 +23,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_TITLE_SOURCE: Option<&TitleSource> = None;
+impl TitleSource {
+    pub const NONE: Option<&'static TitleSource> = None;
+}
 
 pub trait TitleSourceExt: 'static {
     #[doc(alias = "ges_title_source_get_background_color")]
diff --git a/gstreamer-editing-services/src/auto/track.rs b/gstreamer-editing-services/src/auto/track.rs
index 3e584889f..963dc458c 100644
--- a/gstreamer-editing-services/src/auto/track.rs
+++ b/gstreamer-editing-services/src/auto/track.rs
@@ -39,7 +39,9 @@ impl Track {
     }
 }
 
-pub const NONE_TRACK: Option<&Track> = None;
+impl Track {
+    pub const NONE: Option<&'static Track> = None;
+}
 
 pub trait GESTrackExt: 'static {
     #[doc(alias = "ges_track_add_element")]
diff --git a/gstreamer-editing-services/src/auto/track_element.rs b/gstreamer-editing-services/src/auto/track_element.rs
index 5fbf5ddcf..62f9a872d 100644
--- a/gstreamer-editing-services/src/auto/track_element.rs
+++ b/gstreamer-editing-services/src/auto/track_element.rs
@@ -28,7 +28,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_TRACK_ELEMENT: Option<&TrackElement> = None;
+impl TrackElement {
+    pub const NONE: Option<&'static TrackElement> = None;
+}
 
 pub trait TrackElementExt: 'static {
     #[doc(alias = "ges_track_element_add_children_props")]
diff --git a/gstreamer-editing-services/src/auto/track_element_asset.rs b/gstreamer-editing-services/src/auto/track_element_asset.rs
index af4894777..8b38389cb 100644
--- a/gstreamer-editing-services/src/auto/track_element_asset.rs
+++ b/gstreamer-editing-services/src/auto/track_element_asset.rs
@@ -26,7 +26,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_TRACK_ELEMENT_ASSET: Option<&TrackElementAsset> = None;
+impl TrackElementAsset {
+    pub const NONE: Option<&'static TrackElementAsset> = None;
+}
 
 pub trait TrackElementAssetExt: 'static {
     #[cfg(any(feature = "v1_18", feature = "dox"))]
diff --git a/gstreamer-editing-services/src/auto/transition.rs b/gstreamer-editing-services/src/auto/transition.rs
index e0ffa168c..4c86809cc 100644
--- a/gstreamer-editing-services/src/auto/transition.rs
+++ b/gstreamer-editing-services/src/auto/transition.rs
@@ -20,4 +20,6 @@ glib::wrapper! {
 
 impl Transition {}
 
-pub const NONE_TRANSITION: Option<&Transition> = None;
+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 d4f5c6da4..bde52cbac 100644
--- a/gstreamer-editing-services/src/auto/transition_clip.rs
+++ b/gstreamer-editing-services/src/auto/transition_clip.rs
@@ -45,7 +45,9 @@ impl TransitionClip {
     }
 }
 
-pub const NONE_TRANSITION_CLIP: Option<&TransitionClip> = None;
+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 d04e16de3..0eb4e74c7 100644
--- a/gstreamer-editing-services/src/auto/uri_clip.rs
+++ b/gstreamer-editing-services/src/auto/uri_clip.rs
@@ -37,7 +37,9 @@ impl UriClip {
     }
 }
 
-pub const NONE_URI_CLIP: Option<&UriClip> = None;
+impl UriClip {
+    pub const NONE: Option<&'static UriClip> = None;
+}
 
 pub trait UriClipExt: 'static {
     #[doc(alias = "ges_uri_clip_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 b11dfd28d..962b97c9f 100644
--- a/gstreamer-editing-services/src/auto/uri_clip_asset.rs
+++ b/gstreamer-editing-services/src/auto/uri_clip_asset.rs
@@ -72,7 +72,9 @@ impl UriClipAsset {
     }
 }
 
-pub const NONE_URI_CLIP_ASSET: Option<&UriClipAsset> = None;
+impl UriClipAsset {
+    pub const NONE: Option<&'static UriClipAsset> = None;
+}
 
 pub trait UriClipAssetExt: 'static {
     #[doc(alias = "ges_uri_clip_asset_get_duration")]
diff --git a/gstreamer-editing-services/src/auto/uri_source_asset.rs b/gstreamer-editing-services/src/auto/uri_source_asset.rs
index 4e05ba4c5..3b6718b3b 100644
--- a/gstreamer-editing-services/src/auto/uri_source_asset.rs
+++ b/gstreamer-editing-services/src/auto/uri_source_asset.rs
@@ -19,7 +19,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_URI_SOURCE_ASSET: Option<&UriSourceAsset> = None;
+impl UriSourceAsset {
+    pub const NONE: Option<&'static UriSourceAsset> = None;
+}
 
 pub trait UriSourceAssetExt: 'static {
     #[doc(alias = "ges_uri_source_asset_get_filesource_asset")]
diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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_source.rs b/gstreamer-editing-services/src/auto/video_source.rs
index 56454c01b..472f13ffe 100644
--- a/gstreamer-editing-services/src/auto/video_source.rs
+++ b/gstreamer-editing-services/src/auto/video_source.rs
@@ -25,7 +25,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_VIDEO_SOURCE: Option<&VideoSource> = None;
+impl VideoSource {
+    pub const NONE: Option<&'static VideoSource> = None;
+}
 
 pub trait VideoSourceExt: 'static {
     #[cfg(any(feature = "v1_18", feature = "dox"))]
diff --git a/gstreamer-editing-services/src/auto/video_test_source.rs b/gstreamer-editing-services/src/auto/video_test_source.rs
index a28028ebc..915f3dba0 100644
--- a/gstreamer-editing-services/src/auto/video_test_source.rs
+++ b/gstreamer-editing-services/src/auto/video_test_source.rs
@@ -22,7 +22,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_VIDEO_TEST_SOURCE: Option<&VideoTestSource> = None;
+impl VideoTestSource {
+    pub const NONE: Option<&'static VideoTestSource> = None;
+}
 
 pub trait VideoTestSourceExt: 'static {
     #[doc(alias = "ges_video_test_source_get_pattern")]
diff --git a/gstreamer-editing-services/src/auto/video_track.rs b/gstreamer-editing-services/src/auto/video_track.rs
index ed8ce58ea..13906e0f7 100644
--- a/gstreamer-editing-services/src/auto/video_track.rs
+++ b/gstreamer-editing-services/src/auto/video_track.rs
@@ -30,4 +30,6 @@ impl Default for VideoTrack {
     }
 }
 
-pub const NONE_VIDEO_TRACK: Option<&VideoTrack> = None;
+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 f0a87ea16..d8b53603b 100644
--- a/gstreamer-editing-services/src/auto/video_transition.rs
+++ b/gstreamer-editing-services/src/auto/video_transition.rs
@@ -43,7 +43,9 @@ impl Default for VideoTransition {
     }
 }
 
-pub const NONE_VIDEO_TRANSITION: Option<&VideoTransition> = None;
+impl VideoTransition {
+    pub const NONE: Option<&'static VideoTransition> = None;
+}
 
 pub trait VideoTransitionExt: 'static {
     #[cfg_attr(feature = "v1_20", deprecated = "Since 1.20")]
diff --git a/gstreamer-editing-services/src/auto/video_uri_source.rs b/gstreamer-editing-services/src/auto/video_uri_source.rs
index 12388b6aa..4efbe0adb 100644
--- a/gstreamer-editing-services/src/auto/video_uri_source.rs
+++ b/gstreamer-editing-services/src/auto/video_uri_source.rs
@@ -22,7 +22,9 @@ glib::wrapper! {
     }
 }
 
-pub const NONE_VIDEO_URI_SOURCE: Option<&VideoUriSource> = None;
+impl VideoUriSource {
+    pub const NONE: Option<&'static VideoUriSource> = None;
+}
 
 pub trait VideoUriSourceExt: 'static {
     fn uri(&self) -> Option<glib::GString>;
diff --git a/gstreamer-editing-services/src/auto/xml_formatter.rs b/gstreamer-editing-services/src/auto/xml_formatter.rs
index f391097b5..2c0884c31 100644
--- a/gstreamer-editing-services/src/auto/xml_formatter.rs
+++ b/gstreamer-editing-services/src/auto/xml_formatter.rs
@@ -18,4 +18,6 @@ glib::wrapper! {
 
 impl XmlFormatter {}
 
-pub const NONE_XML_FORMATTER: Option<&XmlFormatter> = None;
+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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 7887e9635..8410b01d2 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 069755df5..e172b871d 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 86a7fcfd3..16a86efa7 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 d5206233b..383818e9e 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 01b1389e9..7b5c11d41 100644
--- a/gstreamer-gl/egl/src/auto/gl_display_egl.rs
+++ b/gstreamer-gl/egl/src/auto/gl_display_egl.rs
@@ -54,4 +54,6 @@ impl Default for GLDisplayEGL {
 unsafe impl Send for GLDisplayEGL {}
 unsafe impl Sync for GLDisplayEGL {}
 
-pub const NONE_GL_DISPLAY_EGL: Option<&GLDisplayEGL> = None;
+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 e2ed53717..f869ff39f 100644
--- a/gstreamer-gl/egl/src/auto/mod.rs
+++ b/gstreamer-gl/egl/src/auto/mod.rs
@@ -4,7 +4,7 @@
 // DO NOT EDIT
 
 mod gl_display_egl;
-pub use self::gl_display_egl::{GLDisplayEGL, NONE_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 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 6c9a101d6..7a88f5b34 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 8e84634c0..393d3f280 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 c99479fd4..23e72842d 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 dfe96128f..9ad016658 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 24d4f411b..766c90526 100644
--- a/gstreamer-gl/src/auto/gl_base_filter.rs
+++ b/gstreamer-gl/src/auto/gl_base_filter.rs
@@ -25,7 +25,9 @@ glib::wrapper! {
 unsafe impl Send for GLBaseFilter {}
 unsafe impl Sync for GLBaseFilter {}
 
-pub const NONE_GL_BASE_FILTER: Option<&GLBaseFilter> = None;
+impl GLBaseFilter {
+    pub const NONE: Option<&'static GLBaseFilter> = None;
+}
 
 pub trait GLBaseFilterExt: 'static {
     #[cfg(any(feature = "v1_16", feature = "dox"))]
diff --git a/gstreamer-gl/src/auto/gl_base_memory_allocator.rs b/gstreamer-gl/src/auto/gl_base_memory_allocator.rs
index a63fd112f..cb1903250 100644
--- a/gstreamer-gl/src/auto/gl_base_memory_allocator.rs
+++ b/gstreamer-gl/src/auto/gl_base_memory_allocator.rs
@@ -17,4 +17,6 @@ impl GLBaseMemoryAllocator {}
 unsafe impl Send for GLBaseMemoryAllocator {}
 unsafe impl Sync for GLBaseMemoryAllocator {}
 
-pub const NONE_GL_BASE_MEMORY_ALLOCATOR: Option<&GLBaseMemoryAllocator> = None;
+impl GLBaseMemoryAllocator {
+    pub const NONE: Option<&'static GLBaseMemoryAllocator> = None;
+}
diff --git a/gstreamer-gl/src/auto/gl_base_src.rs b/gstreamer-gl/src/auto/gl_base_src.rs
index 8c0806e87..f9a873ff2 100644
--- a/gstreamer-gl/src/auto/gl_base_src.rs
+++ b/gstreamer-gl/src/auto/gl_base_src.rs
@@ -25,7 +25,9 @@ glib::wrapper! {
 unsafe impl Send for GLBaseSrc {}
 unsafe impl Sync for GLBaseSrc {}
 
-pub const NONE_GL_BASE_SRC: Option<&GLBaseSrc> = None;
+impl GLBaseSrc {
+    pub const NONE: Option<&'static GLBaseSrc> = None;
+}
 
 pub trait GLBaseSrcExt: 'static {
     #[doc(alias = "timestamp-offset")]
diff --git a/gstreamer-gl/src/auto/gl_context.rs b/gstreamer-gl/src/auto/gl_context.rs
index 2c3bf1bd4..34579d879 100644
--- a/gstreamer-gl/src/auto/gl_context.rs
+++ b/gstreamer-gl/src/auto/gl_context.rs
@@ -59,7 +59,9 @@ impl GLContext {
 unsafe impl Send for GLContext {}
 unsafe impl Sync for GLContext {}
 
-pub const NONE_GL_CONTEXT: Option<&GLContext> = None;
+impl GLContext {
+    pub const NONE: Option<&'static GLContext> = None;
+}
 
 pub trait GLContextExt: 'static {
     #[doc(alias = "gst_gl_context_activate")]
diff --git a/gstreamer-gl/src/auto/gl_display.rs b/gstreamer-gl/src/auto/gl_display.rs
index 2bcb73179..7fc271ca2 100644
--- a/gstreamer-gl/src/auto/gl_display.rs
+++ b/gstreamer-gl/src/auto/gl_display.rs
@@ -51,7 +51,9 @@ impl Default for GLDisplay {
 unsafe impl Send for GLDisplay {}
 unsafe impl Sync for GLDisplay {}
 
-pub const NONE_GL_DISPLAY: Option<&GLDisplay> = None;
+impl GLDisplay {
+    pub const NONE: Option<&'static GLDisplay> = None;
+}
 
 pub trait GLDisplayExt: 'static {
     #[doc(alias = "gst_gl_display_add_context")]
diff --git a/gstreamer-gl/src/auto/gl_filter.rs b/gstreamer-gl/src/auto/gl_filter.rs
index 2ed5820fe..5729319b4 100644
--- a/gstreamer-gl/src/auto/gl_filter.rs
+++ b/gstreamer-gl/src/auto/gl_filter.rs
@@ -21,7 +21,9 @@ glib::wrapper! {
 unsafe impl Send for GLFilter {}
 unsafe impl Sync for GLFilter {}
 
-pub const NONE_GL_FILTER: Option<&GLFilter> = None;
+impl GLFilter {
+    pub const NONE: Option<&'static GLFilter> = None;
+}
 
 pub trait GLFilterExt: 'static {
     #[doc(alias = "gst_gl_filter_draw_fullscreen_quad")]
diff --git a/gstreamer-gl/src/auto/gl_framebuffer.rs b/gstreamer-gl/src/auto/gl_framebuffer.rs
index 41d550754..6900829f5 100644
--- a/gstreamer-gl/src/auto/gl_framebuffer.rs
+++ b/gstreamer-gl/src/auto/gl_framebuffer.rs
@@ -50,7 +50,9 @@ impl GLFramebuffer {
 unsafe impl Send for GLFramebuffer {}
 unsafe impl Sync for GLFramebuffer {}
 
-pub const NONE_GL_FRAMEBUFFER: Option<&GLFramebuffer> = None;
+impl GLFramebuffer {
+    pub const NONE: Option<&'static GLFramebuffer> = None;
+}
 
 pub trait GLFramebufferExt: 'static {
     #[doc(alias = "gst_gl_framebuffer_attach")]
diff --git a/gstreamer-gl/src/auto/gl_memory_allocator.rs b/gstreamer-gl/src/auto/gl_memory_allocator.rs
index 948d5ceda..37d3313b8 100644
--- a/gstreamer-gl/src/auto/gl_memory_allocator.rs
+++ b/gstreamer-gl/src/auto/gl_memory_allocator.rs
@@ -33,4 +33,6 @@ impl GLMemoryAllocator {
 unsafe impl Send for GLMemoryAllocator {}
 unsafe impl Sync for GLMemoryAllocator {}
 
-pub const NONE_GL_MEMORY_ALLOCATOR: Option<&GLMemoryAllocator> = None;
+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 e94c4e35f..46c1be0fe 100644
--- a/gstreamer-gl/src/auto/gl_window.rs
+++ b/gstreamer-gl/src/auto/gl_window.rs
@@ -34,7 +34,9 @@ impl GLWindow {
 unsafe impl Send for GLWindow {}
 unsafe impl Sync for GLWindow {}
 
-pub const NONE_GL_WINDOW: Option<&GLWindow> = None;
+impl GLWindow {
+    pub const NONE: Option<&'static GLWindow> = None;
+}
 
 pub trait GLWindowExt: 'static {
     #[cfg(any(feature = "v1_16", feature = "dox"))]
diff --git a/gstreamer-gl/src/auto/mod.rs b/gstreamer-gl/src/auto/mod.rs
index 1ffd418b1..e2ebbba23 100644
--- a/gstreamer-gl/src/auto/mod.rs
+++ b/gstreamer-gl/src/auto/mod.rs
@@ -4,35 +4,35 @@
 // DO NOT EDIT
 
 mod gl_base_filter;
-pub use self::gl_base_filter::{GLBaseFilter, NONE_GL_BASE_FILTER};
+pub use self::gl_base_filter::GLBaseFilter;
 
 mod gl_base_memory_allocator;
-pub use self::gl_base_memory_allocator::{GLBaseMemoryAllocator, NONE_GL_BASE_MEMORY_ALLOCATOR};
+pub use self::gl_base_memory_allocator::GLBaseMemoryAllocator;
 
 #[cfg(any(feature = "v1_18", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
 mod gl_base_src;
 #[cfg(any(feature = "v1_18", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
-pub use self::gl_base_src::{GLBaseSrc, NONE_GL_BASE_SRC};
+pub use self::gl_base_src::GLBaseSrc;
 
 mod gl_color_convert;
 pub use self::gl_color_convert::GLColorConvert;
 
 mod gl_context;
-pub use self::gl_context::{GLContext, NONE_GL_CONTEXT};
+pub use self::gl_context::GLContext;
 
 mod gl_display;
-pub use self::gl_display::{GLDisplay, NONE_GL_DISPLAY};
+pub use self::gl_display::GLDisplay;
 
 mod gl_filter;
-pub use self::gl_filter::{GLFilter, NONE_GL_FILTER};
+pub use self::gl_filter::GLFilter;
 
 mod gl_framebuffer;
-pub use self::gl_framebuffer::{GLFramebuffer, NONE_GL_FRAMEBUFFER};
+pub use self::gl_framebuffer::GLFramebuffer;
 
 mod gl_memory_allocator;
-pub use self::gl_memory_allocator::{GLMemoryAllocator, NONE_GL_MEMORY_ALLOCATOR};
+pub use self::gl_memory_allocator::GLMemoryAllocator;
 
 mod gl_overlay_compositor;
 pub use self::gl_overlay_compositor::GLOverlayCompositor;
@@ -50,7 +50,7 @@ mod gl_view_convert;
 pub use self::gl_view_convert::GLViewConvert;
 
 mod gl_window;
-pub use self::gl_window::{GLWindow, NONE_GL_WINDOW};
+pub use self::gl_window::GLWindow;
 
 mod gl_allocation_params;
 pub use self::gl_allocation_params::GLAllocationParams;
diff --git a/gstreamer-gl/src/auto/versions.txt b/gstreamer-gl/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 0dcc9387f..9ca7554e4 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 c14b673f2..e5bc76622 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 067764536..6572414ad 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 a49983c8b..a572d83e8 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 8d0809643..bc38f4fb8 100644
--- a/gstreamer-gl/wayland/src/auto/gl_display_wayland.rs
+++ b/gstreamer-gl/wayland/src/auto/gl_display_wayland.rs
@@ -31,4 +31,6 @@ impl GLDisplayWayland {
 unsafe impl Send for GLDisplayWayland {}
 unsafe impl Sync for GLDisplayWayland {}
 
-pub const NONE_GL_DISPLAY_WAYLAND: Option<&GLDisplayWayland> = None;
+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 e394f1390..5a5826597 100644
--- a/gstreamer-gl/wayland/src/auto/mod.rs
+++ b/gstreamer-gl/wayland/src/auto/mod.rs
@@ -4,7 +4,7 @@
 // DO NOT EDIT
 
 mod gl_display_wayland;
-pub use self::gl_display_wayland::{GLDisplayWayland, NONE_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 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 3a31cea8f..4c851f2b2 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 3f895be6b..b185ca020 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 e80dfc8e2..04ebaccec 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 198967bf5..ce8eaed97 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 774b85619..3c33bd6b2 100644
--- a/gstreamer-gl/x11/src/auto/gl_display_x11.rs
+++ b/gstreamer-gl/x11/src/auto/gl_display_x11.rs
@@ -31,4 +31,6 @@ impl GLDisplayX11 {
 unsafe impl Send for GLDisplayX11 {}
 unsafe impl Sync for GLDisplayX11 {}
 
-pub const NONE_GL_DISPLAY_X11: Option<&GLDisplayX11> = None;
+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 846b3d582..7725a8e42 100644
--- a/gstreamer-gl/x11/src/auto/mod.rs
+++ b/gstreamer-gl/x11/src/auto/mod.rs
@@ -4,7 +4,7 @@
 // DO NOT EDIT
 
 mod gl_display_x11;
-pub use self::gl_display_x11::{GLDisplayX11, NONE_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 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 7ac91045c..0d59f8961 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 4138b2ac6..0d5a718ea 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 e80dfc8e2..04ebaccec 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 f15087fb6..bf4d5baf7 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 86411419d..530b0819d 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 25f4424db..c32cdc612 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 eacdd6959..8892eb21f 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 866b070c8..9a3056646 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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/versions.txt b/gstreamer-net/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 23616b07a..097c083f6 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 c85c1805a..ffc45f3f4 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 203dd3d53..a295487b1 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 181a02ac7..88c29f67b 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 884756824..2d1c565e3 100644
--- a/gstreamer-pbutils/src/auto/discoverer_stream_info.rs
+++ b/gstreamer-pbutils/src/auto/discoverer_stream_info.rs
@@ -18,7 +18,9 @@ glib::wrapper! {
 unsafe impl Send for DiscovererStreamInfo {}
 unsafe impl Sync for DiscovererStreamInfo {}
 
-pub const NONE_DISCOVERER_STREAM_INFO: Option<&DiscovererStreamInfo> = None;
+impl DiscovererStreamInfo {
+    pub const NONE: Option<&'static DiscovererStreamInfo> = None;
+}
 
 pub trait DiscovererStreamInfoExt: 'static {
     #[doc(alias = "gst_discoverer_stream_info_get_caps")]
diff --git a/gstreamer-pbutils/src/auto/encoding_profile.rs b/gstreamer-pbutils/src/auto/encoding_profile.rs
index 9ab2e8fc9..92ed586e1 100644
--- a/gstreamer-pbutils/src/auto/encoding_profile.rs
+++ b/gstreamer-pbutils/src/auto/encoding_profile.rs
@@ -65,7 +65,9 @@ impl EncodingProfile {
 unsafe impl Send for EncodingProfile {}
 unsafe impl Sync for EncodingProfile {}
 
-pub const NONE_ENCODING_PROFILE: Option<&EncodingProfile> = None;
+impl EncodingProfile {
+    pub const NONE: Option<&'static EncodingProfile> = None;
+}
 
 pub trait EncodingProfileExt: 'static {
     #[cfg(any(feature = "v1_12", feature = "dox"))]
diff --git a/gstreamer-pbutils/src/auto/mod.rs b/gstreamer-pbutils/src/auto/mod.rs
index 26e227276..be665b1d9 100644
--- a/gstreamer-pbutils/src/auto/mod.rs
+++ b/gstreamer-pbutils/src/auto/mod.rs
@@ -16,7 +16,7 @@ mod discoverer_info;
 pub use self::discoverer_info::DiscovererInfo;
 
 mod discoverer_stream_info;
-pub use self::discoverer_stream_info::{DiscovererStreamInfo, NONE_DISCOVERER_STREAM_INFO};
+pub use self::discoverer_stream_info::DiscovererStreamInfo;
 
 mod discoverer_subtitle_info;
 pub use self::discoverer_subtitle_info::DiscovererSubtitleInfo;
@@ -31,7 +31,7 @@ mod encoding_container_profile;
 pub use self::encoding_container_profile::EncodingContainerProfile;
 
 mod encoding_profile;
-pub use self::encoding_profile::{EncodingProfile, NONE_ENCODING_PROFILE};
+pub use self::encoding_profile::EncodingProfile;
 
 mod encoding_target;
 pub use self::encoding_target::EncodingTarget;
diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 69c35a702..338efa9ff 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 9e1f31686..4f88f9a92 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 1e2fd64fb..2be0d6d6b 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 79dbb6351..b279da790 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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/mod.rs b/gstreamer-player/src/auto/mod.rs
index 03c86e994..3045a99a2 100644
--- a/gstreamer-player/src/auto/mod.rs
+++ b/gstreamer-player/src/auto/mod.rs
@@ -16,10 +16,10 @@ mod player_media_info;
 pub use self::player_media_info::PlayerMediaInfo;
 
 mod player_signal_dispatcher;
-pub use self::player_signal_dispatcher::{PlayerSignalDispatcher, NONE_PLAYER_SIGNAL_DISPATCHER};
+pub use self::player_signal_dispatcher::PlayerSignalDispatcher;
 
 mod player_stream_info;
-pub use self::player_stream_info::{PlayerStreamInfo, NONE_PLAYER_STREAM_INFO};
+pub use self::player_stream_info::PlayerStreamInfo;
 
 mod player_subtitle_info;
 pub use self::player_subtitle_info::PlayerSubtitleInfo;
@@ -31,7 +31,7 @@ mod player_video_overlay_video_renderer;
 pub use self::player_video_overlay_video_renderer::PlayerVideoOverlayVideoRenderer;
 
 mod player_video_renderer;
-pub use self::player_video_renderer::{PlayerVideoRenderer, NONE_PLAYER_VIDEO_RENDERER};
+pub use self::player_video_renderer::PlayerVideoRenderer;
 
 mod player_visualization;
 pub use self::player_visualization::PlayerVisualization;
diff --git a/gstreamer-player/src/auto/player_signal_dispatcher.rs b/gstreamer-player/src/auto/player_signal_dispatcher.rs
index e68c672e1..8ee4734a4 100644
--- a/gstreamer-player/src/auto/player_signal_dispatcher.rs
+++ b/gstreamer-player/src/auto/player_signal_dispatcher.rs
@@ -17,7 +17,9 @@ glib::wrapper! {
 unsafe impl Send for PlayerSignalDispatcher {}
 unsafe impl Sync for PlayerSignalDispatcher {}
 
-pub const NONE_PLAYER_SIGNAL_DISPATCHER: Option<&PlayerSignalDispatcher> = None;
+impl PlayerSignalDispatcher {
+    pub const NONE: Option<&'static PlayerSignalDispatcher> = None;
+}
 
 pub trait PlayerSignalDispatcherExt: 'static {}
 
diff --git a/gstreamer-player/src/auto/player_stream_info.rs b/gstreamer-player/src/auto/player_stream_info.rs
index 75ff5e5c4..c459c650a 100644
--- a/gstreamer-player/src/auto/player_stream_info.rs
+++ b/gstreamer-player/src/auto/player_stream_info.rs
@@ -18,7 +18,9 @@ glib::wrapper! {
 unsafe impl Send for PlayerStreamInfo {}
 unsafe impl Sync for PlayerStreamInfo {}
 
-pub const NONE_PLAYER_STREAM_INFO: Option<&PlayerStreamInfo> = None;
+impl PlayerStreamInfo {
+    pub const NONE: Option<&'static PlayerStreamInfo> = None;
+}
 
 pub trait PlayerStreamInfoExt: 'static {
     #[doc(alias = "gst_player_stream_info_get_caps")]
diff --git a/gstreamer-player/src/auto/player_video_renderer.rs b/gstreamer-player/src/auto/player_video_renderer.rs
index 92905e63c..7539aeaba 100644
--- a/gstreamer-player/src/auto/player_video_renderer.rs
+++ b/gstreamer-player/src/auto/player_video_renderer.rs
@@ -17,7 +17,9 @@ glib::wrapper! {
 unsafe impl Send for PlayerVideoRenderer {}
 unsafe impl Sync for PlayerVideoRenderer {}
 
-pub const NONE_PLAYER_VIDEO_RENDERER: Option<&PlayerVideoRenderer> = None;
+impl PlayerVideoRenderer {
+    pub const NONE: Option<&'static PlayerVideoRenderer> = None;
+}
 
 pub trait PlayerVideoRendererExt: 'static {}
 
diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 04b42ebd4..f1fc544a3 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 5701425dd..e49323b3b 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 c1c4fd26d..0d199f40a 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 4a259208e..548fcf459 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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/mod.rs b/gstreamer-rtp/src/auto/mod.rs
index 2883de3bf..210833bd5 100644
--- a/gstreamer-rtp/src/auto/mod.rs
+++ b/gstreamer-rtp/src/auto/mod.rs
@@ -8,7 +8,7 @@
 mod rtp_header_extension;
 #[cfg(any(feature = "v1_20", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_20")))]
-pub use self::rtp_header_extension::{RTPHeaderExtension, NONE_RTP_HEADER_EXTENSION};
+pub use self::rtp_header_extension::RTPHeaderExtension;
 
 mod enums;
 pub use self::enums::RTCPFBType;
diff --git a/gstreamer-rtp/src/auto/rtp_header_extension.rs b/gstreamer-rtp/src/auto/rtp_header_extension.rs
index 4ba1d0433..f21c648ad 100644
--- a/gstreamer-rtp/src/auto/rtp_header_extension.rs
+++ b/gstreamer-rtp/src/auto/rtp_header_extension.rs
@@ -32,7 +32,9 @@ impl RTPHeaderExtension {
 unsafe impl Send for RTPHeaderExtension {}
 unsafe impl Sync for RTPHeaderExtension {}
 
-pub const NONE_RTP_HEADER_EXTENSION: Option<&RTPHeaderExtension> = None;
+impl RTPHeaderExtension {
+    pub const NONE: Option<&'static RTPHeaderExtension> = None;
+}
 
 pub trait RTPHeaderExtensionExt: 'static {
     #[doc(alias = "gst_rtp_header_extension_get_direction")]
diff --git a/gstreamer-rtp/src/auto/versions.txt b/gstreamer-rtp/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 d7ca4f32f..0d68b7eb9 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 5cf17503e..c0a4d1995 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 576ddaf75..d7c7e172e 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 25db71d67..8fb92ae64 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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/mod.rs b/gstreamer-rtsp-server/src/auto/mod.rs
index ff930344e..c8d534a16 100644
--- a/gstreamer-rtsp-server/src/auto/mod.rs
+++ b/gstreamer-rtsp-server/src/auto/mod.rs
@@ -4,46 +4,46 @@
 // DO NOT EDIT
 
 mod rtsp_address_pool;
-pub use self::rtsp_address_pool::{RTSPAddressPool, NONE_RTSP_ADDRESS_POOL};
+pub use self::rtsp_address_pool::RTSPAddressPool;
 
 mod rtsp_auth;
-pub use self::rtsp_auth::{RTSPAuth, NONE_RTSP_AUTH};
+pub use self::rtsp_auth::RTSPAuth;
 
 mod rtsp_client;
-pub use self::rtsp_client::{RTSPClient, NONE_RTSP_CLIENT};
+pub use self::rtsp_client::RTSPClient;
 
 mod rtsp_media;
-pub use self::rtsp_media::{RTSPMedia, NONE_RTSP_MEDIA};
+pub use self::rtsp_media::RTSPMedia;
 
 mod rtsp_media_factory;
-pub use self::rtsp_media_factory::{RTSPMediaFactory, NONE_RTSP_MEDIA_FACTORY};
+pub use self::rtsp_media_factory::RTSPMediaFactory;
 
 mod rtsp_media_factory_uri;
-pub use self::rtsp_media_factory_uri::{RTSPMediaFactoryURI, NONE_RTSP_MEDIA_FACTORY_URI};
+pub use self::rtsp_media_factory_uri::RTSPMediaFactoryURI;
 
 mod rtsp_mount_points;
-pub use self::rtsp_mount_points::{RTSPMountPoints, NONE_RTSP_MOUNT_POINTS};
+pub use self::rtsp_mount_points::RTSPMountPoints;
 
 mod rtsp_server;
-pub use self::rtsp_server::{RTSPServer, NONE_RTSP_SERVER};
+pub use self::rtsp_server::RTSPServer;
 
 mod rtsp_session;
-pub use self::rtsp_session::{RTSPSession, NONE_RTSP_SESSION};
+pub use self::rtsp_session::RTSPSession;
 
 mod rtsp_session_media;
-pub use self::rtsp_session_media::{RTSPSessionMedia, NONE_RTSP_SESSION_MEDIA};
+pub use self::rtsp_session_media::RTSPSessionMedia;
 
 mod rtsp_session_pool;
-pub use self::rtsp_session_pool::{RTSPSessionPool, NONE_RTSP_SESSION_POOL};
+pub use self::rtsp_session_pool::RTSPSessionPool;
 
 mod rtsp_stream;
-pub use self::rtsp_stream::{RTSPStream, NONE_RTSP_STREAM};
+pub use self::rtsp_stream::RTSPStream;
 
 mod rtsp_stream_transport;
-pub use self::rtsp_stream_transport::{RTSPStreamTransport, NONE_RTSP_STREAM_TRANSPORT};
+pub use self::rtsp_stream_transport::RTSPStreamTransport;
 
 mod rtsp_thread_pool;
-pub use self::rtsp_thread_pool::{RTSPThreadPool, NONE_RTSP_THREAD_POOL};
+pub use self::rtsp_thread_pool::RTSPThreadPool;
 
 mod rtsp_address;
 pub use self::rtsp_address::RTSPAddress;
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_address_pool.rs b/gstreamer-rtsp-server/src/auto/rtsp_address_pool.rs
index 6adab08ab..8ec4e09e1 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_address_pool.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_address_pool.rs
@@ -34,7 +34,9 @@ impl Default for RTSPAddressPool {
 unsafe impl Send for RTSPAddressPool {}
 unsafe impl Sync for RTSPAddressPool {}
 
-pub const NONE_RTSP_ADDRESS_POOL: Option<&RTSPAddressPool> = None;
+impl RTSPAddressPool {
+    pub const NONE: Option<&'static RTSPAddressPool> = None;
+}
 
 pub trait RTSPAddressPoolExt: 'static {
     #[doc(alias = "gst_rtsp_address_pool_acquire_address")]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs
index 896903a87..1dda24f0a 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs
@@ -60,7 +60,9 @@ impl Default for RTSPAuth {
 unsafe impl Send for RTSPAuth {}
 unsafe impl Sync for RTSPAuth {}
 
-pub const NONE_RTSP_AUTH: Option<&RTSPAuth> = None;
+impl RTSPAuth {
+    pub const NONE: Option<&'static RTSPAuth> = None;
+}
 
 pub trait RTSPAuthExt: 'static {
     #[doc(alias = "gst_rtsp_auth_add_basic")]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_client.rs b/gstreamer-rtsp-server/src/auto/rtsp_client.rs
index 3b6a3fe2f..22880dd7e 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_client.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_client.rs
@@ -49,7 +49,9 @@ impl Default for RTSPClient {
 unsafe impl Send for RTSPClient {}
 unsafe impl Sync for RTSPClient {}
 
-pub const NONE_RTSP_CLIENT: Option<&RTSPClient> = None;
+impl RTSPClient {
+    pub const NONE: Option<&'static RTSPClient> = None;
+}
 
 pub trait RTSPClientExt: 'static {
     #[doc(alias = "gst_rtsp_client_close")]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_media.rs
index 4fc11deec..9ae7053e9 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_media.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_media.rs
@@ -44,7 +44,9 @@ impl RTSPMedia {
 unsafe impl Send for RTSPMedia {}
 unsafe impl Sync for RTSPMedia {}
 
-pub const NONE_RTSP_MEDIA: Option<&RTSPMedia> = None;
+impl RTSPMedia {
+    pub const NONE: Option<&'static RTSPMedia> = None;
+}
 
 pub trait RTSPMediaExt: 'static {
     #[doc(alias = "gst_rtsp_media_collect_streams")]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs b/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs
index fe6a8de78..3e3675b3f 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs
@@ -44,7 +44,9 @@ impl Default for RTSPMediaFactory {
 unsafe impl Send for RTSPMediaFactory {}
 unsafe impl Sync for RTSPMediaFactory {}
 
-pub const NONE_RTSP_MEDIA_FACTORY: Option<&RTSPMediaFactory> = None;
+impl RTSPMediaFactory {
+    pub const NONE: Option<&'static RTSPMediaFactory> = None;
+}
 
 pub trait RTSPMediaFactoryExt: 'static {
     //#[doc(alias = "gst_rtsp_media_factory_add_role")]
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 9bd40a8c3..c5b715239 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_media_factory_uri.rs
@@ -40,7 +40,9 @@ impl Default for RTSPMediaFactoryURI {
 unsafe impl Send for RTSPMediaFactoryURI {}
 unsafe impl Sync for RTSPMediaFactoryURI {}
 
-pub const NONE_RTSP_MEDIA_FACTORY_URI: Option<&RTSPMediaFactoryURI> = None;
+impl RTSPMediaFactoryURI {
+    pub const NONE: Option<&'static RTSPMediaFactoryURI> = None;
+}
 
 pub trait RTSPMediaFactoryURIExt: 'static {
     #[doc(alias = "gst_rtsp_media_factory_uri_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 72efc7428..12e51128a 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_mount_points.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_mount_points.rs
@@ -34,7 +34,9 @@ impl Default for RTSPMountPoints {
 unsafe impl Send for RTSPMountPoints {}
 unsafe impl Sync for RTSPMountPoints {}
 
-pub const NONE_RTSP_MOUNT_POINTS: Option<&RTSPMountPoints> = None;
+impl RTSPMountPoints {
+    pub const NONE: Option<&'static RTSPMountPoints> = None;
+}
 
 pub trait RTSPMountPointsExt: 'static {
     #[doc(alias = "gst_rtsp_mount_points_add_factory")]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_server.rs b/gstreamer-rtsp-server/src/auto/rtsp_server.rs
index df8b17a10..7a0e72c2a 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_server.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_server.rs
@@ -65,7 +65,9 @@ impl Default for RTSPServer {
 unsafe impl Send for RTSPServer {}
 unsafe impl Sync for RTSPServer {}
 
-pub const NONE_RTSP_SERVER: Option<&RTSPServer> = None;
+impl RTSPServer {
+    pub const NONE: Option<&'static RTSPServer> = None;
+}
 
 pub trait RTSPServerExt: 'static {
     #[doc(alias = "gst_rtsp_server_client_filter")]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session.rs b/gstreamer-rtsp-server/src/auto/rtsp_session.rs
index c04493764..966eff814 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_session.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_session.rs
@@ -37,7 +37,9 @@ impl RTSPSession {
 unsafe impl Send for RTSPSession {}
 unsafe impl Sync for RTSPSession {}
 
-pub const NONE_RTSP_SESSION: Option<&RTSPSession> = None;
+impl RTSPSession {
+    pub const NONE: Option<&'static RTSPSession> = None;
+}
 
 pub trait RTSPSessionExt: 'static {
     #[doc(alias = "gst_rtsp_session_allow_expire")]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs
index f2c6164f5..dde6cfbdb 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs
@@ -34,7 +34,9 @@ impl RTSPSessionMedia {
 unsafe impl Send for RTSPSessionMedia {}
 unsafe impl Sync for RTSPSessionMedia {}
 
-pub const NONE_RTSP_SESSION_MEDIA: Option<&RTSPSessionMedia> = None;
+impl RTSPSessionMedia {
+    pub const NONE: Option<&'static RTSPSessionMedia> = None;
+}
 
 pub trait RTSPSessionMediaExt: 'static {
     //#[doc(alias = "gst_rtsp_session_media_alloc_channels")]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs b/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs
index b448e0434..3e82e8534 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs
@@ -39,7 +39,9 @@ impl Default for RTSPSessionPool {
 unsafe impl Send for RTSPSessionPool {}
 unsafe impl Sync for RTSPSessionPool {}
 
-pub const NONE_RTSP_SESSION_POOL: Option<&RTSPSessionPool> = None;
+impl RTSPSessionPool {
+    pub const NONE: Option<&'static RTSPSessionPool> = None;
+}
 
 pub trait RTSPSessionPoolExt: 'static {
     #[doc(alias = "gst_rtsp_session_pool_cleanup")]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_stream.rs b/gstreamer-rtsp-server/src/auto/rtsp_stream.rs
index 831e86321..6da97663a 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_stream.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_stream.rs
@@ -47,7 +47,9 @@ impl RTSPStream {
 unsafe impl Send for RTSPStream {}
 unsafe impl Sync for RTSPStream {}
 
-pub const NONE_RTSP_STREAM: Option<&RTSPStream> = None;
+impl RTSPStream {
+    pub const NONE: Option<&'static RTSPStream> = None;
+}
 
 pub trait RTSPStreamExt: 'static {
     #[cfg(any(feature = "v1_16", feature = "dox"))]
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs b/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs
index 5ebdb49e1..21d33d3c4 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs
@@ -24,7 +24,9 @@ impl RTSPStreamTransport {
     //}
 }
 
-pub const NONE_RTSP_STREAM_TRANSPORT: Option<&RTSPStreamTransport> = None;
+impl RTSPStreamTransport {
+    pub const NONE: Option<&'static RTSPStreamTransport> = None;
+}
 
 pub trait RTSPStreamTransportExt: 'static {
     #[doc(alias = "gst_rtsp_stream_transport_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 af7ca5764..afe6ecde9 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs
@@ -48,7 +48,9 @@ impl Default for RTSPThreadPool {
 unsafe impl Send for RTSPThreadPool {}
 unsafe impl Sync for RTSPThreadPool {}
 
-pub const NONE_RTSP_THREAD_POOL: Option<&RTSPThreadPool> = None;
+impl RTSPThreadPool {
+    pub const NONE: Option<&'static RTSPThreadPool> = None;
+}
 
 pub trait RTSPThreadPoolExt: 'static {
     #[doc(alias = "gst_rtsp_thread_pool_get_max_threads")]
diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 a3a0b983a..4a82bd24f 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 fa55bd07b..33c47812e 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 e2983d72f..604a6214b 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 f126df44f..abdd55fd3 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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/versions.txt b/gstreamer-rtsp/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 d81afee3d..7ea825e6a 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 8a5099ae5..f615af307 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 ba8446215..b58d66385 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 de6dc4edc..170070fb1 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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/versions.txt b/gstreamer-sdp/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 63f771334..844b790f2 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 216d8682c..523dd87a1 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 8ade6e94a..e1f96a33b 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 4f547ce6b..7e267abbc 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 efadd4dd2..369b9824b 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 05c9b64e0..989e64a62 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 9629fda0c..b2fdc1651 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 985a6cf6e..937116097 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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/mod.rs b/gstreamer-video/src/auto/mod.rs
index 4b1b7a340..cca809fc0 100644
--- a/gstreamer-video/src/auto/mod.rs
+++ b/gstreamer-video/src/auto/mod.rs
@@ -8,30 +8,28 @@
 mod video_aggregator_parallel_convert_pad;
 #[cfg(any(feature = "v1_20", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_20")))]
-pub use self::video_aggregator_parallel_convert_pad::{
-    VideoAggregatorParallelConvertPad, NONE_VIDEO_AGGREGATOR_PARALLEL_CONVERT_PAD,
-};
+pub use self::video_aggregator_parallel_convert_pad::VideoAggregatorParallelConvertPad;
 
 mod video_buffer_pool;
-pub use self::video_buffer_pool::{VideoBufferPool, NONE_VIDEO_BUFFER_POOL};
+pub use self::video_buffer_pool::VideoBufferPool;
 
 mod video_decoder;
-pub use self::video_decoder::{VideoDecoder, NONE_VIDEO_DECODER};
+pub use self::video_decoder::VideoDecoder;
 
 mod video_encoder;
-pub use self::video_encoder::{VideoEncoder, NONE_VIDEO_ENCODER};
+pub use self::video_encoder::VideoEncoder;
 
 mod video_filter;
-pub use self::video_filter::{VideoFilter, NONE_VIDEO_FILTER};
+pub use self::video_filter::VideoFilter;
 
 mod video_orientation;
-pub use self::video_orientation::{VideoOrientation, NONE_VIDEO_ORIENTATION};
+pub use self::video_orientation::VideoOrientation;
 
 mod video_overlay;
-pub use self::video_overlay::{VideoOverlay, NONE_VIDEO_OVERLAY};
+pub use self::video_overlay::VideoOverlay;
 
 mod video_sink;
-pub use self::video_sink::{VideoSink, NONE_VIDEO_SINK};
+pub use self::video_sink::VideoSink;
 
 mod enums;
 #[cfg(any(feature = "v1_18", feature = "dox"))]
diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 ec38484a8..6604bab11 100644
--- a/gstreamer-video/src/auto/video_aggregator_parallel_convert_pad.rs
+++ b/gstreamer-video/src/auto/video_aggregator_parallel_convert_pad.rs
@@ -17,5 +17,6 @@ impl VideoAggregatorParallelConvertPad {}
 unsafe impl Send for VideoAggregatorParallelConvertPad {}
 unsafe impl Sync for VideoAggregatorParallelConvertPad {}
 
-pub const NONE_VIDEO_AGGREGATOR_PARALLEL_CONVERT_PAD: Option<&VideoAggregatorParallelConvertPad> =
-    None;
+impl VideoAggregatorParallelConvertPad {
+    pub const NONE: Option<&'static VideoAggregatorParallelConvertPad> = None;
+}
diff --git a/gstreamer-video/src/auto/video_buffer_pool.rs b/gstreamer-video/src/auto/video_buffer_pool.rs
index b374e1245..b93f77b0d 100644
--- a/gstreamer-video/src/auto/video_buffer_pool.rs
+++ b/gstreamer-video/src/auto/video_buffer_pool.rs
@@ -32,4 +32,6 @@ impl Default for VideoBufferPool {
 unsafe impl Send for VideoBufferPool {}
 unsafe impl Sync for VideoBufferPool {}
 
-pub const NONE_VIDEO_BUFFER_POOL: Option<&VideoBufferPool> = None;
+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 61148d086..2ec00a00b 100644
--- a/gstreamer-video/src/auto/video_decoder.rs
+++ b/gstreamer-video/src/auto/video_decoder.rs
@@ -43,7 +43,9 @@ glib::wrapper! {
 unsafe impl Send for VideoDecoder {}
 unsafe impl Sync for VideoDecoder {}
 
-pub const NONE_VIDEO_DECODER: Option<&VideoDecoder> = None;
+impl VideoDecoder {
+    pub const NONE: Option<&'static VideoDecoder> = None;
+}
 
 pub trait VideoDecoderExt: 'static {
     #[doc(alias = "gst_video_decoder_add_to_frame")]
diff --git a/gstreamer-video/src/auto/video_encoder.rs b/gstreamer-video/src/auto/video_encoder.rs
index 32f30965a..0de997707 100644
--- a/gstreamer-video/src/auto/video_encoder.rs
+++ b/gstreamer-video/src/auto/video_encoder.rs
@@ -28,7 +28,9 @@ glib::wrapper! {
 unsafe impl Send for VideoEncoder {}
 unsafe impl Sync for VideoEncoder {}
 
-pub const NONE_VIDEO_ENCODER: Option<&VideoEncoder> = None;
+impl VideoEncoder {
+    pub const NONE: Option<&'static VideoEncoder> = None;
+}
 
 pub trait VideoEncoderExt: 'static {
     #[doc(alias = "gst_video_encoder_allocate_output_buffer")]
diff --git a/gstreamer-video/src/auto/video_filter.rs b/gstreamer-video/src/auto/video_filter.rs
index 6d3b61768..f98180e47 100644
--- a/gstreamer-video/src/auto/video_filter.rs
+++ b/gstreamer-video/src/auto/video_filter.rs
@@ -17,4 +17,6 @@ impl VideoFilter {}
 unsafe impl Send for VideoFilter {}
 unsafe impl Sync for VideoFilter {}
 
-pub const NONE_VIDEO_FILTER: Option<&VideoFilter> = None;
+impl VideoFilter {
+    pub const NONE: Option<&'static VideoFilter> = None;
+}
diff --git a/gstreamer-video/src/auto/video_orientation.rs b/gstreamer-video/src/auto/video_orientation.rs
index 15caf5864..eb31384c3 100644
--- a/gstreamer-video/src/auto/video_orientation.rs
+++ b/gstreamer-video/src/auto/video_orientation.rs
@@ -44,7 +44,9 @@ impl VideoOrientation {
 unsafe impl Send for VideoOrientation {}
 unsafe impl Sync for VideoOrientation {}
 
-pub const NONE_VIDEO_ORIENTATION: Option<&VideoOrientation> = None;
+impl VideoOrientation {
+    pub const NONE: Option<&'static VideoOrientation> = None;
+}
 
 pub trait VideoOrientationExt: 'static {
     #[doc(alias = "gst_video_orientation_get_hcenter")]
diff --git a/gstreamer-video/src/auto/video_overlay.rs b/gstreamer-video/src/auto/video_overlay.rs
index 488226a56..83b2c0af6 100644
--- a/gstreamer-video/src/auto/video_overlay.rs
+++ b/gstreamer-video/src/auto/video_overlay.rs
@@ -27,7 +27,9 @@ impl VideoOverlay {
 unsafe impl Send for VideoOverlay {}
 unsafe impl Sync for VideoOverlay {}
 
-pub const NONE_VIDEO_OVERLAY: Option<&VideoOverlay> = None;
+impl VideoOverlay {
+    pub const NONE: Option<&'static VideoOverlay> = None;
+}
 
 pub trait VideoOverlayExt: 'static {
     #[doc(alias = "gst_video_overlay_expose")]
diff --git a/gstreamer-video/src/auto/video_sink.rs b/gstreamer-video/src/auto/video_sink.rs
index 9a54d3858..cbeaeb77e 100644
--- a/gstreamer-video/src/auto/video_sink.rs
+++ b/gstreamer-video/src/auto/video_sink.rs
@@ -25,7 +25,9 @@ glib::wrapper! {
 unsafe impl Send for VideoSink {}
 unsafe impl Sync for VideoSink {}
 
-pub const NONE_VIDEO_SINK: Option<&VideoSink> = None;
+impl VideoSink {
+    pub const NONE: Option<&'static VideoSink> = None;
+}
 
 pub trait VideoSinkExt: 'static {
     #[doc(alias = "show-preroll-frame")]
diff --git a/gstreamer-video/sys/build.rs b/gstreamer-video/sys/build.rs
index 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 783911968..6ebfc2084 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 35c71bb43..4213cb282 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 f8945d127..b8b22e7dc 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 61e5f5b49..9655096bd 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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/versions.txt b/gstreamer-webrtc/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 a5e83a2d0..545e4fea0 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 1e85da436..72b7b316b 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 e3eaa08fe..ae7656542 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 50a6520ab..ff4305c3f 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 4aead1c12..29ecb0b2f 100644
--- a/gstreamer/src/auto/allocator.rs
+++ b/gstreamer/src/auto/allocator.rs
@@ -37,7 +37,9 @@ impl Allocator {
 unsafe impl Send for Allocator {}
 unsafe impl Sync for Allocator {}
 
-pub const NONE_ALLOCATOR: Option<&Allocator> = None;
+impl Allocator {
+    pub const NONE: Option<&'static Allocator> = None;
+}
 
 pub trait AllocatorExt: 'static {
     #[doc(alias = "gst_allocator_alloc")]
diff --git a/gstreamer/src/auto/bin.rs b/gstreamer/src/auto/bin.rs
index 9331ec8cb..ad85f5823 100644
--- a/gstreamer/src/auto/bin.rs
+++ b/gstreamer/src/auto/bin.rs
@@ -41,7 +41,9 @@ impl Bin {
 unsafe impl Send for Bin {}
 unsafe impl Sync for Bin {}
 
-pub const NONE_BIN: Option<&Bin> = None;
+impl Bin {
+    pub const NONE: Option<&'static Bin> = None;
+}
 
 pub trait GstBinExt: 'static {
     #[doc(alias = "gst_bin_add")]
diff --git a/gstreamer/src/auto/buffer_pool.rs b/gstreamer/src/auto/buffer_pool.rs
index 32a89b9dd..0c62ab05b 100644
--- a/gstreamer/src/auto/buffer_pool.rs
+++ b/gstreamer/src/auto/buffer_pool.rs
@@ -19,7 +19,9 @@ glib::wrapper! {
 unsafe impl Send for BufferPool {}
 unsafe impl Sync for BufferPool {}
 
-pub const NONE_BUFFER_POOL: Option<&BufferPool> = None;
+impl BufferPool {
+    pub const NONE: Option<&'static BufferPool> = None;
+}
 
 pub trait BufferPoolExt: 'static {
     #[doc(alias = "gst_buffer_pool_get_options")]
diff --git a/gstreamer/src/auto/child_proxy.rs b/gstreamer/src/auto/child_proxy.rs
index b8d30f1b7..84f2118a5 100644
--- a/gstreamer/src/auto/child_proxy.rs
+++ b/gstreamer/src/auto/child_proxy.rs
@@ -23,7 +23,9 @@ glib::wrapper! {
 unsafe impl Send for ChildProxy {}
 unsafe impl Sync for ChildProxy {}
 
-pub const NONE_CHILD_PROXY: Option<&ChildProxy> = None;
+impl ChildProxy {
+    pub const NONE: Option<&'static ChildProxy> = None;
+}
 
 pub trait ChildProxyExt: 'static {
     #[doc(alias = "gst_child_proxy_child_added")]
diff --git a/gstreamer/src/auto/clock.rs b/gstreamer/src/auto/clock.rs
index dab794211..1505c320b 100644
--- a/gstreamer/src/auto/clock.rs
+++ b/gstreamer/src/auto/clock.rs
@@ -79,7 +79,9 @@ impl Clock {
 unsafe impl Send for Clock {}
 unsafe impl Sync for Clock {}
 
-pub const NONE_CLOCK: Option<&Clock> = None;
+impl Clock {
+    pub const NONE: Option<&'static Clock> = None;
+}
 
 pub trait ClockExt: 'static {
     #[doc(alias = "gst_clock_add_observation")]
diff --git a/gstreamer/src/auto/control_binding.rs b/gstreamer/src/auto/control_binding.rs
index 7d40f4c4f..4ccc54c8f 100644
--- a/gstreamer/src/auto/control_binding.rs
+++ b/gstreamer/src/auto/control_binding.rs
@@ -21,7 +21,9 @@ glib::wrapper! {
 unsafe impl Send for ControlBinding {}
 unsafe impl Sync for ControlBinding {}
 
-pub const NONE_CONTROL_BINDING: Option<&ControlBinding> = None;
+impl ControlBinding {
+    pub const NONE: Option<&'static ControlBinding> = None;
+}
 
 pub trait ControlBindingExt: 'static {
     #[doc(alias = "gst_control_binding_get_value")]
diff --git a/gstreamer/src/auto/control_source.rs b/gstreamer/src/auto/control_source.rs
index 569610a36..6cfbb7c35 100644
--- a/gstreamer/src/auto/control_source.rs
+++ b/gstreamer/src/auto/control_source.rs
@@ -21,7 +21,9 @@ glib::wrapper! {
 unsafe impl Send for ControlSource {}
 unsafe impl Sync for ControlSource {}
 
-pub const NONE_CONTROL_SOURCE: Option<&ControlSource> = None;
+impl ControlSource {
+    pub const NONE: Option<&'static ControlSource> = None;
+}
 
 pub trait ControlSourceExt: 'static {
     #[doc(alias = "gst_control_source_get_value")]
diff --git a/gstreamer/src/auto/device.rs b/gstreamer/src/auto/device.rs
index 761819fde..3af685d98 100644
--- a/gstreamer/src/auto/device.rs
+++ b/gstreamer/src/auto/device.rs
@@ -27,7 +27,9 @@ glib::wrapper! {
 unsafe impl Send for Device {}
 unsafe impl Sync for Device {}
 
-pub const NONE_DEVICE: Option<&Device> = None;
+impl Device {
+    pub const NONE: Option<&'static Device> = None;
+}
 
 pub trait DeviceExt: 'static {
     #[doc(alias = "gst_device_create_element")]
diff --git a/gstreamer/src/auto/device_monitor.rs b/gstreamer/src/auto/device_monitor.rs
index d892d72d1..979ca9810 100644
--- a/gstreamer/src/auto/device_monitor.rs
+++ b/gstreamer/src/auto/device_monitor.rs
@@ -28,7 +28,9 @@ glib::wrapper! {
 unsafe impl Send for DeviceMonitor {}
 unsafe impl Sync for DeviceMonitor {}
 
-pub const NONE_DEVICE_MONITOR: Option<&DeviceMonitor> = None;
+impl DeviceMonitor {
+    pub const NONE: Option<&'static DeviceMonitor> = None;
+}
 
 pub trait DeviceMonitorExt: 'static {
     #[doc(alias = "gst_device_monitor_get_bus")]
diff --git a/gstreamer/src/auto/device_provider.rs b/gstreamer/src/auto/device_provider.rs
index a3ab7d94b..1a5f90e50 100644
--- a/gstreamer/src/auto/device_provider.rs
+++ b/gstreamer/src/auto/device_provider.rs
@@ -27,7 +27,9 @@ glib::wrapper! {
 unsafe impl Send for DeviceProvider {}
 unsafe impl Sync for DeviceProvider {}
 
-pub const NONE_DEVICE_PROVIDER: Option<&DeviceProvider> = None;
+impl DeviceProvider {
+    pub const NONE: Option<&'static DeviceProvider> = None;
+}
 
 pub trait DeviceProviderExt: 'static {
     #[doc(alias = "gst_device_provider_can_monitor")]
diff --git a/gstreamer/src/auto/element.rs b/gstreamer/src/auto/element.rs
index 5bf1fefa3..c3004c1f7 100644
--- a/gstreamer/src/auto/element.rs
+++ b/gstreamer/src/auto/element.rs
@@ -66,7 +66,9 @@ impl Element {
 unsafe impl Send for Element {}
 unsafe impl Sync for Element {}
 
-pub const NONE_ELEMENT: Option<&Element> = None;
+impl Element {
+    pub const NONE: Option<&'static Element> = None;
+}
 
 pub trait ElementExt: 'static {
     #[doc(alias = "gst_element_abort_state")]
diff --git a/gstreamer/src/auto/ghost_pad.rs b/gstreamer/src/auto/ghost_pad.rs
index 2c14dc5bd..ea28641ab 100644
--- a/gstreamer/src/auto/ghost_pad.rs
+++ b/gstreamer/src/auto/ghost_pad.rs
@@ -21,7 +21,9 @@ glib::wrapper! {
 unsafe impl Send for GhostPad {}
 unsafe impl Sync for GhostPad {}
 
-pub const NONE_GHOST_PAD: Option<&GhostPad> = None;
+impl GhostPad {
+    pub const NONE: Option<&'static GhostPad> = None;
+}
 
 pub trait GhostPadExt: 'static {
     #[doc(alias = "gst_ghost_pad_get_target")]
diff --git a/gstreamer/src/auto/mod.rs b/gstreamer/src/auto/mod.rs
index 55edbd290..f157d227f 100644
--- a/gstreamer/src/auto/mod.rs
+++ b/gstreamer/src/auto/mod.rs
@@ -4,73 +4,73 @@
 // DO NOT EDIT
 
 mod allocator;
-pub use self::allocator::{Allocator, NONE_ALLOCATOR};
+pub use self::allocator::Allocator;
 
 mod bin;
-pub use self::bin::{Bin, NONE_BIN};
+pub use self::bin::Bin;
 
 mod buffer_pool;
-pub use self::buffer_pool::{BufferPool, NONE_BUFFER_POOL};
+pub use self::buffer_pool::BufferPool;
 
 mod bus;
 pub use self::bus::Bus;
 
 mod child_proxy;
-pub use self::child_proxy::{ChildProxy, NONE_CHILD_PROXY};
+pub use self::child_proxy::ChildProxy;
 
 mod clock;
-pub use self::clock::{Clock, NONE_CLOCK};
+pub use self::clock::Clock;
 
 mod control_binding;
-pub use self::control_binding::{ControlBinding, NONE_CONTROL_BINDING};
+pub use self::control_binding::ControlBinding;
 
 mod control_source;
-pub use self::control_source::{ControlSource, NONE_CONTROL_SOURCE};
+pub use self::control_source::ControlSource;
 
 mod device;
-pub use self::device::{Device, NONE_DEVICE};
+pub use self::device::Device;
 
 mod device_monitor;
-pub use self::device_monitor::{DeviceMonitor, NONE_DEVICE_MONITOR};
+pub use self::device_monitor::DeviceMonitor;
 
 mod device_provider;
-pub use self::device_provider::{DeviceProvider, NONE_DEVICE_PROVIDER};
+pub use self::device_provider::DeviceProvider;
 
 mod device_provider_factory;
 pub use self::device_provider_factory::DeviceProviderFactory;
 
 mod element;
-pub use self::element::{Element, NONE_ELEMENT};
+pub use self::element::Element;
 
 mod element_factory;
 pub use self::element_factory::ElementFactory;
 
 mod ghost_pad;
-pub use self::ghost_pad::{GhostPad, NONE_GHOST_PAD};
+pub use self::ghost_pad::GhostPad;
 
 mod object;
-pub use self::object::{Object, NONE_OBJECT};
+pub use self::object::Object;
 
 mod pad;
-pub use self::pad::{Pad, NONE_PAD};
+pub use self::pad::Pad;
 
 mod pad_template;
 pub use self::pad_template::PadTemplate;
 
 mod pipeline;
-pub use self::pipeline::{Pipeline, NONE_PIPELINE};
+pub use self::pipeline::Pipeline;
 
 mod plugin;
 pub use self::plugin::Plugin;
 
 mod plugin_feature;
-pub use self::plugin_feature::{PluginFeature, NONE_PLUGIN_FEATURE};
+pub use self::plugin_feature::PluginFeature;
 
 mod preset;
-pub use self::preset::{Preset, NONE_PRESET};
+pub use self::preset::Preset;
 
 mod proxy_pad;
-pub use self::proxy_pad::{ProxyPad, NONE_PROXY_PAD};
+pub use self::proxy_pad::ProxyPad;
 
 mod registry;
 pub use self::registry::Registry;
@@ -90,16 +90,16 @@ mod stream_collection;
 pub use self::stream_collection::StreamCollection;
 
 mod system_clock;
-pub use self::system_clock::{SystemClock, NONE_SYSTEM_CLOCK};
+pub use self::system_clock::SystemClock;
 
 mod tag_setter;
-pub use self::tag_setter::{TagSetter, NONE_TAG_SETTER};
+pub use self::tag_setter::TagSetter;
 
 mod toc_setter;
-pub use self::toc_setter::{TocSetter, NONE_TOC_SETTER};
+pub use self::toc_setter::TocSetter;
 
 mod tracer;
-pub use self::tracer::{Tracer, NONE_TRACER};
+pub use self::tracer::Tracer;
 
 mod tracer_factory;
 pub use self::tracer_factory::TracerFactory;
@@ -108,7 +108,7 @@ mod type_find_factory;
 pub use self::type_find_factory::TypeFindFactory;
 
 mod uri_handler;
-pub use self::uri_handler::{URIHandler, NONE_URI_HANDLER};
+pub use self::uri_handler::URIHandler;
 
 mod date_time;
 pub use self::date_time::DateTime;
diff --git a/gstreamer/src/auto/object.rs b/gstreamer/src/auto/object.rs
index 0e3acfdd9..20ba03a44 100644
--- a/gstreamer/src/auto/object.rs
+++ b/gstreamer/src/auto/object.rs
@@ -56,7 +56,9 @@ impl fmt::Display for Object {
 unsafe impl Send for Object {}
 unsafe impl Sync for Object {}
 
-pub const NONE_OBJECT: Option<&Object> = None;
+impl Object {
+    pub const NONE: Option<&'static Object> = None;
+}
 
 pub trait GstObjectExt: 'static {
     #[doc(alias = "gst_object_add_control_binding")]
diff --git a/gstreamer/src/auto/pad.rs b/gstreamer/src/auto/pad.rs
index e143f7105..b819317e0 100644
--- a/gstreamer/src/auto/pad.rs
+++ b/gstreamer/src/auto/pad.rs
@@ -42,7 +42,9 @@ glib::wrapper! {
 unsafe impl Send for Pad {}
 unsafe impl Sync for Pad {}
 
-pub const NONE_PAD: Option<&Pad> = None;
+impl Pad {
+    pub const NONE: Option<&'static Pad> = None;
+}
 
 pub trait PadExt: 'static {
     #[doc(alias = "gst_pad_activate_mode")]
diff --git a/gstreamer/src/auto/pipeline.rs b/gstreamer/src/auto/pipeline.rs
index 54dd0dfb7..f05cbbdfe 100644
--- a/gstreamer/src/auto/pipeline.rs
+++ b/gstreamer/src/auto/pipeline.rs
@@ -39,7 +39,9 @@ impl Pipeline {
 unsafe impl Send for Pipeline {}
 unsafe impl Sync for Pipeline {}
 
-pub const NONE_PIPELINE: Option<&Pipeline> = None;
+impl Pipeline {
+    pub const NONE: Option<&'static Pipeline> = None;
+}
 
 pub trait PipelineExt: 'static {
     #[doc(alias = "gst_pipeline_auto_clock")]
diff --git a/gstreamer/src/auto/plugin_feature.rs b/gstreamer/src/auto/plugin_feature.rs
index 414cc6cf3..0209bd9a5 100644
--- a/gstreamer/src/auto/plugin_feature.rs
+++ b/gstreamer/src/auto/plugin_feature.rs
@@ -20,7 +20,9 @@ glib::wrapper! {
 unsafe impl Send for PluginFeature {}
 unsafe impl Sync for PluginFeature {}
 
-pub const NONE_PLUGIN_FEATURE: Option<&PluginFeature> = None;
+impl PluginFeature {
+    pub const NONE: Option<&'static PluginFeature> = None;
+}
 
 pub trait PluginFeatureExt: 'static {
     #[doc(alias = "gst_plugin_feature_check_version")]
diff --git a/gstreamer/src/auto/preset.rs b/gstreamer/src/auto/preset.rs
index f39fa9184..2bd84e4f8 100644
--- a/gstreamer/src/auto/preset.rs
+++ b/gstreamer/src/auto/preset.rs
@@ -39,7 +39,9 @@ impl Preset {
 unsafe impl Send for Preset {}
 unsafe impl Sync for Preset {}
 
-pub const NONE_PRESET: Option<&Preset> = None;
+impl Preset {
+    pub const NONE: Option<&'static Preset> = None;
+}
 
 pub trait PresetExt: 'static {
     #[doc(alias = "gst_preset_delete_preset")]
diff --git a/gstreamer/src/auto/proxy_pad.rs b/gstreamer/src/auto/proxy_pad.rs
index 1bc48c173..4ca8f2804 100644
--- a/gstreamer/src/auto/proxy_pad.rs
+++ b/gstreamer/src/auto/proxy_pad.rs
@@ -27,7 +27,9 @@ impl ProxyPad {
 unsafe impl Send for ProxyPad {}
 unsafe impl Sync for ProxyPad {}
 
-pub const NONE_PROXY_PAD: Option<&ProxyPad> = None;
+impl ProxyPad {
+    pub const NONE: Option<&'static ProxyPad> = None;
+}
 
 pub trait ProxyPadExt: 'static {
     #[doc(alias = "gst_proxy_pad_get_internal")]
diff --git a/gstreamer/src/auto/system_clock.rs b/gstreamer/src/auto/system_clock.rs
index e3feb0158..4207dc550 100644
--- a/gstreamer/src/auto/system_clock.rs
+++ b/gstreamer/src/auto/system_clock.rs
@@ -44,7 +44,9 @@ impl SystemClock {
 unsafe impl Send for SystemClock {}
 unsafe impl Sync for SystemClock {}
 
-pub const NONE_SYSTEM_CLOCK: Option<&SystemClock> = None;
+impl SystemClock {
+    pub const NONE: Option<&'static SystemClock> = None;
+}
 
 pub trait SystemClockExt: 'static {
     #[doc(alias = "clock-type")]
diff --git a/gstreamer/src/auto/tag_setter.rs b/gstreamer/src/auto/tag_setter.rs
index fecf1f7e1..2e91258c2 100644
--- a/gstreamer/src/auto/tag_setter.rs
+++ b/gstreamer/src/auto/tag_setter.rs
@@ -22,7 +22,9 @@ glib::wrapper! {
 unsafe impl Send for TagSetter {}
 unsafe impl Sync for TagSetter {}
 
-pub const NONE_TAG_SETTER: Option<&TagSetter> = None;
+impl TagSetter {
+    pub const NONE: Option<&'static TagSetter> = None;
+}
 
 pub trait TagSetterExt: 'static {
     //#[doc(alias = "gst_tag_setter_add_tag_valist")]
diff --git a/gstreamer/src/auto/toc_setter.rs b/gstreamer/src/auto/toc_setter.rs
index 69e3642b9..cbb850e0c 100644
--- a/gstreamer/src/auto/toc_setter.rs
+++ b/gstreamer/src/auto/toc_setter.rs
@@ -21,7 +21,9 @@ glib::wrapper! {
 unsafe impl Send for TocSetter {}
 unsafe impl Sync for TocSetter {}
 
-pub const NONE_TOC_SETTER: Option<&TocSetter> = None;
+impl TocSetter {
+    pub const NONE: Option<&'static TocSetter> = None;
+}
 
 pub trait TocSetterExt: 'static {
     #[doc(alias = "gst_toc_setter_get_toc")]
diff --git a/gstreamer/src/auto/tracer.rs b/gstreamer/src/auto/tracer.rs
index deceffd9d..f89ac15a1 100644
--- a/gstreamer/src/auto/tracer.rs
+++ b/gstreamer/src/auto/tracer.rs
@@ -26,7 +26,9 @@ glib::wrapper! {
 unsafe impl Send for Tracer {}
 unsafe impl Sync for Tracer {}
 
-pub const NONE_TRACER: Option<&Tracer> = None;
+impl Tracer {
+    pub const NONE: Option<&'static Tracer> = None;
+}
 
 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 b59619f52..4ba04c9aa 100644
--- a/gstreamer/src/auto/uri_handler.rs
+++ b/gstreamer/src/auto/uri_handler.rs
@@ -20,7 +20,9 @@ glib::wrapper! {
 unsafe impl Send for URIHandler {}
 unsafe impl Sync for URIHandler {}
 
-pub const NONE_URI_HANDLER: Option<&URIHandler> = None;
+impl URIHandler {
+    pub const NONE: Option<&'static URIHandler> = None;
+}
 
 pub trait URIHandlerExt: 'static {
     #[doc(alias = "gst_uri_handler_get_protocols")]
diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt
index 7e2a1340f..3e512c8a3 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 @ 7b93dbf37ad7)
+Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 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 7b6f19d66..3bcb7f365 100644
--- a/gstreamer/sys/build.rs
+++ b/gstreamer/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 a0197006f..d87fbba9d 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 a0e181196..2a4f7cd87 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 e97ac8dec..c8abe49d5 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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 1fcf17d3a..3837a2079 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 @ 7b93dbf37ad7)
+// Generated by gir (https://github.com/gtk-rs/gir @ e0b1709803a7)
 // 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