diff --git a/Gir_Gst.toml b/Gir_Gst.toml
index d6ee970ae..e5485eaf9 100644
--- a/Gir_Gst.toml
+++ b/Gir_Gst.toml
@@ -50,11 +50,9 @@ generate = [
     "Gst.ChildProxy",
     "Gst.TagSetter",
     "Gst.QOSType",
-    "Gst.EventType",
     "Gst.TocSetter",
     "Gst.ClockType",
     "Gst.ElementFlags",
-    "Gst.Rank",
     "Gst.PadLinkCheck",
     "Gst.DebugLevel",
     "Gst.DebugColorFlags",
@@ -64,7 +62,6 @@ generate = [
     "Gst.TaskState",
     "Gst.PluginDependencyFlags",
     "Gst.DateTime",
-    "Gst.TypeFindProbability",
     "Gst.BufferPoolAcquireFlags",
     "Gst.PromiseResult",
 ]
@@ -156,6 +153,8 @@ status = "generate"
     [[object.derive]]
     name = "Serialize, Deserialize"
     cfg_condition = "feature = \"ser_de\""
+    [[object.derive]]
+    name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash"
 
 [[object]]
 name = "Gst.SegmentFlags"
@@ -170,6 +169,8 @@ status = "generate"
     [[object.derive]]
     name = "Serialize, Deserialize"
     cfg_condition = "feature = \"ser_de\""
+    [[object.derive]]
+    name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash"
 
 [[object]]
 name = "Gst.TocEntryType"
@@ -177,6 +178,8 @@ status = "generate"
     [[object.derive]]
     name = "Serialize, Deserialize"
     cfg_condition = "feature = \"ser_de\""
+    [[object.derive]]
+    name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash"
 
 [[object]]
 name = "Gst.TocLoopType"
@@ -184,6 +187,26 @@ status = "generate"
     [[object.derive]]
     name = "Serialize, Deserialize"
     cfg_condition = "feature = \"ser_de\""
+    [[object.derive]]
+    name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash"
+
+[[object]]
+name = "Gst.Rank"
+status = "generate"
+    [[object.derive]]
+    name = "Debug, PartialEq, Eq, Hash"
+
+[[object]]
+name = "Gst.TypeFindProbability"
+status = "generate"
+    [[object.derive]]
+    name = "Debug, PartialEq, Eq, Hash"
+
+[[object]]
+name = "Gst.EventType"
+status = "generate"
+    [[object.derive]]
+    name = "Debug, PartialEq, Eq, Hash"
 
 [[object]]
 name = "Gst.Structure"
diff --git a/gstreamer-app/src/auto/enums.rs b/gstreamer-app/src/auto/enums.rs
index b980d4118..924df7518 100644
--- a/gstreamer-app/src/auto/enums.rs
+++ b/gstreamer-app/src/auto/enums.rs
@@ -12,7 +12,8 @@ use glib::value::SetValue;
 use glib::value::Value;
 use gobject_ffi;
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum AppStreamType {
     Stream,
     Seekable,
diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt
index 4cb9e90ba..59fe339ba 100644
--- a/gstreamer-app/src/auto/versions.txt
+++ b/gstreamer-app/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
+Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-audio/src/auto/audio_stream_align.rs b/gstreamer-audio/src/auto/audio_stream_align.rs
index 11c9b37f1..9fead9394 100644
--- a/gstreamer-audio/src/auto/audio_stream_align.rs
+++ b/gstreamer-audio/src/auto/audio_stream_align.rs
@@ -12,6 +12,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct AudioStreamAlign(Boxed<ffi::GstAudioStreamAlign>);
 
     match fn {
diff --git a/gstreamer-audio/src/auto/enums.rs b/gstreamer-audio/src/auto/enums.rs
index 8ed2144fb..38915215d 100644
--- a/gstreamer-audio/src/auto/enums.rs
+++ b/gstreamer-audio/src/auto/enums.rs
@@ -12,7 +12,8 @@ use glib::value::SetValue;
 use glib::value::Value;
 use gobject_ffi;
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum AudioChannelPosition {
     None,
     Mono,
@@ -156,7 +157,8 @@ impl SetValue for AudioChannelPosition {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum AudioFormat {
     Unknown,
     Encoded,
@@ -303,7 +305,8 @@ impl SetValue for AudioFormat {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum AudioLayout {
     Interleaved,
     NonInterleaved,
@@ -360,7 +363,8 @@ impl SetValue for AudioLayout {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum StreamVolumeFormat {
     Linear,
     Cubic,
diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt
index 4cb9e90ba..59fe339ba 100644
--- a/gstreamer-audio/src/auto/versions.txt
+++ b/gstreamer-audio/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
+Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt
index 4cb9e90ba..59fe339ba 100644
--- a/gstreamer-base/src/auto/versions.txt
+++ b/gstreamer-base/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
+Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt
index 4cb9e90ba..59fe339ba 100644
--- a/gstreamer-net/src/auto/versions.txt
+++ b/gstreamer-net/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
+Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-pbutils/src/auto/enums.rs b/gstreamer-pbutils/src/auto/enums.rs
index 366381423..37f60915c 100644
--- a/gstreamer-pbutils/src/auto/enums.rs
+++ b/gstreamer-pbutils/src/auto/enums.rs
@@ -12,7 +12,8 @@ use glib::value::SetValue;
 use glib::value::Value;
 use gobject_ffi;
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum DiscovererResult {
     Ok,
     UriInvalid,
diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt
index 4cb9e90ba..59fe339ba 100644
--- a/gstreamer-pbutils/src/auto/versions.txt
+++ b/gstreamer-pbutils/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
+Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-player/src/auto/enums.rs b/gstreamer-player/src/auto/enums.rs
index 8be7cf7bd..0bd329142 100644
--- a/gstreamer-player/src/auto/enums.rs
+++ b/gstreamer-player/src/auto/enums.rs
@@ -14,7 +14,8 @@ use glib::value::SetValue;
 use glib::value::Value;
 use gobject_ffi;
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum PlayerColorBalanceType {
     Hue,
     Brightness,
@@ -77,7 +78,8 @@ impl SetValue for PlayerColorBalanceType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum PlayerError {
     Failed,
     #[doc(hidden)]
@@ -150,7 +152,8 @@ impl SetValue for PlayerError {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum PlayerSnapshotFormat {
     RawNative,
     RawXrgb,
@@ -192,7 +195,8 @@ impl FromGlib<ffi::GstPlayerSnapshotFormat> for PlayerSnapshotFormat {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum PlayerState {
     Stopped,
     Buffering,
diff --git a/gstreamer-player/src/auto/player_visualization.rs b/gstreamer-player/src/auto/player_visualization.rs
index 18b26a4b6..a13e96d0e 100644
--- a/gstreamer-player/src/auto/player_visualization.rs
+++ b/gstreamer-player/src/auto/player_visualization.rs
@@ -10,6 +10,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct PlayerVisualization(Boxed<ffi::GstPlayerVisualization>);
 
     match fn {
diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt
index 4cb9e90ba..59fe339ba 100644
--- a/gstreamer-player/src/auto/versions.txt
+++ b/gstreamer-player/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
+Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-rtsp-server/src/auto/enums.rs b/gstreamer-rtsp-server/src/auto/enums.rs
index 0d9c15c22..1da847333 100644
--- a/gstreamer-rtsp-server/src/auto/enums.rs
+++ b/gstreamer-rtsp-server/src/auto/enums.rs
@@ -12,7 +12,8 @@ use glib::value::SetValue;
 use glib::value::Value;
 use gobject_ffi;
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPAddressPoolResult {
     Ok,
     Einval,
@@ -54,7 +55,8 @@ impl FromGlib<ffi::GstRTSPAddressPoolResult> for RTSPAddressPoolResult {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPMediaStatus {
     Unprepared,
     Unpreparing,
@@ -99,7 +101,8 @@ impl FromGlib<ffi::GstRTSPMediaStatus> for RTSPMediaStatus {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPPublishClockMode {
     None,
     Clock,
@@ -159,7 +162,8 @@ impl SetValue for RTSPPublishClockMode {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPSuspendMode {
     None,
     Pause,
@@ -219,7 +223,8 @@ impl SetValue for RTSPSuspendMode {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPThreadType {
     Client,
     Media,
diff --git a/gstreamer-rtsp-server/src/auto/rtsp_address.rs b/gstreamer-rtsp-server/src/auto/rtsp_address.rs
index 676ae49e0..2e591f7ba 100644
--- a/gstreamer-rtsp-server/src/auto/rtsp_address.rs
+++ b/gstreamer-rtsp-server/src/auto/rtsp_address.rs
@@ -10,6 +10,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct RTSPAddress(Boxed<ffi::GstRTSPAddress>);
 
     match fn {
diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt
index 4cb9e90ba..59fe339ba 100644
--- a/gstreamer-rtsp-server/src/auto/versions.txt
+++ b/gstreamer-rtsp-server/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
+Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-rtsp/src/auto/enums.rs b/gstreamer-rtsp/src/auto/enums.rs
index 89bed7281..1dadaafaa 100644
--- a/gstreamer-rtsp/src/auto/enums.rs
+++ b/gstreamer-rtsp/src/auto/enums.rs
@@ -12,7 +12,8 @@ use glib::value::SetValue;
 use glib::value::Value;
 use gobject_ffi;
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPAuthMethod {
     None,
     Basic,
@@ -72,7 +73,8 @@ impl SetValue for RTSPAuthMethod {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPFamily {
     None,
     Inet,
@@ -132,7 +134,8 @@ impl SetValue for RTSPFamily {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPHeaderField {
     Invalid,
     Accept,
@@ -447,7 +450,8 @@ impl SetValue for RTSPHeaderField {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPMsgType {
     Invalid,
     Request,
@@ -516,7 +520,8 @@ impl SetValue for RTSPMsgType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPRangeUnit {
     Smpte,
     Smpte30Drop,
@@ -582,7 +587,8 @@ impl SetValue for RTSPRangeUnit {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPResult {
     Ok,
     Error,
@@ -687,7 +693,8 @@ impl SetValue for RTSPResult {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPState {
     Invalid,
     Init,
@@ -756,7 +763,8 @@ impl SetValue for RTSPState {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPStatusCode {
     Invalid,
     Continue,
@@ -945,7 +953,8 @@ impl SetValue for RTSPStatusCode {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum RTSPTimeType {
     Seconds,
     Now,
diff --git a/gstreamer-rtsp/src/auto/rtsp_auth_param.rs b/gstreamer-rtsp/src/auto/rtsp_auth_param.rs
index 5f6b55f10..fe401406e 100644
--- a/gstreamer-rtsp/src/auto/rtsp_auth_param.rs
+++ b/gstreamer-rtsp/src/auto/rtsp_auth_param.rs
@@ -10,6 +10,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct RTSPAuthParam(Boxed<ffi::GstRTSPAuthParam>);
 
     match fn {
diff --git a/gstreamer-rtsp/src/auto/rtsp_url.rs b/gstreamer-rtsp/src/auto/rtsp_url.rs
index 4eadfccd4..c41de260c 100644
--- a/gstreamer-rtsp/src/auto/rtsp_url.rs
+++ b/gstreamer-rtsp/src/auto/rtsp_url.rs
@@ -11,6 +11,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct RTSPUrl(Boxed<ffi::GstRTSPUrl>);
 
     match fn {
diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt
index 4cb9e90ba..59fe339ba 100644
--- a/gstreamer-rtsp/src/auto/versions.txt
+++ b/gstreamer-rtsp/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
+Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-sdp/src/auto/enums.rs b/gstreamer-sdp/src/auto/enums.rs
index 75de400d4..39b677b22 100644
--- a/gstreamer-sdp/src/auto/enums.rs
+++ b/gstreamer-sdp/src/auto/enums.rs
@@ -5,7 +5,8 @@
 use ffi;
 use glib::translate::*;
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum MIKEYCacheType {
     None,
     Always,
@@ -41,7 +42,8 @@ impl FromGlib<ffi::GstMIKEYCacheType> for MIKEYCacheType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum MIKEYEncAlg {
     Null,
     AesCm128,
@@ -77,7 +79,8 @@ impl FromGlib<ffi::GstMIKEYEncAlg> for MIKEYEncAlg {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum MIKEYKVType {
     Null,
     Spi,
@@ -113,7 +116,8 @@ impl FromGlib<ffi::GstMIKEYKVType> for MIKEYKVType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum MIKEYKeyDataType {
     Tgk,
     Tek,
@@ -146,7 +150,8 @@ impl FromGlib<ffi::GstMIKEYKeyDataType> for MIKEYKeyDataType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum MIKEYMacAlg {
     Null,
     HmacSha1160,
@@ -179,7 +184,8 @@ impl FromGlib<ffi::GstMIKEYMacAlg> for MIKEYMacAlg {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum MIKEYMapType {
     MikeyMapTypeSrtp,
     #[doc(hidden)]
@@ -209,7 +215,8 @@ impl FromGlib<ffi::GstMIKEYMapType> for MIKEYMapType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum MIKEYPRFFunc {
     MikeyPrfMikey1,
     #[doc(hidden)]
@@ -239,7 +246,8 @@ impl FromGlib<ffi::GstMIKEYPRFFunc> for MIKEYPRFFunc {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum MIKEYPayloadType {
     Last,
     Kemac,
@@ -311,7 +319,8 @@ impl FromGlib<ffi::GstMIKEYPayloadType> for MIKEYPayloadType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum MIKEYSecProto {
     MikeySecProtoSrtp,
     #[doc(hidden)]
@@ -341,7 +350,8 @@ impl FromGlib<ffi::GstMIKEYSecProto> for MIKEYSecProto {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum MIKEYSecSRTP {
     EncAlg,
     EncKeyLen,
@@ -407,7 +417,8 @@ impl FromGlib<ffi::GstMIKEYSecSRTP> for MIKEYSecSRTP {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum MIKEYTSType {
     NtpUtc,
     Ntp,
@@ -443,7 +454,8 @@ impl FromGlib<ffi::GstMIKEYTSType> for MIKEYTSType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum MIKEYType {
     Invalid,
     PskInit,
diff --git a/gstreamer-sdp/src/auto/mikey_message.rs b/gstreamer-sdp/src/auto/mikey_message.rs
index 35cb1fd05..8b486123b 100644
--- a/gstreamer-sdp/src/auto/mikey_message.rs
+++ b/gstreamer-sdp/src/auto/mikey_message.rs
@@ -17,6 +17,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct MIKEYMessage(Boxed<ffi::GstMIKEYMessage>);
 
     match fn {
diff --git a/gstreamer-sdp/src/auto/mikey_payload.rs b/gstreamer-sdp/src/auto/mikey_payload.rs
index 761f26a42..a5226ec7d 100644
--- a/gstreamer-sdp/src/auto/mikey_payload.rs
+++ b/gstreamer-sdp/src/auto/mikey_payload.rs
@@ -16,6 +16,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct MIKEYPayload(Boxed<ffi::GstMIKEYPayload>);
 
     match fn {
diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt
index 4cb9e90ba..59fe339ba 100644
--- a/gstreamer-sdp/src/auto/versions.txt
+++ b/gstreamer-sdp/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
+Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-video/src/auto/enums.rs b/gstreamer-video/src/auto/enums.rs
index 3a40aea52..502ddb0b3 100644
--- a/gstreamer-video/src/auto/enums.rs
+++ b/gstreamer-video/src/auto/enums.rs
@@ -12,7 +12,8 @@ use glib::value::SetValue;
 use glib::value::Value;
 use gobject_ffi;
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum VideoColorMatrix {
     Unknown,
     Rgb,
@@ -84,7 +85,8 @@ impl SetValue for VideoColorMatrix {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum VideoColorPrimaries {
     Unknown,
     Bt709,
@@ -163,7 +165,8 @@ impl SetValue for VideoColorPrimaries {
 }
 
 #[cfg(any(feature = "v1_12", feature = "dox"))]
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum VideoFieldOrder {
     Unknown,
     TopFieldFirst,
@@ -229,7 +232,8 @@ impl SetValue for VideoFieldOrder {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum VideoFormat {
     Unknown,
     Encoded,
@@ -523,7 +527,8 @@ impl SetValue for VideoFormat {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum VideoInterlaceMode {
     Progressive,
     Interleaved,
@@ -586,7 +591,8 @@ impl SetValue for VideoInterlaceMode {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum VideoMultiviewFramePacking {
     None,
     Mono,
@@ -667,7 +673,8 @@ impl SetValue for VideoMultiviewFramePacking {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum VideoMultiviewMode {
     None,
     Mono,
@@ -757,7 +764,8 @@ impl SetValue for VideoMultiviewMode {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum VideoTileMode {
     Unknown,
     Zflipz2x2,
@@ -814,7 +822,8 @@ impl SetValue for VideoTileMode {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum VideoTransferFunction {
     Unknown,
     Gamma10,
diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt
index 4cb9e90ba..59fe339ba 100644
--- a/gstreamer-video/src/auto/versions.txt
+++ b/gstreamer-video/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
+Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-webrtc/src/auto/enums.rs b/gstreamer-webrtc/src/auto/enums.rs
index d73dbcfe7..a722ea24f 100644
--- a/gstreamer-webrtc/src/auto/enums.rs
+++ b/gstreamer-webrtc/src/auto/enums.rs
@@ -12,7 +12,8 @@ use glib::value::SetValue;
 use glib::value::Value;
 use gobject_ffi;
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum WebRTCDTLSSetup {
     None,
     Actpass,
@@ -75,7 +76,8 @@ impl SetValue for WebRTCDTLSSetup {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum WebRTCDTLSTransportState {
     New,
     Closed,
@@ -141,7 +143,8 @@ impl SetValue for WebRTCDTLSTransportState {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum WebRTCICEComponent {
     Rtp,
     Rtcp,
@@ -198,7 +201,8 @@ impl SetValue for WebRTCICEComponent {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum WebRTCICEConnectionState {
     New,
     Checking,
@@ -270,7 +274,8 @@ impl SetValue for WebRTCICEConnectionState {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum WebRTCICEGatheringState {
     New,
     Gathering,
@@ -330,7 +335,8 @@ impl SetValue for WebRTCICEGatheringState {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum WebRTCICERole {
     Controlled,
     Controlling,
@@ -387,7 +393,8 @@ impl SetValue for WebRTCICERole {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum WebRTCPeerConnectionState {
     New,
     Connecting,
@@ -456,7 +463,8 @@ impl SetValue for WebRTCPeerConnectionState {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum WebRTCRTPTransceiverDirection {
     None,
     Inactive,
@@ -522,7 +530,8 @@ impl SetValue for WebRTCRTPTransceiverDirection {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum WebRTCSDPType {
     Offer,
     Pranswer,
@@ -585,7 +594,8 @@ impl SetValue for WebRTCSDPType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum WebRTCSignalingState {
     Stable,
     Closed,
@@ -654,7 +664,8 @@ impl SetValue for WebRTCSignalingState {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum WebRTCStatsType {
     Codec,
     InboundRtp,
diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt
index 4cb9e90ba..59fe339ba 100644
--- a/gstreamer-webrtc/src/auto/versions.txt
+++ b/gstreamer-webrtc/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
+Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)
diff --git a/gstreamer-webrtc/src/auto/web_rtc_session_description.rs b/gstreamer-webrtc/src/auto/web_rtc_session_description.rs
index d7508dd24..0a000d839 100644
--- a/gstreamer-webrtc/src/auto/web_rtc_session_description.rs
+++ b/gstreamer-webrtc/src/auto/web_rtc_session_description.rs
@@ -10,6 +10,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct WebRTCSessionDescription(Boxed<ffi::GstWebRTCSessionDescription>);
 
     match fn {
diff --git a/gstreamer/src/auto/date_time.rs b/gstreamer/src/auto/date_time.rs
index 368677cb2..1df707921 100644
--- a/gstreamer/src/auto/date_time.rs
+++ b/gstreamer/src/auto/date_time.rs
@@ -11,6 +11,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct DateTime(Shared<ffi::GstDateTime>);
 
     match fn {
diff --git a/gstreamer/src/auto/enums.rs b/gstreamer/src/auto/enums.rs
index 917131e4a..43deb5ebb 100644
--- a/gstreamer/src/auto/enums.rs
+++ b/gstreamer/src/auto/enums.rs
@@ -14,7 +14,8 @@ use glib::value::SetValue;
 use glib::value::Value;
 use gobject_ffi;
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum BufferingMode {
     Stream,
     Download,
@@ -77,7 +78,8 @@ impl SetValue for BufferingMode {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum BusSyncReply {
     Drop,
     Pass,
@@ -137,7 +139,8 @@ impl SetValue for BusSyncReply {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum CapsIntersectMode {
     ZigZag,
     First,
@@ -194,8 +197,9 @@ impl SetValue for CapsIntersectMode {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
 #[must_use]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum ClockReturn {
     Ok,
     Early,
@@ -270,7 +274,8 @@ impl SetValue for ClockReturn {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum ClockType {
     Realtime,
     Monotonic,
@@ -330,7 +335,8 @@ impl SetValue for ClockType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum CoreError {
     Failed,
     TooLazy,
@@ -459,7 +465,8 @@ impl SetValue for CoreError {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum DebugLevel {
     None,
     Error,
@@ -540,7 +547,8 @@ impl SetValue for DebugLevel {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+    #[derive(Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Copy)]
 pub enum EventType {
     Unknown,
     FlushStart,
@@ -681,8 +689,9 @@ impl SetValue for EventType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
 #[must_use]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum FlowReturn {
     CustomSuccess2,
     CustomSuccess1,
@@ -772,8 +781,9 @@ impl SetValue for FlowReturn {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
-#[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))]
+    #[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))]
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Clone, Copy)]
 pub enum Format {
     Undefined,
     Default,
@@ -842,7 +852,8 @@ impl SetValue for Format {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum LibraryError {
     Failed,
     TooLazy,
@@ -939,7 +950,8 @@ impl SetValue for LibraryError {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum PadDirection {
     Unknown,
     Src,
@@ -999,8 +1011,9 @@ impl SetValue for PadDirection {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
 #[must_use]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum PadLinkReturn {
     Ok,
     WrongHierarchy,
@@ -1072,7 +1085,8 @@ impl SetValue for PadLinkReturn {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum PadMode {
     None,
     Push,
@@ -1132,7 +1146,8 @@ impl SetValue for PadMode {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum PadPresence {
     Always,
     Sometimes,
@@ -1192,7 +1207,8 @@ impl SetValue for PadPresence {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum PadProbeReturn {
     Drop,
     Ok,
@@ -1258,7 +1274,8 @@ impl SetValue for PadProbeReturn {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum ParseError {
     Syntax,
     NoSuchElement,
@@ -1359,7 +1376,8 @@ impl SetValue for ParseError {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum PluginError {
     Module,
     Dependencies,
@@ -1440,7 +1458,8 @@ impl SetValue for PluginError {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum ProgressType {
     Start,
     Continue,
@@ -1507,7 +1526,8 @@ impl SetValue for ProgressType {
 }
 
 #[cfg(any(feature = "v1_14", feature = "dox"))]
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum PromiseResult {
     Pending,
     Interrupted,
@@ -1576,7 +1596,8 @@ impl SetValue for PromiseResult {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum QOSType {
     Overflow,
     Underflow,
@@ -1636,7 +1657,8 @@ impl SetValue for QOSType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+    #[derive(Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Copy)]
 pub enum Rank {
     None,
     Marginal,
@@ -1699,7 +1721,8 @@ impl SetValue for Rank {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum ResourceError {
     Failed,
     TooLazy,
@@ -1832,7 +1855,8 @@ impl SetValue for ResourceError {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum SeekType {
     None,
     Set,
@@ -1892,7 +1916,8 @@ impl SetValue for SeekType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum State {
     VoidPending,
     Null,
@@ -1958,7 +1983,8 @@ impl SetValue for State {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum StateChange {
     NullToReady,
     ReadyToPaused,
@@ -2039,8 +2065,9 @@ impl SetValue for StateChange {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
 #[must_use]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum StateChangeReturn {
     Failure,
     Success,
@@ -2103,7 +2130,8 @@ impl SetValue for StateChangeReturn {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum StreamError {
     Failed,
     TooLazy,
@@ -2228,7 +2256,8 @@ impl SetValue for StreamError {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum StreamStatusType {
     Create,
     Enter,
@@ -2300,7 +2329,8 @@ impl SetValue for StreamStatusType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum StructureChangeType {
     Link,
     Unlink,
@@ -2357,7 +2387,8 @@ impl SetValue for StructureChangeType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum TagMergeMode {
     Undefined,
     ReplaceAll,
@@ -2432,7 +2463,8 @@ impl SetValue for TagMergeMode {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum TaskState {
     Started,
     Stopped,
@@ -2492,8 +2524,9 @@ impl SetValue for TaskState {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
-#[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))]
+    #[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))]
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Clone, Copy)]
 pub enum TocEntryType {
     Angle,
     Version,
@@ -2565,8 +2598,9 @@ impl SetValue for TocEntryType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
-#[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))]
+    #[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))]
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Clone, Copy)]
 pub enum TocLoopType {
     None,
     Forward,
@@ -2629,8 +2663,9 @@ impl SetValue for TocLoopType {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
-#[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))]
+    #[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))]
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Clone, Copy)]
 pub enum TocScope {
     Global,
     Current,
@@ -2687,7 +2722,8 @@ impl SetValue for TocScope {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+    #[derive(Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Copy)]
 pub enum TypeFindProbability {
     None,
     Minimum,
@@ -2756,7 +2792,8 @@ impl SetValue for TypeFindProbability {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum URIError {
     UnsupportedProtocol,
     BadUri,
@@ -2841,7 +2878,8 @@ impl SetValue for URIError {
     }
 }
 
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Clone, Copy)]
 pub enum URIType {
     Unknown,
     Sink,
diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt
index 4cb9e90ba..59fe339ba 100644
--- a/gstreamer/src/auto/versions.txt
+++ b/gstreamer/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ bec7561)
+Generated by gir (https://github.com/gtk-rs/gir @ 04c26a8)
 from gir-files (https://github.com/gtk-rs/gir-files @ ???)