diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 30a547c91..b990d6741 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -37,8 +37,8 @@ pub const GST_APP_STREAM_TYPE_SEEKABLE: GstAppStreamType = 1;
 pub const GST_APP_STREAM_TYPE_RANDOM_ACCESS: GstAppStreamType = 2;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAppSinkCallbacks {
     pub eos: Option<unsafe extern "C" fn(*mut GstAppSink, gpointer)>,
     pub new_preroll: Option<unsafe extern "C" fn(*mut GstAppSink, gpointer) -> gst::GstFlowReturn>,
@@ -58,8 +58,8 @@ impl ::std::fmt::Debug for GstAppSinkCallbacks {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAppSinkClass {
     pub basesink_class: gst_base::GstBaseSinkClass,
     pub eos: Option<unsafe extern "C" fn(*mut GstAppSink)>,
@@ -93,12 +93,15 @@ impl ::std::fmt::Debug for GstAppSinkClass {
 }
 
 #[repr(C)]
-pub struct _GstAppSinkPrivate(c_void);
+pub struct _GstAppSinkPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAppSinkPrivate = *mut _GstAppSinkPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAppSrcCallbacks {
     pub need_data: Option<unsafe extern "C" fn(*mut GstAppSrc, c_uint, gpointer)>,
     pub enough_data: Option<unsafe extern "C" fn(*mut GstAppSrc, gpointer)>,
@@ -116,8 +119,8 @@ impl ::std::fmt::Debug for GstAppSrcCallbacks {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAppSrcClass {
     pub basesrc_class: gst_base::GstBaseSrcClass,
     pub need_data: Option<unsafe extern "C" fn(*mut GstAppSrc, c_uint)>,
@@ -149,13 +152,16 @@ impl ::std::fmt::Debug for GstAppSrcClass {
 }
 
 #[repr(C)]
-pub struct _GstAppSrcPrivate(c_void);
+pub struct _GstAppSrcPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAppSrcPrivate = *mut _GstAppSrcPrivate;
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAppSink {
     pub basesink: gst_base::GstBaseSink,
     pub priv_: *mut GstAppSinkPrivate,
@@ -170,8 +176,8 @@ impl ::std::fmt::Debug for GstAppSink {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAppSrc {
     pub basesrc: gst_base::GstBaseSrc,
     pub priv_: *mut GstAppSrcPrivate,
diff --git a/gstreamer-app/sys/tests/abi.rs b/gstreamer-app/sys/tests/abi.rs
index dd8801c31..98cebc1f8 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 6eee3a5f9..22f2dedcc 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 66d693aec..75a555481 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-audio/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 1a70796bf..ab77e4aee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -319,8 +319,8 @@ pub type GstAudioRingBufferCallback =
     Option<unsafe extern "C" fn(*mut GstAudioRingBuffer, *mut u8, c_uint, gpointer)>;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioAggregatorClass {
     pub parent_class: gst_base::GstAggregatorClass,
     pub create_output_buffer:
@@ -349,8 +349,8 @@ impl ::std::fmt::Debug for GstAudioAggregatorClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioAggregatorConvertPadClass {
     pub parent_class: GstAudioAggregatorPadClass,
     pub _gst_reserved: [gpointer; 4],
@@ -365,12 +365,15 @@ impl ::std::fmt::Debug for GstAudioAggregatorConvertPadClass {
 }
 
 #[repr(C)]
-pub struct _GstAudioAggregatorConvertPadPrivate(c_void);
+pub struct _GstAudioAggregatorConvertPadPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAudioAggregatorConvertPadPrivate = *mut _GstAudioAggregatorConvertPadPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioAggregatorPadClass {
     pub parent_class: gst_base::GstAggregatorPadClass,
     pub convert_buffer: Option<
@@ -396,17 +399,23 @@ impl ::std::fmt::Debug for GstAudioAggregatorPadClass {
 }
 
 #[repr(C)]
-pub struct _GstAudioAggregatorPadPrivate(c_void);
+pub struct _GstAudioAggregatorPadPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAudioAggregatorPadPrivate = *mut _GstAudioAggregatorPadPrivate;
 
 #[repr(C)]
-pub struct _GstAudioAggregatorPrivate(c_void);
+pub struct _GstAudioAggregatorPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAudioAggregatorPrivate = *mut _GstAudioAggregatorPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioBaseSinkClass {
     pub parent_class: gst_base::GstBaseSinkClass,
     pub create_ringbuffer:
@@ -428,12 +437,15 @@ impl ::std::fmt::Debug for GstAudioBaseSinkClass {
 }
 
 #[repr(C)]
-pub struct _GstAudioBaseSinkPrivate(c_void);
+pub struct _GstAudioBaseSinkPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAudioBaseSinkPrivate = *mut _GstAudioBaseSinkPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioBaseSrcClass {
     pub parent_class: gst_base::GstPushSrcClass,
     pub create_ringbuffer:
@@ -451,12 +463,15 @@ impl ::std::fmt::Debug for GstAudioBaseSrcClass {
 }
 
 #[repr(C)]
-pub struct _GstAudioBaseSrcPrivate(c_void);
+pub struct _GstAudioBaseSrcPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAudioBaseSrcPrivate = *mut _GstAudioBaseSrcPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioBuffer {
     pub info: GstAudioInfo,
     pub n_samples: size_t,
@@ -481,8 +496,8 @@ impl ::std::fmt::Debug for GstAudioBuffer {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioCdSrcClass {
     pub pushsrc_class: gst_base::GstPushSrcClass,
     pub open: Option<unsafe extern "C" fn(*mut GstAudioCdSrc, *const c_char) -> gboolean>,
@@ -503,12 +518,15 @@ impl ::std::fmt::Debug for GstAudioCdSrcClass {
 }
 
 #[repr(C)]
-pub struct _GstAudioCdSrcPrivate(c_void);
+pub struct _GstAudioCdSrcPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAudioCdSrcPrivate = *mut _GstAudioCdSrcPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioCdSrcTrack {
     pub is_audio: gboolean,
     pub num: c_uint,
@@ -532,12 +550,15 @@ impl ::std::fmt::Debug for GstAudioCdSrcTrack {
 }
 
 #[repr(C)]
-pub struct _GstAudioChannelMixer(c_void);
+pub struct _GstAudioChannelMixer {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAudioChannelMixer = *mut _GstAudioChannelMixer;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioClippingMeta {
     pub meta: gst::GstMeta,
     pub format: gst::GstFormat,
@@ -556,8 +577,8 @@ impl ::std::fmt::Debug for GstAudioClippingMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioClockClass {
     pub parent_class: gst::GstSystemClockClass,
     pub _gst_reserved: [gpointer; 4],
@@ -572,7 +593,10 @@ impl ::std::fmt::Debug for GstAudioClockClass {
 }
 
 #[repr(C)]
-pub struct GstAudioConverter(c_void);
+pub struct GstAudioConverter {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstAudioConverter {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -581,8 +605,8 @@ impl ::std::fmt::Debug for GstAudioConverter {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioDecoderClass {
     pub element_class: gst::GstElementClass,
     pub start: Option<unsafe extern "C" fn(*mut GstAudioDecoder) -> gboolean>,
@@ -659,12 +683,15 @@ impl ::std::fmt::Debug for GstAudioDecoderClass {
 }
 
 #[repr(C)]
-pub struct _GstAudioDecoderPrivate(c_void);
+pub struct _GstAudioDecoderPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAudioDecoderPrivate = *mut _GstAudioDecoderPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioDownmixMeta {
     pub meta: gst::GstMeta,
     pub from_position: *mut GstAudioChannelPosition,
@@ -687,8 +714,8 @@ impl ::std::fmt::Debug for GstAudioDownmixMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioEncoderClass {
     pub element_class: gst::GstElementClass,
     pub start: Option<unsafe extern "C" fn(*mut GstAudioEncoder) -> gboolean>,
@@ -756,12 +783,15 @@ impl ::std::fmt::Debug for GstAudioEncoderClass {
 }
 
 #[repr(C)]
-pub struct _GstAudioEncoderPrivate(c_void);
+pub struct _GstAudioEncoderPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAudioEncoderPrivate = *mut _GstAudioEncoderPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioFilterClass {
     pub basetransformclass: gst_base::GstBaseTransformClass,
     pub setup: Option<unsafe extern "C" fn(*mut GstAudioFilter, *const GstAudioInfo) -> gboolean>,
@@ -777,8 +807,8 @@ impl ::std::fmt::Debug for GstAudioFilterClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioFormatInfo {
     pub format: GstAudioFormat,
     pub name: *const c_char,
@@ -812,8 +842,8 @@ impl ::std::fmt::Debug for GstAudioFormatInfo {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioInfo {
     pub finfo: *const GstAudioFormatInfo,
     pub flags: GstAudioFlags,
@@ -838,8 +868,8 @@ impl ::std::fmt::Debug for GstAudioInfo {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioLevelMeta {
     pub meta: gst::GstMeta,
     pub level: u8,
@@ -856,8 +886,8 @@ impl ::std::fmt::Debug for GstAudioLevelMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioMeta {
     pub meta: gst::GstMeta,
     pub info: GstAudioInfo,
@@ -879,17 +909,23 @@ impl ::std::fmt::Debug for GstAudioMeta {
 }
 
 #[repr(C)]
-pub struct _GstAudioQuantize(c_void);
+pub struct _GstAudioQuantize {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAudioQuantize = *mut _GstAudioQuantize;
 
 #[repr(C)]
-pub struct _GstAudioResampler(c_void);
+pub struct _GstAudioResampler {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAudioResampler = *mut _GstAudioResampler;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioRingBufferClass {
     pub parent_class: gst::GstObjectClass,
     pub open_device: Option<unsafe extern "C" fn(*mut GstAudioRingBuffer) -> gboolean>,
@@ -938,8 +974,8 @@ impl ::std::fmt::Debug for GstAudioRingBufferClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioRingBufferSpec {
     pub caps: *mut gst::GstCaps,
     pub type_: GstAudioRingBufferFormatType,
@@ -967,8 +1003,8 @@ impl ::std::fmt::Debug for GstAudioRingBufferSpec {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioSinkClass {
     pub parent_class: GstAudioBaseSinkClass,
     pub open: Option<unsafe extern "C" fn(*mut GstAudioSink) -> gboolean>,
@@ -1004,8 +1040,8 @@ impl ::std::fmt::Debug for GstAudioSinkClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioSinkClassExtension {
     pub clear_all: Option<unsafe extern "C" fn(*mut GstAudioSink)>,
 }
@@ -1018,8 +1054,8 @@ impl ::std::fmt::Debug for GstAudioSinkClassExtension {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioSrcClass {
     pub parent_class: GstAudioBaseSrcClass,
     pub open: Option<unsafe extern "C" fn(*mut GstAudioSrc) -> gboolean>,
@@ -1051,7 +1087,10 @@ impl ::std::fmt::Debug for GstAudioSrcClass {
 }
 
 #[repr(C)]
-pub struct GstAudioStreamAlign(c_void);
+pub struct GstAudioStreamAlign {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstAudioStreamAlign {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -1060,8 +1099,8 @@ impl ::std::fmt::Debug for GstAudioStreamAlign {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstStreamVolumeInterface {
     pub iface: gobject::GTypeInterface,
 }
@@ -1075,8 +1114,8 @@ impl ::std::fmt::Debug for GstStreamVolumeInterface {
 }
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioAggregator {
     pub parent: gst_base::GstAggregator,
     pub current_caps: *mut gst::GstCaps,
@@ -1093,8 +1132,8 @@ impl ::std::fmt::Debug for GstAudioAggregator {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioAggregatorConvertPad {
     pub parent: GstAudioAggregatorPad,
     pub priv_: *mut GstAudioAggregatorConvertPadPrivate,
@@ -1108,8 +1147,8 @@ impl ::std::fmt::Debug for GstAudioAggregatorConvertPad {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioAggregatorPad {
     pub parent: gst_base::GstAggregatorPad,
     pub info: GstAudioInfo,
@@ -1126,8 +1165,8 @@ impl ::std::fmt::Debug for GstAudioAggregatorPad {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioBaseSink {
     pub element: gst_base::GstBaseSink,
     pub ringbuffer: *mut GstAudioRingBuffer,
@@ -1154,8 +1193,8 @@ impl ::std::fmt::Debug for GstAudioBaseSink {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioBaseSrc {
     pub element: gst_base::GstPushSrc,
     pub ringbuffer: *mut GstAudioRingBuffer,
@@ -1180,8 +1219,8 @@ impl ::std::fmt::Debug for GstAudioBaseSrc {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioCdSrc {
     pub pushsrc: gst_base::GstPushSrc,
     pub tags: *mut gst::GstTagList,
@@ -1199,8 +1238,8 @@ impl ::std::fmt::Debug for GstAudioCdSrc {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioClock {
     pub clock: gst::GstSystemClock,
     pub func: GstAudioClockGetTimeFunc,
@@ -1222,8 +1261,8 @@ impl ::std::fmt::Debug for GstAudioClock {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioDecoder {
     pub element: gst::GstElement,
     pub sinkpad: *mut gst::GstPad,
@@ -1248,8 +1287,8 @@ impl ::std::fmt::Debug for GstAudioDecoder {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioEncoder {
     pub element: gst::GstElement,
     pub sinkpad: *mut gst::GstPad,
@@ -1274,8 +1313,8 @@ impl ::std::fmt::Debug for GstAudioEncoder {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioFilter {
     pub basetransform: gst_base::GstBaseTransform,
     pub info: GstAudioInfo,
@@ -1291,8 +1330,8 @@ impl ::std::fmt::Debug for GstAudioFilter {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioRingBuffer {
     pub object: gst::GstObject,
     pub cond: glib::GCond,
@@ -1339,8 +1378,8 @@ impl ::std::fmt::Debug for GstAudioRingBuffer {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioSink {
     pub element: GstAudioBaseSink,
     pub thread: *mut glib::GThread,
@@ -1355,8 +1394,8 @@ impl ::std::fmt::Debug for GstAudioSink {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioSrc {
     pub element: GstAudioBaseSrc,
     pub thread: *mut glib::GThread,
@@ -1373,7 +1412,10 @@ impl ::std::fmt::Debug for GstAudioSrc {
 
 // Interfaces
 #[repr(C)]
-pub struct GstStreamVolume(c_void);
+pub struct GstStreamVolume {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstStreamVolume {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
diff --git a/gstreamer-audio/sys/tests/abi.rs b/gstreamer-audio/sys/tests/abi.rs
index f489e440a..3b2bb310e 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 7e32e9424..522cd88f7 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 934da9878..00d04d867 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-base/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 45de11219..d4b1b1cb8 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -59,8 +59,8 @@ pub const GST_COLLECT_PADS_STATE_WAITING: GstCollectPadsStateFlags = 8;
 pub const GST_COLLECT_PADS_STATE_LOCKED: GstCollectPadsStateFlags = 16;
 
 // Unions
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GstCollectData_ABI {
     pub abi: GstCollectData_ABI_abi,
     pub _gst_reserved: [gpointer; 4],
@@ -138,12 +138,15 @@ pub type GstTypeFindHelperGetRangeFunction = Option<
 
 // Records
 #[repr(C)]
-pub struct _GstAdapterClass(c_void);
+pub struct _GstAdapterClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAdapterClass = *mut _GstAdapterClass;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAggregatorClass {
     pub parent_class: gst::GstElementClass,
     pub flush: Option<unsafe extern "C" fn(*mut GstAggregator) -> gst::GstFlowReturn>,
@@ -262,8 +265,8 @@ impl ::std::fmt::Debug for GstAggregatorClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAggregatorPadClass {
     pub parent_class: gst::GstPadClass,
     pub flush: Option<
@@ -290,17 +293,23 @@ impl ::std::fmt::Debug for GstAggregatorPadClass {
 }
 
 #[repr(C)]
-pub struct _GstAggregatorPadPrivate(c_void);
+pub struct _GstAggregatorPadPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAggregatorPadPrivate = *mut _GstAggregatorPadPrivate;
 
 #[repr(C)]
-pub struct _GstAggregatorPrivate(c_void);
+pub struct _GstAggregatorPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAggregatorPrivate = *mut _GstAggregatorPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBaseParseClass {
     pub parent_class: gst::GstElementClass,
     pub start: Option<unsafe extern "C" fn(*mut GstBaseParse) -> gboolean>,
@@ -357,8 +366,8 @@ impl ::std::fmt::Debug for GstBaseParseClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBaseParseFrame {
     pub buffer: *mut gst::GstBuffer,
     pub out_buffer: *mut gst::GstBuffer,
@@ -384,12 +393,15 @@ impl ::std::fmt::Debug for GstBaseParseFrame {
 }
 
 #[repr(C)]
-pub struct _GstBaseParsePrivate(c_void);
+pub struct _GstBaseParsePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstBaseParsePrivate = *mut _GstBaseParsePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBaseSinkClass {
     pub parent_class: gst::GstElementClass,
     pub get_caps:
@@ -458,12 +470,15 @@ impl ::std::fmt::Debug for GstBaseSinkClass {
 }
 
 #[repr(C)]
-pub struct _GstBaseSinkPrivate(c_void);
+pub struct _GstBaseSinkPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstBaseSinkPrivate = *mut _GstBaseSinkPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBaseSrcClass {
     pub parent_class: gst::GstElementClass,
     pub get_caps:
@@ -549,12 +564,15 @@ impl ::std::fmt::Debug for GstBaseSrcClass {
 }
 
 #[repr(C)]
-pub struct _GstBaseSrcPrivate(c_void);
+pub struct _GstBaseSrcPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstBaseSrcPrivate = *mut _GstBaseSrcPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBaseTransformClass {
     pub parent_class: gst::GstElementClass,
     pub passthrough_on_same_caps: gboolean,
@@ -714,12 +732,15 @@ impl ::std::fmt::Debug for GstBaseTransformClass {
 }
 
 #[repr(C)]
-pub struct _GstBaseTransformPrivate(c_void);
+pub struct _GstBaseTransformPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstBaseTransformPrivate = *mut _GstBaseTransformPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBitReader {
     pub data: *const u8,
     pub size: c_uint,
@@ -739,8 +760,8 @@ impl ::std::fmt::Debug for GstBitReader {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBitWriter {
     pub data: *mut u8,
     pub bit_size: c_uint,
@@ -759,8 +780,8 @@ impl ::std::fmt::Debug for GstBitWriter {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstByteReader {
     pub data: *const u8,
     pub size: c_uint,
@@ -778,8 +799,8 @@ impl ::std::fmt::Debug for GstByteReader {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstByteWriter {
     pub parent: GstByteReader,
     pub alloc_size: c_uint,
@@ -799,8 +820,8 @@ impl ::std::fmt::Debug for GstByteWriter {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstCollectData {
     pub collect: *mut GstCollectPads,
     pub pad: *mut gst::GstPad,
@@ -826,12 +847,15 @@ impl ::std::fmt::Debug for GstCollectData {
 }
 
 #[repr(C)]
-pub struct _GstCollectDataPrivate(c_void);
+pub struct _GstCollectDataPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstCollectDataPrivate = *mut _GstCollectDataPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstCollectData_ABI_abi {
     pub dts: i64,
 }
@@ -844,8 +868,8 @@ impl ::std::fmt::Debug for GstCollectData_ABI_abi {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstCollectPadsClass {
     pub parent_class: gst::GstObjectClass,
     pub _gst_reserved: [gpointer; 4],
@@ -860,12 +884,15 @@ impl ::std::fmt::Debug for GstCollectPadsClass {
 }
 
 #[repr(C)]
-pub struct _GstCollectPadsPrivate(c_void);
+pub struct _GstCollectPadsPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstCollectPadsPrivate = *mut _GstCollectPadsPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDataQueueClass {
     pub parent_class: gobject::GObjectClass,
     pub empty: Option<unsafe extern "C" fn(*mut GstDataQueue)>,
@@ -884,8 +911,8 @@ impl ::std::fmt::Debug for GstDataQueueClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDataQueueItem {
     pub object: *mut gst::GstMiniObject,
     pub size: c_uint,
@@ -908,12 +935,15 @@ impl ::std::fmt::Debug for GstDataQueueItem {
 }
 
 #[repr(C)]
-pub struct _GstDataQueuePrivate(c_void);
+pub struct _GstDataQueuePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstDataQueuePrivate = *mut _GstDataQueuePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDataQueueSize {
     pub visible: c_uint,
     pub bytes: c_uint,
@@ -931,7 +961,10 @@ impl ::std::fmt::Debug for GstDataQueueSize {
 }
 
 #[repr(C)]
-pub struct GstFlowCombiner(c_void);
+pub struct GstFlowCombiner {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstFlowCombiner {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -940,8 +973,8 @@ impl ::std::fmt::Debug for GstFlowCombiner {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPushSrcClass {
     pub parent_class: GstBaseSrcClass,
     pub create:
@@ -965,13 +998,19 @@ impl ::std::fmt::Debug for GstPushSrcClass {
 }
 
 #[repr(C)]
-pub struct _GstQueueArray(c_void);
+pub struct _GstQueueArray {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstQueueArray = *mut _GstQueueArray;
 
 // Classes
 #[repr(C)]
-pub struct GstAdapter(c_void);
+pub struct GstAdapter {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstAdapter {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -979,8 +1018,8 @@ impl ::std::fmt::Debug for GstAdapter {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAggregator {
     pub parent: gst::GstElement,
     pub srcpad: *mut gst::GstPad,
@@ -997,8 +1036,8 @@ impl ::std::fmt::Debug for GstAggregator {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAggregatorPad {
     pub parent: gst::GstPad,
     pub segment: gst::GstSegment,
@@ -1015,8 +1054,8 @@ impl ::std::fmt::Debug for GstAggregatorPad {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBaseParse {
     pub element: gst::GstElement,
     pub sinkpad: *mut gst::GstPad,
@@ -1039,8 +1078,8 @@ impl ::std::fmt::Debug for GstBaseParse {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBaseSink {
     pub element: gst::GstElement,
     pub sinkpad: *mut gst::GstPad,
@@ -1086,8 +1125,8 @@ impl ::std::fmt::Debug for GstBaseSink {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBaseSrc {
     pub element: gst::GstElement,
     pub srcpad: *mut gst::GstPad,
@@ -1135,8 +1174,8 @@ impl ::std::fmt::Debug for GstBaseSrc {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBaseTransform {
     pub element: gst::GstElement,
     pub sinkpad: *mut gst::GstPad,
@@ -1161,8 +1200,8 @@ impl ::std::fmt::Debug for GstBaseTransform {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstCollectPads {
     pub object: gst::GstObject,
     pub data: *mut glib::GSList,
@@ -1180,8 +1219,8 @@ impl ::std::fmt::Debug for GstCollectPads {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDataQueue {
     pub object: gobject::GObject,
     pub priv_: *mut GstDataQueuePrivate,
@@ -1196,8 +1235,8 @@ impl ::std::fmt::Debug for GstDataQueue {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPushSrc {
     pub parent: GstBaseSrc,
     pub _gst_reserved: [gpointer; 4],
diff --git a/gstreamer-base/sys/tests/abi.rs b/gstreamer-base/sys/tests/abi.rs
index ed65b10f0..efe081ba9 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 ead680c55..030c04dca 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 4017afaf5..29f899804 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 d38120177..c61e7f859 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -32,8 +32,8 @@ pub type GstHarnessPrepareEventFunc =
     Option<unsafe extern "C" fn(*mut GstHarness, gpointer) -> *mut gst::GstEvent>;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstHarness {
     pub element: *mut gst::GstElement,
     pub srcpad: *mut gst::GstPad,
@@ -56,22 +56,31 @@ impl ::std::fmt::Debug for GstHarness {
 }
 
 #[repr(C)]
-pub struct _GstHarnessPrivate(c_void);
+pub struct _GstHarnessPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstHarnessPrivate = *mut _GstHarnessPrivate;
 
 #[repr(C)]
-pub struct _GstHarnessThread(c_void);
+pub struct _GstHarnessThread {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstHarnessThread = *mut _GstHarnessThread;
 
 #[repr(C)]
-pub struct _GstStreamConsistency(c_void);
+pub struct _GstStreamConsistency {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstStreamConsistency = *mut _GstStreamConsistency;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTestClockClass {
     pub parent_class: gst::GstClockClass,
 }
@@ -85,13 +94,16 @@ impl ::std::fmt::Debug for GstTestClockClass {
 }
 
 #[repr(C)]
-pub struct _GstTestClockPrivate(c_void);
+pub struct _GstTestClockPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstTestClockPrivate = *mut _GstTestClockPrivate;
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTestClock {
     pub parent: gst::GstClock,
     pub priv_: *mut GstTestClockPrivate,
diff --git a/gstreamer-check/sys/tests/abi.rs b/gstreamer-check/sys/tests/abi.rs
index 196e22ddf..374205330 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 071fa9f0a..879922c29 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 b8c22ab80..f10cabc17 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-controller/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 b6a10367f..013f2df6f 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -40,8 +40,8 @@ pub const GST_LFO_WAVEFORM_REVERSE_SAW: GstLFOWaveform = 3;
 pub const GST_LFO_WAVEFORM_TRIANGLE: GstLFOWaveform = 4;
 
 // Unions
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GstControlPoint_cache {
     pub cubic: GstControlPoint_cache_cubic,
     pub cubic_monotonic: GstControlPoint_cache_cubic_monotonic,
@@ -57,8 +57,8 @@ impl ::std::fmt::Debug for GstControlPoint_cache {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GstDirectControlBinding_ABI {
     pub _gst_reserved: [gpointer; 4],
     pub abi: GstDirectControlBinding_ABI_abi,
@@ -80,8 +80,8 @@ pub type GstDirectControlBindingConvertValue =
     Option<unsafe extern "C" fn(*mut GstDirectControlBinding, c_double, gpointer)>;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstARGBControlBindingClass {
     pub parent_class: gst::GstControlBindingClass,
     pub _gst_reserved: [gpointer; 4],
@@ -95,8 +95,8 @@ impl ::std::fmt::Debug for GstARGBControlBindingClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstControlPoint {
     pub timestamp: gst::GstClockTime,
     pub value: c_double,
@@ -113,8 +113,8 @@ impl ::std::fmt::Debug for GstControlPoint {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstControlPoint_cache_cubic {
     pub h: c_double,
     pub z: c_double,
@@ -129,8 +129,8 @@ impl ::std::fmt::Debug for GstControlPoint_cache_cubic {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstControlPoint_cache_cubic_monotonic {
     pub c1s: c_double,
     pub c2s: c_double,
@@ -150,8 +150,8 @@ impl ::std::fmt::Debug for GstControlPoint_cache_cubic_monotonic {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDirectControlBindingClass {
     pub parent_class: gst::GstControlBindingClass,
     pub _gst_reserved: [gpointer; 4],
@@ -165,8 +165,8 @@ impl ::std::fmt::Debug for GstDirectControlBindingClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDirectControlBinding_ABI_abi {
     pub want_absolute: gboolean,
 }
@@ -179,8 +179,8 @@ impl ::std::fmt::Debug for GstDirectControlBinding_ABI_abi {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstInterpolationControlSourceClass {
     pub parent_class: GstTimedValueControlSourceClass,
     pub _gst_reserved: [gpointer; 4],
@@ -195,12 +195,15 @@ impl ::std::fmt::Debug for GstInterpolationControlSourceClass {
 }
 
 #[repr(C)]
-pub struct _GstInterpolationControlSourcePrivate(c_void);
+pub struct _GstInterpolationControlSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstInterpolationControlSourcePrivate = *mut _GstInterpolationControlSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstLFOControlSourceClass {
     pub parent_class: gst::GstControlSourceClass,
     pub _gst_reserved: [gpointer; 4],
@@ -215,12 +218,15 @@ impl ::std::fmt::Debug for GstLFOControlSourceClass {
 }
 
 #[repr(C)]
-pub struct _GstLFOControlSourcePrivate(c_void);
+pub struct _GstLFOControlSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstLFOControlSourcePrivate = *mut _GstLFOControlSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstProxyControlBindingClass {
     pub parent_class: gst::GstControlBindingClass,
     pub _padding: [gpointer; 4],
@@ -233,8 +239,8 @@ impl ::std::fmt::Debug for GstProxyControlBindingClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTimedValueControlSourceClass {
     pub parent_class: gst::GstControlSourceClass,
     pub _gst_reserved: [gpointer; 4],
@@ -249,12 +255,15 @@ impl ::std::fmt::Debug for GstTimedValueControlSourceClass {
 }
 
 #[repr(C)]
-pub struct _GstTimedValueControlSourcePrivate(c_void);
+pub struct _GstTimedValueControlSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstTimedValueControlSourcePrivate = *mut _GstTimedValueControlSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTriggerControlSourceClass {
     pub parent_class: GstTimedValueControlSourceClass,
     pub _gst_reserved: [gpointer; 4],
@@ -269,13 +278,16 @@ impl ::std::fmt::Debug for GstTriggerControlSourceClass {
 }
 
 #[repr(C)]
-pub struct _GstTriggerControlSourcePrivate(c_void);
+pub struct _GstTriggerControlSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstTriggerControlSourcePrivate = *mut _GstTriggerControlSourcePrivate;
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstARGBControlBinding {
     pub parent: gst::GstControlBinding,
     pub cs_a: *mut gst::GstControlSource,
@@ -295,8 +307,8 @@ impl ::std::fmt::Debug for GstARGBControlBinding {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDirectControlBinding {
     pub parent: gst::GstControlBinding,
     pub cs: *mut gst::GstControlSource,
@@ -317,8 +329,8 @@ impl ::std::fmt::Debug for GstDirectControlBinding {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstInterpolationControlSource {
     pub parent: GstTimedValueControlSource,
     pub priv_: *mut GstInterpolationControlSourcePrivate,
@@ -333,8 +345,8 @@ impl ::std::fmt::Debug for GstInterpolationControlSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstLFOControlSource {
     pub parent: gst::GstControlSource,
     pub priv_: *mut GstLFOControlSourcePrivate,
@@ -350,8 +362,8 @@ impl ::std::fmt::Debug for GstLFOControlSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstProxyControlBinding {
     pub parent: gst::GstControlBinding,
     pub ref_object: gobject::GWeakRef,
@@ -366,8 +378,8 @@ impl ::std::fmt::Debug for GstProxyControlBinding {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTimedValueControlSource {
     pub parent: gst::GstControlSource,
     pub lock: glib::GMutex,
@@ -390,8 +402,8 @@ impl ::std::fmt::Debug for GstTimedValueControlSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTriggerControlSource {
     pub parent: GstTimedValueControlSource,
     pub priv_: *mut GstTriggerControlSourcePrivate,
diff --git a/gstreamer-controller/sys/tests/abi.rs b/gstreamer-controller/sys/tests/abi.rs
index 299320830..f698494ff 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 791dcd072..13853f7df 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 263b70cbd..831c1836a 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-editing-services/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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/sys/build.rs b/gstreamer-editing-services/sys/build.rs
index c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 4e48ba4d2..72f052eee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -224,8 +224,8 @@ pub const GES_TRACK_TYPE_TEXT: GESTrackType = 8;
 pub const GES_TRACK_TYPE_CUSTOM: GESTrackType = 16;
 
 // Unions
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GESClipClass_ABI {
     pub _ges_reserved: [gpointer; 20],
     pub abi: GESClipClass_ABI_abi,
@@ -240,8 +240,8 @@ impl ::std::fmt::Debug for GESClipClass_ABI {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GESTrackElementClass_ABI {
     pub _ges_reserved: [gpointer; 20],
     pub abi: GESTrackElementClass_ABI_abi,
@@ -256,8 +256,8 @@ impl ::std::fmt::Debug for GESTrackElementClass_ABI {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GESVideoSourceClass_ABI {
     pub _ges_reserved: [gpointer; 4],
     pub abi: GESVideoSourceClass_ABI_abi,
@@ -317,8 +317,8 @@ pub type GESMetaForeachFunc = Option<
 >;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESAssetClass {
     pub parent: gobject::GObjectClass,
     pub start_loading: Option<
@@ -349,12 +349,15 @@ impl ::std::fmt::Debug for GESAssetClass {
 }
 
 #[repr(C)]
-pub struct _GESAssetPrivate(c_void);
+pub struct _GESAssetPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESAssetPrivate = *mut _GESAssetPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESAudioSourceClass {
     pub parent_class: GESSourceClass,
     pub create_source: Option<unsafe extern "C" fn(*mut GESTrackElement) -> *mut gst::GstElement>,
@@ -370,12 +373,15 @@ impl ::std::fmt::Debug for GESAudioSourceClass {
 }
 
 #[repr(C)]
-pub struct _GESAudioSourcePrivate(c_void);
+pub struct _GESAudioSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESAudioSourcePrivate = *mut _GESAudioSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESAudioTestSourceClass {
     pub parent_class: GESAudioSourceClass,
     pub _ges_reserved: [gpointer; 4],
@@ -389,12 +395,15 @@ impl ::std::fmt::Debug for GESAudioTestSourceClass {
 }
 
 #[repr(C)]
-pub struct _GESAudioTestSourcePrivate(c_void);
+pub struct _GESAudioTestSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESAudioTestSourcePrivate = *mut _GESAudioTestSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESAudioTrackClass {
     pub parent_class: GESTrackClass,
     pub _ges_reserved: [gpointer; 4],
@@ -410,12 +419,15 @@ impl ::std::fmt::Debug for GESAudioTrackClass {
 }
 
 #[repr(C)]
-pub struct _GESAudioTrackPrivate(c_void);
+pub struct _GESAudioTrackPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESAudioTrackPrivate = *mut _GESAudioTrackPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESAudioTransitionClass {
     pub parent_class: GESTransitionClass,
     pub _ges_reserved: [gpointer; 4],
@@ -431,12 +443,15 @@ impl ::std::fmt::Debug for GESAudioTransitionClass {
 }
 
 #[repr(C)]
-pub struct _GESAudioTransitionPrivate(c_void);
+pub struct _GESAudioTransitionPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESAudioTransitionPrivate = *mut _GESAudioTransitionPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESAudioUriSourceClass {
     pub parent_class: GESAudioSourceClass,
     pub _ges_reserved: [gpointer; 4],
@@ -450,12 +465,15 @@ impl ::std::fmt::Debug for GESAudioUriSourceClass {
 }
 
 #[repr(C)]
-pub struct _GESAudioUriSourcePrivate(c_void);
+pub struct _GESAudioUriSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESAudioUriSourcePrivate = *mut _GESAudioUriSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESBaseEffectClass {
     pub parent_class: GESOperationClass,
     pub _ges_reserved: [gpointer; 4],
@@ -468,8 +486,8 @@ impl ::std::fmt::Debug for GESBaseEffectClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESBaseEffectClipClass {
     pub parent_class: GESOperationClipClass,
     pub _ges_reserved: [gpointer; 4],
@@ -483,17 +501,23 @@ impl ::std::fmt::Debug for GESBaseEffectClipClass {
 }
 
 #[repr(C)]
-pub struct _GESBaseEffectClipPrivate(c_void);
+pub struct _GESBaseEffectClipPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESBaseEffectClipPrivate = *mut _GESBaseEffectClipPrivate;
 
 #[repr(C)]
-pub struct _GESBaseEffectPrivate(c_void);
+pub struct _GESBaseEffectPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESBaseEffectPrivate = *mut _GESBaseEffectPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESBaseTransitionClipClass {
     pub parent_class: GESOperationClipClass,
     pub _ges_reserved: [gpointer; 4],
@@ -507,12 +531,15 @@ impl ::std::fmt::Debug for GESBaseTransitionClipClass {
 }
 
 #[repr(C)]
-pub struct _GESBaseTransitionClipPrivate(c_void);
+pub struct _GESBaseTransitionClipPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESBaseTransitionClipPrivate = *mut _GESBaseTransitionClipPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESBaseXmlFormatterClass {
     pub parent: GESFormatterClass,
     pub content_parser: glib::GMarkupParser,
@@ -538,12 +565,15 @@ impl ::std::fmt::Debug for GESBaseXmlFormatterClass {
 }
 
 #[repr(C)]
-pub struct _GESBaseXmlFormatterPrivate(c_void);
+pub struct _GESBaseXmlFormatterPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESBaseXmlFormatterPrivate = *mut _GESBaseXmlFormatterPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESClipAssetClass {
     pub parent: GESAssetClass,
     pub get_natural_framerate:
@@ -562,12 +592,15 @@ impl ::std::fmt::Debug for GESClipAssetClass {
 }
 
 #[repr(C)]
-pub struct _GESClipAssetPrivate(c_void);
+pub struct _GESClipAssetPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESClipAssetPrivate = *mut _GESClipAssetPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESClipClass {
     pub parent_class: GESContainerClass,
     pub create_track_element: GESCreateTrackElementFunc,
@@ -585,8 +618,8 @@ impl ::std::fmt::Debug for GESClipClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESClipClass_ABI_abi {
     pub can_add_effects: gboolean,
 }
@@ -600,12 +633,15 @@ impl ::std::fmt::Debug for GESClipClass_ABI_abi {
 }
 
 #[repr(C)]
-pub struct _GESClipPrivate(c_void);
+pub struct _GESClipPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESClipPrivate = *mut _GESClipPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESCommandLineFormatterClass {
     pub parent_class: GESFormatterClass,
 }
@@ -619,12 +655,15 @@ impl ::std::fmt::Debug for GESCommandLineFormatterClass {
 }
 
 #[repr(C)]
-pub struct _GESCommandLineFormatterPrivate(c_void);
+pub struct _GESCommandLineFormatterPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESCommandLineFormatterPrivate = *mut _GESCommandLineFormatterPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESContainerClass {
     pub parent_class: GESTimelineElementClass,
     pub child_added: Option<unsafe extern "C" fn(*mut GESContainer, *mut GESTimelineElement)>,
@@ -664,12 +703,15 @@ impl ::std::fmt::Debug for GESContainerClass {
 }
 
 #[repr(C)]
-pub struct _GESContainerPrivate(c_void);
+pub struct _GESContainerPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESContainerPrivate = *mut _GESContainerPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESEffectAssetClass {
     pub parent_class: GESTrackElementAssetClass,
     pub _ges_reserved: [gpointer; 4],
@@ -685,12 +727,15 @@ impl ::std::fmt::Debug for GESEffectAssetClass {
 }
 
 #[repr(C)]
-pub struct _GESEffectAssetPrivate(c_void);
+pub struct _GESEffectAssetPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESEffectAssetPrivate = *mut _GESEffectAssetPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESEffectClass {
     pub parent_class: GESBaseEffectClass,
     pub rate_properties: *mut glib::GList,
@@ -704,8 +749,8 @@ impl ::std::fmt::Debug for GESEffectClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESEffectClipClass {
     pub parent_class: GESBaseEffectClipClass,
     pub _ges_reserved: [gpointer; 4],
@@ -719,17 +764,23 @@ impl ::std::fmt::Debug for GESEffectClipClass {
 }
 
 #[repr(C)]
-pub struct _GESEffectClipPrivate(c_void);
+pub struct _GESEffectClipPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESEffectClipPrivate = *mut _GESEffectClipPrivate;
 
 #[repr(C)]
-pub struct _GESEffectPrivate(c_void);
+pub struct _GESEffectPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESEffectPrivate = *mut _GESEffectPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESExtractableInterface {
     pub parent: gobject::GTypeInterface,
     pub asset_type: GType,
@@ -770,8 +821,8 @@ impl ::std::fmt::Debug for GESExtractableInterface {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESFormatterClass {
     pub parent_class: gobject::GInitiallyUnownedClass,
     pub can_load_uri: GESFormatterCanLoadURIMethod,
@@ -798,12 +849,15 @@ impl ::std::fmt::Debug for GESFormatterClass {
 }
 
 #[repr(C)]
-pub struct _GESFormatterPrivate(c_void);
+pub struct _GESFormatterPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESFormatterPrivate = *mut _GESFormatterPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESGroupClass {
     pub parent_class: GESContainerClass,
     pub _ges_reserved: [gpointer; 4],
@@ -819,12 +873,15 @@ impl ::std::fmt::Debug for GESGroupClass {
 }
 
 #[repr(C)]
-pub struct _GESGroupPrivate(c_void);
+pub struct _GESGroupPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESGroupPrivate = *mut _GESGroupPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESImageSourceClass {
     pub parent_class: GESVideoSourceClass,
     pub _ges_reserved: [gpointer; 4],
@@ -840,12 +897,15 @@ impl ::std::fmt::Debug for GESImageSourceClass {
 }
 
 #[repr(C)]
-pub struct _GESImageSourcePrivate(c_void);
+pub struct _GESImageSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESImageSourcePrivate = *mut _GESImageSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESLayerClass {
     pub parent_class: gobject::GInitiallyUnownedClass,
     pub get_objects: Option<unsafe extern "C" fn(*mut GESLayer) -> *mut glib::GList>,
@@ -865,12 +925,15 @@ impl ::std::fmt::Debug for GESLayerClass {
 }
 
 #[repr(C)]
-pub struct _GESLayerPrivate(c_void);
+pub struct _GESLayerPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESLayerPrivate = *mut _GESLayerPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESMarkerClass {
     pub parent_class: gobject::GObjectClass,
 }
@@ -883,8 +946,8 @@ impl ::std::fmt::Debug for GESMarkerClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESMarkerListClass {
     pub parent_class: gobject::GObjectClass,
 }
@@ -897,8 +960,8 @@ impl ::std::fmt::Debug for GESMarkerListClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESMetaContainerInterface {
     pub parent_iface: gobject::GTypeInterface,
     pub _ges_reserved: [gpointer; 4],
@@ -913,8 +976,8 @@ impl ::std::fmt::Debug for GESMetaContainerInterface {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESMultiFileSourceClass {
     pub parent_class: GESVideoSourceClass,
     pub _ges_reserved: [gpointer; 4],
@@ -930,12 +993,15 @@ impl ::std::fmt::Debug for GESMultiFileSourceClass {
 }
 
 #[repr(C)]
-pub struct _GESMultiFileSourcePrivate(c_void);
+pub struct _GESMultiFileSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESMultiFileSourcePrivate = *mut _GESMultiFileSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESOperationClass {
     pub parent_class: GESTrackElementClass,
     pub _ges_reserved: [gpointer; 4],
@@ -948,8 +1014,8 @@ impl ::std::fmt::Debug for GESOperationClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESOperationClipClass {
     pub parent_class: GESClipClass,
     pub _ges_reserved: [gpointer; 4],
@@ -963,17 +1029,23 @@ impl ::std::fmt::Debug for GESOperationClipClass {
 }
 
 #[repr(C)]
-pub struct _GESOperationClipPrivate(c_void);
+pub struct _GESOperationClipPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESOperationClipPrivate = *mut _GESOperationClipPrivate;
 
 #[repr(C)]
-pub struct _GESOperationPrivate(c_void);
+pub struct _GESOperationPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESOperationPrivate = *mut _GESOperationPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESOverlayClipClass {
     pub parent_class: GESOperationClipClass,
     pub _ges_reserved: [gpointer; 4],
@@ -988,12 +1060,15 @@ impl ::std::fmt::Debug for GESOverlayClipClass {
 }
 
 #[repr(C)]
-pub struct _GESOverlayClipPrivate(c_void);
+pub struct _GESOverlayClipPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESOverlayClipPrivate = *mut _GESOverlayClipPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESPipelineClass {
     pub parent_class: gst::GstPipelineClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1007,12 +1082,15 @@ impl ::std::fmt::Debug for GESPipelineClass {
 }
 
 #[repr(C)]
-pub struct _GESPipelinePrivate(c_void);
+pub struct _GESPipelinePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESPipelinePrivate = *mut _GESPipelinePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESPitiviFormatterClass {
     pub parent_class: GESFormatterClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1026,12 +1104,15 @@ impl ::std::fmt::Debug for GESPitiviFormatterClass {
 }
 
 #[repr(C)]
-pub struct _GESPitiviFormatterPrivate(c_void);
+pub struct _GESPitiviFormatterPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESPitiviFormatterPrivate = *mut _GESPitiviFormatterPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESProjectClass {
     pub parent_class: GESAssetClass,
     pub asset_added: Option<unsafe extern "C" fn(*mut GESProject, *mut GESAsset)>,
@@ -1065,12 +1146,15 @@ impl ::std::fmt::Debug for GESProjectClass {
 }
 
 #[repr(C)]
-pub struct _GESProjectPrivate(c_void);
+pub struct _GESProjectPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESProjectPrivate = *mut _GESProjectPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESSourceClass {
     pub parent_class: GESTrackElementClass,
     pub select_pad: Option<unsafe extern "C" fn(*mut GESSource, *mut gst::GstPad) -> gboolean>,
@@ -1087,8 +1171,8 @@ impl ::std::fmt::Debug for GESSourceClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESSourceClipAssetClass {
     pub parent_class: GESClipAssetClass,
 }
@@ -1101,8 +1185,8 @@ impl ::std::fmt::Debug for GESSourceClipAssetClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESSourceClipClass {
     pub parent_class: GESClipClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1116,17 +1200,23 @@ impl ::std::fmt::Debug for GESSourceClipClass {
 }
 
 #[repr(C)]
-pub struct _GESSourceClipPrivate(c_void);
+pub struct _GESSourceClipPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESSourceClipPrivate = *mut _GESSourceClipPrivate;
 
 #[repr(C)]
-pub struct _GESSourcePrivate(c_void);
+pub struct _GESSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESSourcePrivate = *mut _GESSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTestClipClass {
     pub parent_class: GESSourceClipClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1140,12 +1230,15 @@ impl ::std::fmt::Debug for GESTestClipClass {
 }
 
 #[repr(C)]
-pub struct _GESTestClipPrivate(c_void);
+pub struct _GESTestClipPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESTestClipPrivate = *mut _GESTestClipPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTextOverlayClass {
     pub parent_class: GESOperationClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1159,8 +1252,8 @@ impl ::std::fmt::Debug for GESTextOverlayClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTextOverlayClipClass {
     pub parent_class: GESOverlayClipClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1174,17 +1267,23 @@ impl ::std::fmt::Debug for GESTextOverlayClipClass {
 }
 
 #[repr(C)]
-pub struct _GESTextOverlayClipPrivate(c_void);
+pub struct _GESTextOverlayClipPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESTextOverlayClipPrivate = *mut _GESTextOverlayClipPrivate;
 
 #[repr(C)]
-pub struct _GESTextOverlayPrivate(c_void);
+pub struct _GESTextOverlayPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESTextOverlayPrivate = *mut _GESTextOverlayPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTimelineClass {
     pub parent_class: gst::GstBinClass,
     pub track_added: Option<unsafe extern "C" fn(*mut GESTimeline, *mut GESTrack)>,
@@ -1211,8 +1310,8 @@ impl ::std::fmt::Debug for GESTimelineClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTimelineElementClass {
     pub parent_class: gobject::GInitiallyUnownedClass,
     pub set_parent:
@@ -1304,17 +1403,23 @@ impl ::std::fmt::Debug for GESTimelineElementClass {
 }
 
 #[repr(C)]
-pub struct _GESTimelineElementPrivate(c_void);
+pub struct _GESTimelineElementPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESTimelineElementPrivate = *mut _GESTimelineElementPrivate;
 
 #[repr(C)]
-pub struct _GESTimelinePrivate(c_void);
+pub struct _GESTimelinePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESTimelinePrivate = *mut _GESTimelinePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTitleClipClass {
     pub parent_class: GESSourceClipClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1328,12 +1433,15 @@ impl ::std::fmt::Debug for GESTitleClipClass {
 }
 
 #[repr(C)]
-pub struct _GESTitleClipPrivate(c_void);
+pub struct _GESTitleClipPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESTitleClipPrivate = *mut _GESTitleClipPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTitleSourceClass {
     pub parent_class: GESVideoSourceClass,
     pub _ges_reserved: [gpointer; 3],
@@ -1348,12 +1456,15 @@ impl ::std::fmt::Debug for GESTitleSourceClass {
 }
 
 #[repr(C)]
-pub struct _GESTitleSourcePrivate(c_void);
+pub struct _GESTitleSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESTitleSourcePrivate = *mut _GESTitleSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTrackClass {
     pub parent_class: gst::GstBinClass,
     pub get_mixing_element: Option<unsafe extern "C" fn(*mut GESTrack) -> *mut gst::GstElement>,
@@ -1368,8 +1479,8 @@ impl ::std::fmt::Debug for GESTrackClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTrackElementAssetClass {
     pub parent_class: GESAssetClass,
     pub get_natural_framerate:
@@ -1388,12 +1499,15 @@ impl ::std::fmt::Debug for GESTrackElementAssetClass {
 }
 
 #[repr(C)]
-pub struct _GESTrackElementAssetPrivate(c_void);
+pub struct _GESTrackElementAssetPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESTrackElementAssetPrivate = *mut _GESTrackElementAssetPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTrackElementClass {
     pub parent_class: GESTimelineElementClass,
     pub nleobject_factorytype: *const c_char,
@@ -1431,8 +1545,8 @@ impl ::std::fmt::Debug for GESTrackElementClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTrackElementClass_ABI_abi {
     pub default_has_internal_source: gboolean,
     pub default_track_type: GESTrackType,
@@ -1451,17 +1565,23 @@ impl ::std::fmt::Debug for GESTrackElementClass_ABI_abi {
 }
 
 #[repr(C)]
-pub struct _GESTrackElementPrivate(c_void);
+pub struct _GESTrackElementPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESTrackElementPrivate = *mut _GESTrackElementPrivate;
 
 #[repr(C)]
-pub struct _GESTrackPrivate(c_void);
+pub struct _GESTrackPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESTrackPrivate = *mut _GESTrackPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTransitionClass {
     pub parent_class: GESOperationClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1474,8 +1594,8 @@ impl ::std::fmt::Debug for GESTransitionClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTransitionClipClass {
     pub parent_class: GESBaseTransitionClipClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1489,17 +1609,23 @@ impl ::std::fmt::Debug for GESTransitionClipClass {
 }
 
 #[repr(C)]
-pub struct _GESTransitionClipPrivate(c_void);
+pub struct _GESTransitionClipPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESTransitionClipPrivate = *mut _GESTransitionClipPrivate;
 
 #[repr(C)]
-pub struct _GESTransitionPrivate(c_void);
+pub struct _GESTransitionPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESTransitionPrivate = *mut _GESTransitionPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESUriClipAssetClass {
     pub parent_class: GESSourceClipAssetClass,
     pub discoverer: *mut gst_pbutils::GstDiscoverer,
@@ -1525,12 +1651,15 @@ impl ::std::fmt::Debug for GESUriClipAssetClass {
 }
 
 #[repr(C)]
-pub struct _GESUriClipAssetPrivate(c_void);
+pub struct _GESUriClipAssetPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESUriClipAssetPrivate = *mut _GESUriClipAssetPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESUriClipClass {
     pub parent_class: GESSourceClipClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1544,17 +1673,23 @@ impl ::std::fmt::Debug for GESUriClipClass {
 }
 
 #[repr(C)]
-pub struct _GESUriClipPrivate(c_void);
+pub struct _GESUriClipPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESUriClipPrivate = *mut _GESUriClipPrivate;
 
 #[repr(C)]
-pub struct _GESUriSource(c_void);
+pub struct _GESUriSource {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESUriSource = *mut _GESUriSource;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESUriSourceAssetClass {
     pub parent_class: GESTrackElementAssetClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1570,12 +1705,15 @@ impl ::std::fmt::Debug for GESUriSourceAssetClass {
 }
 
 #[repr(C)]
-pub struct _GESUriSourceAssetPrivate(c_void);
+pub struct _GESUriSourceAssetPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESUriSourceAssetPrivate = *mut _GESUriSourceAssetPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESVideoSourceClass {
     pub parent_class: GESSourceClass,
     pub create_source: Option<unsafe extern "C" fn(*mut GESTrackElement) -> *mut gst::GstElement>,
@@ -1591,8 +1729,8 @@ impl ::std::fmt::Debug for GESVideoSourceClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESVideoSourceClass_ABI_abi {
     pub disable_scale_in_compositor: gboolean,
     pub needs_converters: Option<unsafe extern "C" fn(*mut GESVideoSource) -> gboolean>,
@@ -1618,12 +1756,15 @@ impl ::std::fmt::Debug for GESVideoSourceClass_ABI_abi {
 }
 
 #[repr(C)]
-pub struct _GESVideoSourcePrivate(c_void);
+pub struct _GESVideoSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESVideoSourcePrivate = *mut _GESVideoSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESVideoTestSourceClass {
     pub parent_class: GESVideoSourceClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1639,12 +1780,15 @@ impl ::std::fmt::Debug for GESVideoTestSourceClass {
 }
 
 #[repr(C)]
-pub struct _GESVideoTestSourcePrivate(c_void);
+pub struct _GESVideoTestSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESVideoTestSourcePrivate = *mut _GESVideoTestSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESVideoTrackClass {
     pub parent_class: GESTrackClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1660,12 +1804,15 @@ impl ::std::fmt::Debug for GESVideoTrackClass {
 }
 
 #[repr(C)]
-pub struct _GESVideoTrackPrivate(c_void);
+pub struct _GESVideoTrackPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESVideoTrackPrivate = *mut _GESVideoTrackPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESVideoTransitionClass {
     pub parent_class: GESTransitionClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1680,12 +1827,15 @@ impl ::std::fmt::Debug for GESVideoTransitionClass {
 }
 
 #[repr(C)]
-pub struct _GESVideoTransitionPrivate(c_void);
+pub struct _GESVideoTransitionPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESVideoTransitionPrivate = *mut _GESVideoTransitionPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESVideoUriSourceClass {
     pub parent_class: GESVideoSourceClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1699,12 +1849,15 @@ impl ::std::fmt::Debug for GESVideoUriSourceClass {
 }
 
 #[repr(C)]
-pub struct _GESVideoUriSourcePrivate(c_void);
+pub struct _GESVideoUriSourcePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESVideoUriSourcePrivate = *mut _GESVideoUriSourcePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESXmlFormatterClass {
     pub parent: GESBaseXmlFormatterClass,
     pub _ges_reserved: [gpointer; 4],
@@ -1720,13 +1873,16 @@ impl ::std::fmt::Debug for GESXmlFormatterClass {
 }
 
 #[repr(C)]
-pub struct _GESXmlFormatterPrivate(c_void);
+pub struct _GESXmlFormatterPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GESXmlFormatterPrivate = *mut _GESXmlFormatterPrivate;
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESAsset {
     pub parent: gobject::GObject,
     pub priv_: *mut GESAssetPrivate,
@@ -1741,8 +1897,8 @@ impl ::std::fmt::Debug for GESAsset {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESAudioSource {
     pub parent: GESSource,
     pub priv_: *mut GESAudioSourcePrivate,
@@ -1756,8 +1912,8 @@ impl ::std::fmt::Debug for GESAudioSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESAudioTestSource {
     pub parent: GESAudioSource,
     pub priv_: *mut GESAudioTestSourcePrivate,
@@ -1772,8 +1928,8 @@ impl ::std::fmt::Debug for GESAudioTestSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESAudioTrack {
     pub parent_instance: GESTrack,
     pub priv_: *mut GESAudioTrackPrivate,
@@ -1788,8 +1944,8 @@ impl ::std::fmt::Debug for GESAudioTrack {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESAudioTransition {
     pub parent: GESTransition,
     pub priv_: *mut GESAudioTransitionPrivate,
@@ -1804,8 +1960,8 @@ impl ::std::fmt::Debug for GESAudioTransition {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESAudioUriSource {
     pub parent: GESAudioSource,
     pub uri: *mut c_char,
@@ -1820,8 +1976,8 @@ impl ::std::fmt::Debug for GESAudioUriSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESBaseEffect {
     pub parent: GESOperation,
     pub priv_: *mut GESBaseEffectPrivate,
@@ -1835,8 +1991,8 @@ impl ::std::fmt::Debug for GESBaseEffect {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESBaseEffectClip {
     pub parent: GESOperationClip,
     pub priv_: *mut GESBaseEffectClipPrivate,
@@ -1850,8 +2006,8 @@ impl ::std::fmt::Debug for GESBaseEffectClip {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESBaseTransitionClip {
     pub parent: GESOperationClip,
     pub priv_: *mut GESBaseTransitionClipPrivate,
@@ -1865,8 +2021,8 @@ impl ::std::fmt::Debug for GESBaseTransitionClip {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESBaseXmlFormatter {
     pub parent: GESFormatter,
     pub priv_: *mut GESBaseXmlFormatterPrivate,
@@ -1882,8 +2038,8 @@ impl ::std::fmt::Debug for GESBaseXmlFormatter {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESClip {
     pub parent: GESContainer,
     pub priv_: *mut GESClipPrivate,
@@ -1898,8 +2054,8 @@ impl ::std::fmt::Debug for GESClip {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESClipAsset {
     pub parent: GESAsset,
     pub priv_: *mut GESClipAssetPrivate,
@@ -1914,8 +2070,8 @@ impl ::std::fmt::Debug for GESClipAsset {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESCommandLineFormatter {
     pub parent_instance: GESFormatter,
     pub priv_: *mut GESCommandLineFormatterPrivate,
@@ -1930,8 +2086,8 @@ impl ::std::fmt::Debug for GESCommandLineFormatter {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESContainer {
     pub parent: GESTimelineElement,
     pub children: *mut glib::GList,
@@ -1954,8 +2110,8 @@ impl ::std::fmt::Debug for GESContainer {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESEffect {
     pub parent: GESBaseEffect,
     pub priv_: *mut GESEffectPrivate,
@@ -1968,8 +2124,8 @@ impl ::std::fmt::Debug for GESEffect {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESEffectAsset {
     pub parent_instance: GESTrackElementAsset,
     pub priv_: *mut GESEffectAssetPrivate,
@@ -1986,8 +2142,8 @@ impl ::std::fmt::Debug for GESEffectAsset {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESEffectClip {
     pub parent: GESBaseEffectClip,
     pub priv_: *mut GESEffectClipPrivate,
@@ -2001,8 +2157,8 @@ impl ::std::fmt::Debug for GESEffectClip {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESFormatter {
     pub parent: gobject::GInitiallyUnowned,
     pub priv_: *mut GESFormatterPrivate,
@@ -2019,8 +2175,8 @@ impl ::std::fmt::Debug for GESFormatter {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESGroup {
     pub parent: GESContainer,
     pub priv_: *mut GESGroupPrivate,
@@ -2035,8 +2191,8 @@ impl ::std::fmt::Debug for GESGroup {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESImageSource {
     pub parent: GESVideoSource,
     pub uri: *mut c_char,
@@ -2051,8 +2207,8 @@ impl ::std::fmt::Debug for GESImageSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESLayer {
     pub parent: gobject::GInitiallyUnowned,
     pub timeline: *mut GESTimeline,
@@ -2076,7 +2232,10 @@ impl ::std::fmt::Debug for GESLayer {
 }
 
 #[repr(C)]
-pub struct GESMarker(c_void);
+pub struct GESMarker {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GESMarker {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2085,7 +2244,10 @@ impl ::std::fmt::Debug for GESMarker {
 }
 
 #[repr(C)]
-pub struct GESMarkerList(c_void);
+pub struct GESMarkerList {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GESMarkerList {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2094,8 +2256,8 @@ impl ::std::fmt::Debug for GESMarkerList {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESMultiFileSource {
     pub parent: GESVideoSource,
     pub uri: *mut c_char,
@@ -2110,8 +2272,8 @@ impl ::std::fmt::Debug for GESMultiFileSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESOperation {
     pub parent: GESTrackElement,
     pub priv_: *mut GESOperationPrivate,
@@ -2125,8 +2287,8 @@ impl ::std::fmt::Debug for GESOperation {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESOperationClip {
     pub parent: GESClip,
     pub priv_: *mut GESOperationClipPrivate,
@@ -2140,8 +2302,8 @@ impl ::std::fmt::Debug for GESOperationClip {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESOverlayClip {
     pub parent: GESOperationClip,
     pub priv_: *mut GESOverlayClipPrivate,
@@ -2155,8 +2317,8 @@ impl ::std::fmt::Debug for GESOverlayClip {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESPipeline {
     pub parent: gst::GstPipeline,
     pub priv_: *mut GESPipelinePrivate,
@@ -2170,8 +2332,8 @@ impl ::std::fmt::Debug for GESPipeline {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESPitiviFormatter {
     pub parent: GESFormatter,
     pub priv_: *mut GESPitiviFormatterPrivate,
@@ -2186,8 +2348,8 @@ impl ::std::fmt::Debug for GESPitiviFormatter {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESProject {
     pub parent: GESAsset,
     pub priv_: *mut GESProjectPrivate,
@@ -2202,8 +2364,8 @@ impl ::std::fmt::Debug for GESProject {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESSource {
     pub parent: GESTrackElement,
     pub priv_: *mut GESSourcePrivate,
@@ -2216,8 +2378,8 @@ impl ::std::fmt::Debug for GESSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESSourceClip {
     pub parent: GESClip,
     pub priv_: *mut GESSourceClipPrivate,
@@ -2232,8 +2394,8 @@ impl ::std::fmt::Debug for GESSourceClip {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESSourceClipAsset {
     pub parent_instance: GESClipAsset,
 }
@@ -2246,8 +2408,8 @@ impl ::std::fmt::Debug for GESSourceClipAsset {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTestClip {
     pub parent: GESSourceClip,
     pub priv_: *mut GESTestClipPrivate,
@@ -2262,8 +2424,8 @@ impl ::std::fmt::Debug for GESTestClip {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTextOverlay {
     pub parent: GESOperation,
     pub priv_: *mut GESTextOverlayPrivate,
@@ -2278,8 +2440,8 @@ impl ::std::fmt::Debug for GESTextOverlay {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTextOverlayClip {
     pub parent: GESOverlayClip,
     pub priv_: *mut GESTextOverlayClipPrivate,
@@ -2294,8 +2456,8 @@ impl ::std::fmt::Debug for GESTextOverlayClip {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTimeline {
     pub parent: gst::GstBin,
     pub layers: *mut glib::GList,
@@ -2314,8 +2476,8 @@ impl ::std::fmt::Debug for GESTimeline {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTimelineElement {
     pub parent_instance: gobject::GInitiallyUnowned,
     pub parent: *mut GESTimelineElement,
@@ -2348,8 +2510,8 @@ impl ::std::fmt::Debug for GESTimelineElement {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTitleClip {
     pub parent: GESSourceClip,
     pub priv_: *mut GESTitleClipPrivate,
@@ -2364,8 +2526,8 @@ impl ::std::fmt::Debug for GESTitleClip {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTitleSource {
     pub parent: GESVideoSource,
     pub priv_: *mut GESTitleSourcePrivate,
@@ -2380,8 +2542,8 @@ impl ::std::fmt::Debug for GESTitleSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTrack {
     pub parent: gst::GstBin,
     pub type_: GESTrackType,
@@ -2398,8 +2560,8 @@ impl ::std::fmt::Debug for GESTrack {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTrackElement {
     pub parent: GESTimelineElement,
     pub active: gboolean,
@@ -2416,8 +2578,8 @@ impl ::std::fmt::Debug for GESTrackElement {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTrackElementAsset {
     pub parent: GESAsset,
     pub priv_: *mut GESTrackElementAssetPrivate,
@@ -2432,8 +2594,8 @@ impl ::std::fmt::Debug for GESTrackElementAsset {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTransition {
     pub parent: GESOperation,
     pub priv_: *mut GESTransitionPrivate,
@@ -2447,8 +2609,8 @@ impl ::std::fmt::Debug for GESTransition {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESTransitionClip {
     pub parent: GESBaseTransitionClip,
     pub vtype: GESVideoStandardTransitionType,
@@ -2464,8 +2626,8 @@ impl ::std::fmt::Debug for GESTransitionClip {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESUriClip {
     pub parent: GESSourceClip,
     pub priv_: *mut GESUriClipPrivate,
@@ -2480,8 +2642,8 @@ impl ::std::fmt::Debug for GESUriClip {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESUriClipAsset {
     pub parent: GESSourceClipAsset,
     pub priv_: *mut GESUriClipAssetPrivate,
@@ -2496,8 +2658,8 @@ impl ::std::fmt::Debug for GESUriClipAsset {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESUriSourceAsset {
     pub parent: GESTrackElementAsset,
     pub priv_: *mut GESUriSourceAssetPrivate,
@@ -2512,8 +2674,8 @@ impl ::std::fmt::Debug for GESUriSourceAsset {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESVideoSource {
     pub parent: GESSource,
     pub priv_: *mut GESVideoSourcePrivate,
@@ -2527,8 +2689,8 @@ impl ::std::fmt::Debug for GESVideoSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESVideoTestSource {
     pub parent: GESVideoSource,
     pub priv_: *mut GESVideoTestSourcePrivate,
@@ -2542,8 +2704,8 @@ impl ::std::fmt::Debug for GESVideoTestSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESVideoTrack {
     pub parent_instance: GESTrack,
     pub priv_: *mut GESVideoTrackPrivate,
@@ -2558,8 +2720,8 @@ impl ::std::fmt::Debug for GESVideoTrack {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESVideoTransition {
     pub parent: GESTransition,
     pub priv_: *mut GESVideoTransitionPrivate,
@@ -2574,8 +2736,8 @@ impl ::std::fmt::Debug for GESVideoTransition {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESVideoUriSource {
     pub parent: GESVideoSource,
     pub uri: *mut c_char,
@@ -2590,8 +2752,8 @@ impl ::std::fmt::Debug for GESVideoUriSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GESXmlFormatter {
     pub parent: GESBaseXmlFormatter,
     pub priv_: *mut GESXmlFormatterPrivate,
@@ -2610,7 +2772,10 @@ impl ::std::fmt::Debug for GESXmlFormatter {
 
 // Interfaces
 #[repr(C)]
-pub struct GESExtractable(c_void);
+pub struct GESExtractable {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GESExtractable {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2619,7 +2784,10 @@ impl ::std::fmt::Debug for GESExtractable {
 }
 
 #[repr(C)]
-pub struct GESMetaContainer(c_void);
+pub struct GESMetaContainer {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GESMetaContainer {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
diff --git a/gstreamer-editing-services/sys/tests/abi.rs b/gstreamer-editing-services/sys/tests/abi.rs
index 483b97e71..2db955fc3 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 276faed0b..bb13f15f1 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 49bf252b6..1d10bf25f 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-gl/egl/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 b1ff327fb..16ae5e2e9 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -29,8 +29,8 @@ pub const GST_GL_DISPLAY_EGL_NAME: *const c_char =
     b"gst.gl.display.egl\0" as *const u8 as *const c_char;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLDisplayEGLClass {
     pub object_class: gst_gl::GstGLDisplayClass,
     pub _padding: [gpointer; 4],
@@ -46,8 +46,8 @@ impl ::std::fmt::Debug for GstGLDisplayEGLClass {
 }
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLDisplayEGL {
     pub parent: gst_gl::GstGLDisplay,
     pub display: gpointer,
diff --git a/gstreamer-gl/egl/sys/tests/abi.rs b/gstreamer-gl/egl/sys/tests/abi.rs
index 15e3f3e9e..a160dd595 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 3937ae296..d7b2e2130 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 99c82b2ec..2de089588 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-gl/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 9007ca46c..357cf4d6f 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -269,8 +269,8 @@ pub type GstGLWindowCB = Option<unsafe extern "C" fn(gpointer)>;
 pub type GstGLWindowResizeCB = Option<unsafe extern "C" fn(gpointer, c_uint, c_uint)>;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLAllocationParams {
     pub struct_size: size_t,
     pub copy: GstGLAllocationParamsCopyFunc,
@@ -304,8 +304,8 @@ impl ::std::fmt::Debug for GstGLAllocationParams {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLAsyncDebug {
     pub state_flags: c_uint,
     pub cat: *mut gst::GstDebugCategory,
@@ -328,8 +328,8 @@ impl ::std::fmt::Debug for GstGLAsyncDebug {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBaseFilterClass {
     pub parent_class: gst_base::GstBaseTransformClass,
     pub supported_gl_api: GstGLAPI,
@@ -358,12 +358,15 @@ impl ::std::fmt::Debug for GstGLBaseFilterClass {
 }
 
 #[repr(C)]
-pub struct _GstGLBaseFilterPrivate(c_void);
+pub struct _GstGLBaseFilterPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLBaseFilterPrivate = *mut _GstGLBaseFilterPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBaseMemory {
     pub mem: gst::GstMemory,
     pub context: *mut GstGLContext,
@@ -395,8 +398,8 @@ impl ::std::fmt::Debug for GstGLBaseMemory {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBaseMemoryAllocatorClass {
     pub parent_class: gst::GstAllocatorClass,
     pub alloc: GstGLBaseMemoryAllocatorAllocFunction,
@@ -422,8 +425,8 @@ impl ::std::fmt::Debug for GstGLBaseMemoryAllocatorClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBaseSrcClass {
     pub parent_class: gst_base::GstPushSrcClass,
     pub supported_gl_api: GstGLAPI,
@@ -447,12 +450,15 @@ impl ::std::fmt::Debug for GstGLBaseSrcClass {
 }
 
 #[repr(C)]
-pub struct _GstGLBaseSrcPrivate(c_void);
+pub struct _GstGLBaseSrcPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLBaseSrcPrivate = *mut _GstGLBaseSrcPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBuffer {
     pub mem: GstGLBaseMemory,
     pub id: c_uint,
@@ -471,8 +477,8 @@ impl ::std::fmt::Debug for GstGLBuffer {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBufferAllocationParams {
     pub parent: GstGLAllocationParams,
     pub gl_target: c_uint,
@@ -490,8 +496,8 @@ impl ::std::fmt::Debug for GstGLBufferAllocationParams {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBufferAllocatorClass {
     pub parent_class: GstGLBaseMemoryAllocatorClass,
     pub _padding: [gpointer; 4],
@@ -505,8 +511,8 @@ impl ::std::fmt::Debug for GstGLBufferAllocatorClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBufferPoolClass {
     pub parent_class: gst::GstBufferPoolClass,
     pub _padding: [gpointer; 4],
@@ -521,12 +527,15 @@ impl ::std::fmt::Debug for GstGLBufferPoolClass {
 }
 
 #[repr(C)]
-pub struct _GstGLBufferPoolPrivate(c_void);
+pub struct _GstGLBufferPoolPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLBufferPoolPrivate = *mut _GstGLBufferPoolPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLColorConvertClass {
     pub object_class: gst::GstObjectClass,
     pub _padding: [gpointer; 4],
@@ -540,12 +549,15 @@ impl ::std::fmt::Debug for GstGLColorConvertClass {
 }
 
 #[repr(C)]
-pub struct _GstGLColorConvertPrivate(c_void);
+pub struct _GstGLColorConvertPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLColorConvertPrivate = *mut _GstGLColorConvertPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLContextClass {
     pub parent_class: gst::GstObjectClass,
     pub get_current_context: Option<unsafe extern "C" fn() -> uintptr_t>,
@@ -598,12 +610,15 @@ impl ::std::fmt::Debug for GstGLContextClass {
 }
 
 #[repr(C)]
-pub struct _GstGLContextPrivate(c_void);
+pub struct _GstGLContextPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLContextPrivate = *mut _GstGLContextPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLDisplayClass {
     pub object_class: gst::GstObjectClass,
     pub get_handle: Option<unsafe extern "C" fn(*mut GstGLDisplay) -> uintptr_t>,
@@ -622,12 +637,15 @@ impl ::std::fmt::Debug for GstGLDisplayClass {
 }
 
 #[repr(C)]
-pub struct _GstGLDisplayPrivate(c_void);
+pub struct _GstGLDisplayPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLDisplayPrivate = *mut _GstGLDisplayPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLFilterClass {
     pub parent_class: GstGLBaseFilterClass,
     pub set_caps: Option<
@@ -668,8 +686,8 @@ impl ::std::fmt::Debug for GstGLFilterClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLFramebufferClass {
     pub object_class: gst::GstObjectClass,
     pub _padding: [gpointer; 4],
@@ -683,17 +701,23 @@ impl ::std::fmt::Debug for GstGLFramebufferClass {
 }
 
 #[repr(C)]
-pub struct _GstGLFramebufferPrivate(c_void);
+pub struct _GstGLFramebufferPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLFramebufferPrivate = *mut _GstGLFramebufferPrivate;
 
 #[repr(C)]
-pub struct _GstGLFuncs(c_void);
+pub struct _GstGLFuncs {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLFuncs = *mut _GstGLFuncs;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLMemory {
     pub mem: GstGLBaseMemory,
     pub tex_id: c_uint,
@@ -727,8 +751,8 @@ impl ::std::fmt::Debug for GstGLMemory {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLMemoryAllocatorClass {
     pub parent_class: GstGLBaseMemoryAllocatorClass,
     pub map: GstGLBaseMemoryAllocatorMapFunction,
@@ -747,8 +771,8 @@ impl ::std::fmt::Debug for GstGLMemoryAllocatorClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLMemoryPBO {
     pub mem: GstGLMemory,
     pub pbo: *mut GstGLBuffer,
@@ -762,8 +786,8 @@ impl ::std::fmt::Debug for GstGLMemoryPBO {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLMemoryPBOAllocatorClass {
     pub parent_class: GstGLMemoryAllocatorClass,
     pub _padding: [gpointer; 4],
@@ -777,8 +801,8 @@ impl ::std::fmt::Debug for GstGLMemoryPBOAllocatorClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLOverlayCompositorClass {
     pub object_class: gst::GstObjectClass,
     pub _padding: [gpointer; 4],
@@ -792,8 +816,8 @@ impl ::std::fmt::Debug for GstGLOverlayCompositorClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLQuery {
     pub context: *mut GstGLContext,
     pub query_type: c_uint,
@@ -810,8 +834,8 @@ impl ::std::fmt::Debug for GstGLQuery {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLRenderbuffer {
     pub mem: GstGLBaseMemory,
     pub renderbuffer_id: c_uint,
@@ -834,8 +858,8 @@ impl ::std::fmt::Debug for GstGLRenderbuffer {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLRenderbufferAllocationParams {
     pub parent: GstGLAllocationParams,
     pub renderbuffer_format: GstGLFormat,
@@ -854,8 +878,8 @@ impl ::std::fmt::Debug for GstGLRenderbufferAllocationParams {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLRenderbufferAllocatorClass {
     pub parent_class: GstGLBaseMemoryAllocatorClass,
     pub _padding: [gpointer; 4],
@@ -869,8 +893,8 @@ impl ::std::fmt::Debug for GstGLRenderbufferAllocatorClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLSLStageClass {
     pub parent: gst::GstObjectClass,
     pub _padding: [gpointer; 4],
@@ -884,12 +908,15 @@ impl ::std::fmt::Debug for GstGLSLStageClass {
 }
 
 #[repr(C)]
-pub struct _GstGLSLStagePrivate(c_void);
+pub struct _GstGLSLStagePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLSLStagePrivate = *mut _GstGLSLStagePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLShaderClass {
     pub parent_class: gst::GstObjectClass,
 }
@@ -902,12 +929,15 @@ impl ::std::fmt::Debug for GstGLShaderClass {
 }
 
 #[repr(C)]
-pub struct _GstGLShaderPrivate(c_void);
+pub struct _GstGLShaderPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLShaderPrivate = *mut _GstGLShaderPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLSyncMeta {
     pub parent: gst::GstMeta,
     pub context: *mut GstGLContext,
@@ -949,8 +979,8 @@ impl ::std::fmt::Debug for GstGLSyncMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLUploadClass {
     pub object_class: gst::GstObjectClass,
     pub _padding: [gpointer; 4],
@@ -965,12 +995,15 @@ impl ::std::fmt::Debug for GstGLUploadClass {
 }
 
 #[repr(C)]
-pub struct _GstGLUploadPrivate(c_void);
+pub struct _GstGLUploadPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLUploadPrivate = *mut _GstGLUploadPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLVideoAllocationParams {
     pub parent: GstGLAllocationParams,
     pub v_info: *mut gst_video::GstVideoInfo,
@@ -994,8 +1027,8 @@ impl ::std::fmt::Debug for GstGLVideoAllocationParams {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLViewConvertClass {
     pub object_class: gst::GstObjectClass,
     pub _padding: [gpointer; 4],
@@ -1009,12 +1042,15 @@ impl ::std::fmt::Debug for GstGLViewConvertClass {
 }
 
 #[repr(C)]
-pub struct _GstGLViewConvertPrivate(c_void);
+pub struct _GstGLViewConvertPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLViewConvertPrivate = *mut _GstGLViewConvertPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLWindowClass {
     pub parent_class: gst::GstObjectClass,
     pub get_display: Option<unsafe extern "C" fn(*mut GstGLWindow) -> uintptr_t>,
@@ -1066,13 +1102,16 @@ impl ::std::fmt::Debug for GstGLWindowClass {
 }
 
 #[repr(C)]
-pub struct _GstGLWindowPrivate(c_void);
+pub struct _GstGLWindowPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGLWindowPrivate = *mut _GstGLWindowPrivate;
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBaseFilter {
     pub parent: gst_base::GstBaseTransform,
     pub display: *mut GstGLDisplay,
@@ -1095,8 +1134,8 @@ impl ::std::fmt::Debug for GstGLBaseFilter {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBaseMemoryAllocator {
     pub parent: gst::GstAllocator,
     pub fallback_mem_copy: gst::GstMemoryCopyFunction,
@@ -1110,8 +1149,8 @@ impl ::std::fmt::Debug for GstGLBaseMemoryAllocator {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBaseSrc {
     pub parent: gst_base::GstPushSrc,
     pub display: *mut GstGLDisplay,
@@ -1136,8 +1175,8 @@ impl ::std::fmt::Debug for GstGLBaseSrc {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBufferAllocator {
     pub parent: GstGLBaseMemoryAllocator,
     pub _padding: [gpointer; 4],
@@ -1151,8 +1190,8 @@ impl ::std::fmt::Debug for GstGLBufferAllocator {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLBufferPool {
     pub bufferpool: gst::GstBufferPool,
     pub context: *mut GstGLContext,
@@ -1169,8 +1208,8 @@ impl ::std::fmt::Debug for GstGLBufferPool {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLColorConvert {
     pub parent: gst::GstObject,
     pub context: *mut GstGLContext,
@@ -1193,8 +1232,8 @@ impl ::std::fmt::Debug for GstGLColorConvert {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLContext {
     pub parent: gst::GstObject,
     pub display: *mut GstGLDisplay,
@@ -1212,8 +1251,8 @@ impl ::std::fmt::Debug for GstGLContext {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLDisplay {
     pub object: gst::GstObject,
     pub type_: GstGLDisplayType,
@@ -1231,8 +1270,8 @@ impl ::std::fmt::Debug for GstGLDisplay {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLFilter {
     pub parent: GstGLBaseFilter,
     pub in_info: gst_video::GstVideoInfo,
@@ -1268,8 +1307,8 @@ impl ::std::fmt::Debug for GstGLFilter {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLFramebuffer {
     pub object: gst::GstObject,
     pub context: *mut GstGLContext,
@@ -1286,8 +1325,8 @@ impl ::std::fmt::Debug for GstGLFramebuffer {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLMemoryAllocator {
     pub parent: GstGLBaseMemoryAllocator,
     pub _padding: [gpointer; 4],
@@ -1300,8 +1339,8 @@ impl ::std::fmt::Debug for GstGLMemoryAllocator {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLMemoryPBOAllocator {
     pub parent: GstGLMemoryAllocator,
     pub _padding: [gpointer; 4],
@@ -1315,8 +1354,8 @@ impl ::std::fmt::Debug for GstGLMemoryPBOAllocator {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLOverlayCompositor {
     pub parent: gst::GstObject,
     pub context: *mut GstGLContext,
@@ -1336,8 +1375,8 @@ impl ::std::fmt::Debug for GstGLOverlayCompositor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLRenderbufferAllocator {
     pub parent: GstGLBaseMemoryAllocator,
     pub _padding: [gpointer; 4],
@@ -1351,8 +1390,8 @@ impl ::std::fmt::Debug for GstGLRenderbufferAllocator {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLSLStage {
     pub parent: gst::GstObject,
     pub context: *mut GstGLContext,
@@ -1367,8 +1406,8 @@ impl ::std::fmt::Debug for GstGLSLStage {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLShader {
     pub parent: gst::GstObject,
     pub context: *mut GstGLContext,
@@ -1385,8 +1424,8 @@ impl ::std::fmt::Debug for GstGLShader {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLUpload {
     pub parent: gst::GstObject,
     pub context: *mut GstGLContext,
@@ -1403,8 +1442,8 @@ impl ::std::fmt::Debug for GstGLUpload {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLViewConvert {
     pub object: gst::GstObject,
     pub context: *mut GstGLContext,
@@ -1449,8 +1488,8 @@ impl ::std::fmt::Debug for GstGLViewConvert {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLWindow {
     pub parent: gst::GstObject,
     pub lock: glib::GMutex,
diff --git a/gstreamer-gl/sys/tests/abi.rs b/gstreamer-gl/sys/tests/abi.rs
index f8350bba7..c0c7bc97d 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 9a7637e98..32fd7a6ec 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 9c8187fbb..4afe90dab 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-gl/wayland/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 500e5309e..5a81d28ae 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -25,8 +25,8 @@ use libc::{
 use glib::{gboolean, gconstpointer, gpointer, GType};
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLDisplayWaylandClass {
     pub object_class: gst_gl::GstGLDisplayClass,
     pub _padding: [gpointer; 4],
@@ -42,8 +42,8 @@ impl ::std::fmt::Debug for GstGLDisplayWaylandClass {
 }
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLDisplayWayland {
     pub parent: gst_gl::GstGLDisplay,
     pub display: gpointer,
diff --git a/gstreamer-gl/wayland/sys/tests/abi.rs b/gstreamer-gl/wayland/sys/tests/abi.rs
index dde0698f3..9cd3994b7 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 071fa9f0a..879922c29 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 0b57917c7..175df8fa9 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-gl/x11/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 0de2cd6e1..87fe33a35 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -25,8 +25,8 @@ use libc::{
 use glib::{gboolean, gconstpointer, gpointer, GType};
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLDisplayX11Class {
     pub object_class: gst_gl::GstGLDisplayClass,
     pub _padding: [gpointer; 4],
@@ -42,8 +42,8 @@ impl ::std::fmt::Debug for GstGLDisplayX11Class {
 }
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGLDisplayX11 {
     pub parent: gst_gl::GstGLDisplay,
     pub name: *mut c_char,
diff --git a/gstreamer-gl/x11/sys/tests/abi.rs b/gstreamer-gl/x11/sys/tests/abi.rs
index 1a958b882..12080ea7f 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 071fa9f0a..879922c29 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 c38632a2e..4de58cdfe 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 eb3dc3415..2130a9672 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -686,8 +686,8 @@ pub const GST_MTS_REGISTRATION_OTHER_HEVC: GstMpegtsRegistrationId = 1212503619;
 pub type GstMpegtsPacketizeFunc = Option<unsafe extern "C" fn(*mut GstMpegtsSection) -> gboolean>;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscEIT {
     pub source_id: u16,
     pub protocol_version: u8,
@@ -704,8 +704,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscEIT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscEITEvent {
     pub event_id: u16,
     pub start_time: u32,
@@ -728,8 +728,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscEITEvent {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscETT {
     pub ett_table_id_extension: u16,
     pub protocol_version: u16,
@@ -748,8 +748,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscETT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscMGT {
     pub protocol_version: u8,
     pub tables_defined: u16,
@@ -768,8 +768,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscMGT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscMGTTable {
     pub table_type: u16,
     pub pid: u16,
@@ -790,8 +790,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscMGTTable {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscMultString {
     pub iso_639_langcode: [c_char; 4],
     pub segments: *mut glib::GPtrArray,
@@ -806,8 +806,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscMultString {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscRRT {
     pub protocol_version: u8,
     pub names: *mut glib::GPtrArray,
@@ -828,8 +828,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscRRT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscRRTDimension {
     pub names: *mut glib::GPtrArray,
     pub graduated_scale: gboolean,
@@ -848,8 +848,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscRRTDimension {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscRRTDimensionValue {
     pub abbrev_ratings: *mut glib::GPtrArray,
     pub ratings: *mut glib::GPtrArray,
@@ -864,8 +864,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscRRTDimensionValue {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscSTT {
     pub protocol_version: u8,
     pub system_time: u32,
@@ -892,8 +892,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscSTT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscStringSegment {
     pub compression_type: u8,
     pub mode: u8,
@@ -914,8 +914,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscStringSegment {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscVCT {
     pub transport_stream_id: u16,
     pub protocol_version: u8,
@@ -934,8 +934,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscVCT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAtscVCTSource {
     pub short_name: *mut c_char,
     pub major_channel_number: u16,
@@ -978,8 +978,8 @@ impl ::std::fmt::Debug for GstMpegtsAtscVCTSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsAudioPreselectionDescriptor {
     pub preselection_id: u8,
     pub audio_rendering_indication: u8,
@@ -1020,8 +1020,8 @@ impl ::std::fmt::Debug for GstMpegtsAudioPreselectionDescriptor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsBAT {
     pub descriptors: *mut glib::GPtrArray,
     pub streams: *mut glib::GPtrArray,
@@ -1036,8 +1036,8 @@ impl ::std::fmt::Debug for GstMpegtsBAT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsBATStream {
     pub transport_stream_id: u16,
     pub original_network_id: u16,
@@ -1054,8 +1054,8 @@ impl ::std::fmt::Debug for GstMpegtsBATStream {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsCableDeliverySystemDescriptor {
     pub frequency: u32,
     pub outer_fec: GstMpegtsCableOuterFECScheme,
@@ -1079,8 +1079,8 @@ impl ::std::fmt::Debug for GstMpegtsCableDeliverySystemDescriptor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsComponentDescriptor {
     pub stream_content: u8,
     pub component_type: u8,
@@ -1101,8 +1101,8 @@ impl ::std::fmt::Debug for GstMpegtsComponentDescriptor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsContent {
     pub content_nibble_1: GstMpegtsContentNibbleHi,
     pub content_nibble_2: u8,
@@ -1119,8 +1119,8 @@ impl ::std::fmt::Debug for GstMpegtsContent {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsDVBLinkageDescriptor {
     pub transport_stream_id: u16,
     pub original_network_id: u16,
@@ -1144,8 +1144,8 @@ impl ::std::fmt::Debug for GstMpegtsDVBLinkageDescriptor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsDVBLinkageEvent {
     pub target_event_id: u16,
     pub target_listed: gboolean,
@@ -1162,8 +1162,8 @@ impl ::std::fmt::Debug for GstMpegtsDVBLinkageEvent {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsDVBLinkageExtendedEvent {
     pub target_event_id: u16,
     pub target_listed: gboolean,
@@ -1202,8 +1202,8 @@ impl ::std::fmt::Debug for GstMpegtsDVBLinkageExtendedEvent {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsDVBLinkageMobileHandOver {
     pub hand_over_type: GstMpegtsDVBLinkageHandOverType,
     pub origin_type: gboolean,
@@ -1222,8 +1222,8 @@ impl ::std::fmt::Debug for GstMpegtsDVBLinkageMobileHandOver {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsDVBParentalRatingItem {
     pub country_code: *mut c_char,
     pub rating: u8,
@@ -1238,8 +1238,8 @@ impl ::std::fmt::Debug for GstMpegtsDVBParentalRatingItem {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsDVBServiceListItem {
     pub service_id: u16,
     pub type_: GstMpegtsDVBServiceType,
@@ -1254,8 +1254,8 @@ impl ::std::fmt::Debug for GstMpegtsDVBServiceListItem {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsDataBroadcastDescriptor {
     pub data_broadcast_id: u16,
     pub component_tag: u8,
@@ -1278,8 +1278,8 @@ impl ::std::fmt::Debug for GstMpegtsDataBroadcastDescriptor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsDescriptor {
     pub tag: u8,
     pub tag_extension: u8,
@@ -1299,8 +1299,8 @@ impl ::std::fmt::Debug for GstMpegtsDescriptor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsDvbMultilingualBouquetNameItem {
     pub language_code: *mut c_char,
     pub bouquet_name: *mut c_char,
@@ -1318,8 +1318,8 @@ impl ::std::fmt::Debug for GstMpegtsDvbMultilingualBouquetNameItem {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsDvbMultilingualComponentItem {
     pub language_code: *mut c_char,
     pub description: *mut c_char,
@@ -1337,8 +1337,8 @@ impl ::std::fmt::Debug for GstMpegtsDvbMultilingualComponentItem {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsDvbMultilingualNetworkNameItem {
     pub language_code: *mut c_char,
     pub network_name: *mut c_char,
@@ -1356,8 +1356,8 @@ impl ::std::fmt::Debug for GstMpegtsDvbMultilingualNetworkNameItem {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsDvbMultilingualServiceNameItem {
     pub language_code: *mut c_char,
     pub provider_name: *mut c_char,
@@ -1377,8 +1377,8 @@ impl ::std::fmt::Debug for GstMpegtsDvbMultilingualServiceNameItem {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsEIT {
     pub transport_stream_id: u16,
     pub original_network_id: u16,
@@ -1406,8 +1406,8 @@ impl ::std::fmt::Debug for GstMpegtsEIT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsEITEvent {
     pub event_id: u16,
     pub start_time: *mut gst::GstDateTime,
@@ -1430,8 +1430,8 @@ impl ::std::fmt::Debug for GstMpegtsEITEvent {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsExtendedEventDescriptor {
     pub descriptor_number: u8,
     pub last_descriptor_number: u8,
@@ -1452,8 +1452,8 @@ impl ::std::fmt::Debug for GstMpegtsExtendedEventDescriptor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsExtendedEventItem {
     pub item_description: *mut c_char,
     pub item: *mut c_char,
@@ -1468,8 +1468,8 @@ impl ::std::fmt::Debug for GstMpegtsExtendedEventItem {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsISO639LanguageDescriptor {
     pub nb_language: c_uint,
     pub language: [*mut c_char; 64],
@@ -1484,8 +1484,8 @@ impl ::std::fmt::Debug for GstMpegtsISO639LanguageDescriptor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsLogicalChannel {
     pub service_id: u16,
     pub visible_service: gboolean,
@@ -1502,8 +1502,8 @@ impl ::std::fmt::Debug for GstMpegtsLogicalChannel {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsLogicalChannelDescriptor {
     pub nb_channels: c_uint,
     pub channels: [GstMpegtsLogicalChannel; 64],
@@ -1517,8 +1517,8 @@ impl ::std::fmt::Debug for GstMpegtsLogicalChannelDescriptor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsNIT {
     pub actual_network: gboolean,
     pub network_id: u16,
@@ -1537,8 +1537,8 @@ impl ::std::fmt::Debug for GstMpegtsNIT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsNITStream {
     pub transport_stream_id: u16,
     pub original_network_id: u16,
@@ -1555,8 +1555,8 @@ impl ::std::fmt::Debug for GstMpegtsNITStream {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsPMT {
     pub pcr_pid: u16,
     pub program_number: u16,
@@ -1575,8 +1575,8 @@ impl ::std::fmt::Debug for GstMpegtsPMT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsPMTStream {
     pub stream_type: u8,
     pub pid: u16,
@@ -1593,8 +1593,8 @@ impl ::std::fmt::Debug for GstMpegtsPMTStream {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsPatProgram {
     pub program_number: u16,
     pub network_or_program_map_PID: u16,
@@ -1612,8 +1612,8 @@ impl ::std::fmt::Debug for GstMpegtsPatProgram {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsSCTESIT {
     pub encrypted_packet: gboolean,
     pub encryption_algorithm: u8,
@@ -1650,8 +1650,8 @@ impl ::std::fmt::Debug for GstMpegtsSCTESIT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsSCTESpliceComponent {
     pub tag: u8,
     pub splice_time_specified: gboolean,
@@ -1670,8 +1670,8 @@ impl ::std::fmt::Debug for GstMpegtsSCTESpliceComponent {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsSCTESpliceEvent {
     pub insert_event: gboolean,
     pub splice_event_id: u32,
@@ -1723,8 +1723,8 @@ impl ::std::fmt::Debug for GstMpegtsSCTESpliceEvent {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsSDT {
     pub original_network_id: u16,
     pub actual_ts: gboolean,
@@ -1743,8 +1743,8 @@ impl ::std::fmt::Debug for GstMpegtsSDT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsSDTService {
     pub service_id: u16,
     pub EIT_schedule_flag: gboolean,
@@ -1770,8 +1770,8 @@ impl ::std::fmt::Debug for GstMpegtsSDTService {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsSIT {
     pub descriptors: *mut glib::GPtrArray,
     pub services: *mut glib::GPtrArray,
@@ -1786,8 +1786,8 @@ impl ::std::fmt::Debug for GstMpegtsSIT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsSITService {
     pub service_id: u16,
     pub running_status: GstMpegtsRunningStatus,
@@ -1804,8 +1804,8 @@ impl ::std::fmt::Debug for GstMpegtsSITService {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsSatelliteDeliverySystemDescriptor {
     pub frequency: u32,
     pub orbital_position: c_float,
@@ -1837,8 +1837,8 @@ impl ::std::fmt::Debug for GstMpegtsSatelliteDeliverySystemDescriptor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsSection {
     pub parent: gst::GstMiniObject,
     pub section_type: GstMpegtsSectionType,
@@ -1876,8 +1876,8 @@ impl ::std::fmt::Debug for GstMpegtsSection {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsT2DeliverySystemCell {
     pub cell_id: u16,
     pub centre_frequencies: *mut glib::GArray,
@@ -1894,8 +1894,8 @@ impl ::std::fmt::Debug for GstMpegtsT2DeliverySystemCell {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsT2DeliverySystemCellExtension {
     pub cell_id_extension: u8,
     pub transposer_frequency: u32,
@@ -1913,8 +1913,8 @@ impl ::std::fmt::Debug for GstMpegtsT2DeliverySystemCellExtension {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsT2DeliverySystemDescriptor {
     pub plp_id: u8,
     pub t2_system_id: u16,
@@ -1943,8 +1943,8 @@ impl ::std::fmt::Debug for GstMpegtsT2DeliverySystemDescriptor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsTOT {
     pub utc_time: *mut gst::GstDateTime,
     pub descriptors: *mut glib::GPtrArray,
@@ -1959,8 +1959,8 @@ impl ::std::fmt::Debug for GstMpegtsTOT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMpegtsTerrestrialDeliverySystemDescriptor {
     pub frequency: u32,
     pub bandwidth: u32,
diff --git a/gstreamer-mpegts/sys/tests/abi.rs b/gstreamer-mpegts/sys/tests/abi.rs
index 93f316dcf..1c0157c8e 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 4db2d3356..02ddf0e4c 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 52cd15367..1dedf10d0 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 176e82138..544300820 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -42,8 +42,8 @@ pub type GstPtpStatisticsCallback =
     Option<unsafe extern "C" fn(u8, *const gst::GstStructure, gpointer) -> gboolean>;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstNetAddressMeta {
     pub meta: gst::GstMeta,
     pub addr: *mut gio::GSocketAddress,
@@ -58,8 +58,8 @@ impl ::std::fmt::Debug for GstNetAddressMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstNetClientClockClass {
     pub parent_class: gst::GstSystemClockClass,
     pub _gst_reserved: [gpointer; 4],
@@ -74,12 +74,15 @@ impl ::std::fmt::Debug for GstNetClientClockClass {
 }
 
 #[repr(C)]
-pub struct _GstNetClientClockPrivate(c_void);
+pub struct _GstNetClientClockPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstNetClientClockPrivate = *mut _GstNetClientClockPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstNetControlMessageMeta {
     pub meta: gst::GstMeta,
     pub message: *mut gio::GSocketControlMessage,
@@ -94,8 +97,8 @@ impl ::std::fmt::Debug for GstNetControlMessageMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstNetTimePacket {
     pub local_time: gst::GstClockTime,
     pub remote_time: gst::GstClockTime,
@@ -110,8 +113,8 @@ impl ::std::fmt::Debug for GstNetTimePacket {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstNetTimeProviderClass {
     pub parent_class: gst::GstObjectClass,
     pub _gst_reserved: [gpointer; 4],
@@ -127,12 +130,15 @@ impl ::std::fmt::Debug for GstNetTimeProviderClass {
 }
 
 #[repr(C)]
-pub struct _GstNetTimeProviderPrivate(c_void);
+pub struct _GstNetTimeProviderPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstNetTimeProviderPrivate = *mut _GstNetTimeProviderPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstNtpClockClass {
     pub parent_class: gst::GstSystemClockClass,
     pub _gst_reserved: [gpointer; 4],
@@ -146,8 +152,8 @@ impl ::std::fmt::Debug for GstNtpClockClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPtpClockClass {
     pub parent_class: gst::GstSystemClockClass,
     pub _gst_reserved: [gpointer; 4],
@@ -162,13 +168,16 @@ impl ::std::fmt::Debug for GstPtpClockClass {
 }
 
 #[repr(C)]
-pub struct _GstPtpClockPrivate(c_void);
+pub struct _GstPtpClockPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPtpClockPrivate = *mut _GstPtpClockPrivate;
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstNetClientClock {
     pub clock: gst::GstSystemClock,
     pub priv_: *mut GstNetClientClockPrivate,
@@ -183,8 +192,8 @@ impl ::std::fmt::Debug for GstNetClientClock {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstNetTimeProvider {
     pub parent: gst::GstObject,
     pub priv_: *mut GstNetTimeProviderPrivate,
@@ -199,8 +208,8 @@ impl ::std::fmt::Debug for GstNetTimeProvider {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstNtpClock {
     pub clock: gst::GstSystemClock,
     pub priv_: *mut GstNetClientClockPrivate,
@@ -215,8 +224,8 @@ impl ::std::fmt::Debug for GstNtpClock {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPtpClock {
     pub clock: gst::GstSystemClock,
     pub priv_: *mut GstPtpClockPrivate,
diff --git a/gstreamer-net/sys/tests/abi.rs b/gstreamer-net/sys/tests/abi.rs
index d02303c26..260b7b80e 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 b6b5e8099..50bd7f300 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 30efa3bec..e7c80ea9c 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-pbutils/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 54ba34018..a4a59b8b3 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -109,8 +109,8 @@ pub type GstInstallPluginsResultFunc =
     Option<unsafe extern "C" fn(GstInstallPluginsReturn, gpointer)>;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioVisualizerClass {
     pub parent_class: gst::GstElementClass,
     pub setup: Option<unsafe extern "C" fn(*mut GstAudioVisualizer) -> gboolean>,
@@ -136,12 +136,15 @@ impl ::std::fmt::Debug for GstAudioVisualizerClass {
 }
 
 #[repr(C)]
-pub struct _GstAudioVisualizerPrivate(c_void);
+pub struct _GstAudioVisualizerPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAudioVisualizerPrivate = *mut _GstAudioVisualizerPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDiscovererClass {
     pub parentclass: gobject::GObjectClass,
     pub finished: Option<unsafe extern "C" fn(*mut GstDiscoverer)>,
@@ -167,32 +170,50 @@ impl ::std::fmt::Debug for GstDiscovererClass {
 }
 
 #[repr(C)]
-pub struct _GstDiscovererPrivate(c_void);
+pub struct _GstDiscovererPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstDiscovererPrivate = *mut _GstDiscovererPrivate;
 
 #[repr(C)]
-pub struct _GstEncodingAudioProfileClass(c_void);
+pub struct _GstEncodingAudioProfileClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstEncodingAudioProfileClass = *mut _GstEncodingAudioProfileClass;
 
 #[repr(C)]
-pub struct _GstEncodingContainerProfileClass(c_void);
+pub struct _GstEncodingContainerProfileClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstEncodingContainerProfileClass = *mut _GstEncodingContainerProfileClass;
 
 #[repr(C)]
-pub struct _GstEncodingProfileClass(c_void);
+pub struct _GstEncodingProfileClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstEncodingProfileClass = *mut _GstEncodingProfileClass;
 
 #[repr(C)]
-pub struct _GstEncodingVideoProfileClass(c_void);
+pub struct _GstEncodingVideoProfileClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstEncodingVideoProfileClass = *mut _GstEncodingVideoProfileClass;
 
 #[repr(C)]
-pub struct GstInstallPluginsContext(c_void);
+pub struct GstInstallPluginsContext {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstInstallPluginsContext {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -202,8 +223,8 @@ impl ::std::fmt::Debug for GstInstallPluginsContext {
 }
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAudioVisualizer {
     pub parent: gst::GstElement,
     pub req_spf: c_uint,
@@ -223,8 +244,8 @@ impl ::std::fmt::Debug for GstAudioVisualizer {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDiscoverer {
     pub parent: gobject::GObject,
     pub priv_: *mut GstDiscovererPrivate,
@@ -240,7 +261,10 @@ impl ::std::fmt::Debug for GstDiscoverer {
 }
 
 #[repr(C)]
-pub struct GstDiscovererAudioInfo(c_void);
+pub struct GstDiscovererAudioInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstDiscovererAudioInfo {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -250,7 +274,10 @@ impl ::std::fmt::Debug for GstDiscovererAudioInfo {
 }
 
 #[repr(C)]
-pub struct GstDiscovererContainerInfo(c_void);
+pub struct GstDiscovererContainerInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstDiscovererContainerInfo {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -260,7 +287,10 @@ impl ::std::fmt::Debug for GstDiscovererContainerInfo {
 }
 
 #[repr(C)]
-pub struct GstDiscovererInfo(c_void);
+pub struct GstDiscovererInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstDiscovererInfo {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -270,7 +300,10 @@ impl ::std::fmt::Debug for GstDiscovererInfo {
 }
 
 #[repr(C)]
-pub struct GstDiscovererStreamInfo(c_void);
+pub struct GstDiscovererStreamInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstDiscovererStreamInfo {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -280,7 +313,10 @@ impl ::std::fmt::Debug for GstDiscovererStreamInfo {
 }
 
 #[repr(C)]
-pub struct GstDiscovererSubtitleInfo(c_void);
+pub struct GstDiscovererSubtitleInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstDiscovererSubtitleInfo {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -290,7 +326,10 @@ impl ::std::fmt::Debug for GstDiscovererSubtitleInfo {
 }
 
 #[repr(C)]
-pub struct GstDiscovererVideoInfo(c_void);
+pub struct GstDiscovererVideoInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstDiscovererVideoInfo {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -300,7 +339,10 @@ impl ::std::fmt::Debug for GstDiscovererVideoInfo {
 }
 
 #[repr(C)]
-pub struct GstEncodingAudioProfile(c_void);
+pub struct GstEncodingAudioProfile {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstEncodingAudioProfile {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -310,7 +352,10 @@ impl ::std::fmt::Debug for GstEncodingAudioProfile {
 }
 
 #[repr(C)]
-pub struct GstEncodingContainerProfile(c_void);
+pub struct GstEncodingContainerProfile {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstEncodingContainerProfile {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -320,7 +365,10 @@ impl ::std::fmt::Debug for GstEncodingContainerProfile {
 }
 
 #[repr(C)]
-pub struct GstEncodingProfile(c_void);
+pub struct GstEncodingProfile {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstEncodingProfile {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -330,7 +378,10 @@ impl ::std::fmt::Debug for GstEncodingProfile {
 }
 
 #[repr(C)]
-pub struct GstEncodingTarget(c_void);
+pub struct GstEncodingTarget {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstEncodingTarget {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -340,7 +391,10 @@ impl ::std::fmt::Debug for GstEncodingTarget {
 }
 
 #[repr(C)]
-pub struct GstEncodingVideoProfile(c_void);
+pub struct GstEncodingVideoProfile {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstEncodingVideoProfile {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
diff --git a/gstreamer-pbutils/sys/tests/abi.rs b/gstreamer-pbutils/sys/tests/abi.rs
index 3f4679973..d853b6e54 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 3b5058ade..37d697cc7 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 e2775c31d..a4104727f 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-player/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 5e461b1da..0244125c4 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -54,28 +54,40 @@ pub type GstPlayerSignalDispatcherFunc = Option<unsafe extern "C" fn(gpointer)>;
 
 // Records
 #[repr(C)]
-pub struct _GstPlayerAudioInfoClass(c_void);
+pub struct _GstPlayerAudioInfoClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPlayerAudioInfoClass = *mut _GstPlayerAudioInfoClass;
 
 #[repr(C)]
-pub struct _GstPlayerClass(c_void);
+pub struct _GstPlayerClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPlayerClass = *mut _GstPlayerClass;
 
 #[repr(C)]
-pub struct _GstPlayerGMainContextSignalDispatcherClass(c_void);
+pub struct _GstPlayerGMainContextSignalDispatcherClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPlayerGMainContextSignalDispatcherClass =
     *mut _GstPlayerGMainContextSignalDispatcherClass;
 
 #[repr(C)]
-pub struct _GstPlayerMediaInfoClass(c_void);
+pub struct _GstPlayerMediaInfoClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPlayerMediaInfoClass = *mut _GstPlayerMediaInfoClass;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPlayerSignalDispatcherInterface {
     pub parent_iface: gobject::GTypeInterface,
     pub dispatch: Option<
@@ -99,27 +111,39 @@ impl ::std::fmt::Debug for GstPlayerSignalDispatcherInterface {
 }
 
 #[repr(C)]
-pub struct _GstPlayerStreamInfoClass(c_void);
+pub struct _GstPlayerStreamInfoClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPlayerStreamInfoClass = *mut _GstPlayerStreamInfoClass;
 
 #[repr(C)]
-pub struct _GstPlayerSubtitleInfoClass(c_void);
+pub struct _GstPlayerSubtitleInfoClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPlayerSubtitleInfoClass = *mut _GstPlayerSubtitleInfoClass;
 
 #[repr(C)]
-pub struct _GstPlayerVideoInfoClass(c_void);
+pub struct _GstPlayerVideoInfoClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPlayerVideoInfoClass = *mut _GstPlayerVideoInfoClass;
 
 #[repr(C)]
-pub struct _GstPlayerVideoOverlayVideoRendererClass(c_void);
+pub struct _GstPlayerVideoOverlayVideoRendererClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPlayerVideoOverlayVideoRendererClass = *mut _GstPlayerVideoOverlayVideoRendererClass;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPlayerVideoRendererInterface {
     pub parent_iface: gobject::GTypeInterface,
     pub create_video_sink: Option<
@@ -136,8 +160,8 @@ impl ::std::fmt::Debug for GstPlayerVideoRendererInterface {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPlayerVisualization {
     pub name: *mut c_char,
     pub description: *mut c_char,
@@ -154,7 +178,10 @@ impl ::std::fmt::Debug for GstPlayerVisualization {
 
 // Classes
 #[repr(C)]
-pub struct GstPlayer(c_void);
+pub struct GstPlayer {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPlayer {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -163,7 +190,10 @@ impl ::std::fmt::Debug for GstPlayer {
 }
 
 #[repr(C)]
-pub struct GstPlayerAudioInfo(c_void);
+pub struct GstPlayerAudioInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPlayerAudioInfo {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -173,7 +203,10 @@ impl ::std::fmt::Debug for GstPlayerAudioInfo {
 }
 
 #[repr(C)]
-pub struct GstPlayerGMainContextSignalDispatcher(c_void);
+pub struct GstPlayerGMainContextSignalDispatcher {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPlayerGMainContextSignalDispatcher {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -186,7 +219,10 @@ impl ::std::fmt::Debug for GstPlayerGMainContextSignalDispatcher {
 }
 
 #[repr(C)]
-pub struct GstPlayerMediaInfo(c_void);
+pub struct GstPlayerMediaInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPlayerMediaInfo {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -196,7 +232,10 @@ impl ::std::fmt::Debug for GstPlayerMediaInfo {
 }
 
 #[repr(C)]
-pub struct GstPlayerStreamInfo(c_void);
+pub struct GstPlayerStreamInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPlayerStreamInfo {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -206,7 +245,10 @@ impl ::std::fmt::Debug for GstPlayerStreamInfo {
 }
 
 #[repr(C)]
-pub struct GstPlayerSubtitleInfo(c_void);
+pub struct GstPlayerSubtitleInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPlayerSubtitleInfo {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -216,7 +258,10 @@ impl ::std::fmt::Debug for GstPlayerSubtitleInfo {
 }
 
 #[repr(C)]
-pub struct GstPlayerVideoInfo(c_void);
+pub struct GstPlayerVideoInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPlayerVideoInfo {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -226,7 +271,10 @@ impl ::std::fmt::Debug for GstPlayerVideoInfo {
 }
 
 #[repr(C)]
-pub struct GstPlayerVideoOverlayVideoRenderer(c_void);
+pub struct GstPlayerVideoOverlayVideoRenderer {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPlayerVideoOverlayVideoRenderer {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -237,7 +285,10 @@ impl ::std::fmt::Debug for GstPlayerVideoOverlayVideoRenderer {
 
 // Interfaces
 #[repr(C)]
-pub struct GstPlayerSignalDispatcher(c_void);
+pub struct GstPlayerSignalDispatcher {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPlayerSignalDispatcher {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -246,7 +297,10 @@ impl ::std::fmt::Debug for GstPlayerSignalDispatcher {
 }
 
 #[repr(C)]
-pub struct GstPlayerVideoRenderer(c_void);
+pub struct GstPlayerVideoRenderer {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPlayerVideoRenderer {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
diff --git a/gstreamer-player/sys/tests/abi.rs b/gstreamer-player/sys/tests/abi.rs
index c062201cb..10ba204ca 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 683aa043c..724c0b828 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 b29b7c153..90288ea47 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-rtp/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 18f5d4ed2..6b9eda973 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -211,8 +211,8 @@ pub const GST_RTP_HEADER_EXTENSION_ONE_BYTE: GstRTPHeaderExtensionFlags = 1;
 pub const GST_RTP_HEADER_EXTENSION_TWO_BYTE: GstRTPHeaderExtensionFlags = 2;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTCPBuffer {
     pub buffer: *mut gst::GstBuffer,
     pub map: gst::GstMapInfo,
@@ -227,8 +227,8 @@ impl ::std::fmt::Debug for GstRTCPBuffer {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTCPPacket {
     pub rtcp: *mut GstRTCPBuffer,
     pub offset: c_uint,
@@ -250,8 +250,8 @@ impl ::std::fmt::Debug for GstRTCPPacket {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTPBaseAudioPayloadClass {
     pub parent_class: GstRTPBasePayloadClass,
     pub _gst_reserved: [gpointer; 4],
@@ -266,12 +266,15 @@ impl ::std::fmt::Debug for GstRTPBaseAudioPayloadClass {
 }
 
 #[repr(C)]
-pub struct _GstRTPBaseAudioPayloadPrivate(c_void);
+pub struct _GstRTPBaseAudioPayloadPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTPBaseAudioPayloadPrivate = *mut _GstRTPBaseAudioPayloadPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTPBaseDepayloadClass {
     pub parent_class: gst::GstElementClass,
     pub set_caps:
@@ -303,12 +306,15 @@ impl ::std::fmt::Debug for GstRTPBaseDepayloadClass {
 }
 
 #[repr(C)]
-pub struct _GstRTPBaseDepayloadPrivate(c_void);
+pub struct _GstRTPBaseDepayloadPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTPBaseDepayloadPrivate = *mut _GstRTPBaseDepayloadPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTPBasePayloadClass {
     pub parent_class: gst::GstElementClass,
     pub get_caps: Option<
@@ -352,12 +358,15 @@ impl ::std::fmt::Debug for GstRTPBasePayloadClass {
 }
 
 #[repr(C)]
-pub struct _GstRTPBasePayloadPrivate(c_void);
+pub struct _GstRTPBasePayloadPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTPBasePayloadPrivate = *mut _GstRTPBasePayloadPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTPBuffer {
     pub buffer: *mut gst::GstBuffer,
     pub state: c_uint,
@@ -378,8 +387,8 @@ impl ::std::fmt::Debug for GstRTPBuffer {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTPHeaderExtensionClass {
     pub parent_class: gst::GstElementClass,
     pub get_supported_flags:
@@ -437,8 +446,8 @@ impl ::std::fmt::Debug for GstRTPHeaderExtensionClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTPPayloadInfo {
     pub payload_type: u8,
     pub media: *const c_char,
@@ -462,8 +471,8 @@ impl ::std::fmt::Debug for GstRTPPayloadInfo {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTPSourceMeta {
     pub meta: gst::GstMeta,
     pub ssrc: u32,
@@ -485,8 +494,8 @@ impl ::std::fmt::Debug for GstRTPSourceMeta {
 }
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTPBaseAudioPayload {
     pub payload: GstRTPBasePayload,
     pub priv_: *mut GstRTPBaseAudioPayloadPrivate,
@@ -510,8 +519,8 @@ impl ::std::fmt::Debug for GstRTPBaseAudioPayload {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTPBaseDepayload {
     pub parent: gst::GstElement,
     pub sinkpad: *mut gst::GstPad,
@@ -536,8 +545,8 @@ impl ::std::fmt::Debug for GstRTPBaseDepayload {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTPBasePayload {
     pub element: gst::GstElement,
     pub sinkpad: *mut gst::GstPad,
@@ -573,8 +582,8 @@ impl ::std::fmt::Debug for GstRTPBasePayload {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTPHeaderExtension {
     pub parent: gst::GstElement,
     pub _gst_reserved: [gpointer; 4],
diff --git a/gstreamer-rtp/sys/tests/abi.rs b/gstreamer-rtp/sys/tests/abi.rs
index cdbac8a5e..0ce5f263b 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 ecebdffdd..241de0821 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 c609a9d88..701f31799 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 d5f836b79..81e0f15ad 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -161,8 +161,8 @@ pub type GstRTSPStreamTransportFilterFunc = Option<
 >;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPAddress {
     pub pool: *mut GstRTSPAddressPool,
     pub address: *mut c_char,
@@ -184,8 +184,8 @@ impl ::std::fmt::Debug for GstRTSPAddress {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPAddressPoolClass {
     pub parent_class: gobject::GObjectClass,
     pub _gst_reserved: [gpointer; 4],
@@ -200,12 +200,15 @@ impl ::std::fmt::Debug for GstRTSPAddressPoolClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPAddressPoolPrivate(c_void);
+pub struct _GstRTSPAddressPoolPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPAddressPoolPrivate = *mut _GstRTSPAddressPoolPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPAuthClass {
     pub parent_class: gobject::GObjectClass,
     pub authenticate:
@@ -242,12 +245,15 @@ impl ::std::fmt::Debug for GstRTSPAuthClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPAuthPrivate(c_void);
+pub struct _GstRTSPAuthPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPAuthPrivate = *mut _GstRTSPAuthPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPClientClass {
     pub parent_class: gobject::GObjectClass,
     pub create_sdp: Option<
@@ -448,12 +454,15 @@ impl ::std::fmt::Debug for GstRTSPClientClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPClientPrivate(c_void);
+pub struct _GstRTSPClientPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPClientPrivate = *mut _GstRTSPClientPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPContext {
     pub server: *mut GstRTSPServer,
     pub conn: *mut gst_rtsp::GstRTSPConnection,
@@ -495,8 +504,8 @@ impl ::std::fmt::Debug for GstRTSPContext {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPMediaClass {
     pub parent_class: gobject::GObjectClass,
     pub handle_message:
@@ -561,8 +570,8 @@ impl ::std::fmt::Debug for GstRTSPMediaClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPMediaFactoryClass {
     pub parent_class: gobject::GObjectClass,
     pub gen_key: Option<
@@ -606,12 +615,15 @@ impl ::std::fmt::Debug for GstRTSPMediaFactoryClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPMediaFactoryPrivate(c_void);
+pub struct _GstRTSPMediaFactoryPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPMediaFactoryPrivate = *mut _GstRTSPMediaFactoryPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPMediaFactoryURIClass {
     pub parent_class: GstRTSPMediaFactoryClass,
     pub _gst_reserved: [gpointer; 4],
@@ -626,17 +638,23 @@ impl ::std::fmt::Debug for GstRTSPMediaFactoryURIClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPMediaFactoryURIPrivate(c_void);
+pub struct _GstRTSPMediaFactoryURIPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPMediaFactoryURIPrivate = *mut _GstRTSPMediaFactoryURIPrivate;
 
 #[repr(C)]
-pub struct _GstRTSPMediaPrivate(c_void);
+pub struct _GstRTSPMediaPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPMediaPrivate = *mut _GstRTSPMediaPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPMountPointsClass {
     pub parent_class: gobject::GObjectClass,
     pub make_path: Option<
@@ -655,12 +673,15 @@ impl ::std::fmt::Debug for GstRTSPMountPointsClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPMountPointsPrivate(c_void);
+pub struct _GstRTSPMountPointsPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPMountPointsPrivate = *mut _GstRTSPMountPointsPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPOnvifClientClass {
     pub parent: GstRTSPClientClass,
     pub _gst_reserved: [gpointer; 20],
@@ -674,8 +695,8 @@ impl ::std::fmt::Debug for GstRTSPOnvifClientClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPOnvifMediaClass {
     pub parent: GstRTSPMediaClass,
     pub _gst_reserved: [gpointer; 20],
@@ -689,8 +710,8 @@ impl ::std::fmt::Debug for GstRTSPOnvifMediaClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPOnvifMediaFactoryClass {
     pub parent: GstRTSPMediaFactoryClass,
     pub has_backchannel_support:
@@ -708,17 +729,23 @@ impl ::std::fmt::Debug for GstRTSPOnvifMediaFactoryClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPOnvifMediaFactoryPrivate(c_void);
+pub struct _GstRTSPOnvifMediaFactoryPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPOnvifMediaFactoryPrivate = *mut _GstRTSPOnvifMediaFactoryPrivate;
 
 #[repr(C)]
-pub struct _GstRTSPOnvifMediaPrivate(c_void);
+pub struct _GstRTSPOnvifMediaPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPOnvifMediaPrivate = *mut _GstRTSPOnvifMediaPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPOnvifServerClass {
     pub parent: GstRTSPServerClass,
     pub _gst_reserved: [gpointer; 20],
@@ -732,8 +759,8 @@ impl ::std::fmt::Debug for GstRTSPOnvifServerClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPPermissions {
     pub mini_object: gst::GstMiniObject,
 }
@@ -746,8 +773,8 @@ impl ::std::fmt::Debug for GstRTSPPermissions {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPServerClass {
     pub parent_class: gobject::GObjectClass,
     pub create_client: Option<unsafe extern "C" fn(*mut GstRTSPServer) -> *mut GstRTSPClient>,
@@ -766,12 +793,15 @@ impl ::std::fmt::Debug for GstRTSPServerClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPServerPrivate(c_void);
+pub struct _GstRTSPServerPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPServerPrivate = *mut _GstRTSPServerPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPSessionClass {
     pub parent_class: gobject::GObjectClass,
     pub _gst_reserved: [gpointer; 4],
@@ -785,8 +815,8 @@ impl ::std::fmt::Debug for GstRTSPSessionClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPSessionMediaClass {
     pub parent_class: gobject::GObjectClass,
     pub _gst_reserved: [gpointer; 4],
@@ -801,12 +831,15 @@ impl ::std::fmt::Debug for GstRTSPSessionMediaClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPSessionMediaPrivate(c_void);
+pub struct _GstRTSPSessionMediaPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPSessionMediaPrivate = *mut _GstRTSPSessionMediaPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPSessionPoolClass {
     pub parent_class: gobject::GObjectClass,
     pub create_session_id: Option<unsafe extern "C" fn(*mut GstRTSPSessionPool) -> *mut c_char>,
@@ -828,17 +861,23 @@ impl ::std::fmt::Debug for GstRTSPSessionPoolClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPSessionPoolPrivate(c_void);
+pub struct _GstRTSPSessionPoolPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPSessionPoolPrivate = *mut _GstRTSPSessionPoolPrivate;
 
 #[repr(C)]
-pub struct _GstRTSPSessionPrivate(c_void);
+pub struct _GstRTSPSessionPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPSessionPrivate = *mut _GstRTSPSessionPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPStreamClass {
     pub parent_class: gobject::GObjectClass,
     pub _gst_reserved: [gpointer; 4],
@@ -853,12 +892,15 @@ impl ::std::fmt::Debug for GstRTSPStreamClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPStreamPrivate(c_void);
+pub struct _GstRTSPStreamPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPStreamPrivate = *mut _GstRTSPStreamPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPStreamTransportClass {
     pub parent_class: gobject::GObjectClass,
     pub _gst_reserved: [gpointer; 4],
@@ -873,12 +915,15 @@ impl ::std::fmt::Debug for GstRTSPStreamTransportClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPStreamTransportPrivate(c_void);
+pub struct _GstRTSPStreamTransportPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPStreamTransportPrivate = *mut _GstRTSPStreamTransportPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPThread {
     pub mini_object: gst::GstMiniObject,
     pub type_: GstRTSPThreadType,
@@ -897,8 +942,8 @@ impl ::std::fmt::Debug for GstRTSPThread {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPThreadPoolClass {
     pub parent_class: gobject::GObjectClass,
     pub pool: *mut glib::GThreadPool,
@@ -931,12 +976,15 @@ impl ::std::fmt::Debug for GstRTSPThreadPoolClass {
 }
 
 #[repr(C)]
-pub struct _GstRTSPThreadPoolPrivate(c_void);
+pub struct _GstRTSPThreadPoolPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPThreadPoolPrivate = *mut _GstRTSPThreadPoolPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPToken {
     pub mini_object: gst::GstMiniObject,
 }
@@ -949,8 +997,8 @@ impl ::std::fmt::Debug for GstRTSPToken {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSDPInfo {
     pub is_ipv6: gboolean,
     pub server_ip: *const c_char,
@@ -966,8 +1014,8 @@ impl ::std::fmt::Debug for GstSDPInfo {
 }
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPAddressPool {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPAddressPoolPrivate,
@@ -982,8 +1030,8 @@ impl ::std::fmt::Debug for GstRTSPAddressPool {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPAuth {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPAuthPrivate,
@@ -998,8 +1046,8 @@ impl ::std::fmt::Debug for GstRTSPAuth {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPClient {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPClientPrivate,
@@ -1014,8 +1062,8 @@ impl ::std::fmt::Debug for GstRTSPClient {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPMedia {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPMediaPrivate,
@@ -1030,8 +1078,8 @@ impl ::std::fmt::Debug for GstRTSPMedia {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPMediaFactory {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPMediaFactoryPrivate,
@@ -1046,8 +1094,8 @@ impl ::std::fmt::Debug for GstRTSPMediaFactory {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPMediaFactoryURI {
     pub parent: GstRTSPMediaFactory,
     pub priv_: *mut GstRTSPMediaFactoryURIPrivate,
@@ -1062,8 +1110,8 @@ impl ::std::fmt::Debug for GstRTSPMediaFactoryURI {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPMountPoints {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPMountPointsPrivate,
@@ -1078,8 +1126,8 @@ impl ::std::fmt::Debug for GstRTSPMountPoints {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPOnvifClient {
     pub parent: GstRTSPClient,
     pub _gst_reserved: [gpointer; 4],
@@ -1093,8 +1141,8 @@ impl ::std::fmt::Debug for GstRTSPOnvifClient {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPOnvifMedia {
     pub parent: GstRTSPMedia,
     pub priv_: *mut GstRTSPOnvifMediaPrivate,
@@ -1110,8 +1158,8 @@ impl ::std::fmt::Debug for GstRTSPOnvifMedia {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPOnvifMediaFactory {
     pub parent: GstRTSPMediaFactory,
     pub priv_: *mut GstRTSPOnvifMediaFactoryPrivate,
@@ -1127,8 +1175,8 @@ impl ::std::fmt::Debug for GstRTSPOnvifMediaFactory {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPOnvifServer {
     pub parent: GstRTSPServer,
     pub _gst_reserved: [gpointer; 4],
@@ -1142,8 +1190,8 @@ impl ::std::fmt::Debug for GstRTSPOnvifServer {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPServer {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPServerPrivate,
@@ -1158,8 +1206,8 @@ impl ::std::fmt::Debug for GstRTSPServer {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPSession {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPSessionPrivate,
@@ -1174,8 +1222,8 @@ impl ::std::fmt::Debug for GstRTSPSession {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPSessionMedia {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPSessionMediaPrivate,
@@ -1190,8 +1238,8 @@ impl ::std::fmt::Debug for GstRTSPSessionMedia {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPSessionPool {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPSessionPoolPrivate,
@@ -1206,8 +1254,8 @@ impl ::std::fmt::Debug for GstRTSPSessionPool {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPStream {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPStreamPrivate,
@@ -1222,8 +1270,8 @@ impl ::std::fmt::Debug for GstRTSPStream {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPStreamTransport {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPStreamTransportPrivate,
@@ -1238,8 +1286,8 @@ impl ::std::fmt::Debug for GstRTSPStreamTransport {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPThreadPool {
     pub parent: gobject::GObject,
     pub priv_: *mut GstRTSPThreadPoolPrivate,
diff --git a/gstreamer-rtsp-server/sys/tests/abi.rs b/gstreamer-rtsp-server/sys/tests/abi.rs
index 4383b9086..2b9c15431 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 c8875cc69..e7d192aed 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 f1c49180f..eff50e54c 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 8a2149af0..a407fb42b 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -279,8 +279,8 @@ pub const GST_RTSP_TRANS_RTP: GstRTSPTransMode = 1;
 pub const GST_RTSP_TRANS_RDT: GstRTSPTransMode = 2;
 
 // Unions
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GstRTSPMessage_type_data {
     pub request: GstRTSPMessage_type_data_request,
     pub response: GstRTSPMessage_type_data_response,
@@ -308,8 +308,8 @@ pub type GstRTSPConnectionAcceptCertificateFunc = Option<
 >;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPAuthCredential {
     pub scheme: GstRTSPAuthMethod,
     pub params: *mut *mut GstRTSPAuthParam,
@@ -326,8 +326,8 @@ impl ::std::fmt::Debug for GstRTSPAuthCredential {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPAuthParam {
     pub name: *mut c_char,
     pub value: *mut c_char,
@@ -343,12 +343,15 @@ impl ::std::fmt::Debug for GstRTSPAuthParam {
 }
 
 #[repr(C)]
-pub struct _GstRTSPConnection(c_void);
+pub struct _GstRTSPConnection {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPConnection = *mut _GstRTSPConnection;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPExtensionInterface {
     pub parent: gobject::GTypeInterface,
     pub detect_server:
@@ -413,8 +416,8 @@ impl ::std::fmt::Debug for GstRTSPExtensionInterface {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPMessage {
     pub type_: GstRTSPMsgType,
     pub type_data: GstRTSPMessage_type_data,
@@ -434,8 +437,8 @@ impl ::std::fmt::Debug for GstRTSPMessage {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPMessage_type_data_data {
     pub channel: u8,
 }
@@ -448,8 +451,8 @@ impl ::std::fmt::Debug for GstRTSPMessage_type_data_data {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPMessage_type_data_request {
     pub method: GstRTSPMethod,
     pub uri: *mut c_char,
@@ -466,8 +469,8 @@ impl ::std::fmt::Debug for GstRTSPMessage_type_data_request {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPMessage_type_data_response {
     pub code: GstRTSPStatusCode,
     pub reason: *mut c_char,
@@ -484,8 +487,8 @@ impl ::std::fmt::Debug for GstRTSPMessage_type_data_response {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPRange {
     pub min: c_int,
     pub max: c_int,
@@ -500,8 +503,8 @@ impl ::std::fmt::Debug for GstRTSPRange {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPTime {
     pub type_: GstRTSPTimeType,
     pub seconds: c_double,
@@ -516,8 +519,8 @@ impl ::std::fmt::Debug for GstRTSPTime {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPTime2 {
     pub frames: c_double,
     pub year: c_uint,
@@ -536,8 +539,8 @@ impl ::std::fmt::Debug for GstRTSPTime2 {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPTimeRange {
     pub unit: GstRTSPRangeUnit,
     pub min: GstRTSPTime,
@@ -558,8 +561,8 @@ impl ::std::fmt::Debug for GstRTSPTimeRange {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPTransport {
     pub trans: GstRTSPTransMode,
     pub profile: GstRTSPProfile,
@@ -601,8 +604,8 @@ impl ::std::fmt::Debug for GstRTSPTransport {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPUrl {
     pub transports: GstRTSPLowerTrans,
     pub family: GstRTSPFamily,
@@ -630,12 +633,15 @@ impl ::std::fmt::Debug for GstRTSPUrl {
 }
 
 #[repr(C)]
-pub struct _GstRTSPWatch(c_void);
+pub struct _GstRTSPWatch {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRTSPWatch = *mut _GstRTSPWatch;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRTSPWatchFuncs {
     pub message_received: Option<
         unsafe extern "C" fn(*mut GstRTSPWatch, *mut GstRTSPMessage, gpointer) -> GstRTSPResult,
@@ -687,7 +693,10 @@ impl ::std::fmt::Debug for GstRTSPWatchFuncs {
 
 // Interfaces
 #[repr(C)]
-pub struct GstRTSPExtension(c_void);
+pub struct GstRTSPExtension {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstRTSPExtension {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
diff --git a/gstreamer-rtsp/sys/tests/abi.rs b/gstreamer-rtsp/sys/tests/abi.rs
index c64a44e12..2e41da616 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 4e65599ef..86750780e 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 9f2bd0cce..d2a7bfeee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 bb400c7ad..a8fa91580 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -121,17 +121,23 @@ pub const GST_SDP_BWTYPE_TIAS: *const c_char = b"TIAS\0" as *const u8 as *const
 
 // Records
 #[repr(C)]
-pub struct _GstMIKEYDecryptInfo(c_void);
+pub struct _GstMIKEYDecryptInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstMIKEYDecryptInfo = *mut _GstMIKEYDecryptInfo;
 
 #[repr(C)]
-pub struct _GstMIKEYEncryptInfo(c_void);
+pub struct _GstMIKEYEncryptInfo {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstMIKEYEncryptInfo = *mut _GstMIKEYEncryptInfo;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMIKEYMapSRTP {
     pub policy: u8,
     pub ssrc: u32,
@@ -148,8 +154,8 @@ impl ::std::fmt::Debug for GstMIKEYMapSRTP {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMIKEYMessage {
     pub mini_object: gst::GstMiniObject,
     pub version: u8,
@@ -177,8 +183,8 @@ impl ::std::fmt::Debug for GstMIKEYMessage {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMIKEYPayload {
     pub mini_object: gst::GstMiniObject,
     pub type_: GstMIKEYPayloadType,
@@ -194,8 +200,8 @@ impl ::std::fmt::Debug for GstMIKEYPayload {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMIKEYPayloadKEMAC {
     pub pt: GstMIKEYPayload,
     pub enc_alg: GstMIKEYEncAlg,
@@ -214,8 +220,8 @@ impl ::std::fmt::Debug for GstMIKEYPayloadKEMAC {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMIKEYPayloadKeyData {
     pub pt: GstMIKEYPayload,
     pub key_type: GstMIKEYKeyDataType,
@@ -244,8 +250,8 @@ impl ::std::fmt::Debug for GstMIKEYPayloadKeyData {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMIKEYPayloadPKE {
     pub pt: GstMIKEYPayload,
     pub C: GstMIKEYCacheType,
@@ -264,8 +270,8 @@ impl ::std::fmt::Debug for GstMIKEYPayloadPKE {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMIKEYPayloadRAND {
     pub pt: GstMIKEYPayload,
     pub len: u8,
@@ -282,8 +288,8 @@ impl ::std::fmt::Debug for GstMIKEYPayloadRAND {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMIKEYPayloadSP {
     pub pt: GstMIKEYPayload,
     pub policy: c_uint,
@@ -302,8 +308,8 @@ impl ::std::fmt::Debug for GstMIKEYPayloadSP {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMIKEYPayloadSPParam {
     pub type_: u8,
     pub len: u8,
@@ -320,8 +326,8 @@ impl ::std::fmt::Debug for GstMIKEYPayloadSPParam {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMIKEYPayloadT {
     pub pt: GstMIKEYPayload,
     pub type_: GstMIKEYTSType,
@@ -338,8 +344,8 @@ impl ::std::fmt::Debug for GstMIKEYPayloadT {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSDPAttribute {
     pub key: *mut c_char,
     pub value: *mut c_char,
@@ -354,8 +360,8 @@ impl ::std::fmt::Debug for GstSDPAttribute {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSDPBandwidth {
     pub bwtype: *mut c_char,
     pub bandwidth: c_uint,
@@ -370,8 +376,8 @@ impl ::std::fmt::Debug for GstSDPBandwidth {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSDPConnection {
     pub nettype: *mut c_char,
     pub addrtype: *mut c_char,
@@ -392,8 +398,8 @@ impl ::std::fmt::Debug for GstSDPConnection {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSDPKey {
     pub type_: *mut c_char,
     pub data: *mut c_char,
@@ -408,8 +414,8 @@ impl ::std::fmt::Debug for GstSDPKey {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSDPMedia {
     pub media: *mut c_char,
     pub port: c_uint,
@@ -440,8 +446,8 @@ impl ::std::fmt::Debug for GstSDPMedia {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSDPMessage {
     pub version: *mut c_char,
     pub origin: GstSDPOrigin,
@@ -480,8 +486,8 @@ impl ::std::fmt::Debug for GstSDPMessage {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSDPOrigin {
     pub username: *mut c_char,
     pub sess_id: *mut c_char,
@@ -504,8 +510,8 @@ impl ::std::fmt::Debug for GstSDPOrigin {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSDPTime {
     pub start: *mut c_char,
     pub stop: *mut c_char,
@@ -522,8 +528,8 @@ impl ::std::fmt::Debug for GstSDPTime {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSDPZone {
     pub time: *mut c_char,
     pub typed_time: *mut c_char,
diff --git a/gstreamer-sdp/sys/tests/abi.rs b/gstreamer-sdp/sys/tests/abi.rs
index 4fc0b2e72..59fa05d22 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 f1aa914b7..713a5673f 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 a2088545e..082edb19f 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 7a294f16d..47fd90469 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -144,8 +144,8 @@ pub const GST_TAG_LICENSE_CREATIVE_COMMONS_LICENSE: GstTagLicenseFlags = 1677721
 pub const GST_TAG_LICENSE_FREE_SOFTWARE_FOUNDATION_LICENSE: GstTagLicenseFlags = 33554432;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTagDemuxClass {
     pub parent_class: gst::GstElementClass,
     pub min_start_size: c_uint,
@@ -191,12 +191,15 @@ impl ::std::fmt::Debug for GstTagDemuxClass {
 }
 
 #[repr(C)]
-pub struct _GstTagDemuxPrivate(c_void);
+pub struct _GstTagDemuxPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstTagDemuxPrivate = *mut _GstTagDemuxPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTagMuxClass {
     pub parent_class: gst::GstElementClass,
     pub render_start_tag:
@@ -217,12 +220,15 @@ impl ::std::fmt::Debug for GstTagMuxClass {
 }
 
 #[repr(C)]
-pub struct _GstTagMuxPrivate(c_void);
+pub struct _GstTagMuxPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstTagMuxPrivate = *mut _GstTagMuxPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTagXmpWriterInterface {
     pub parent: gobject::GTypeInterface,
 }
@@ -236,8 +242,8 @@ impl ::std::fmt::Debug for GstTagXmpWriterInterface {
 }
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTagDemux {
     pub element: gst::GstElement,
     pub priv_: *mut GstTagDemuxPrivate,
@@ -252,8 +258,8 @@ impl ::std::fmt::Debug for GstTagDemux {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTagMux {
     pub element: gst::GstElement,
     pub priv_: *mut GstTagMuxPrivate,
@@ -270,7 +276,10 @@ impl ::std::fmt::Debug for GstTagMux {
 
 // Interfaces
 #[repr(C)]
-pub struct GstTagXmpWriter(c_void);
+pub struct GstTagXmpWriter {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstTagXmpWriter {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
diff --git a/gstreamer-tag/sys/tests/abi.rs b/gstreamer-tag/sys/tests/abi.rs
index cac0c00aa..74d226aae 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 92ff8abbb..be69a8558 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 c82c3f57a..ad23f598a 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer-video/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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/sys/build.rs b/gstreamer-video/sys/build.rs
index c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 9365a5bca..c341569c4 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -662,8 +662,8 @@ pub const GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME: GstVideoTimeCodeFlags = 1;
 pub const GST_VIDEO_TIME_CODE_FLAGS_INTERLACED: GstVideoTimeCodeFlags = 2;
 
 // Unions
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GstVideoCodecFrame_abidata {
     pub ABI: GstVideoCodecFrame_abidata_ABI,
     pub padding: [gpointer; 20],
@@ -677,8 +677,8 @@ impl ::std::fmt::Debug for GstVideoCodecFrame_abidata {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GstVideoInfo_ABI {
     pub abi: GstVideoInfo_ABI_abi,
     pub _gst_reserved: [gpointer; 4],
@@ -726,8 +726,8 @@ pub type GstVideoGLTextureUpload =
     Option<unsafe extern "C" fn(*mut GstVideoGLTextureUploadMeta, *mut c_uint) -> gboolean>;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstColorBalanceChannelClass {
     pub parent: gobject::GObjectClass,
     pub value_changed: Option<unsafe extern "C" fn(*mut GstColorBalanceChannel, c_int)>,
@@ -743,8 +743,8 @@ impl ::std::fmt::Debug for GstColorBalanceChannelClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstColorBalanceInterface {
     pub iface: gobject::GTypeInterface,
     pub list_channels: Option<unsafe extern "C" fn(*mut GstColorBalance) -> *const glib::GList>,
@@ -771,8 +771,8 @@ impl ::std::fmt::Debug for GstColorBalanceInterface {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstNavigationInterface {
     pub iface: gobject::GTypeInterface,
     pub send_event: Option<unsafe extern "C" fn(*mut GstNavigation, *mut gst::GstStructure)>,
@@ -787,8 +787,8 @@ impl ::std::fmt::Debug for GstNavigationInterface {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoAFDMeta {
     pub meta: gst::GstMeta,
     pub field: u8,
@@ -807,8 +807,8 @@ impl ::std::fmt::Debug for GstVideoAFDMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoAffineTransformationMeta {
     pub meta: gst::GstMeta,
     pub matrix: [c_float; 16],
@@ -823,8 +823,8 @@ impl ::std::fmt::Debug for GstVideoAffineTransformationMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoAggregatorClass {
     pub parent_class: gst_base::GstAggregatorClass,
     pub update_caps: Option<
@@ -864,8 +864,8 @@ impl ::std::fmt::Debug for GstVideoAggregatorClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoAggregatorConvertPadClass {
     pub parent_class: GstVideoAggregatorPadClass,
     pub create_conversion_info: Option<
@@ -888,12 +888,15 @@ impl ::std::fmt::Debug for GstVideoAggregatorConvertPadClass {
 }
 
 #[repr(C)]
-pub struct _GstVideoAggregatorConvertPadPrivate(c_void);
+pub struct _GstVideoAggregatorConvertPadPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstVideoAggregatorConvertPadPrivate = *mut _GstVideoAggregatorConvertPadPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoAggregatorPadClass {
     pub parent_class: gst_base::GstAggregatorPadClass,
     pub update_conversion_info: Option<unsafe extern "C" fn(*mut GstVideoAggregatorPad)>,
@@ -945,12 +948,15 @@ impl ::std::fmt::Debug for GstVideoAggregatorPadClass {
 }
 
 #[repr(C)]
-pub struct _GstVideoAggregatorPadPrivate(c_void);
+pub struct _GstVideoAggregatorPadPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstVideoAggregatorPadPrivate = *mut _GstVideoAggregatorPadPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoAggregatorParallelConvertPadClass {
     pub parent_class: GstVideoAggregatorConvertPadClass,
     pub _gst_reserved: [gpointer; 4],
@@ -968,12 +974,15 @@ impl ::std::fmt::Debug for GstVideoAggregatorParallelConvertPadClass {
 }
 
 #[repr(C)]
-pub struct _GstVideoAggregatorPrivate(c_void);
+pub struct _GstVideoAggregatorPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstVideoAggregatorPrivate = *mut _GstVideoAggregatorPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoAlignment {
     pub padding_top: c_uint,
     pub padding_bottom: c_uint,
@@ -994,8 +1003,8 @@ impl ::std::fmt::Debug for GstVideoAlignment {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoAncillary {
     pub DID: u8,
     pub SDID_block_number: u8,
@@ -1014,8 +1023,8 @@ impl ::std::fmt::Debug for GstVideoAncillary {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoBarMeta {
     pub meta: gst::GstMeta,
     pub field: u8,
@@ -1036,8 +1045,8 @@ impl ::std::fmt::Debug for GstVideoBarMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoBufferPoolClass {
     pub parent_class: gst::GstBufferPoolClass,
 }
@@ -1051,12 +1060,15 @@ impl ::std::fmt::Debug for GstVideoBufferPoolClass {
 }
 
 #[repr(C)]
-pub struct _GstVideoBufferPoolPrivate(c_void);
+pub struct _GstVideoBufferPoolPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstVideoBufferPoolPrivate = *mut _GstVideoBufferPoolPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoCaptionMeta {
     pub meta: gst::GstMeta,
     pub caption_type: GstVideoCaptionType,
@@ -1076,12 +1088,15 @@ impl ::std::fmt::Debug for GstVideoCaptionMeta {
 }
 
 #[repr(C)]
-pub struct _GstVideoChromaResample(c_void);
+pub struct _GstVideoChromaResample {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstVideoChromaResample = *mut _GstVideoChromaResample;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoCodecAlphaMeta {
     pub meta: gst::GstMeta,
     pub buffer: *mut gst::GstBuffer,
@@ -1096,8 +1111,8 @@ impl ::std::fmt::Debug for GstVideoCodecAlphaMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoCodecFrame {
     pub ref_count: c_int,
     pub flags: u32,
@@ -1133,8 +1148,8 @@ impl ::std::fmt::Debug for GstVideoCodecFrame {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoCodecFrame_abidata_ABI {
     pub ts: gst::GstClockTime,
     pub ts2: gst::GstClockTime,
@@ -1149,8 +1164,8 @@ impl ::std::fmt::Debug for GstVideoCodecFrame_abidata_ABI {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoCodecState {
     pub ref_count: c_int,
     pub info: GstVideoInfo,
@@ -1175,8 +1190,8 @@ impl ::std::fmt::Debug for GstVideoCodecState {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoColorPrimariesInfo {
     pub primaries: GstVideoColorPrimaries,
     pub Wx: c_double,
@@ -1205,8 +1220,8 @@ impl ::std::fmt::Debug for GstVideoColorPrimariesInfo {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoColorimetry {
     pub range: GstVideoColorRange,
     pub matrix: GstVideoColorMatrix,
@@ -1225,8 +1240,8 @@ impl ::std::fmt::Debug for GstVideoColorimetry {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoContentLightLevel {
     pub max_content_light_level: u16,
     pub max_frame_average_light_level: u16,
@@ -1246,12 +1261,15 @@ impl ::std::fmt::Debug for GstVideoContentLightLevel {
 }
 
 #[repr(C)]
-pub struct _GstVideoConverter(c_void);
+pub struct _GstVideoConverter {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstVideoConverter = *mut _GstVideoConverter;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoCropMeta {
     pub meta: gst::GstMeta,
     pub x: c_uint,
@@ -1272,8 +1290,8 @@ impl ::std::fmt::Debug for GstVideoCropMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoDecoderClass {
     pub element_class: gst::GstElementClass,
     pub open: Option<unsafe extern "C" fn(*mut GstVideoDecoder) -> gboolean>,
@@ -1358,12 +1376,15 @@ impl ::std::fmt::Debug for GstVideoDecoderClass {
 }
 
 #[repr(C)]
-pub struct _GstVideoDecoderPrivate(c_void);
+pub struct _GstVideoDecoderPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstVideoDecoderPrivate = *mut _GstVideoDecoderPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoDirectionInterface {
     pub iface: gobject::GTypeInterface,
 }
@@ -1377,12 +1398,15 @@ impl ::std::fmt::Debug for GstVideoDirectionInterface {
 }
 
 #[repr(C)]
-pub struct _GstVideoDither(c_void);
+pub struct _GstVideoDither {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstVideoDither = *mut _GstVideoDither;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoEncoderClass {
     pub element_class: gst::GstElementClass,
     pub open: Option<unsafe extern "C" fn(*mut GstVideoEncoder) -> gboolean>,
@@ -1452,12 +1476,15 @@ impl ::std::fmt::Debug for GstVideoEncoderClass {
 }
 
 #[repr(C)]
-pub struct _GstVideoEncoderPrivate(c_void);
+pub struct _GstVideoEncoderPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstVideoEncoderPrivate = *mut _GstVideoEncoderPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoFilterClass {
     pub parent_class: gst_base::GstBaseTransformClass,
     pub set_info: Option<
@@ -1492,8 +1519,8 @@ impl ::std::fmt::Debug for GstVideoFilterClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoFormatInfo {
     pub format: GstVideoFormat,
     pub name: *const c_char,
@@ -1547,8 +1574,8 @@ impl ::std::fmt::Debug for GstVideoFormatInfo {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoFrame {
     pub info: GstVideoInfo,
     pub flags: GstVideoFrameFlags,
@@ -1574,8 +1601,8 @@ impl ::std::fmt::Debug for GstVideoFrame {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoGLTextureUploadMeta {
     pub meta: gst::GstMeta,
     pub texture_orientation: GstVideoGLTextureOrientation,
@@ -1599,8 +1626,8 @@ impl ::std::fmt::Debug for GstVideoGLTextureUploadMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoInfo {
     pub finfo: *const GstVideoFormatInfo,
     pub interlace_mode: GstVideoInterlaceMode,
@@ -1643,8 +1670,8 @@ impl ::std::fmt::Debug for GstVideoInfo {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoInfo_ABI_abi {
     pub multiview_mode: GstVideoMultiviewMode,
     pub multiview_flags: GstVideoMultiviewFlags,
@@ -1661,8 +1688,8 @@ impl ::std::fmt::Debug for GstVideoInfo_ABI_abi {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoMasteringDisplayInfo {
     pub display_primaries: [GstVideoMasteringDisplayInfoCoordinates; 3],
     pub white_point: GstVideoMasteringDisplayInfoCoordinates,
@@ -1688,8 +1715,8 @@ impl ::std::fmt::Debug for GstVideoMasteringDisplayInfo {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoMasteringDisplayInfoCoordinates {
     pub x: u16,
     pub y: u16,
@@ -1707,8 +1734,8 @@ impl ::std::fmt::Debug for GstVideoMasteringDisplayInfoCoordinates {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoMeta {
     pub meta: gst::GstMeta,
     pub buffer: *mut gst::GstBuffer,
@@ -1755,8 +1782,8 @@ impl ::std::fmt::Debug for GstVideoMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoMetaTransform {
     pub in_info: *mut GstVideoInfo,
     pub out_info: *mut GstVideoInfo,
@@ -1771,8 +1798,8 @@ impl ::std::fmt::Debug for GstVideoMetaTransform {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoOrientationInterface {
     pub iface: gobject::GTypeInterface,
     pub get_hflip: Option<unsafe extern "C" fn(*mut GstVideoOrientation, gboolean) -> gboolean>,
@@ -1802,7 +1829,10 @@ impl ::std::fmt::Debug for GstVideoOrientationInterface {
 }
 
 #[repr(C)]
-pub struct GstVideoOverlayComposition(c_void);
+pub struct GstVideoOverlayComposition {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstVideoOverlayComposition {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -1811,8 +1841,8 @@ impl ::std::fmt::Debug for GstVideoOverlayComposition {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoOverlayCompositionMeta {
     pub meta: gst::GstMeta,
     pub overlay: *mut GstVideoOverlayComposition,
@@ -1827,8 +1857,8 @@ impl ::std::fmt::Debug for GstVideoOverlayCompositionMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoOverlayInterface {
     pub iface: gobject::GTypeInterface,
     pub expose: Option<unsafe extern "C" fn(*mut GstVideoOverlay)>,
@@ -1851,7 +1881,10 @@ impl ::std::fmt::Debug for GstVideoOverlayInterface {
 }
 
 #[repr(C)]
-pub struct GstVideoOverlayRectangle(c_void);
+pub struct GstVideoOverlayRectangle {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstVideoOverlayRectangle {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -1860,8 +1893,8 @@ impl ::std::fmt::Debug for GstVideoOverlayRectangle {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoRectangle {
     pub x: c_int,
     pub y: c_int,
@@ -1880,8 +1913,8 @@ impl ::std::fmt::Debug for GstVideoRectangle {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoRegionOfInterestMeta {
     pub meta: gst::GstMeta,
     pub roi_type: glib::GQuark,
@@ -1910,8 +1943,8 @@ impl ::std::fmt::Debug for GstVideoRegionOfInterestMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoResampler {
     pub in_size: c_int,
     pub out_size: c_int,
@@ -1940,12 +1973,15 @@ impl ::std::fmt::Debug for GstVideoResampler {
 }
 
 #[repr(C)]
-pub struct _GstVideoScaler(c_void);
+pub struct _GstVideoScaler {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstVideoScaler = *mut _GstVideoScaler;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoSinkClass {
     pub parent_class: gst_base::GstBaseSinkClass,
     pub show_frame:
@@ -1967,12 +2003,15 @@ impl ::std::fmt::Debug for GstVideoSinkClass {
 }
 
 #[repr(C)]
-pub struct _GstVideoSinkPrivate(c_void);
+pub struct _GstVideoSinkPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstVideoSinkPrivate = *mut _GstVideoSinkPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoTimeCode {
     pub config: GstVideoTimeCodeConfig,
     pub hours: c_uint,
@@ -1995,8 +2034,8 @@ impl ::std::fmt::Debug for GstVideoTimeCode {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoTimeCodeConfig {
     pub fps_n: c_uint,
     pub fps_d: c_uint,
@@ -2015,8 +2054,8 @@ impl ::std::fmt::Debug for GstVideoTimeCodeConfig {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoTimeCodeInterval {
     pub hours: c_uint,
     pub minutes: c_uint,
@@ -2035,8 +2074,8 @@ impl ::std::fmt::Debug for GstVideoTimeCodeInterval {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoTimeCodeMeta {
     pub meta: gst::GstMeta,
     pub tc: GstVideoTimeCode,
@@ -2052,7 +2091,10 @@ impl ::std::fmt::Debug for GstVideoTimeCodeMeta {
 }
 
 #[repr(C)]
-pub struct GstVideoVBIEncoder(c_void);
+pub struct GstVideoVBIEncoder {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstVideoVBIEncoder {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2062,7 +2104,10 @@ impl ::std::fmt::Debug for GstVideoVBIEncoder {
 }
 
 #[repr(C)]
-pub struct GstVideoVBIParser(c_void);
+pub struct GstVideoVBIParser {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstVideoVBIParser {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2072,8 +2117,8 @@ impl ::std::fmt::Debug for GstVideoVBIParser {
 }
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstColorBalanceChannel {
     pub parent: gobject::GObject,
     pub label: *mut c_char,
@@ -2093,8 +2138,8 @@ impl ::std::fmt::Debug for GstColorBalanceChannel {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoAggregator {
     pub aggregator: gst_base::GstAggregator,
     pub info: GstVideoInfo,
@@ -2111,8 +2156,8 @@ impl ::std::fmt::Debug for GstVideoAggregator {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoAggregatorConvertPad {
     pub parent: GstVideoAggregatorPad,
     pub priv_: *mut GstVideoAggregatorConvertPadPrivate,
@@ -2126,8 +2171,8 @@ impl ::std::fmt::Debug for GstVideoAggregatorConvertPad {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoAggregatorPad {
     pub parent: gst_base::GstAggregatorPad,
     pub info: GstVideoInfo,
@@ -2144,8 +2189,8 @@ impl ::std::fmt::Debug for GstVideoAggregatorPad {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoAggregatorParallelConvertPad {
     pub parent_instance: GstVideoAggregatorConvertPad,
 }
@@ -2161,8 +2206,8 @@ impl ::std::fmt::Debug for GstVideoAggregatorParallelConvertPad {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoBufferPool {
     pub bufferpool: gst::GstBufferPool,
     pub priv_: *mut GstVideoBufferPoolPrivate,
@@ -2177,8 +2222,8 @@ impl ::std::fmt::Debug for GstVideoBufferPool {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoDecoder {
     pub element: gst::GstElement,
     pub sinkpad: *mut gst::GstPad,
@@ -2197,8 +2242,8 @@ impl ::std::fmt::Debug for GstVideoDecoder {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoEncoder {
     pub element: gst::GstElement,
     pub sinkpad: *mut gst::GstPad,
@@ -2217,8 +2262,8 @@ impl ::std::fmt::Debug for GstVideoEncoder {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoFilter {
     pub element: gst_base::GstBaseTransform,
     pub negotiated: gboolean,
@@ -2239,7 +2284,10 @@ impl ::std::fmt::Debug for GstVideoFilter {
 }
 
 #[repr(C)]
-pub struct GstVideoMultiviewFlagsSet(c_void);
+pub struct GstVideoMultiviewFlagsSet {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstVideoMultiviewFlagsSet {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2248,8 +2296,8 @@ impl ::std::fmt::Debug for GstVideoMultiviewFlagsSet {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstVideoSink {
     pub element: gst_base::GstBaseSink,
     pub width: c_int,
@@ -2270,7 +2318,10 @@ impl ::std::fmt::Debug for GstVideoSink {
 
 // Interfaces
 #[repr(C)]
-pub struct GstColorBalance(c_void);
+pub struct GstColorBalance {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstColorBalance {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2279,7 +2330,10 @@ impl ::std::fmt::Debug for GstColorBalance {
 }
 
 #[repr(C)]
-pub struct GstNavigation(c_void);
+pub struct GstNavigation {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstNavigation {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2288,7 +2342,10 @@ impl ::std::fmt::Debug for GstNavigation {
 }
 
 #[repr(C)]
-pub struct GstVideoDirection(c_void);
+pub struct GstVideoDirection {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstVideoDirection {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2297,7 +2354,10 @@ impl ::std::fmt::Debug for GstVideoDirection {
 }
 
 #[repr(C)]
-pub struct GstVideoOrientation(c_void);
+pub struct GstVideoOrientation {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstVideoOrientation {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2306,7 +2366,10 @@ impl ::std::fmt::Debug for GstVideoOrientation {
 }
 
 #[repr(C)]
-pub struct GstVideoOverlay(c_void);
+pub struct GstVideoOverlay {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstVideoOverlay {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
diff --git a/gstreamer-video/sys/tests/abi.rs b/gstreamer-video/sys/tests/abi.rs
index d2391f2c6..96951d974 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 8a9fc8427..7b570878d 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 f3d853fde..f25bffd05 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 17cfb397a..a8dbd2050 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -145,42 +145,63 @@ pub const GST_WEBRTC_STATS_CERTIFICATE: GstWebRTCStatsType = 14;
 
 // Records
 #[repr(C)]
-pub struct _GstWebRTCDTLSTransportClass(c_void);
+pub struct _GstWebRTCDTLSTransportClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstWebRTCDTLSTransportClass = *mut _GstWebRTCDTLSTransportClass;
 
 #[repr(C)]
-pub struct _GstWebRTCDataChannelClass(c_void);
+pub struct _GstWebRTCDataChannelClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstWebRTCDataChannelClass = *mut _GstWebRTCDataChannelClass;
 
 #[repr(C)]
-pub struct _GstWebRTCICETransportClass(c_void);
+pub struct _GstWebRTCICETransportClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstWebRTCICETransportClass = *mut _GstWebRTCICETransportClass;
 
 #[repr(C)]
-pub struct _GstWebRTCRTPReceiverClass(c_void);
+pub struct _GstWebRTCRTPReceiverClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstWebRTCRTPReceiverClass = *mut _GstWebRTCRTPReceiverClass;
 
 #[repr(C)]
-pub struct _GstWebRTCRTPSenderClass(c_void);
+pub struct _GstWebRTCRTPSenderClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstWebRTCRTPSenderClass = *mut _GstWebRTCRTPSenderClass;
 
 #[repr(C)]
-pub struct _GstWebRTCRTPTransceiverClass(c_void);
+pub struct _GstWebRTCRTPTransceiverClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstWebRTCRTPTransceiverClass = *mut _GstWebRTCRTPTransceiverClass;
 
 #[repr(C)]
-pub struct _GstWebRTCSCTPTransportClass(c_void);
+pub struct _GstWebRTCSCTPTransportClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstWebRTCSCTPTransportClass = *mut _GstWebRTCSCTPTransportClass;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstWebRTCSessionDescription {
     pub type_: GstWebRTCSDPType,
     pub sdp: *mut gst_sdp::GstSDPMessage,
@@ -197,7 +218,10 @@ impl ::std::fmt::Debug for GstWebRTCSessionDescription {
 
 // Classes
 #[repr(C)]
-pub struct GstWebRTCDTLSTransport(c_void);
+pub struct GstWebRTCDTLSTransport {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstWebRTCDTLSTransport {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -207,7 +231,10 @@ impl ::std::fmt::Debug for GstWebRTCDTLSTransport {
 }
 
 #[repr(C)]
-pub struct GstWebRTCDataChannel(c_void);
+pub struct GstWebRTCDataChannel {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstWebRTCDataChannel {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -217,7 +244,10 @@ impl ::std::fmt::Debug for GstWebRTCDataChannel {
 }
 
 #[repr(C)]
-pub struct GstWebRTCICETransport(c_void);
+pub struct GstWebRTCICETransport {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstWebRTCICETransport {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -227,7 +257,10 @@ impl ::std::fmt::Debug for GstWebRTCICETransport {
 }
 
 #[repr(C)]
-pub struct GstWebRTCRTPReceiver(c_void);
+pub struct GstWebRTCRTPReceiver {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstWebRTCRTPReceiver {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -237,7 +270,10 @@ impl ::std::fmt::Debug for GstWebRTCRTPReceiver {
 }
 
 #[repr(C)]
-pub struct GstWebRTCRTPSender(c_void);
+pub struct GstWebRTCRTPSender {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstWebRTCRTPSender {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -247,7 +283,10 @@ impl ::std::fmt::Debug for GstWebRTCRTPSender {
 }
 
 #[repr(C)]
-pub struct GstWebRTCRTPTransceiver(c_void);
+pub struct GstWebRTCRTPTransceiver {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstWebRTCRTPTransceiver {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -257,7 +296,10 @@ impl ::std::fmt::Debug for GstWebRTCRTPTransceiver {
 }
 
 #[repr(C)]
-pub struct GstWebRTCSCTPTransport(c_void);
+pub struct GstWebRTCSCTPTransport {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstWebRTCSCTPTransport {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
diff --git a/gstreamer-webrtc/sys/tests/abi.rs b/gstreamer-webrtc/sys/tests/abi.rs
index 3945d6d40..7fa65e444 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 9d1e3e79f..0bfeb0e8b 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 70f931397..803df434b 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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/versions.txt b/gstreamer/src/auto/versions.txt
index 089fea68f..2f7c7414c 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 @ df67128a87f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 from 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 c52027f60..254ab7cee 100644
--- a/gstreamer/sys/build.rs
+++ b/gstreamer/sys/build.rs
@@ -1,4 +1,4 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 970d1245f..13896b3b4 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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
@@ -986,8 +986,8 @@ pub const GST_TRACER_VALUE_FLAGS_OPTIONAL: GstTracerValueFlags = 1;
 pub const GST_TRACER_VALUE_FLAGS_AGGREGATED: GstTracerValueFlags = 2;
 
 // Unions
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GstControlBinding_ABI {
     pub abi: GstControlBinding_ABI_abi,
     pub _gst_reserved: [gpointer; 4],
@@ -1001,8 +1001,8 @@ impl ::std::fmt::Debug for GstControlBinding_ABI {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GstPadProbeInfo_ABI {
     pub _gst_reserved: [gpointer; 4],
     pub abi: GstPadProbeInfo_ABI_abi,
@@ -1017,8 +1017,8 @@ impl ::std::fmt::Debug for GstPadProbeInfo_ABI {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GstPadTemplate_ABI {
     pub _gst_reserved: [gpointer; 4],
     pub abi: GstPadTemplate_ABI_abi,
@@ -1033,8 +1033,8 @@ impl ::std::fmt::Debug for GstPadTemplate_ABI {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub union GstPad_ABI {
     pub _gst_reserved: [gpointer; 4],
     pub abi: GstPad_ABI_abi,
@@ -1213,8 +1213,8 @@ pub type GstValueSerializeFunc =
     Option<unsafe extern "C" fn(*const gobject::GValue) -> *mut c_char>;
 
 // Records
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAllocationParams {
     pub flags: GstMemoryFlags,
     pub align: size_t,
@@ -1234,8 +1234,8 @@ impl ::std::fmt::Debug for GstAllocationParams {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAllocatorClass {
     pub object_class: GstObjectClass,
     pub alloc: Option<
@@ -1256,12 +1256,18 @@ impl ::std::fmt::Debug for GstAllocatorClass {
 }
 
 #[repr(C)]
-pub struct _GstAllocatorPrivate(c_void);
+pub struct _GstAllocatorPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstAllocatorPrivate = *mut _GstAllocatorPrivate;
 
 #[repr(C)]
-pub struct GstAtomicQueue(c_void);
+pub struct GstAtomicQueue {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstAtomicQueue {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -1270,8 +1276,8 @@ impl ::std::fmt::Debug for GstAtomicQueue {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBinClass {
     pub parent_class: GstElementClass,
     pub pool: *mut glib::GThreadPool,
@@ -1304,12 +1310,15 @@ impl ::std::fmt::Debug for GstBinClass {
 }
 
 #[repr(C)]
-pub struct _GstBinPrivate(c_void);
+pub struct _GstBinPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstBinPrivate = *mut _GstBinPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBuffer {
     pub mini_object: GstMiniObject,
     pub pool: *mut GstBufferPool,
@@ -1335,7 +1344,10 @@ impl ::std::fmt::Debug for GstBuffer {
 }
 
 #[repr(C)]
-pub struct GstBufferList(c_void);
+pub struct GstBufferList {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstBufferList {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -1344,8 +1356,8 @@ impl ::std::fmt::Debug for GstBufferList {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBufferPoolAcquireParams {
     pub format: GstFormat,
     pub start: i64,
@@ -1365,8 +1377,8 @@ impl ::std::fmt::Debug for GstBufferPoolAcquireParams {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBufferPoolClass {
     pub object_class: GstObjectClass,
     pub get_options: Option<unsafe extern "C" fn(*mut GstBufferPool) -> *mut *const c_char>,
@@ -1415,12 +1427,15 @@ impl ::std::fmt::Debug for GstBufferPoolClass {
 }
 
 #[repr(C)]
-pub struct _GstBufferPoolPrivate(c_void);
+pub struct _GstBufferPoolPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstBufferPoolPrivate = *mut _GstBufferPoolPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBusClass {
     pub parent_class: GstObjectClass,
     pub message: Option<unsafe extern "C" fn(*mut GstBus, *mut GstMessage)>,
@@ -1439,12 +1454,15 @@ impl ::std::fmt::Debug for GstBusClass {
 }
 
 #[repr(C)]
-pub struct _GstBusPrivate(c_void);
+pub struct _GstBusPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstBusPrivate = *mut _GstBusPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstCaps {
     pub mini_object: GstMiniObject,
 }
@@ -1458,7 +1476,10 @@ impl ::std::fmt::Debug for GstCaps {
 }
 
 #[repr(C)]
-pub struct GstCapsFeatures(c_void);
+pub struct GstCapsFeatures {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstCapsFeatures {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -1467,8 +1488,8 @@ impl ::std::fmt::Debug for GstCapsFeatures {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstChildProxyInterface {
     pub parent: gobject::GTypeInterface,
     pub get_child_by_name:
@@ -1496,8 +1517,8 @@ impl ::std::fmt::Debug for GstChildProxyInterface {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstClockClass {
     pub parent_class: GstObjectClass,
     pub change_resolution:
@@ -1531,8 +1552,8 @@ impl ::std::fmt::Debug for GstClockClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstClockEntry {
     pub refcount: c_int,
     pub clock: *mut GstClock,
@@ -1557,12 +1578,18 @@ impl ::std::fmt::Debug for GstClockEntry {
 }
 
 #[repr(C)]
-pub struct _GstClockPrivate(c_void);
+pub struct _GstClockPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstClockPrivate = *mut _GstClockPrivate;
 
 #[repr(C)]
-pub struct GstContext(c_void);
+pub struct GstContext {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstContext {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -1570,8 +1597,8 @@ impl ::std::fmt::Debug for GstContext {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstControlBindingClass {
     pub parent_class: GstObjectClass,
     pub sync_values: Option<
@@ -1618,12 +1645,15 @@ impl ::std::fmt::Debug for GstControlBindingClass {
 }
 
 #[repr(C)]
-pub struct _GstControlBindingPrivate(c_void);
+pub struct _GstControlBindingPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstControlBindingPrivate = *mut _GstControlBindingPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstControlBinding_ABI_abi {
     pub priv_: *mut GstControlBindingPrivate,
 }
@@ -1635,8 +1665,8 @@ impl ::std::fmt::Debug for GstControlBinding_ABI_abi {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstControlSourceClass {
     pub parent_class: GstObjectClass,
     pub _gst_reserved: [gpointer; 4],
@@ -1650,8 +1680,8 @@ impl ::std::fmt::Debug for GstControlSourceClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstCustomMeta {
     pub meta: GstMeta,
 }
@@ -1665,7 +1695,10 @@ impl ::std::fmt::Debug for GstCustomMeta {
 }
 
 #[repr(C)]
-pub struct GstDateTime(c_void);
+pub struct GstDateTime {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstDateTime {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -1674,8 +1707,8 @@ impl ::std::fmt::Debug for GstDateTime {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDebugCategory {
     pub threshold: c_int,
     pub color: c_uint,
@@ -1691,12 +1724,15 @@ impl ::std::fmt::Debug for GstDebugCategory {
 }
 
 #[repr(C)]
-pub struct _GstDebugMessage(c_void);
+pub struct _GstDebugMessage {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstDebugMessage = *mut _GstDebugMessage;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDeviceClass {
     pub parent_class: GstObjectClass,
     pub create_element:
@@ -1716,8 +1752,8 @@ impl ::std::fmt::Debug for GstDeviceClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDeviceMonitorClass {
     pub parent_class: GstObjectClass,
     pub _gst_reserved: [gpointer; 4],
@@ -1732,17 +1768,23 @@ impl ::std::fmt::Debug for GstDeviceMonitorClass {
 }
 
 #[repr(C)]
-pub struct _GstDeviceMonitorPrivate(c_void);
+pub struct _GstDeviceMonitorPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstDeviceMonitorPrivate = *mut _GstDeviceMonitorPrivate;
 
 #[repr(C)]
-pub struct _GstDevicePrivate(c_void);
+pub struct _GstDevicePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstDevicePrivate = *mut _GstDevicePrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDeviceProviderClass {
     pub parent_class: GstObjectClass,
     pub factory: *mut GstDeviceProviderFactory,
@@ -1766,22 +1808,31 @@ impl ::std::fmt::Debug for GstDeviceProviderClass {
 }
 
 #[repr(C)]
-pub struct _GstDeviceProviderFactoryClass(c_void);
+pub struct _GstDeviceProviderFactoryClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstDeviceProviderFactoryClass = *mut _GstDeviceProviderFactoryClass;
 
 #[repr(C)]
-pub struct _GstDeviceProviderPrivate(c_void);
+pub struct _GstDeviceProviderPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstDeviceProviderPrivate = *mut _GstDeviceProviderPrivate;
 
 #[repr(C)]
-pub struct _GstDynamicTypeFactoryClass(c_void);
+pub struct _GstDynamicTypeFactoryClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstDynamicTypeFactoryClass = *mut _GstDynamicTypeFactoryClass;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstElementClass {
     pub parent_class: GstObjectClass,
     pub metadata: gpointer,
@@ -1853,12 +1904,15 @@ impl ::std::fmt::Debug for GstElementClass {
 }
 
 #[repr(C)]
-pub struct _GstElementFactoryClass(c_void);
+pub struct _GstElementFactoryClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstElementFactoryClass = *mut _GstElementFactoryClass;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstEvent {
     pub mini_object: GstMiniObject,
     pub type_: GstEventType,
@@ -1877,8 +1931,8 @@ impl ::std::fmt::Debug for GstEvent {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstFormatDefinition {
     pub value: GstFormat,
     pub nick: *const c_char,
@@ -1897,8 +1951,8 @@ impl ::std::fmt::Debug for GstFormatDefinition {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGhostPadClass {
     pub parent_class: GstProxyPadClass,
     pub _gst_reserved: [gpointer; 4],
@@ -1913,12 +1967,15 @@ impl ::std::fmt::Debug for GstGhostPadClass {
 }
 
 #[repr(C)]
-pub struct _GstGhostPadPrivate(c_void);
+pub struct _GstGhostPadPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstGhostPadPrivate = *mut _GstGhostPadPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstIterator {
     pub copy: GstIteratorCopyFunction,
     pub next: GstIteratorNextFunction,
@@ -1952,8 +2009,8 @@ impl ::std::fmt::Debug for GstIterator {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMapInfo {
     pub memory: *mut GstMemory,
     pub flags: GstMapFlags,
@@ -1977,8 +2034,8 @@ impl ::std::fmt::Debug for GstMapInfo {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMemory {
     pub mini_object: GstMiniObject,
     pub allocator: *mut GstAllocator,
@@ -2003,8 +2060,8 @@ impl ::std::fmt::Debug for GstMemory {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMessage {
     pub mini_object: GstMiniObject,
     pub type_: GstMessageType,
@@ -2027,8 +2084,8 @@ impl ::std::fmt::Debug for GstMessage {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMeta {
     pub flags: GstMetaFlags,
     pub info: *const GstMetaInfo,
@@ -2043,8 +2100,8 @@ impl ::std::fmt::Debug for GstMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMetaInfo {
     pub api: GType,
     pub type_: GType,
@@ -2067,8 +2124,8 @@ impl ::std::fmt::Debug for GstMetaInfo {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMetaTransformCopy {
     pub region: gboolean,
     pub offset: size_t,
@@ -2085,8 +2142,8 @@ impl ::std::fmt::Debug for GstMetaTransformCopy {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstMiniObject {
     pub type_: GType,
     pub refcount: c_int,
@@ -2113,8 +2170,8 @@ impl ::std::fmt::Debug for GstMiniObject {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstObjectClass {
     pub parent_class: gobject::GInitiallyUnownedClass,
     pub path_string_separator: *const c_char,
@@ -2133,8 +2190,8 @@ impl ::std::fmt::Debug for GstObjectClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPadClass {
     pub parent_class: GstObjectClass,
     pub linked: Option<unsafe extern "C" fn(*mut GstPad, *mut GstPad)>,
@@ -2153,12 +2210,15 @@ impl ::std::fmt::Debug for GstPadClass {
 }
 
 #[repr(C)]
-pub struct _GstPadPrivate(c_void);
+pub struct _GstPadPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPadPrivate = *mut _GstPadPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPadProbeInfo {
     pub type_: GstPadProbeType,
     pub id: c_ulong,
@@ -2181,8 +2241,8 @@ impl ::std::fmt::Debug for GstPadProbeInfo {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPadProbeInfo_ABI_abi {
     pub flow_ret: GstFlowReturn,
 }
@@ -2195,8 +2255,8 @@ impl ::std::fmt::Debug for GstPadProbeInfo_ABI_abi {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPadTemplateClass {
     pub parent_class: GstObjectClass,
     pub pad_created: Option<unsafe extern "C" fn(*mut GstPadTemplate, *mut GstPad)>,
@@ -2212,8 +2272,8 @@ impl ::std::fmt::Debug for GstPadTemplateClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPadTemplate_ABI_abi {
     pub gtype: GType,
     pub documentation_caps: *mut GstCaps,
@@ -2228,8 +2288,8 @@ impl ::std::fmt::Debug for GstPadTemplate_ABI_abi {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPad_ABI_abi {
     pub last_flowret: GstFlowReturn,
     pub eventfullfunc: GstPadEventFullFunction,
@@ -2244,8 +2304,8 @@ impl ::std::fmt::Debug for GstPad_ABI_abi {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstParamSpecArray {
     pub parent_instance: gobject::GParamSpec,
     pub element_spec: *mut gobject::GParamSpec,
@@ -2260,8 +2320,8 @@ impl ::std::fmt::Debug for GstParamSpecArray {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstParamSpecFraction {
     pub parent_instance: gobject::GParamSpec,
     pub min_num: c_int,
@@ -2286,8 +2346,8 @@ impl ::std::fmt::Debug for GstParamSpecFraction {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstParentBufferMeta {
     pub parent: GstMeta,
     pub buffer: *mut GstBuffer,
@@ -2303,7 +2363,10 @@ impl ::std::fmt::Debug for GstParentBufferMeta {
 }
 
 #[repr(C)]
-pub struct GstParseContext(c_void);
+pub struct GstParseContext {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstParseContext {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2312,8 +2375,8 @@ impl ::std::fmt::Debug for GstParseContext {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPipelineClass {
     pub parent_class: GstBinClass,
     pub _gst_reserved: [gpointer; 4],
@@ -2328,17 +2391,23 @@ impl ::std::fmt::Debug for GstPipelineClass {
 }
 
 #[repr(C)]
-pub struct _GstPipelinePrivate(c_void);
+pub struct _GstPipelinePrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPipelinePrivate = *mut _GstPipelinePrivate;
 
 #[repr(C)]
-pub struct _GstPluginClass(c_void);
+pub struct _GstPluginClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPluginClass = *mut _GstPluginClass;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPluginDesc {
     pub major_version: c_int,
     pub minor_version: c_int,
@@ -2373,17 +2442,23 @@ impl ::std::fmt::Debug for GstPluginDesc {
 }
 
 #[repr(C)]
-pub struct _GstPluginFeatureClass(c_void);
+pub struct _GstPluginFeatureClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPluginFeatureClass = *mut _GstPluginFeatureClass;
 
 #[repr(C)]
-pub struct _GstPoll(c_void);
+pub struct _GstPoll {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstPoll = *mut _GstPoll;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPollFD {
     pub fd: c_int,
     pub idx: c_int,
@@ -2397,8 +2472,8 @@ impl ::std::fmt::Debug for GstPollFD {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPresetInterface {
     pub parent: gobject::GTypeInterface,
     pub get_preset_names: Option<unsafe extern "C" fn(*mut GstPreset) -> *mut *mut c_char>,
@@ -2443,8 +2518,8 @@ impl ::std::fmt::Debug for GstPresetInterface {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPromise {
     pub parent: GstMiniObject,
 }
@@ -2457,8 +2532,8 @@ impl ::std::fmt::Debug for GstPromise {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstProtectionMeta {
     pub meta: GstMeta,
     pub info: *mut GstStructure,
@@ -2473,8 +2548,8 @@ impl ::std::fmt::Debug for GstProtectionMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstProxyPadClass {
     pub parent_class: GstPadClass,
     pub _gst_reserved: [gpointer; 1],
@@ -2489,12 +2564,15 @@ impl ::std::fmt::Debug for GstProxyPadClass {
 }
 
 #[repr(C)]
-pub struct _GstProxyPadPrivate(c_void);
+pub struct _GstProxyPadPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstProxyPadPrivate = *mut _GstProxyPadPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstQuery {
     pub mini_object: GstMiniObject,
     pub type_: GstQueryType,
@@ -2509,8 +2587,8 @@ impl ::std::fmt::Debug for GstQuery {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstReferenceTimestampMeta {
     pub parent: GstMeta,
     pub reference: *mut GstCaps,
@@ -2529,8 +2607,8 @@ impl ::std::fmt::Debug for GstReferenceTimestampMeta {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRegistryClass {
     pub parent_class: GstObjectClass,
 }
@@ -2544,12 +2622,18 @@ impl ::std::fmt::Debug for GstRegistryClass {
 }
 
 #[repr(C)]
-pub struct _GstRegistryPrivate(c_void);
+pub struct _GstRegistryPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstRegistryPrivate = *mut _GstRegistryPrivate;
 
 #[repr(C)]
-pub struct GstSample(c_void);
+pub struct GstSample {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstSample {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2557,8 +2641,8 @@ impl ::std::fmt::Debug for GstSample {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSegment {
     pub flags: GstSegmentFlags,
     pub rate: c_double,
@@ -2592,8 +2676,8 @@ impl ::std::fmt::Debug for GstSegment {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSharedTaskPoolClass {
     pub parent_class: GstTaskPoolClass,
     pub _gst_reserved: [gpointer; 4],
@@ -2608,12 +2692,15 @@ impl ::std::fmt::Debug for GstSharedTaskPoolClass {
 }
 
 #[repr(C)]
-pub struct _GstSharedTaskPoolPrivate(c_void);
+pub struct _GstSharedTaskPoolPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstSharedTaskPoolPrivate = *mut _GstSharedTaskPoolPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstStaticCaps {
     pub caps: *mut GstCaps,
     pub string: *const c_char,
@@ -2629,8 +2716,8 @@ impl ::std::fmt::Debug for GstStaticCaps {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstStaticPadTemplate {
     pub name_template: *const c_char,
     pub direction: GstPadDirection,
@@ -2649,8 +2736,8 @@ impl ::std::fmt::Debug for GstStaticPadTemplate {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstStreamClass {
     pub parent_class: GstObjectClass,
     pub _gst_reserved: [gpointer; 4],
@@ -2664,8 +2751,8 @@ impl ::std::fmt::Debug for GstStreamClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstStreamCollectionClass {
     pub parent_class: GstObjectClass,
     pub stream_notify: Option<
@@ -2684,17 +2771,23 @@ impl ::std::fmt::Debug for GstStreamCollectionClass {
 }
 
 #[repr(C)]
-pub struct _GstStreamCollectionPrivate(c_void);
+pub struct _GstStreamCollectionPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstStreamCollectionPrivate = *mut _GstStreamCollectionPrivate;
 
 #[repr(C)]
-pub struct _GstStreamPrivate(c_void);
+pub struct _GstStreamPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstStreamPrivate = *mut _GstStreamPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstStructure {
     pub type_: GType,
     pub name: glib::GQuark,
@@ -2708,8 +2801,8 @@ impl ::std::fmt::Debug for GstStructure {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSystemClockClass {
     pub parent_class: GstClockClass,
     pub _gst_reserved: [gpointer; 4],
@@ -2724,12 +2817,15 @@ impl ::std::fmt::Debug for GstSystemClockClass {
 }
 
 #[repr(C)]
-pub struct _GstSystemClockPrivate(c_void);
+pub struct _GstSystemClockPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstSystemClockPrivate = *mut _GstSystemClockPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTagList {
     pub mini_object: GstMiniObject,
 }
@@ -2742,8 +2838,8 @@ impl ::std::fmt::Debug for GstTagList {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTagSetterInterface {
     pub g_iface: gobject::GTypeInterface,
 }
@@ -2756,8 +2852,8 @@ impl ::std::fmt::Debug for GstTagSetterInterface {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTaskClass {
     pub parent_class: GstObjectClass,
     pub pool: *mut GstTaskPool,
@@ -2772,8 +2868,8 @@ impl ::std::fmt::Debug for GstTaskClass {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTaskPoolClass {
     pub parent_class: GstObjectClass,
     pub prepare: Option<unsafe extern "C" fn(*mut GstTaskPool, *mut *mut glib::GError)>,
@@ -2805,12 +2901,15 @@ impl ::std::fmt::Debug for GstTaskPoolClass {
 }
 
 #[repr(C)]
-pub struct _GstTaskPrivate(c_void);
+pub struct _GstTaskPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstTaskPrivate = *mut _GstTaskPrivate;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTimedValue {
     pub timestamp: GstClockTime,
     pub value: c_double,
@@ -2826,7 +2925,10 @@ impl ::std::fmt::Debug for GstTimedValue {
 }
 
 #[repr(C)]
-pub struct GstToc(c_void);
+pub struct GstToc {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstToc {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2835,7 +2937,10 @@ impl ::std::fmt::Debug for GstToc {
 }
 
 #[repr(C)]
-pub struct GstTocEntry(c_void);
+pub struct GstTocEntry {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstTocEntry {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2844,8 +2949,8 @@ impl ::std::fmt::Debug for GstTocEntry {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTocSetterInterface {
     pub g_iface: gobject::GTypeInterface,
 }
@@ -2858,8 +2963,8 @@ impl ::std::fmt::Debug for GstTocSetterInterface {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTracerClass {
     pub parent_class: GstObjectClass,
     pub _gst_reserved: [gpointer; 4],
@@ -2874,22 +2979,31 @@ impl ::std::fmt::Debug for GstTracerClass {
 }
 
 #[repr(C)]
-pub struct _GstTracerFactoryClass(c_void);
+pub struct _GstTracerFactoryClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstTracerFactoryClass = *mut _GstTracerFactoryClass;
 
 #[repr(C)]
-pub struct _GstTracerPrivate(c_void);
+pub struct _GstTracerPrivate {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstTracerPrivate = *mut _GstTracerPrivate;
 
 #[repr(C)]
-pub struct _GstTracerRecordClass(c_void);
+pub struct _GstTracerRecordClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstTracerRecordClass = *mut _GstTracerRecordClass;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTypeFind {
     pub peek: Option<unsafe extern "C" fn(gpointer, i64, c_uint) -> *const u8>,
     pub suggest: Option<unsafe extern "C" fn(gpointer, c_uint, *mut GstCaps)>,
@@ -2910,12 +3024,15 @@ impl ::std::fmt::Debug for GstTypeFind {
 }
 
 #[repr(C)]
-pub struct _GstTypeFindFactoryClass(c_void);
+pub struct _GstTypeFindFactoryClass {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 pub type GstTypeFindFactoryClass = *mut _GstTypeFindFactoryClass;
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstURIHandlerInterface {
     pub parent: gobject::GTypeInterface,
     pub get_type: Option<unsafe extern "C" fn(GType) -> GstURIType>,
@@ -2939,7 +3056,10 @@ impl ::std::fmt::Debug for GstURIHandlerInterface {
 }
 
 #[repr(C)]
-pub struct GstUri(c_void);
+pub struct GstUri {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstUri {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -2947,8 +3067,8 @@ impl ::std::fmt::Debug for GstUri {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstValueTable {
     pub type_: GType,
     pub compare: GstValueCompareFunc,
@@ -2971,8 +3091,8 @@ impl ::std::fmt::Debug for GstValueTable {
 }
 
 // Classes
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstAllocator {
     pub object: GstObject,
     pub mem_type: *const c_char,
@@ -3003,8 +3123,8 @@ impl ::std::fmt::Debug for GstAllocator {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBin {
     pub element: GstElement,
     pub numchildren: c_int,
@@ -3040,7 +3160,10 @@ impl ::std::fmt::Debug for GstBin {
 }
 
 #[repr(C)]
-pub struct GstBitmask(c_void);
+pub struct GstBitmask {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstBitmask {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3048,8 +3171,8 @@ impl ::std::fmt::Debug for GstBitmask {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBufferPool {
     pub object: GstObject,
     pub flushing: c_int,
@@ -3066,8 +3189,8 @@ impl ::std::fmt::Debug for GstBufferPool {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstBus {
     pub object: GstObject,
     pub priv_: *mut GstBusPrivate,
@@ -3082,8 +3205,8 @@ impl ::std::fmt::Debug for GstBus {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstClock {
     pub object: GstObject,
     pub priv_: *mut GstClockPrivate,
@@ -3098,8 +3221,8 @@ impl ::std::fmt::Debug for GstClock {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstControlBinding {
     pub parent: GstObject,
     pub name: *mut c_char,
@@ -3120,8 +3243,8 @@ impl ::std::fmt::Debug for GstControlBinding {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstControlSource {
     pub parent: GstObject,
     pub get_value: GstControlSourceGetValue,
@@ -3139,8 +3262,8 @@ impl ::std::fmt::Debug for GstControlSource {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDevice {
     pub parent: GstObject,
     pub priv_: *mut GstDevicePrivate,
@@ -3155,8 +3278,8 @@ impl ::std::fmt::Debug for GstDevice {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDeviceMonitor {
     pub parent: GstObject,
     pub priv_: *mut GstDeviceMonitorPrivate,
@@ -3171,8 +3294,8 @@ impl ::std::fmt::Debug for GstDeviceMonitor {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstDeviceProvider {
     pub parent: GstObject,
     pub devices: *mut glib::GList,
@@ -3190,7 +3313,10 @@ impl ::std::fmt::Debug for GstDeviceProvider {
 }
 
 #[repr(C)]
-pub struct GstDeviceProviderFactory(c_void);
+pub struct GstDeviceProviderFactory {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstDeviceProviderFactory {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3200,7 +3326,10 @@ impl ::std::fmt::Debug for GstDeviceProviderFactory {
 }
 
 #[repr(C)]
-pub struct GstDoubleRange(c_void);
+pub struct GstDoubleRange {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstDoubleRange {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3210,7 +3339,10 @@ impl ::std::fmt::Debug for GstDoubleRange {
 }
 
 #[repr(C)]
-pub struct GstDynamicTypeFactory(c_void);
+pub struct GstDynamicTypeFactory {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstDynamicTypeFactory {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3219,8 +3351,8 @@ impl ::std::fmt::Debug for GstDynamicTypeFactory {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstElement {
     pub object: GstObject,
     pub state_lock: glib::GRecMutex,
@@ -3275,7 +3407,10 @@ impl ::std::fmt::Debug for GstElement {
 }
 
 #[repr(C)]
-pub struct GstElementFactory(c_void);
+pub struct GstElementFactory {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstElementFactory {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3285,7 +3420,10 @@ impl ::std::fmt::Debug for GstElementFactory {
 }
 
 #[repr(C)]
-pub struct GstFlagSet(c_void);
+pub struct GstFlagSet {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstFlagSet {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3294,7 +3432,10 @@ impl ::std::fmt::Debug for GstFlagSet {
 }
 
 #[repr(C)]
-pub struct GstFraction(c_void);
+pub struct GstFraction {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstFraction {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3304,7 +3445,10 @@ impl ::std::fmt::Debug for GstFraction {
 }
 
 #[repr(C)]
-pub struct GstFractionRange(c_void);
+pub struct GstFractionRange {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstFractionRange {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3313,8 +3457,8 @@ impl ::std::fmt::Debug for GstFractionRange {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstGhostPad {
     pub pad: GstProxyPad,
     pub priv_: *mut GstGhostPadPrivate,
@@ -3329,7 +3473,10 @@ impl ::std::fmt::Debug for GstGhostPad {
 }
 
 #[repr(C)]
-pub struct GstInt64Range(c_void);
+pub struct GstInt64Range {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstInt64Range {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3339,7 +3486,10 @@ impl ::std::fmt::Debug for GstInt64Range {
 }
 
 #[repr(C)]
-pub struct GstIntRange(c_void);
+pub struct GstIntRange {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstIntRange {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3348,8 +3498,8 @@ impl ::std::fmt::Debug for GstIntRange {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstObject {
     pub object: gobject::GInitiallyUnowned,
     pub lock: glib::GMutex,
@@ -3374,8 +3524,8 @@ impl ::std::fmt::Debug for GstObject {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPad {
     pub object: GstObject,
     pub element_private: gpointer,
@@ -3436,8 +3586,8 @@ impl ::std::fmt::Debug for GstPad {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPadTemplate {
     pub object: GstObject,
     pub name_template: *mut c_char,
@@ -3461,7 +3611,10 @@ impl ::std::fmt::Debug for GstPadTemplate {
 }
 
 #[repr(C)]
-pub struct GstParamArray(c_void);
+pub struct GstParamArray {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstParamArray {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3471,7 +3624,10 @@ impl ::std::fmt::Debug for GstParamArray {
 }
 
 #[repr(C)]
-pub struct GstParamFraction(c_void);
+pub struct GstParamFraction {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstParamFraction {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3480,8 +3636,8 @@ impl ::std::fmt::Debug for GstParamFraction {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstPipeline {
     pub bin: GstBin,
     pub fixed_clock: *mut GstClock,
@@ -3503,7 +3659,10 @@ impl ::std::fmt::Debug for GstPipeline {
 }
 
 #[repr(C)]
-pub struct GstPlugin(c_void);
+pub struct GstPlugin {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPlugin {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3512,7 +3671,10 @@ impl ::std::fmt::Debug for GstPlugin {
 }
 
 #[repr(C)]
-pub struct GstPluginFeature(c_void);
+pub struct GstPluginFeature {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPluginFeature {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3521,8 +3683,8 @@ impl ::std::fmt::Debug for GstPluginFeature {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstProxyPad {
     pub pad: GstPad,
     pub priv_: *mut GstProxyPadPrivate,
@@ -3536,8 +3698,8 @@ impl ::std::fmt::Debug for GstProxyPad {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstRegistry {
     pub object: GstObject,
     pub priv_: *mut GstRegistryPrivate,
@@ -3551,8 +3713,8 @@ impl ::std::fmt::Debug for GstRegistry {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSharedTaskPool {
     pub parent: GstTaskPool,
     pub priv_: *mut GstSharedTaskPoolPrivate,
@@ -3567,8 +3729,8 @@ impl ::std::fmt::Debug for GstSharedTaskPool {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstStream {
     pub object: GstObject,
     pub stream_id: *const c_char,
@@ -3584,8 +3746,8 @@ impl ::std::fmt::Debug for GstStream {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstStreamCollection {
     pub object: GstObject,
     pub upstream_id: *mut c_char,
@@ -3600,8 +3762,8 @@ impl ::std::fmt::Debug for GstStreamCollection {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstSystemClock {
     pub clock: GstClock,
     pub priv_: *mut GstSystemClockPrivate,
@@ -3616,8 +3778,8 @@ impl ::std::fmt::Debug for GstSystemClock {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTask {
     pub object: GstObject,
     pub state: GstTaskState,
@@ -3647,8 +3809,8 @@ impl ::std::fmt::Debug for GstTask {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTaskPool {
     pub object: GstObject,
     pub pool: *mut glib::GThreadPool,
@@ -3663,8 +3825,8 @@ impl ::std::fmt::Debug for GstTaskPool {
     }
 }
 
-#[repr(C)]
 #[derive(Copy, Clone)]
+#[repr(C)]
 pub struct GstTracer {
     pub parent: GstObject,
     pub priv_: *mut GstTracerPrivate,
@@ -3680,7 +3842,10 @@ impl ::std::fmt::Debug for GstTracer {
 }
 
 #[repr(C)]
-pub struct GstTracerFactory(c_void);
+pub struct GstTracerFactory {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstTracerFactory {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3690,7 +3855,10 @@ impl ::std::fmt::Debug for GstTracerFactory {
 }
 
 #[repr(C)]
-pub struct GstTracerRecord(c_void);
+pub struct GstTracerRecord {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstTracerRecord {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3700,7 +3868,10 @@ impl ::std::fmt::Debug for GstTracerRecord {
 }
 
 #[repr(C)]
-pub struct GstTypeFindFactory(c_void);
+pub struct GstTypeFindFactory {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstTypeFindFactory {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3710,7 +3881,10 @@ impl ::std::fmt::Debug for GstTypeFindFactory {
 }
 
 #[repr(C)]
-pub struct GstValueArray(c_void);
+pub struct GstValueArray {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstValueArray {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3720,7 +3894,10 @@ impl ::std::fmt::Debug for GstValueArray {
 }
 
 #[repr(C)]
-pub struct GstValueList(c_void);
+pub struct GstValueList {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstValueList {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3731,7 +3908,10 @@ impl ::std::fmt::Debug for GstValueList {
 
 // Interfaces
 #[repr(C)]
-pub struct GstChildProxy(c_void);
+pub struct GstChildProxy {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstChildProxy {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3740,7 +3920,10 @@ impl ::std::fmt::Debug for GstChildProxy {
 }
 
 #[repr(C)]
-pub struct GstPreset(c_void);
+pub struct GstPreset {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstPreset {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3749,7 +3932,10 @@ impl ::std::fmt::Debug for GstPreset {
 }
 
 #[repr(C)]
-pub struct GstTagSetter(c_void);
+pub struct GstTagSetter {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstTagSetter {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3758,7 +3944,10 @@ impl ::std::fmt::Debug for GstTagSetter {
 }
 
 #[repr(C)]
-pub struct GstTocSetter(c_void);
+pub struct GstTocSetter {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstTocSetter {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
@@ -3767,7 +3956,10 @@ impl ::std::fmt::Debug for GstTocSetter {
 }
 
 #[repr(C)]
-pub struct GstURIHandler(c_void);
+pub struct GstURIHandler {
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 impl ::std::fmt::Debug for GstURIHandler {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
diff --git a/gstreamer/sys/tests/abi.rs b/gstreamer/sys/tests/abi.rs
index 845ba6cf8..80aa9ddef 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 a5780fd3e..d204e8860 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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 c5fd3cc70..dad0071bd 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 @ df67128a87f0)
+// Generated by gir (https://github.com/gtk-rs/gir @ 61d2f713d84d)
 // from 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