diff --git a/atk/src/auto/util.rs b/atk/src/auto/util.rs
index ae9f89b75ee6..d5657bf34034 100644
--- a/atk/src/auto/util.rs
+++ b/atk/src/auto/util.rs
@@ -2,7 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
 use std::fmt;
 
 glib::wrapper! {
diff --git a/atk/src/auto/versions.txt b/atk/src/auto/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/atk/src/auto/versions.txt
+++ b/atk/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/atk/sys/src/lib.rs b/atk/sys/src/lib.rs
index bce5341b6e78..3a298a88eeed 100644
--- a/atk/sys/src/lib.rs
+++ b/atk/sys/src/lib.rs
@@ -373,7 +373,7 @@ impl ::std::fmt::Debug for AtkActionIface {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct AtkAttribute {
     pub name: *mut c_char,
     pub value: *mut c_char,
@@ -652,7 +652,7 @@ pub struct _AtkImplementor(c_void);
 pub type AtkImplementor = *mut _AtkImplementor;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct AtkKeyEventStruct {
     pub type_: c_int,
     pub state: c_uint,
@@ -844,7 +844,7 @@ impl ::std::fmt::Debug for AtkPlugClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct AtkPropertyValues {
     pub property_name: *const c_char,
     pub old_value: gobject::GValue,
@@ -1282,7 +1282,7 @@ impl ::std::fmt::Debug for AtkTextIface {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct AtkTextRange {
     pub bounds: AtkTextRectangle,
     pub start_offset: c_int,
@@ -1475,7 +1475,7 @@ impl ::std::fmt::Debug for AtkNoOpObjectFactory {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct AtkObject {
     pub parent: gobject::GObject,
     pub description: *mut c_char,
@@ -1529,7 +1529,7 @@ impl ::std::fmt::Debug for AtkPlug {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct AtkRegistry {
     pub parent: gobject::GObject,
     pub factory_type_registry: *mut glib::GHashTable,
@@ -1547,7 +1547,7 @@ impl ::std::fmt::Debug for AtkRegistry {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct AtkRelation {
     pub parent: gobject::GObject,
     pub target: *mut glib::GPtrArray,
@@ -1565,7 +1565,7 @@ impl ::std::fmt::Debug for AtkRelation {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct AtkRelationSet {
     pub parent: gobject::GObject,
     pub relations: *mut glib::GPtrArray,
@@ -1581,7 +1581,7 @@ impl ::std::fmt::Debug for AtkRelationSet {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct AtkSocket {
     pub parent: AtkObject,
     pub embedded_plug_id: *mut c_char,
diff --git a/atk/sys/tests/abi.rs b/atk/sys/tests/abi.rs
index 3a05b11a254d..edf485719ff6 100644
--- a/atk/sys/tests/abi.rs
+++ b/atk/sys/tests/abi.rs
@@ -5,6 +5,7 @@
 use atk_sys::*;
 use std::env;
 use std::error::Error;
+use std::ffi::OsString;
 use std::mem::{align_of, size_of};
 use std::path::Path;
 use std::process::Command;
@@ -69,7 +70,8 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     if packages.is_empty() {
         return Ok(Vec::new());
     }
-    let mut cmd = Command::new("pkg-config");
+    let pkg_config = env::var_os("PKG_CONFIG").unwrap_or_else(|| OsString::from("pkg-config"));
+    let mut cmd = Command::new(pkg_config);
     cmd.arg("--cflags");
     cmd.args(packages);
     let out = cmd.output()?;
diff --git a/atk/sys/versions.txt b/atk/sys/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/atk/sys/versions.txt
+++ b/atk/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/gdk-pixbuf/src/auto/pixbuf_format.rs b/gdk-pixbuf/src/auto/pixbuf_format.rs
index 9d86bb9d1607..be5a177b02b7 100644
--- a/gdk-pixbuf/src/auto/pixbuf_format.rs
+++ b/gdk-pixbuf/src/auto/pixbuf_format.rs
@@ -9,7 +9,7 @@ glib::wrapper! {
     pub struct PixbufFormat(Boxed<ffi::GdkPixbufFormat>);
 
     match fn {
-        copy => |ptr| ffi::gdk_pixbuf_format_copy(mut_override(ptr)),
+        copy => |ptr| ffi::gdk_pixbuf_format_copy(ptr),
         free => |ptr| ffi::gdk_pixbuf_format_free(ptr),
         get_type => || ffi::gdk_pixbuf_format_get_type(),
     }
diff --git a/gdk-pixbuf/src/auto/versions.txt b/gdk-pixbuf/src/auto/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/gdk-pixbuf/src/auto/versions.txt
+++ b/gdk-pixbuf/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/gdk-pixbuf/sys/src/lib.rs b/gdk-pixbuf/sys/src/lib.rs
index 4206dbe1f947..7acbc1025031 100644
--- a/gdk-pixbuf/sys/src/lib.rs
+++ b/gdk-pixbuf/sys/src/lib.rs
@@ -132,7 +132,7 @@ impl ::std::fmt::Debug for GdkPixbufAnimationIterClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkPixbufFormat {
     pub name: *mut c_char,
     pub signature: *mut GdkPixbufModulePattern,
@@ -185,7 +185,7 @@ impl ::std::fmt::Debug for GdkPixbufLoaderClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkPixbufModule {
     pub module_name: *mut c_char,
     pub module_path: *mut c_char,
@@ -259,7 +259,7 @@ impl ::std::fmt::Debug for GdkPixbufModule {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkPixbufModulePattern {
     pub prefix: *mut c_char,
     pub mask: *mut c_char,
diff --git a/gdk-pixbuf/sys/tests/abi.rs b/gdk-pixbuf/sys/tests/abi.rs
index 33743d75ac75..12cd5a11794b 100644
--- a/gdk-pixbuf/sys/tests/abi.rs
+++ b/gdk-pixbuf/sys/tests/abi.rs
@@ -5,6 +5,7 @@
 use gdk_pixbuf_sys::*;
 use std::env;
 use std::error::Error;
+use std::ffi::OsString;
 use std::mem::{align_of, size_of};
 use std::path::Path;
 use std::process::Command;
@@ -69,7 +70,8 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     if packages.is_empty() {
         return Ok(Vec::new());
     }
-    let mut cmd = Command::new("pkg-config");
+    let pkg_config = env::var_os("PKG_CONFIG").unwrap_or_else(|| OsString::from("pkg-config"));
+    let mut cmd = Command::new(pkg_config);
     cmd.arg("--cflags");
     cmd.args(packages);
     let out = cmd.output()?;
diff --git a/gdk-pixbuf/sys/versions.txt b/gdk-pixbuf/sys/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/gdk-pixbuf/sys/versions.txt
+++ b/gdk-pixbuf/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/gdk/src/auto/device_pad.rs b/gdk/src/auto/device_pad.rs
index 702aca045a0a..45d38d006e88 100644
--- a/gdk/src/auto/device_pad.rs
+++ b/gdk/src/auto/device_pad.rs
@@ -7,6 +7,8 @@ use crate::Device;
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_22")))]
 use crate::DevicePadFeature;
 use glib::object::IsA;
+#[cfg(any(feature = "v3_22", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_22")))]
 use glib::translate::*;
 use std::fmt;
 
diff --git a/gdk/src/auto/drawing_context.rs b/gdk/src/auto/drawing_context.rs
index 161db542cbd6..5c8636900a60 100644
--- a/gdk/src/auto/drawing_context.rs
+++ b/gdk/src/auto/drawing_context.rs
@@ -5,6 +5,8 @@
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_22")))]
 use crate::Window;
+#[cfg(any(feature = "v3_22", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_22")))]
 use glib::translate::*;
 use std::fmt;
 
diff --git a/gdk/src/auto/enums.rs b/gdk/src/auto/enums.rs
index 8bcdf33637c1..bcf43d2c9e82 100644
--- a/gdk/src/auto/enums.rs
+++ b/gdk/src/auto/enums.rs
@@ -2,11 +2,15 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+#[cfg(any(feature = "v3_16", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
 use glib::error::ErrorDomain;
 use glib::translate::*;
 use glib::value::FromValue;
 use glib::value::FromValueOptional;
 use glib::value::SetValue;
+#[cfg(any(feature = "v3_16", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
 use glib::Quark;
 use glib::StaticType;
 use glib::Type;
diff --git a/gdk/src/auto/gl_context.rs b/gdk/src/auto/gl_context.rs
index 1b89d5400d4e..815540ba5964 100644
--- a/gdk/src/auto/gl_context.rs
+++ b/gdk/src/auto/gl_context.rs
@@ -8,6 +8,8 @@ use crate::Display;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
 use crate::Window;
+#[cfg(any(feature = "v3_16", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
 use glib::translate::*;
 use std::fmt;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
diff --git a/gdk/src/auto/seat.rs b/gdk/src/auto/seat.rs
index b6f278c88dd2..80f0be86cc08 100644
--- a/gdk/src/auto/seat.rs
+++ b/gdk/src/auto/seat.rs
@@ -35,6 +35,8 @@ use glib::signal::connect_raw;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_20")))]
 use glib::signal::SignalHandlerId;
+#[cfg(any(feature = "v3_20", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_20")))]
 use glib::translate::*;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_20")))]
diff --git a/gdk/src/auto/versions.txt b/gdk/src/auto/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/gdk/src/auto/versions.txt
+++ b/gdk/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/gdk/sys/src/lib.rs b/gdk/sys/src/lib.rs
index 26e5cee34160..392beeaf1235 100644
--- a/gdk/sys/src/lib.rs
+++ b/gdk/sys/src/lib.rs
@@ -2971,7 +2971,7 @@ pub struct _GdkDrawingContextClass(c_void);
 pub type GdkDrawingContextClass = *mut _GdkDrawingContextClass;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventAny {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -2989,7 +2989,7 @@ impl ::std::fmt::Debug for GdkEventAny {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventButton {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3025,7 +3025,7 @@ impl ::std::fmt::Debug for GdkEventButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventConfigure {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3051,7 +3051,7 @@ impl ::std::fmt::Debug for GdkEventConfigure {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventCrossing {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3089,7 +3089,7 @@ impl ::std::fmt::Debug for GdkEventCrossing {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventDND {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3115,7 +3115,7 @@ impl ::std::fmt::Debug for GdkEventDND {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventExpose {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3139,7 +3139,7 @@ impl ::std::fmt::Debug for GdkEventExpose {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventFocus {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3159,7 +3159,7 @@ impl ::std::fmt::Debug for GdkEventFocus {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventGrabBroken {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3183,7 +3183,7 @@ impl ::std::fmt::Debug for GdkEventGrabBroken {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventKey {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3217,7 +3217,7 @@ impl ::std::fmt::Debug for GdkEventKey {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventMotion {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3253,7 +3253,7 @@ impl ::std::fmt::Debug for GdkEventMotion {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventOwnerChange {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3281,7 +3281,7 @@ impl ::std::fmt::Debug for GdkEventOwnerChange {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventPadAxis {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3309,7 +3309,7 @@ impl ::std::fmt::Debug for GdkEventPadAxis {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventPadButton {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3335,7 +3335,7 @@ impl ::std::fmt::Debug for GdkEventPadButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventPadGroupMode {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3359,7 +3359,7 @@ impl ::std::fmt::Debug for GdkEventPadGroupMode {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventProperty {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3383,7 +3383,7 @@ impl ::std::fmt::Debug for GdkEventProperty {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventProximity {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3405,7 +3405,7 @@ impl ::std::fmt::Debug for GdkEventProximity {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventScroll {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3445,7 +3445,7 @@ impl ::std::fmt::Debug for GdkEventScroll {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventSelection {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3483,7 +3483,7 @@ impl ::std::fmt::Debug for GdkEventSequence {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventSetting {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3505,7 +3505,7 @@ impl ::std::fmt::Debug for GdkEventSetting {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventTouch {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3543,7 +3543,7 @@ impl ::std::fmt::Debug for GdkEventTouch {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventTouchpadPinch {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3585,7 +3585,7 @@ impl ::std::fmt::Debug for GdkEventTouchpadPinch {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventTouchpadSwipe {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3623,7 +3623,7 @@ impl ::std::fmt::Debug for GdkEventTouchpadSwipe {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventVisibility {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3643,7 +3643,7 @@ impl ::std::fmt::Debug for GdkEventVisibility {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkEventWindowState {
     pub type_: GdkEventType,
     pub window: *mut GdkWindow,
@@ -3813,7 +3813,7 @@ impl ::std::fmt::Debug for GdkTimeCoord {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GdkWindowAttr {
     pub title: *mut c_char,
     pub event_mask: c_int,
diff --git a/gdk/sys/tests/abi.rs b/gdk/sys/tests/abi.rs
index c8ec5e58d9f4..5a6a1d1d24fd 100644
--- a/gdk/sys/tests/abi.rs
+++ b/gdk/sys/tests/abi.rs
@@ -5,6 +5,7 @@
 use gdk_sys::*;
 use std::env;
 use std::error::Error;
+use std::ffi::OsString;
 use std::mem::{align_of, size_of};
 use std::path::Path;
 use std::process::Command;
@@ -69,7 +70,8 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     if packages.is_empty() {
         return Ok(Vec::new());
     }
-    let mut cmd = Command::new("pkg-config");
+    let pkg_config = env::var_os("PKG_CONFIG").unwrap_or_else(|| OsString::from("pkg-config"));
+    let mut cmd = Command::new(pkg_config);
     cmd.arg("--cflags");
     cmd.args(packages);
     let out = cmd.output()?;
diff --git a/gdk/sys/versions.txt b/gdk/sys/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/gdk/sys/versions.txt
+++ b/gdk/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/gdkx11/src/auto/versions.txt b/gdkx11/src/auto/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/gdkx11/src/auto/versions.txt
+++ b/gdkx11/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/gdkx11/src/auto/x11_app_launch_context.rs b/gdkx11/src/auto/x11_app_launch_context.rs
index 78d2560375b0..711f80807eec 100644
--- a/gdkx11/src/auto/x11_app_launch_context.rs
+++ b/gdkx11/src/auto/x11_app_launch_context.rs
@@ -2,7 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
 use std::fmt;
 
 glib::wrapper! {
diff --git a/gdkx11/src/auto/x11_device_core.rs b/gdkx11/src/auto/x11_device_core.rs
index 452893b08ff1..1804edaeff7e 100644
--- a/gdkx11/src/auto/x11_device_core.rs
+++ b/gdkx11/src/auto/x11_device_core.rs
@@ -2,7 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
 use std::fmt;
 
 glib::wrapper! {
diff --git a/gdkx11/src/auto/x11_device_manager_core.rs b/gdkx11/src/auto/x11_device_manager_core.rs
index f24727eac06a..37b7cfcbc15b 100644
--- a/gdkx11/src/auto/x11_device_manager_core.rs
+++ b/gdkx11/src/auto/x11_device_manager_core.rs
@@ -2,7 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
 use std::fmt;
 
 glib::wrapper! {
diff --git a/gdkx11/src/auto/x11_display_manager.rs b/gdkx11/src/auto/x11_display_manager.rs
index cee0875f1967..b6df4e291f36 100644
--- a/gdkx11/src/auto/x11_display_manager.rs
+++ b/gdkx11/src/auto/x11_display_manager.rs
@@ -2,7 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
 use std::fmt;
 
 glib::wrapper! {
diff --git a/gdkx11/src/auto/x11_drag_context.rs b/gdkx11/src/auto/x11_drag_context.rs
index c396321ea9c3..ae27d48d8647 100644
--- a/gdkx11/src/auto/x11_drag_context.rs
+++ b/gdkx11/src/auto/x11_drag_context.rs
@@ -2,7 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
 use std::fmt;
 
 glib::wrapper! {
diff --git a/gdkx11/src/auto/x11_visual.rs b/gdkx11/src/auto/x11_visual.rs
index 26e327a90778..063910f849ba 100644
--- a/gdkx11/src/auto/x11_visual.rs
+++ b/gdkx11/src/auto/x11_visual.rs
@@ -2,7 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
 use std::fmt;
 
 glib::wrapper! {
diff --git a/gdkx11/src/auto/x11gl_context.rs b/gdkx11/src/auto/x11gl_context.rs
index 42b99437b5fe..6a8b744d0d28 100644
--- a/gdkx11/src/auto/x11gl_context.rs
+++ b/gdkx11/src/auto/x11gl_context.rs
@@ -2,7 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
 use std::fmt;
 
 glib::wrapper! {
diff --git a/gdkx11/sys/versions.txt b/gdkx11/sys/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/gdkx11/sys/versions.txt
+++ b/gdkx11/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/gio/src/auto/dbus_arg_info.rs b/gio/src/auto/dbus_arg_info.rs
index 7d9ca0cf008d..01692f5658ed 100644
--- a/gio/src/auto/dbus_arg_info.rs
+++ b/gio/src/auto/dbus_arg_info.rs
@@ -2,8 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
-
 glib::wrapper! {
     #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct DBusArgInfo(Shared<ffi::GDBusArgInfo>);
diff --git a/gio/src/auto/dbus_method_info.rs b/gio/src/auto/dbus_method_info.rs
index 5cf8e8095ce4..277d7521cdd7 100644
--- a/gio/src/auto/dbus_method_info.rs
+++ b/gio/src/auto/dbus_method_info.rs
@@ -2,8 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
-
 glib::wrapper! {
     #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct DBusMethodInfo(Shared<ffi::GDBusMethodInfo>);
diff --git a/gio/src/auto/dbus_property_info.rs b/gio/src/auto/dbus_property_info.rs
index 5779c693623e..bac420e4afb0 100644
--- a/gio/src/auto/dbus_property_info.rs
+++ b/gio/src/auto/dbus_property_info.rs
@@ -2,8 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
-
 glib::wrapper! {
     #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct DBusPropertyInfo(Shared<ffi::GDBusPropertyInfo>);
diff --git a/gio/src/auto/dbus_signal_info.rs b/gio/src/auto/dbus_signal_info.rs
index 661b6af607bc..2a479b59390e 100644
--- a/gio/src/auto/dbus_signal_info.rs
+++ b/gio/src/auto/dbus_signal_info.rs
@@ -2,8 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
-
 glib::wrapper! {
     #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct DBusSignalInfo(Shared<ffi::GDBusSignalInfo>);
diff --git a/gio/src/auto/list_model.rs b/gio/src/auto/list_model.rs
index d1df5dd2ec7f..cb0bc062ad4f 100644
--- a/gio/src/auto/list_model.rs
+++ b/gio/src/auto/list_model.rs
@@ -12,6 +12,8 @@ use glib::signal::connect_raw;
 #[cfg(any(feature = "v2_44", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_44")))]
 use glib::signal::SignalHandlerId;
+#[cfg(any(feature = "v2_44", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_44")))]
 use glib::translate::*;
 #[cfg(any(feature = "v2_44", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_44")))]
diff --git a/gio/src/auto/list_store.rs b/gio/src/auto/list_store.rs
index c467ab2eee39..d957252bbeb2 100644
--- a/gio/src/auto/list_store.rs
+++ b/gio/src/auto/list_store.rs
@@ -7,6 +7,8 @@ use glib::object::Cast;
 #[cfg(any(feature = "v2_44", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_44")))]
 use glib::object::IsA;
+#[cfg(any(feature = "v2_44", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_44")))]
 use glib::translate::*;
 use glib::StaticType;
 use glib::ToValue;
diff --git a/gio/src/auto/memory_monitor.rs b/gio/src/auto/memory_monitor.rs
index 5c5e2483ef9c..13156da5ac05 100644
--- a/gio/src/auto/memory_monitor.rs
+++ b/gio/src/auto/memory_monitor.rs
@@ -15,6 +15,8 @@ use glib::signal::connect_raw;
 #[cfg(any(feature = "v2_64", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_64")))]
 use glib::signal::SignalHandlerId;
+#[cfg(any(feature = "v2_64", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_64")))]
 use glib::translate::*;
 #[cfg(any(feature = "v2_64", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_64")))]
diff --git a/gio/src/auto/simple_io_stream.rs b/gio/src/auto/simple_io_stream.rs
index 78e2cf51a190..4bd4d47d99d0 100644
--- a/gio/src/auto/simple_io_stream.rs
+++ b/gio/src/auto/simple_io_stream.rs
@@ -15,6 +15,8 @@ use glib::object::Cast;
 #[cfg(any(feature = "v2_44", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_44")))]
 use glib::object::IsA;
+#[cfg(any(feature = "v2_44", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_44")))]
 use glib::translate::*;
 use std::fmt;
 
diff --git a/gio/src/auto/versions.txt b/gio/src/auto/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/gio/src/auto/versions.txt
+++ b/gio/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/gio/sys/src/lib.rs b/gio/sys/src/lib.rs
index 76405afcaf6a..4e0ce6610f10 100644
--- a/gio/sys/src/lib.rs
+++ b/gio/sys/src/lib.rs
@@ -935,7 +935,7 @@ pub type GVfsFileLookupFunc =
 
 // Records
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GActionEntry {
     pub name: *const c_char,
     pub activate: Option<unsafe extern "C" fn(*mut GSimpleAction, *mut glib::GVariant, gpointer)>,
@@ -1593,7 +1593,7 @@ pub struct _GCredentialsClass(c_void);
 pub type GCredentialsClass = *mut _GCredentialsClass;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusAnnotationInfo {
     pub ref_count: c_int,
     pub key: *mut c_char,
@@ -1612,7 +1612,7 @@ impl ::std::fmt::Debug for GDBusAnnotationInfo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusArgInfo {
     pub ref_count: c_int,
     pub name: *mut c_char,
@@ -1631,7 +1631,7 @@ impl ::std::fmt::Debug for GDBusArgInfo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusErrorEntry {
     pub error_code: c_int,
     pub dbus_error_name: *const c_char,
@@ -1669,7 +1669,7 @@ impl ::std::fmt::Debug for GDBusInterfaceIface {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusInterfaceInfo {
     pub ref_count: c_int,
     pub name: *mut c_char,
@@ -1750,7 +1750,7 @@ impl ::std::fmt::Debug for GDBusInterfaceVTable {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusMethodInfo {
     pub ref_count: c_int,
     pub name: *mut c_char,
@@ -1771,7 +1771,7 @@ impl ::std::fmt::Debug for GDBusMethodInfo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusNodeInfo {
     pub ref_count: c_int,
     pub path: *mut c_char,
@@ -1979,7 +1979,7 @@ pub struct _GDBusObjectSkeletonPrivate(c_void);
 pub type GDBusObjectSkeletonPrivate = *mut _GDBusObjectSkeletonPrivate;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusPropertyInfo {
     pub ref_count: c_int,
     pub name: *mut c_char,
@@ -2026,7 +2026,7 @@ pub struct _GDBusProxyPrivate(c_void);
 pub type GDBusProxyPrivate = *mut _GDBusProxyPrivate;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusSignalInfo {
     pub ref_count: c_int,
     pub name: *mut c_char,
@@ -2499,7 +2499,7 @@ pub struct _GEmblemedIconPrivate(c_void);
 pub type GEmblemedIconPrivate = *mut _GEmblemedIconPrivate;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GFileAttributeInfo {
     pub name: *mut c_char,
     pub type_: GFileAttributeType,
@@ -2517,7 +2517,7 @@ impl ::std::fmt::Debug for GFileAttributeInfo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GFileAttributeInfoList {
     pub infos: *mut GFileAttributeInfo,
     pub n_infos: c_int,
@@ -3942,7 +3942,7 @@ impl ::std::fmt::Debug for GInitableIface {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GInputMessage {
     pub address: *mut *mut GSocketAddress,
     pub vectors: *mut GInputVector,
@@ -4692,7 +4692,7 @@ pub struct _GNetworkServicePrivate(c_void);
 pub type GNetworkServicePrivate = *mut _GNetworkServicePrivate;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GOutputMessage {
     pub address: *mut GSocketAddress,
     pub vectors: *mut GOutputVector,
@@ -5938,7 +5938,7 @@ impl ::std::fmt::Debug for GSrvTarget {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GStaticResource {
     pub data: *const u8,
     pub data_len: size_t,
@@ -6982,7 +6982,7 @@ impl ::std::fmt::Debug for GAppInfoMonitor {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GAppLaunchContext {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GAppLaunchContextPrivate,
@@ -6997,7 +6997,7 @@ impl ::std::fmt::Debug for GAppLaunchContext {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GApplication {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GApplicationPrivate,
@@ -7011,7 +7011,7 @@ impl ::std::fmt::Debug for GApplication {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GApplicationCommandLine {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GApplicationCommandLinePrivate,
@@ -7025,7 +7025,7 @@ impl ::std::fmt::Debug for GApplicationCommandLine {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GBufferedInputStream {
     pub parent_instance: GFilterInputStream,
     pub priv_: *mut GBufferedInputStreamPrivate,
@@ -7040,7 +7040,7 @@ impl ::std::fmt::Debug for GBufferedInputStream {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GBufferedOutputStream {
     pub parent_instance: GFilterOutputStream,
     pub priv_: *mut GBufferedOutputStreamPrivate,
@@ -7066,7 +7066,7 @@ impl ::std::fmt::Debug for GBytesIcon {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GCancellable {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GCancellablePrivate,
@@ -7091,7 +7091,7 @@ impl ::std::fmt::Debug for GCharsetConverter {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GConverterInputStream {
     pub parent_instance: GFilterInputStream,
     pub priv_: *mut GConverterInputStreamPrivate,
@@ -7106,7 +7106,7 @@ impl ::std::fmt::Debug for GConverterInputStream {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GConverterOutputStream {
     pub parent_instance: GFilterOutputStream,
     pub priv_: *mut GConverterOutputStreamPrivate,
@@ -7161,7 +7161,7 @@ impl ::std::fmt::Debug for GDBusConnection {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusInterfaceSkeleton {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GDBusInterfaceSkeletonPrivate,
@@ -7205,7 +7205,7 @@ impl ::std::fmt::Debug for GDBusMethodInvocation {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusObjectManagerClient {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GDBusObjectManagerClientPrivate,
@@ -7222,7 +7222,7 @@ impl ::std::fmt::Debug for GDBusObjectManagerClient {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusObjectManagerServer {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GDBusObjectManagerServerPrivate,
@@ -7239,7 +7239,7 @@ impl ::std::fmt::Debug for GDBusObjectManagerServer {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusObjectProxy {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GDBusObjectProxyPrivate,
@@ -7253,7 +7253,7 @@ impl ::std::fmt::Debug for GDBusObjectProxy {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusObjectSkeleton {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GDBusObjectSkeletonPrivate,
@@ -7267,7 +7267,7 @@ impl ::std::fmt::Debug for GDBusObjectSkeleton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDBusProxy {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GDBusProxyPrivate,
@@ -7291,7 +7291,7 @@ impl ::std::fmt::Debug for GDBusServer {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDataInputStream {
     pub parent_instance: GBufferedInputStream,
     pub priv_: *mut GDataInputStreamPrivate,
@@ -7306,7 +7306,7 @@ impl ::std::fmt::Debug for GDataInputStream {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDataOutputStream {
     pub parent_instance: GFilterOutputStream,
     pub priv_: *mut GDataOutputStreamPrivate,
@@ -7341,7 +7341,7 @@ impl ::std::fmt::Debug for GEmblem {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GEmblemedIcon {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GEmblemedIconPrivate,
@@ -7356,7 +7356,7 @@ impl ::std::fmt::Debug for GEmblemedIcon {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GFileEnumerator {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GFileEnumeratorPrivate,
@@ -7371,7 +7371,7 @@ impl ::std::fmt::Debug for GFileEnumerator {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GFileIOStream {
     pub parent_instance: GIOStream,
     pub priv_: *mut GFileIOStreamPrivate,
@@ -7406,7 +7406,7 @@ impl ::std::fmt::Debug for GFileInfo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GFileInputStream {
     pub parent_instance: GInputStream,
     pub priv_: *mut GFileInputStreamPrivate,
@@ -7421,7 +7421,7 @@ impl ::std::fmt::Debug for GFileInputStream {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GFileMonitor {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GFileMonitorPrivate,
@@ -7436,7 +7436,7 @@ impl ::std::fmt::Debug for GFileMonitor {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GFileOutputStream {
     pub parent_instance: GOutputStream,
     pub priv_: *mut GFileOutputStreamPrivate,
@@ -7461,7 +7461,7 @@ impl ::std::fmt::Debug for GFilenameCompleter {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GFilterInputStream {
     pub parent_instance: GInputStream,
     pub base_stream: *mut GInputStream,
@@ -7477,7 +7477,7 @@ impl ::std::fmt::Debug for GFilterInputStream {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GFilterOutputStream {
     pub parent_instance: GOutputStream,
     pub base_stream: *mut GOutputStream,
@@ -7503,7 +7503,7 @@ impl ::std::fmt::Debug for GIOModule {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GIOStream {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GIOStreamPrivate,
@@ -7518,7 +7518,7 @@ impl ::std::fmt::Debug for GIOStream {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GInetAddress {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GInetAddressPrivate,
@@ -7533,7 +7533,7 @@ impl ::std::fmt::Debug for GInetAddress {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GInetAddressMask {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GInetAddressMaskPrivate,
@@ -7548,7 +7548,7 @@ impl ::std::fmt::Debug for GInetAddressMask {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GInetSocketAddress {
     pub parent_instance: GSocketAddress,
     pub priv_: *mut GInetSocketAddressPrivate,
@@ -7563,7 +7563,7 @@ impl ::std::fmt::Debug for GInetSocketAddress {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GInputStream {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GInputStreamPrivate,
@@ -7588,7 +7588,7 @@ impl ::std::fmt::Debug for GListStore {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GMemoryInputStream {
     pub parent_instance: GInputStream,
     pub priv_: *mut GMemoryInputStreamPrivate,
@@ -7603,7 +7603,7 @@ impl ::std::fmt::Debug for GMemoryInputStream {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GMemoryOutputStream {
     pub parent_instance: GOutputStream,
     pub priv_: *mut GMemoryOutputStreamPrivate,
@@ -7628,7 +7628,7 @@ impl ::std::fmt::Debug for GMenu {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GMenuAttributeIter {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GMenuAttributeIterPrivate,
@@ -7654,7 +7654,7 @@ impl ::std::fmt::Debug for GMenuItem {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GMenuLinkIter {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GMenuLinkIterPrivate,
@@ -7670,7 +7670,7 @@ impl ::std::fmt::Debug for GMenuLinkIter {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GMenuModel {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GMenuModelPrivate,
@@ -7686,7 +7686,7 @@ impl ::std::fmt::Debug for GMenuModel {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GMountOperation {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GMountOperationPrivate,
@@ -7702,7 +7702,7 @@ impl ::std::fmt::Debug for GMountOperation {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GNativeSocketAddress {
     pub parent_instance: GSocketAddress,
     pub priv_: *mut GNativeSocketAddressPrivate,
@@ -7731,7 +7731,7 @@ impl ::std::fmt::Debug for GNativeVolumeMonitor {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GNetworkAddress {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GNetworkAddressPrivate,
@@ -7746,7 +7746,7 @@ impl ::std::fmt::Debug for GNetworkAddress {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GNetworkService {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GNetworkServicePrivate,
@@ -7771,7 +7771,7 @@ impl ::std::fmt::Debug for GNotification {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GOutputStream {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GOutputStreamPrivate,
@@ -7786,7 +7786,7 @@ impl ::std::fmt::Debug for GOutputStream {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GPermission {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GPermissionPrivate,
@@ -7811,7 +7811,7 @@ impl ::std::fmt::Debug for GPropertyAction {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GProxyAddress {
     pub parent_instance: GInetSocketAddress,
     pub priv_: *mut GProxyAddressPrivate,
@@ -7826,7 +7826,7 @@ impl ::std::fmt::Debug for GProxyAddress {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GProxyAddressEnumerator {
     pub parent_instance: GSocketAddressEnumerator,
     pub priv_: *mut GProxyAddressEnumeratorPrivate,
@@ -7840,7 +7840,7 @@ impl ::std::fmt::Debug for GProxyAddressEnumerator {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GResolver {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GResolverPrivate,
@@ -7856,7 +7856,7 @@ impl ::std::fmt::Debug for GResolver {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSettings {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GSettingsPrivate,
@@ -7872,7 +7872,7 @@ impl ::std::fmt::Debug for GSettings {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSettingsBackend {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GSettingsBackendPrivate,
@@ -7897,7 +7897,7 @@ impl ::std::fmt::Debug for GSimpleAction {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSimpleActionGroup {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GSimpleActionGroupPrivate,
@@ -7941,7 +7941,7 @@ impl ::std::fmt::Debug for GSimplePermission {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSimpleProxyResolver {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GSimpleProxyResolverPrivate,
@@ -7956,7 +7956,7 @@ impl ::std::fmt::Debug for GSimpleProxyResolver {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSocket {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GSocketPrivate,
@@ -8002,7 +8002,7 @@ impl ::std::fmt::Debug for GSocketAddressEnumerator {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSocketClient {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GSocketClientPrivate,
@@ -8018,7 +8018,7 @@ impl ::std::fmt::Debug for GSocketClient {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSocketConnection {
     pub parent_instance: GIOStream,
     pub priv_: *mut GSocketConnectionPrivate,
@@ -8034,7 +8034,7 @@ impl ::std::fmt::Debug for GSocketConnection {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSocketControlMessage {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GSocketControlMessagePrivate,
@@ -8050,7 +8050,7 @@ impl ::std::fmt::Debug for GSocketControlMessage {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSocketListener {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GSocketListenerPrivate,
@@ -8066,7 +8066,7 @@ impl ::std::fmt::Debug for GSocketListener {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSocketService {
     pub parent_instance: GSocketListener,
     pub priv_: *mut GSocketServicePrivate,
@@ -8112,7 +8112,7 @@ impl ::std::fmt::Debug for GTask {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTcpConnection {
     pub parent_instance: GSocketConnection,
     pub priv_: *mut GTcpConnectionPrivate,
@@ -8128,7 +8128,7 @@ impl ::std::fmt::Debug for GTcpConnection {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTcpWrapperConnection {
     pub parent_instance: GTcpConnection,
     pub priv_: *mut GTcpWrapperConnectionPrivate,
@@ -8164,7 +8164,7 @@ impl ::std::fmt::Debug for GThemedIcon {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GThreadedSocketService {
     pub parent_instance: GSocketService,
     pub priv_: *mut GThreadedSocketServicePrivate,
@@ -8180,7 +8180,7 @@ impl ::std::fmt::Debug for GThreadedSocketService {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTlsCertificate {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GTlsCertificatePrivate,
@@ -8196,7 +8196,7 @@ impl ::std::fmt::Debug for GTlsCertificate {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTlsConnection {
     pub parent_instance: GIOStream,
     pub priv_: *mut GTlsConnectionPrivate,
@@ -8212,7 +8212,7 @@ impl ::std::fmt::Debug for GTlsConnection {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTlsDatabase {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GTlsDatabasePrivate,
@@ -8228,7 +8228,7 @@ impl ::std::fmt::Debug for GTlsDatabase {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTlsInteraction {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GTlsInteractionPrivate,
@@ -8242,7 +8242,7 @@ impl ::std::fmt::Debug for GTlsInteraction {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTlsPassword {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GTlsPasswordPrivate,
@@ -8258,7 +8258,7 @@ impl ::std::fmt::Debug for GTlsPassword {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GUnixConnection {
     pub parent_instance: GSocketConnection,
     pub priv_: *mut GUnixConnectionPrivate,
@@ -8274,7 +8274,7 @@ impl ::std::fmt::Debug for GUnixConnection {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GUnixCredentialsMessage {
     pub parent_instance: GSocketControlMessage,
     pub priv_: *mut GUnixCredentialsMessagePrivate,
@@ -8290,7 +8290,7 @@ impl ::std::fmt::Debug for GUnixCredentialsMessage {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GUnixFDList {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GUnixFDListPrivate,
@@ -8306,7 +8306,7 @@ impl ::std::fmt::Debug for GUnixFDList {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GUnixFDMessage {
     pub parent_instance: GSocketControlMessage,
     pub priv_: *mut GUnixFDMessagePrivate,
@@ -8322,7 +8322,7 @@ impl ::std::fmt::Debug for GUnixFDMessage {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GUnixInputStream {
     pub parent_instance: GInputStream,
     pub priv_: *mut GUnixInputStreamPrivate,
@@ -8347,7 +8347,7 @@ impl ::std::fmt::Debug for GUnixMountMonitor {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GUnixOutputStream {
     pub parent_instance: GOutputStream,
     pub priv_: *mut GUnixOutputStreamPrivate,
@@ -8362,7 +8362,7 @@ impl ::std::fmt::Debug for GUnixOutputStream {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GUnixSocketAddress {
     pub parent_instance: GSocketAddress,
     pub priv_: *mut GUnixSocketAddressPrivate,
diff --git a/gio/sys/tests/abi.rs b/gio/sys/tests/abi.rs
index fd51450a21b2..b0866330f1b0 100644
--- a/gio/sys/tests/abi.rs
+++ b/gio/sys/tests/abi.rs
@@ -5,6 +5,7 @@
 use gio_sys::*;
 use std::env;
 use std::error::Error;
+use std::ffi::OsString;
 use std::mem::{align_of, size_of};
 use std::path::Path;
 use std::process::Command;
@@ -69,7 +70,8 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     if packages.is_empty() {
         return Ok(Vec::new());
     }
-    let mut cmd = Command::new("pkg-config");
+    let pkg_config = env::var_os("PKG_CONFIG").unwrap_or_else(|| OsString::from("pkg-config"));
+    let mut cmd = Command::new(pkg_config);
     cmd.arg("--cflags");
     cmd.args(packages);
     let out = cmd.output()?;
diff --git a/gio/sys/versions.txt b/gio/sys/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/gio/sys/versions.txt
+++ b/gio/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/glib/gobject-sys/src/lib.rs b/glib/gobject-sys/src/lib.rs
index 5590c45b9b5d..9a6fb0f60e5d 100644
--- a/glib/gobject-sys/src/lib.rs
+++ b/glib/gobject-sys/src/lib.rs
@@ -271,7 +271,7 @@ impl ::std::fmt::Debug for GClosureNotifyData {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GEnumClass {
     pub g_type_class: GTypeClass,
     pub minimum: c_int,
@@ -293,7 +293,7 @@ impl ::std::fmt::Debug for GEnumClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GEnumValue {
     pub value: c_int,
     pub value_name: *const c_char,
@@ -311,7 +311,7 @@ impl ::std::fmt::Debug for GEnumValue {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GFlagsClass {
     pub g_type_class: GTypeClass,
     pub mask: c_uint,
@@ -331,7 +331,7 @@ impl ::std::fmt::Debug for GFlagsClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GFlagsValue {
     pub value: c_uint,
     pub value_name: *const c_char,
@@ -349,7 +349,7 @@ impl ::std::fmt::Debug for GFlagsValue {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GInitiallyUnownedClass {
     pub g_type_class: GTypeClass,
     pub construct_properties: *mut glib::GSList,
@@ -407,7 +407,7 @@ impl ::std::fmt::Debug for GInterfaceInfo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GObjectClass {
     pub g_type_class: GTypeClass,
     pub construct_properties: *mut glib::GSList,
@@ -447,7 +447,7 @@ impl ::std::fmt::Debug for GObjectClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GObjectConstructParam {
     pub pspec: *mut GParamSpec,
     pub value: *mut GValue,
@@ -523,7 +523,7 @@ impl ::std::fmt::Debug for GParamSpecTypeInfo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GParameter {
     pub name: *const c_char,
     pub value: GValue,
@@ -557,7 +557,7 @@ impl ::std::fmt::Debug for GSignalInvocationHint {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSignalQuery {
     pub signal_id: c_uint,
     pub signal_name: *const c_char,
@@ -610,7 +610,7 @@ impl ::std::fmt::Debug for GTypeFundamentalInfo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTypeInfo {
     pub class_size: u16,
     pub base_init: GBaseInitFunc,
@@ -642,7 +642,7 @@ impl ::std::fmt::Debug for GTypeInfo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTypeInstance {
     pub g_class: *mut GTypeClass,
 }
@@ -716,7 +716,7 @@ impl ::std::fmt::Debug for GTypePluginClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTypeQuery {
     pub type_: GType,
     pub type_name: *const c_char,
@@ -736,7 +736,7 @@ impl ::std::fmt::Debug for GTypeQuery {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTypeValueTable {
     pub value_init: Option<unsafe extern "C" fn(*mut GValue)>,
     pub value_free: Option<unsafe extern "C" fn(*mut GValue)>,
@@ -783,7 +783,7 @@ impl ::std::fmt::Debug for GValue {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GValueArray {
     pub n_values: c_uint,
     pub values: *mut GValue,
@@ -825,7 +825,7 @@ impl ::std::fmt::Debug for GBinding {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GInitiallyUnowned {
     pub g_type_instance: GTypeInstance,
     pub ref_count: c_uint,
@@ -841,7 +841,7 @@ impl ::std::fmt::Debug for GInitiallyUnowned {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GObject {
     pub g_type_instance: GTypeInstance,
     pub ref_count: c_uint,
@@ -857,7 +857,7 @@ impl ::std::fmt::Debug for GObject {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GParamSpec {
     pub g_type_instance: GTypeInstance,
     pub name: *const c_char,
@@ -956,7 +956,7 @@ impl ::std::fmt::Debug for GParamSpecDouble {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GParamSpecEnum {
     pub parent_instance: GParamSpec,
     pub enum_class: *mut GEnumClass,
@@ -974,7 +974,7 @@ impl ::std::fmt::Debug for GParamSpecEnum {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GParamSpecFlags {
     pub parent_instance: GParamSpec,
     pub flags_class: *mut GFlagsClass,
@@ -1104,7 +1104,7 @@ impl ::std::fmt::Debug for GParamSpecObject {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GParamSpecOverride {
     pub parent_instance: GParamSpec,
     pub overridden: *mut GParamSpec,
@@ -1267,7 +1267,7 @@ impl ::std::fmt::Debug for GParamSpecUnichar {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GParamSpecValueArray {
     pub parent_instance: GParamSpec,
     pub element_spec: *mut GParamSpec,
@@ -1285,7 +1285,7 @@ impl ::std::fmt::Debug for GParamSpecValueArray {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GParamSpecVariant {
     pub parent_instance: GParamSpec,
     pub type_: *mut glib::GVariantType,
@@ -1304,7 +1304,7 @@ impl ::std::fmt::Debug for GParamSpecVariant {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTypeModule {
     pub parent_instance: GObject,
     pub use_count: c_uint,
diff --git a/glib/gobject-sys/tests/abi.rs b/glib/gobject-sys/tests/abi.rs
index c3e11e2290c1..4a9203eb9311 100644
--- a/glib/gobject-sys/tests/abi.rs
+++ b/glib/gobject-sys/tests/abi.rs
@@ -5,6 +5,7 @@
 use gobject_sys::*;
 use std::env;
 use std::error::Error;
+use std::ffi::OsString;
 use std::mem::{align_of, size_of};
 use std::path::Path;
 use std::process::Command;
@@ -69,7 +70,8 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     if packages.is_empty() {
         return Ok(Vec::new());
     }
-    let mut cmd = Command::new("pkg-config");
+    let pkg_config = env::var_os("PKG_CONFIG").unwrap_or_else(|| OsString::from("pkg-config"));
+    let mut cmd = Command::new(pkg_config);
     cmd.arg("--cflags");
     cmd.args(packages);
     let out = cmd.output()?;
diff --git a/glib/gobject-sys/versions.txt b/glib/gobject-sys/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/glib/gobject-sys/versions.txt
+++ b/glib/gobject-sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/glib/src/auto/checksum.rs b/glib/src/auto/checksum.rs
index bc1b26e0facc..9da59a7b8c79 100644
--- a/glib/src/auto/checksum.rs
+++ b/glib/src/auto/checksum.rs
@@ -10,7 +10,7 @@ crate::wrapper! {
     pub struct Checksum(Boxed<ffi::GChecksum>);
 
     match fn {
-        copy => |ptr| ffi::g_checksum_copy(mut_override(ptr)),
+        copy => |ptr| ffi::g_checksum_copy(ptr),
         free => |ptr| ffi::g_checksum_free(ptr),
         get_type => || ffi::g_checksum_get_type(),
     }
diff --git a/glib/src/auto/versions.txt b/glib/src/auto/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/glib/src/auto/versions.txt
+++ b/glib/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/glib/sys/src/lib.rs b/glib/sys/src/lib.rs
index e63c45658233..c8cdc216f2fa 100644
--- a/glib/sys/src/lib.rs
+++ b/glib/sys/src/lib.rs
@@ -1005,7 +1005,7 @@ impl ::std::fmt::Debug for GMutex {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub union GTokenValue {
     pub v_symbol: gpointer,
     pub v_identifier: *mut c_char,
@@ -1144,7 +1144,7 @@ pub type GVoidFunc = Option<unsafe extern "C" fn()>;
 
 // Records
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GArray {
     pub data: *mut c_char,
     pub len: c_uint,
@@ -1170,7 +1170,7 @@ pub struct _GBookmarkFile(c_void);
 pub type GBookmarkFile = *mut _GBookmarkFile;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GByteArray {
     pub data: *mut u8,
     pub len: c_uint,
@@ -1250,7 +1250,7 @@ impl ::std::fmt::Debug for GDateTime {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GDebugKey {
     pub key: *const c_char,
     pub value: c_uint,
@@ -1286,7 +1286,7 @@ impl ::std::fmt::Debug for GDoubleIEEE754_mpn {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GError {
     pub domain: GQuark,
     pub code: c_int,
@@ -1352,7 +1352,7 @@ pub struct _GHmac(c_void);
 pub type GHmac = *mut _GHmac;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GHook {
     pub data: gpointer,
     pub next: *mut GHook,
@@ -1489,7 +1489,7 @@ impl ::std::fmt::Debug for GKeyFile {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GList {
     pub data: gpointer,
     pub next: *mut GList,
@@ -1507,7 +1507,7 @@ impl ::std::fmt::Debug for GList {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GLogField {
     pub key: *const c_char,
     pub value: gconstpointer,
@@ -1648,7 +1648,7 @@ impl ::std::fmt::Debug for GMemVTable {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GNode {
     pub data: gpointer,
     pub next: *mut GNode,
@@ -1689,7 +1689,7 @@ pub struct _GOptionContext(c_void);
 pub type GOptionContext = *mut _GOptionContext;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GOptionEntry {
     pub long_name: *const c_char,
     pub short_name: c_char,
@@ -1745,7 +1745,7 @@ impl ::std::fmt::Debug for GPrivate {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GPtrArray {
     pub pdata: *mut gpointer,
     pub len: c_uint,
@@ -1761,7 +1761,7 @@ impl ::std::fmt::Debug for GPtrArray {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GQueue {
     pub head: *mut GList,
     pub tail: *mut GList,
@@ -1822,7 +1822,7 @@ impl ::std::fmt::Debug for GRegex {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSList {
     pub data: gpointer,
     pub next: *mut GSList,
@@ -1838,7 +1838,7 @@ impl ::std::fmt::Debug for GSList {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GScanner {
     pub user_data: gpointer,
     pub max_parse_errors: c_uint,
@@ -1919,7 +1919,7 @@ pub struct _GSequenceIter(c_void);
 pub type GSequenceIter = *mut _GSequenceIter;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GSource {
     pub callback_data: gpointer,
     pub callback_funcs: *mut GSourceCallbackFuncs,
@@ -1994,7 +1994,7 @@ pub struct _GStatBuf(c_void);
 pub type GStatBuf = *mut _GStatBuf;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GString {
     pub str: *mut c_char,
     pub len: size_t,
@@ -2046,7 +2046,7 @@ impl ::std::fmt::Debug for GTestConfig {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTestLogBuffer {
     pub data: *mut GString,
     pub msgs: *mut GSList,
@@ -2145,7 +2145,7 @@ pub struct _GTimer(c_void);
 pub type GTimer = *mut _GTimer;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GTrashStack {
     pub next: *mut GTrashStack,
 }
@@ -2214,7 +2214,7 @@ impl ::std::fmt::Debug for GVariantBuilder {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GVariantBuilder_u_s {
     pub partial_magic: size_t,
     pub type_: *const GVariantType,
@@ -2246,7 +2246,7 @@ impl ::std::fmt::Debug for GVariantDict {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GVariantDict_u_s {
     pub asv: *mut GVariant,
     pub partial_magic: size_t,
diff --git a/glib/sys/tests/abi.rs b/glib/sys/tests/abi.rs
index db51c545e43e..073c11f96f24 100644
--- a/glib/sys/tests/abi.rs
+++ b/glib/sys/tests/abi.rs
@@ -5,6 +5,7 @@
 use glib_sys::*;
 use std::env;
 use std::error::Error;
+use std::ffi::OsString;
 use std::mem::{align_of, size_of};
 use std::path::Path;
 use std::process::Command;
@@ -69,7 +70,8 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     if packages.is_empty() {
         return Ok(Vec::new());
     }
-    let mut cmd = Command::new("pkg-config");
+    let pkg_config = env::var_os("PKG_CONFIG").unwrap_or_else(|| OsString::from("pkg-config"));
+    let mut cmd = Command::new(pkg_config);
     cmd.arg("--cflags");
     cmd.args(packages);
     let out = cmd.output()?;
diff --git a/glib/sys/versions.txt b/glib/sys/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/glib/sys/versions.txt
+++ b/glib/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/graphene/src/auto/versions.txt b/graphene/src/auto/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/graphene/src/auto/versions.txt
+++ b/graphene/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/graphene/sys/tests/abi.rs b/graphene/sys/tests/abi.rs
index 570aba86f41e..90ba5e8aa0b1 100644
--- a/graphene/sys/tests/abi.rs
+++ b/graphene/sys/tests/abi.rs
@@ -5,6 +5,7 @@
 use graphene_sys::*;
 use std::env;
 use std::error::Error;
+use std::ffi::OsString;
 use std::mem::{align_of, size_of};
 use std::path::Path;
 use std::process::Command;
@@ -69,7 +70,8 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     if packages.is_empty() {
         return Ok(Vec::new());
     }
-    let mut cmd = Command::new("pkg-config");
+    let pkg_config = env::var_os("PKG_CONFIG").unwrap_or_else(|| OsString::from("pkg-config"));
+    let mut cmd = Command::new(pkg_config);
     cmd.arg("--cflags");
     cmd.args(packages);
     let out = cmd.output()?;
diff --git a/graphene/sys/versions.txt b/graphene/sys/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/graphene/sys/versions.txt
+++ b/graphene/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/gtk/src/auto/file_chooser_dialog.rs b/gtk/src/auto/file_chooser_dialog.rs
index fec8fdfd555b..132bb17fb8e4 100644
--- a/gtk/src/auto/file_chooser_dialog.rs
+++ b/gtk/src/auto/file_chooser_dialog.rs
@@ -18,7 +18,6 @@ use crate::WindowPosition;
 use crate::WindowType;
 use glib::object::Cast;
 use glib::object::IsA;
-use glib::translate::*;
 use glib::StaticType;
 use glib::ToValue;
 use std::fmt;
diff --git a/gtk/src/auto/gl_area.rs b/gtk/src/auto/gl_area.rs
index a473dad7dbd3..120f124a1804 100644
--- a/gtk/src/auto/gl_area.rs
+++ b/gtk/src/auto/gl_area.rs
@@ -14,6 +14,8 @@ use glib::signal::connect_raw;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
 use glib::signal::SignalHandlerId;
+#[cfg(any(feature = "v3_16", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
 use glib::translate::*;
 use glib::StaticType;
 use glib::ToValue;
diff --git a/gtk/src/auto/misc.rs b/gtk/src/auto/misc.rs
index ae98a6aff1a7..5ba1790b028d 100644
--- a/gtk/src/auto/misc.rs
+++ b/gtk/src/auto/misc.rs
@@ -4,7 +4,6 @@
 
 use crate::Buildable;
 use crate::Widget;
-use glib::translate::*;
 use std::fmt;
 
 glib::wrapper! {
diff --git a/gtk/src/auto/model_button.rs b/gtk/src/auto/model_button.rs
index c49153c35e0f..30354f50e13b 100644
--- a/gtk/src/auto/model_button.rs
+++ b/gtk/src/auto/model_button.rs
@@ -26,6 +26,8 @@ use glib::signal::connect_raw;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
 use glib::signal::SignalHandlerId;
+#[cfg(any(feature = "v3_16", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
 use glib::translate::*;
 use glib::StaticType;
 use glib::ToValue;
diff --git a/gtk/src/auto/native_dialog.rs b/gtk/src/auto/native_dialog.rs
index d3ab538cc9fa..d7a639d3b0d1 100644
--- a/gtk/src/auto/native_dialog.rs
+++ b/gtk/src/auto/native_dialog.rs
@@ -18,6 +18,8 @@ use glib::signal::connect_raw;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_20")))]
 use glib::signal::SignalHandlerId;
+#[cfg(any(feature = "v3_20", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_20")))]
 use glib::translate::*;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_20")))]
diff --git a/gtk/src/auto/recent_chooser_dialog.rs b/gtk/src/auto/recent_chooser_dialog.rs
index 85bc08353f5d..443584f328f7 100644
--- a/gtk/src/auto/recent_chooser_dialog.rs
+++ b/gtk/src/auto/recent_chooser_dialog.rs
@@ -19,7 +19,6 @@ use crate::WindowPosition;
 use crate::WindowType;
 use glib::object::Cast;
 use glib::object::IsA;
-use glib::translate::*;
 use glib::StaticType;
 use glib::ToValue;
 use std::fmt;
diff --git a/gtk/src/auto/selection_data.rs b/gtk/src/auto/selection_data.rs
index 215fcb105df3..a44ecbefd36a 100644
--- a/gtk/src/auto/selection_data.rs
+++ b/gtk/src/auto/selection_data.rs
@@ -13,7 +13,7 @@ glib::wrapper! {
     pub struct SelectionData(Boxed<ffi::GtkSelectionData>);
 
     match fn {
-        copy => |ptr| ffi::gtk_selection_data_copy(mut_override(ptr)),
+        copy => |ptr| ffi::gtk_selection_data_copy(ptr),
         free => |ptr| ffi::gtk_selection_data_free(ptr),
         get_type => || ffi::gtk_selection_data_get_type(),
     }
diff --git a/gtk/src/auto/shortcut_label.rs b/gtk/src/auto/shortcut_label.rs
index 7a01349abd1b..aac27d3d9864 100644
--- a/gtk/src/auto/shortcut_label.rs
+++ b/gtk/src/auto/shortcut_label.rs
@@ -22,6 +22,8 @@ use glib::signal::connect_raw;
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_22")))]
 use glib::signal::SignalHandlerId;
+#[cfg(any(feature = "v3_22", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_22")))]
 use glib::translate::*;
 use glib::StaticType;
 use glib::ToValue;
diff --git a/gtk/src/auto/text_iter.rs b/gtk/src/auto/text_iter.rs
index fcdae70b85c4..5898a064969e 100644
--- a/gtk/src/auto/text_iter.rs
+++ b/gtk/src/auto/text_iter.rs
@@ -16,7 +16,7 @@ glib::wrapper! {
     pub struct TextIter(Boxed<ffi::GtkTextIter>);
 
     match fn {
-        copy => |ptr| ffi::gtk_text_iter_copy(mut_override(ptr)),
+        copy => |ptr| ffi::gtk_text_iter_copy(ptr),
         free => |ptr| ffi::gtk_text_iter_free(ptr),
         init => |_ptr| (),
         clear => |_ptr| (),
diff --git a/gtk/src/auto/tree_path.rs b/gtk/src/auto/tree_path.rs
index 2063073c4b9a..3f240d729fda 100644
--- a/gtk/src/auto/tree_path.rs
+++ b/gtk/src/auto/tree_path.rs
@@ -12,7 +12,7 @@ glib::wrapper! {
     pub struct TreePath(Boxed<ffi::GtkTreePath>);
 
     match fn {
-        copy => |ptr| ffi::gtk_tree_path_copy(mut_override(ptr)),
+        copy => |ptr| ffi::gtk_tree_path_copy(ptr),
         free => |ptr| ffi::gtk_tree_path_free(ptr),
         get_type => || ffi::gtk_tree_path_get_type(),
     }
diff --git a/gtk/src/auto/versions.txt b/gtk/src/auto/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/gtk/src/auto/versions.txt
+++ b/gtk/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/gtk/sys/src/lib.rs b/gtk/sys/src/lib.rs
index 8e8dcb2b583f..8fdfb5ab2d3b 100644
--- a/gtk/sys/src/lib.rs
+++ b/gtk/sys/src/lib.rs
@@ -1289,7 +1289,7 @@ pub const GTK_UI_MANAGER_POPUP_WITH_ACCELS: GtkUIManagerItemType = 512;
 
 // Unions
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub union GtkBindingArg_d {
     pub long_data: c_long,
     pub double_data: c_double,
@@ -1322,7 +1322,7 @@ impl ::std::fmt::Debug for GtkTextAppearance_u1 {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub union GtkTextAttributes_u1 {
     pub font_features: *mut c_char,
     pub padding: [c_uint; 2],
@@ -1620,7 +1620,7 @@ impl ::std::fmt::Debug for GtkAccelGroupClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAccelGroupEntry {
     pub key: GtkAccelKey,
     pub closure: *mut gobject::GClosure,
@@ -1661,7 +1661,7 @@ impl ::std::fmt::Debug for GtkAccelKey {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAccelLabelClass {
     pub parent_class: GtkLabelClass,
     pub signal_quote1: *mut c_char,
@@ -1796,7 +1796,7 @@ impl ::std::fmt::Debug for GtkActionClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkActionEntry {
     pub name: *const c_char,
     pub stock_id: *const c_char,
@@ -2255,7 +2255,7 @@ impl ::std::fmt::Debug for GtkBindingEntry {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkBindingSet {
     pub set_name: *mut c_char,
     pub priority: c_int,
@@ -2283,7 +2283,7 @@ impl ::std::fmt::Debug for GtkBindingSet {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkBindingSignal {
     pub next: *mut GtkBindingSignal,
     pub signal_name: *mut c_char,
@@ -3088,7 +3088,7 @@ pub struct _GtkCellRendererAccelPrivate(c_void);
 pub type GtkCellRendererAccelPrivate = *mut _GtkCellRendererAccelPrivate;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellRendererClass {
     pub parent_class: gobject::GInitiallyUnownedClass,
     pub get_request_mode: Option<unsafe extern "C" fn(*mut GtkCellRenderer) -> GtkSizeRequestMode>,
@@ -4418,7 +4418,7 @@ pub struct _GtkFileChooserWidgetPrivate(c_void);
 pub type GtkFileChooserWidgetPrivate = *mut _GtkFileChooserWidgetPrivate;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFileFilterInfo {
     pub contains: GtkFileFilterFlags,
     pub filename: *const c_char,
@@ -4440,7 +4440,7 @@ impl ::std::fmt::Debug for GtkFileFilterInfo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFixedChild {
     pub widget: *mut GtkWidget,
     pub x: c_int,
@@ -5205,7 +5205,7 @@ impl ::std::fmt::Debug for GtkIMContextClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkIMContextInfo {
     pub context_id: *const c_char,
     pub context_name: *const c_char,
@@ -6543,7 +6543,7 @@ pub struct _GtkOverlayPrivate(c_void);
 pub type GtkOverlayPrivate = *mut _GtkOverlayPrivate;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkPadActionEntry {
     pub type_: GtkPadActionType,
     pub index: c_int,
@@ -6945,7 +6945,7 @@ impl ::std::fmt::Debug for GtkRadioActionClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRadioActionEntry {
     pub name: *const c_char,
     pub stock_id: *const c_char,
@@ -7117,7 +7117,7 @@ pub struct _GtkRangeAccessiblePrivate(c_void);
 pub type GtkRangeAccessiblePrivate = *mut _GtkRangeAccessiblePrivate;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRangeClass {
     pub parent_class: GtkWidgetClass,
     pub slider_detail: *mut c_char,
@@ -7165,7 +7165,7 @@ pub struct _GtkRcContext(c_void);
 pub type GtkRcContext = *mut _GtkRcContext;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRcProperty {
     pub type_name: glib::GQuark,
     pub property_name: glib::GQuark,
@@ -7395,7 +7395,7 @@ pub struct _GtkRecentChooserWidgetPrivate(c_void);
 pub type GtkRecentChooserWidgetPrivate = *mut _GtkRecentChooserWidgetPrivate;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRecentData {
     pub display_name: *mut c_char,
     pub description: *mut c_char,
@@ -7421,7 +7421,7 @@ impl ::std::fmt::Debug for GtkRecentData {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRecentFilterInfo {
     pub contains: GtkRecentFilterFlags,
     pub uri: *const c_char,
@@ -7915,7 +7915,7 @@ pub struct _GtkSettingsPrivate(c_void);
 pub type GtkSettingsPrivate = *mut _GtkSettingsPrivate;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkSettingsValue {
     pub origin: *mut c_char,
     pub value: gobject::GValue,
@@ -8319,7 +8319,7 @@ pub struct _GtkStatusbarPrivate(c_void);
 pub type GtkStatusbarPrivate = *mut _GtkStatusbarPrivate;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkStockItem {
     pub stock_id: *mut c_char,
     pub label: *mut c_char,
@@ -8931,7 +8931,7 @@ impl ::std::fmt::Debug for GtkTableRowCol {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTargetEntry {
     pub target: *mut c_char,
     pub flags: c_uint,
@@ -9600,7 +9600,7 @@ impl ::std::fmt::Debug for GtkToggleActionClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkToggleActionEntry {
     pub name: *const c_char,
     pub stock_id: *const c_char,
@@ -10592,7 +10592,7 @@ pub struct _GtkWidgetAccessiblePrivate(c_void);
 pub type GtkWidgetAccessiblePrivate = *mut _GtkWidgetAccessiblePrivate;
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkWidgetClass {
     pub parent_class: gobject::GInitiallyUnownedClass,
     pub activate_signal: c_uint,
@@ -10984,7 +10984,7 @@ pub type GtkWindowPrivate = *mut _GtkWindowPrivate;
 
 // Classes
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAboutDialog {
     pub parent_instance: GtkDialog,
     pub priv_: *mut GtkAboutDialogPrivate,
@@ -10999,7 +10999,7 @@ impl ::std::fmt::Debug for GtkAboutDialog {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAccelGroup {
     pub parent: gobject::GObject,
     pub priv_: *mut GtkAccelGroupPrivate,
@@ -11015,7 +11015,7 @@ impl ::std::fmt::Debug for GtkAccelGroup {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAccelLabel {
     pub label: GtkLabel,
     pub priv_: *mut GtkAccelLabelPrivate,
@@ -11041,7 +11041,7 @@ impl ::std::fmt::Debug for GtkAccelMap {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAccessible {
     pub parent: atk::AtkObject,
     pub priv_: *mut GtkAccessiblePrivate,
@@ -11056,7 +11056,7 @@ impl ::std::fmt::Debug for GtkAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAction {
     pub object: gobject::GObject,
     pub private_data: *mut GtkActionPrivate,
@@ -11084,7 +11084,7 @@ impl ::std::fmt::Debug for GtkActionBar {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkActionGroup {
     pub parent: gobject::GObject,
     pub priv_: *mut GtkActionGroupPrivate,
@@ -11099,7 +11099,7 @@ impl ::std::fmt::Debug for GtkActionGroup {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAdjustment {
     pub parent_instance: gobject::GInitiallyUnowned,
     pub priv_: *mut GtkAdjustmentPrivate,
@@ -11115,7 +11115,7 @@ impl ::std::fmt::Debug for GtkAdjustment {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAlignment {
     pub bin: GtkBin,
     pub priv_: *mut GtkAlignmentPrivate,
@@ -11130,7 +11130,7 @@ impl ::std::fmt::Debug for GtkAlignment {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAppChooserButton {
     pub parent: GtkComboBox,
     pub priv_: *mut GtkAppChooserButtonPrivate,
@@ -11145,7 +11145,7 @@ impl ::std::fmt::Debug for GtkAppChooserButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAppChooserDialog {
     pub parent: GtkDialog,
     pub priv_: *mut GtkAppChooserDialogPrivate,
@@ -11160,7 +11160,7 @@ impl ::std::fmt::Debug for GtkAppChooserDialog {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAppChooserWidget {
     pub parent: GtkBox,
     pub priv_: *mut GtkAppChooserWidgetPrivate,
@@ -11175,7 +11175,7 @@ impl ::std::fmt::Debug for GtkAppChooserWidget {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkApplication {
     pub parent: gio::GApplication,
     pub priv_: *mut GtkApplicationPrivate,
@@ -11190,7 +11190,7 @@ impl ::std::fmt::Debug for GtkApplication {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkApplicationWindow {
     pub parent_instance: GtkWindow,
     pub priv_: *mut GtkApplicationWindowPrivate,
@@ -11205,7 +11205,7 @@ impl ::std::fmt::Debug for GtkApplicationWindow {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkArrow {
     pub misc: GtkMisc,
     pub priv_: *mut GtkArrowPrivate,
@@ -11220,7 +11220,7 @@ impl ::std::fmt::Debug for GtkArrow {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkArrowAccessible {
     pub parent: GtkWidgetAccessible,
     pub priv_: *mut GtkArrowAccessiblePrivate,
@@ -11236,7 +11236,7 @@ impl ::std::fmt::Debug for GtkArrowAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAspectFrame {
     pub frame: GtkFrame,
     pub priv_: *mut GtkAspectFramePrivate,
@@ -11251,7 +11251,7 @@ impl ::std::fmt::Debug for GtkAspectFrame {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkAssistant {
     pub parent: GtkWindow,
     pub priv_: *mut GtkAssistantPrivate,
@@ -11266,7 +11266,7 @@ impl ::std::fmt::Debug for GtkAssistant {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkBin {
     pub container: GtkContainer,
     pub priv_: *mut GtkBinPrivate,
@@ -11281,7 +11281,7 @@ impl ::std::fmt::Debug for GtkBin {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkBooleanCellAccessible {
     pub parent: GtkRendererCellAccessible,
     pub priv_: *mut GtkBooleanCellAccessiblePrivate,
@@ -11300,7 +11300,7 @@ impl ::std::fmt::Debug for GtkBooleanCellAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkBox {
     pub container: GtkContainer,
     pub priv_: *mut GtkBoxPrivate,
@@ -11315,7 +11315,7 @@ impl ::std::fmt::Debug for GtkBox {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkBuilder {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkBuilderPrivate,
@@ -11331,7 +11331,7 @@ impl ::std::fmt::Debug for GtkBuilder {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkButton {
     pub bin: GtkBin,
     pub priv_: *mut GtkButtonPrivate,
@@ -11345,7 +11345,7 @@ impl ::std::fmt::Debug for GtkButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkButtonAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkButtonAccessiblePrivate,
@@ -11361,7 +11361,7 @@ impl ::std::fmt::Debug for GtkButtonAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkButtonBox {
     pub box_: GtkBox,
     pub priv_: *mut GtkButtonBoxPrivate,
@@ -11376,7 +11376,7 @@ impl ::std::fmt::Debug for GtkButtonBox {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCalendar {
     pub widget: GtkWidget,
     pub priv_: *mut GtkCalendarPrivate,
@@ -11392,7 +11392,7 @@ impl ::std::fmt::Debug for GtkCalendar {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellAccessible {
     pub parent: GtkAccessible,
     pub priv_: *mut GtkCellAccessiblePrivate,
@@ -11408,7 +11408,7 @@ impl ::std::fmt::Debug for GtkCellAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellArea {
     pub parent_instance: gobject::GInitiallyUnowned,
     pub priv_: *mut GtkCellAreaPrivate,
@@ -11422,7 +11422,7 @@ impl ::std::fmt::Debug for GtkCellArea {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellAreaBox {
     pub parent_instance: GtkCellArea,
     pub priv_: *mut GtkCellAreaBoxPrivate,
@@ -11436,7 +11436,7 @@ impl ::std::fmt::Debug for GtkCellAreaBox {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellAreaContext {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkCellAreaContextPrivate,
@@ -11450,7 +11450,7 @@ impl ::std::fmt::Debug for GtkCellAreaContext {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellRenderer {
     pub parent_instance: gobject::GInitiallyUnowned,
     pub priv_: *mut GtkCellRendererPrivate,
@@ -11465,7 +11465,7 @@ impl ::std::fmt::Debug for GtkCellRenderer {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellRendererAccel {
     pub parent: GtkCellRendererText,
     pub priv_: *mut GtkCellRendererAccelPrivate,
@@ -11480,7 +11480,7 @@ impl ::std::fmt::Debug for GtkCellRendererAccel {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellRendererCombo {
     pub parent: GtkCellRendererText,
     pub priv_: *mut GtkCellRendererComboPrivate,
@@ -11495,7 +11495,7 @@ impl ::std::fmt::Debug for GtkCellRendererCombo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellRendererPixbuf {
     pub parent: GtkCellRenderer,
     pub priv_: *mut GtkCellRendererPixbufPrivate,
@@ -11510,7 +11510,7 @@ impl ::std::fmt::Debug for GtkCellRendererPixbuf {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellRendererProgress {
     pub parent_instance: GtkCellRenderer,
     pub priv_: *mut GtkCellRendererProgressPrivate,
@@ -11525,7 +11525,7 @@ impl ::std::fmt::Debug for GtkCellRendererProgress {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellRendererSpin {
     pub parent: GtkCellRendererText,
     pub priv_: *mut GtkCellRendererSpinPrivate,
@@ -11540,7 +11540,7 @@ impl ::std::fmt::Debug for GtkCellRendererSpin {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellRendererSpinner {
     pub parent: GtkCellRenderer,
     pub priv_: *mut GtkCellRendererSpinnerPrivate,
@@ -11555,7 +11555,7 @@ impl ::std::fmt::Debug for GtkCellRendererSpinner {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellRendererText {
     pub parent: GtkCellRenderer,
     pub priv_: *mut GtkCellRendererTextPrivate,
@@ -11570,7 +11570,7 @@ impl ::std::fmt::Debug for GtkCellRendererText {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellRendererToggle {
     pub parent: GtkCellRenderer,
     pub priv_: *mut GtkCellRendererTogglePrivate,
@@ -11585,7 +11585,7 @@ impl ::std::fmt::Debug for GtkCellRendererToggle {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCellView {
     pub parent_instance: GtkWidget,
     pub priv_: *mut GtkCellViewPrivate,
@@ -11614,7 +11614,7 @@ impl ::std::fmt::Debug for GtkCheckButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCheckMenuItem {
     pub menu_item: GtkMenuItem,
     pub priv_: *mut GtkCheckMenuItemPrivate,
@@ -11629,7 +11629,7 @@ impl ::std::fmt::Debug for GtkCheckMenuItem {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCheckMenuItemAccessible {
     pub parent: GtkMenuItemAccessible,
     pub priv_: *mut GtkCheckMenuItemAccessiblePrivate,
@@ -11658,7 +11658,7 @@ impl ::std::fmt::Debug for GtkClipboard {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkColorButton {
     pub button: GtkButton,
     pub priv_: *mut GtkColorButtonPrivate,
@@ -11673,7 +11673,7 @@ impl ::std::fmt::Debug for GtkColorButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkColorChooserDialog {
     pub parent_instance: GtkDialog,
     pub priv_: *mut GtkColorChooserDialogPrivate,
@@ -11688,7 +11688,7 @@ impl ::std::fmt::Debug for GtkColorChooserDialog {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkColorChooserWidget {
     pub parent_instance: GtkBox,
     pub priv_: *mut GtkColorChooserWidgetPrivate,
@@ -11703,7 +11703,7 @@ impl ::std::fmt::Debug for GtkColorChooserWidget {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkColorSelection {
     pub parent_instance: GtkBox,
     pub private_data: *mut GtkColorSelectionPrivate,
@@ -11718,7 +11718,7 @@ impl ::std::fmt::Debug for GtkColorSelection {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkColorSelectionDialog {
     pub parent_instance: GtkDialog,
     pub priv_: *mut GtkColorSelectionDialogPrivate,
@@ -11733,7 +11733,7 @@ impl ::std::fmt::Debug for GtkColorSelectionDialog {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkComboBox {
     pub parent_instance: GtkBin,
     pub priv_: *mut GtkComboBoxPrivate,
@@ -11748,7 +11748,7 @@ impl ::std::fmt::Debug for GtkComboBox {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkComboBoxAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkComboBoxAccessiblePrivate,
@@ -11764,7 +11764,7 @@ impl ::std::fmt::Debug for GtkComboBoxAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkComboBoxText {
     pub parent_instance: GtkComboBox,
     pub priv_: *mut GtkComboBoxTextPrivate,
@@ -11778,7 +11778,7 @@ impl ::std::fmt::Debug for GtkComboBoxText {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkContainer {
     pub widget: GtkWidget,
     pub priv_: *mut GtkContainerPrivate,
@@ -11793,7 +11793,7 @@ impl ::std::fmt::Debug for GtkContainer {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkContainerAccessible {
     pub parent: GtkWidgetAccessible,
     pub priv_: *mut GtkContainerAccessiblePrivate,
@@ -11809,7 +11809,7 @@ impl ::std::fmt::Debug for GtkContainerAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkContainerCellAccessible {
     pub parent: GtkCellAccessible,
     pub priv_: *mut GtkContainerCellAccessiblePrivate,
@@ -11828,7 +11828,7 @@ impl ::std::fmt::Debug for GtkContainerCellAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkCssProvider {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkCssProviderPrivate,
@@ -11844,7 +11844,7 @@ impl ::std::fmt::Debug for GtkCssProvider {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkDialog {
     pub window: GtkWindow,
     pub priv_: *mut GtkDialogPrivate,
@@ -11874,7 +11874,7 @@ impl ::std::fmt::Debug for GtkDrawingArea {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkEntry {
     pub parent_instance: GtkWidget,
     pub priv_: *mut GtkEntryPrivate,
@@ -11888,7 +11888,7 @@ impl ::std::fmt::Debug for GtkEntry {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkEntryAccessible {
     pub parent: GtkWidgetAccessible,
     pub priv_: *mut GtkEntryAccessiblePrivate,
@@ -11904,7 +11904,7 @@ impl ::std::fmt::Debug for GtkEntryAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkEntryBuffer {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkEntryBufferPrivate,
@@ -11919,7 +11919,7 @@ impl ::std::fmt::Debug for GtkEntryBuffer {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkEntryCompletion {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkEntryCompletionPrivate,
@@ -11944,7 +11944,7 @@ impl ::std::fmt::Debug for GtkEntryIconAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkEventBox {
     pub bin: GtkBin,
     pub priv_: *mut GtkEventBoxPrivate,
@@ -12005,7 +12005,7 @@ impl ::std::fmt::Debug for GtkEventControllerScroll {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkExpander {
     pub bin: GtkBin,
     pub priv_: *mut GtkExpanderPrivate,
@@ -12021,7 +12021,7 @@ impl ::std::fmt::Debug for GtkExpander {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkExpanderAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkExpanderAccessiblePrivate,
@@ -12037,7 +12037,7 @@ impl ::std::fmt::Debug for GtkExpanderAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFileChooserButton {
     pub parent: GtkBox,
     pub priv_: *mut GtkFileChooserButtonPrivate,
@@ -12052,7 +12052,7 @@ impl ::std::fmt::Debug for GtkFileChooserButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFileChooserDialog {
     pub parent_instance: GtkDialog,
     pub priv_: *mut GtkFileChooserDialogPrivate,
@@ -12078,7 +12078,7 @@ impl ::std::fmt::Debug for GtkFileChooserNative {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFileChooserWidget {
     pub parent_instance: GtkBox,
     pub priv_: *mut GtkFileChooserWidgetPrivate,
@@ -12104,7 +12104,7 @@ impl ::std::fmt::Debug for GtkFileFilter {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFixed {
     pub container: GtkContainer,
     pub priv_: *mut GtkFixedPrivate,
@@ -12133,7 +12133,7 @@ impl ::std::fmt::Debug for GtkFlowBox {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFlowBoxAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkFlowBoxAccessiblePrivate,
@@ -12180,7 +12180,7 @@ impl ::std::fmt::Debug for GtkFlowBoxChildAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFontButton {
     pub button: GtkButton,
     pub priv_: *mut GtkFontButtonPrivate,
@@ -12195,7 +12195,7 @@ impl ::std::fmt::Debug for GtkFontButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFontChooserDialog {
     pub parent_instance: GtkDialog,
     pub priv_: *mut GtkFontChooserDialogPrivate,
@@ -12210,7 +12210,7 @@ impl ::std::fmt::Debug for GtkFontChooserDialog {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFontChooserWidget {
     pub parent_instance: GtkBox,
     pub priv_: *mut GtkFontChooserWidgetPrivate,
@@ -12225,7 +12225,7 @@ impl ::std::fmt::Debug for GtkFontChooserWidget {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFontSelection {
     pub parent_instance: GtkBox,
     pub priv_: *mut GtkFontSelectionPrivate,
@@ -12240,7 +12240,7 @@ impl ::std::fmt::Debug for GtkFontSelection {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFontSelectionDialog {
     pub parent_instance: GtkDialog,
     pub priv_: *mut GtkFontSelectionDialogPrivate,
@@ -12255,7 +12255,7 @@ impl ::std::fmt::Debug for GtkFontSelectionDialog {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFrame {
     pub bin: GtkBin,
     pub priv_: *mut GtkFramePrivate,
@@ -12270,7 +12270,7 @@ impl ::std::fmt::Debug for GtkFrame {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkFrameAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkFrameAccessiblePrivate,
@@ -12399,7 +12399,7 @@ impl ::std::fmt::Debug for GtkGestureZoom {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkGrid {
     pub container: GtkContainer,
     pub priv_: *mut GtkGridPrivate,
@@ -12455,7 +12455,7 @@ impl ::std::fmt::Debug for GtkHPaned {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkHSV {
     pub parent_instance: GtkWidget,
     pub priv_: *mut GtkHSVPrivate,
@@ -12512,7 +12512,7 @@ impl ::std::fmt::Debug for GtkHSeparator {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkHandleBox {
     pub bin: GtkBin,
     pub priv_: *mut GtkHandleBoxPrivate,
@@ -12569,7 +12569,7 @@ impl ::std::fmt::Debug for GtkIMContext {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkIMContextSimple {
     pub object: GtkIMContext,
     pub priv_: *mut GtkIMContextSimplePrivate,
@@ -12584,7 +12584,7 @@ impl ::std::fmt::Debug for GtkIMContextSimple {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkIMMulticontext {
     pub object: GtkIMContext,
     pub priv_: *mut GtkIMMulticontextPrivate,
@@ -12599,7 +12599,7 @@ impl ::std::fmt::Debug for GtkIMMulticontext {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkIconFactory {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkIconFactoryPrivate,
@@ -12624,7 +12624,7 @@ impl ::std::fmt::Debug for GtkIconInfo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkIconTheme {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkIconThemePrivate,
@@ -12638,7 +12638,7 @@ impl ::std::fmt::Debug for GtkIconTheme {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkIconView {
     pub parent: GtkContainer,
     pub priv_: *mut GtkIconViewPrivate,
@@ -12653,7 +12653,7 @@ impl ::std::fmt::Debug for GtkIconView {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkIconViewAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkIconViewAccessiblePrivate,
@@ -12669,7 +12669,7 @@ impl ::std::fmt::Debug for GtkIconViewAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkImage {
     pub misc: GtkMisc,
     pub priv_: *mut GtkImagePrivate,
@@ -12684,7 +12684,7 @@ impl ::std::fmt::Debug for GtkImage {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkImageAccessible {
     pub parent: GtkWidgetAccessible,
     pub priv_: *mut GtkImageAccessiblePrivate,
@@ -12700,7 +12700,7 @@ impl ::std::fmt::Debug for GtkImageAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkImageCellAccessible {
     pub parent: GtkRendererCellAccessible,
     pub priv_: *mut GtkImageCellAccessiblePrivate,
@@ -12716,7 +12716,7 @@ impl ::std::fmt::Debug for GtkImageCellAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkImageMenuItem {
     pub menu_item: GtkMenuItem,
     pub priv_: *mut GtkImageMenuItemPrivate,
@@ -12731,7 +12731,7 @@ impl ::std::fmt::Debug for GtkImageMenuItem {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkInfoBar {
     pub parent: GtkBox,
     pub priv_: *mut GtkInfoBarPrivate,
@@ -12746,7 +12746,7 @@ impl ::std::fmt::Debug for GtkInfoBar {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkInvisible {
     pub widget: GtkWidget,
     pub priv_: *mut GtkInvisiblePrivate,
@@ -12761,7 +12761,7 @@ impl ::std::fmt::Debug for GtkInvisible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkLabel {
     pub misc: GtkMisc,
     pub priv_: *mut GtkLabelPrivate,
@@ -12776,7 +12776,7 @@ impl ::std::fmt::Debug for GtkLabel {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkLabelAccessible {
     pub parent: GtkWidgetAccessible,
     pub priv_: *mut GtkLabelAccessiblePrivate,
@@ -12792,7 +12792,7 @@ impl ::std::fmt::Debug for GtkLabelAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkLayout {
     pub container: GtkContainer,
     pub priv_: *mut GtkLayoutPrivate,
@@ -12807,7 +12807,7 @@ impl ::std::fmt::Debug for GtkLayout {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkLevelBar {
     pub parent: GtkWidget,
     pub priv_: *mut GtkLevelBarPrivate,
@@ -12821,7 +12821,7 @@ impl ::std::fmt::Debug for GtkLevelBar {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkLevelBarAccessible {
     pub parent: GtkWidgetAccessible,
     pub priv_: *mut GtkLevelBarAccessiblePrivate,
@@ -12837,7 +12837,7 @@ impl ::std::fmt::Debug for GtkLevelBarAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkLinkButton {
     pub parent_instance: GtkButton,
     pub priv_: *mut GtkLinkButtonPrivate,
@@ -12851,7 +12851,7 @@ impl ::std::fmt::Debug for GtkLinkButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkLinkButtonAccessible {
     pub parent: GtkButtonAccessible,
     pub priv_: *mut GtkLinkButtonAccessiblePrivate,
@@ -12881,7 +12881,7 @@ impl ::std::fmt::Debug for GtkListBox {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkListBoxAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkListBoxAccessiblePrivate,
@@ -12925,7 +12925,7 @@ impl ::std::fmt::Debug for GtkListBoxRowAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkListStore {
     pub parent: gobject::GObject,
     pub priv_: *mut GtkListStorePrivate,
@@ -12940,7 +12940,7 @@ impl ::std::fmt::Debug for GtkListStore {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkLockButton {
     pub parent: GtkButton,
     pub priv_: *mut GtkLockButtonPrivate,
@@ -12956,7 +12956,7 @@ impl ::std::fmt::Debug for GtkLockButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkLockButtonAccessible {
     pub parent: GtkButtonAccessible,
     pub priv_: *mut GtkLockButtonAccessiblePrivate,
@@ -12972,7 +12972,7 @@ impl ::std::fmt::Debug for GtkLockButtonAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMenu {
     pub menu_shell: GtkMenuShell,
     pub priv_: *mut GtkMenuPrivate,
@@ -12987,7 +12987,7 @@ impl ::std::fmt::Debug for GtkMenu {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMenuAccessible {
     pub parent: GtkMenuShellAccessible,
     pub priv_: *mut GtkMenuAccessiblePrivate,
@@ -13003,7 +13003,7 @@ impl ::std::fmt::Debug for GtkMenuAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMenuBar {
     pub menu_shell: GtkMenuShell,
     pub priv_: *mut GtkMenuBarPrivate,
@@ -13018,7 +13018,7 @@ impl ::std::fmt::Debug for GtkMenuBar {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMenuButton {
     pub parent: GtkToggleButton,
     pub priv_: *mut GtkMenuButtonPrivate,
@@ -13033,7 +13033,7 @@ impl ::std::fmt::Debug for GtkMenuButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMenuButtonAccessible {
     pub parent: GtkToggleButtonAccessible,
     pub priv_: *mut GtkMenuButtonAccessiblePrivate,
@@ -13049,7 +13049,7 @@ impl ::std::fmt::Debug for GtkMenuButtonAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMenuItem {
     pub bin: GtkBin,
     pub priv_: *mut GtkMenuItemPrivate,
@@ -13064,7 +13064,7 @@ impl ::std::fmt::Debug for GtkMenuItem {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMenuItemAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkMenuItemAccessiblePrivate,
@@ -13080,7 +13080,7 @@ impl ::std::fmt::Debug for GtkMenuItemAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMenuShell {
     pub container: GtkContainer,
     pub priv_: *mut GtkMenuShellPrivate,
@@ -13095,7 +13095,7 @@ impl ::std::fmt::Debug for GtkMenuShell {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMenuShellAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkMenuShellAccessiblePrivate,
@@ -13111,7 +13111,7 @@ impl ::std::fmt::Debug for GtkMenuShellAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMenuToolButton {
     pub parent: GtkToolButton,
     pub priv_: *mut GtkMenuToolButtonPrivate,
@@ -13126,7 +13126,7 @@ impl ::std::fmt::Debug for GtkMenuToolButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMessageDialog {
     pub parent_instance: GtkDialog,
     pub priv_: *mut GtkMessageDialogPrivate,
@@ -13141,7 +13141,7 @@ impl ::std::fmt::Debug for GtkMessageDialog {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMisc {
     pub widget: GtkWidget,
     pub priv_: *mut GtkMiscPrivate,
@@ -13166,7 +13166,7 @@ impl ::std::fmt::Debug for GtkModelButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkMountOperation {
     pub parent_instance: gio::GMountOperation,
     pub priv_: *mut GtkMountOperationPrivate,
@@ -13196,7 +13196,7 @@ impl ::std::fmt::Debug for GtkNativeDialog {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkNotebook {
     pub container: GtkContainer,
     pub priv_: *mut GtkNotebookPrivate,
@@ -13210,7 +13210,7 @@ impl ::std::fmt::Debug for GtkNotebook {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkNotebookAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkNotebookAccessiblePrivate,
@@ -13226,7 +13226,7 @@ impl ::std::fmt::Debug for GtkNotebookAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkNotebookPageAccessible {
     pub parent: atk::AtkObject,
     pub priv_: *mut GtkNotebookPageAccessiblePrivate,
@@ -13245,7 +13245,7 @@ impl ::std::fmt::Debug for GtkNotebookPageAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkNumerableIcon {
     pub parent: gio::GEmblemedIcon,
     pub priv_: *mut GtkNumerableIconPrivate,
@@ -13274,7 +13274,7 @@ impl ::std::fmt::Debug for GtkOffscreenWindow {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkOverlay {
     pub parent: GtkBin,
     pub priv_: *mut GtkOverlayPrivate,
@@ -13310,7 +13310,7 @@ impl ::std::fmt::Debug for GtkPageSetup {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkPaned {
     pub container: GtkContainer,
     pub priv_: *mut GtkPanedPrivate,
@@ -13325,7 +13325,7 @@ impl ::std::fmt::Debug for GtkPaned {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkPanedAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkPanedAccessiblePrivate,
@@ -13351,7 +13351,7 @@ impl ::std::fmt::Debug for GtkPlacesSidebar {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkPlug {
     pub window: GtkWindow,
     pub priv_: *mut GtkPlugPrivate,
@@ -13367,7 +13367,7 @@ impl ::std::fmt::Debug for GtkPlug {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkPopover {
     pub parent_instance: GtkBin,
     pub priv_: *mut GtkPopoverPrivate,
@@ -13416,7 +13416,7 @@ impl ::std::fmt::Debug for GtkPrintContext {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkPrintOperation {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkPrintOperationPrivate,
@@ -13441,7 +13441,7 @@ impl ::std::fmt::Debug for GtkPrintSettings {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkProgressBar {
     pub parent: GtkWidget,
     pub priv_: *mut GtkProgressBarPrivate,
@@ -13456,7 +13456,7 @@ impl ::std::fmt::Debug for GtkProgressBar {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkProgressBarAccessible {
     pub parent: GtkWidgetAccessible,
     pub priv_: *mut GtkProgressBarAccessiblePrivate,
@@ -13475,7 +13475,7 @@ impl ::std::fmt::Debug for GtkProgressBarAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRadioAction {
     pub parent: GtkToggleAction,
     pub private_data: *mut GtkRadioActionPrivate,
@@ -13490,7 +13490,7 @@ impl ::std::fmt::Debug for GtkRadioAction {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRadioButton {
     pub check_button: GtkCheckButton,
     pub priv_: *mut GtkRadioButtonPrivate,
@@ -13505,7 +13505,7 @@ impl ::std::fmt::Debug for GtkRadioButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRadioButtonAccessible {
     pub parent: GtkToggleButtonAccessible,
     pub priv_: *mut GtkRadioButtonAccessiblePrivate,
@@ -13524,7 +13524,7 @@ impl ::std::fmt::Debug for GtkRadioButtonAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRadioMenuItem {
     pub check_menu_item: GtkCheckMenuItem,
     pub priv_: *mut GtkRadioMenuItemPrivate,
@@ -13539,7 +13539,7 @@ impl ::std::fmt::Debug for GtkRadioMenuItem {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRadioMenuItemAccessible {
     pub parent: GtkCheckMenuItemAccessible,
     pub priv_: *mut GtkRadioMenuItemAccessiblePrivate,
@@ -13572,7 +13572,7 @@ impl ::std::fmt::Debug for GtkRadioToolButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRange {
     pub widget: GtkWidget,
     pub priv_: *mut GtkRangePrivate,
@@ -13588,7 +13588,7 @@ impl ::std::fmt::Debug for GtkRange {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRangeAccessible {
     pub parent: GtkWidgetAccessible,
     pub priv_: *mut GtkRangeAccessiblePrivate,
@@ -13604,7 +13604,7 @@ impl ::std::fmt::Debug for GtkRangeAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRcStyle {
     pub parent_instance: gobject::GObject,
     pub name: *mut c_char,
@@ -13642,7 +13642,7 @@ impl ::std::fmt::Debug for GtkRcStyle {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRecentAction {
     pub parent_instance: GtkAction,
     pub priv_: *mut GtkRecentActionPrivate,
@@ -13657,7 +13657,7 @@ impl ::std::fmt::Debug for GtkRecentAction {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRecentChooserDialog {
     pub parent_instance: GtkDialog,
     pub priv_: *mut GtkRecentChooserDialogPrivate,
@@ -13672,7 +13672,7 @@ impl ::std::fmt::Debug for GtkRecentChooserDialog {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRecentChooserMenu {
     pub parent_instance: GtkMenu,
     pub priv_: *mut GtkRecentChooserMenuPrivate,
@@ -13687,7 +13687,7 @@ impl ::std::fmt::Debug for GtkRecentChooserMenu {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRecentChooserWidget {
     pub parent_instance: GtkBox,
     pub priv_: *mut GtkRecentChooserWidgetPrivate,
@@ -13712,7 +13712,7 @@ impl ::std::fmt::Debug for GtkRecentFilter {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRecentManager {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkRecentManagerPrivate,
@@ -13726,7 +13726,7 @@ impl ::std::fmt::Debug for GtkRecentManager {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkRendererCellAccessible {
     pub parent: GtkCellAccessible,
     pub priv_: *mut GtkRendererCellAccessiblePrivate,
@@ -13759,7 +13759,7 @@ impl ::std::fmt::Debug for GtkRevealer {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkScale {
     pub range: GtkRange,
     pub priv_: *mut GtkScalePrivate,
@@ -13774,7 +13774,7 @@ impl ::std::fmt::Debug for GtkScale {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkScaleAccessible {
     pub parent: GtkRangeAccessible,
     pub priv_: *mut GtkScaleAccessiblePrivate,
@@ -13790,7 +13790,7 @@ impl ::std::fmt::Debug for GtkScaleAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkScaleButton {
     pub parent: GtkButton,
     pub priv_: *mut GtkScaleButtonPrivate,
@@ -13805,7 +13805,7 @@ impl ::std::fmt::Debug for GtkScaleButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkScaleButtonAccessible {
     pub parent: GtkButtonAccessible,
     pub priv_: *mut GtkScaleButtonAccessiblePrivate,
@@ -13838,7 +13838,7 @@ impl ::std::fmt::Debug for GtkScrollbar {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkScrolledWindow {
     pub container: GtkBin,
     pub priv_: *mut GtkScrolledWindowPrivate,
@@ -13854,7 +13854,7 @@ impl ::std::fmt::Debug for GtkScrolledWindow {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkScrolledWindowAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkScrolledWindowAccessiblePrivate,
@@ -13900,7 +13900,7 @@ impl ::std::fmt::Debug for GtkSearchEntry {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkSeparator {
     pub widget: GtkWidget,
     pub priv_: *mut GtkSeparatorPrivate,
@@ -13930,7 +13930,7 @@ impl ::std::fmt::Debug for GtkSeparatorMenuItem {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkSeparatorToolItem {
     pub parent: GtkToolItem,
     pub priv_: *mut GtkSeparatorToolItemPrivate,
@@ -13945,7 +13945,7 @@ impl ::std::fmt::Debug for GtkSeparatorToolItem {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkSettings {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkSettingsPrivate,
@@ -14014,7 +14014,7 @@ impl ::std::fmt::Debug for GtkShortcutsWindow {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkSizeGroup {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkSizeGroupPrivate,
@@ -14029,7 +14029,7 @@ impl ::std::fmt::Debug for GtkSizeGroup {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkSocket {
     pub container: GtkContainer,
     pub priv_: *mut GtkSocketPrivate,
@@ -14045,7 +14045,7 @@ impl ::std::fmt::Debug for GtkSocket {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkSpinButton {
     pub entry: GtkEntry,
     pub priv_: *mut GtkSpinButtonPrivate,
@@ -14060,7 +14060,7 @@ impl ::std::fmt::Debug for GtkSpinButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkSpinButtonAccessible {
     pub parent: GtkEntryAccessible,
     pub priv_: *mut GtkSpinButtonAccessiblePrivate,
@@ -14076,7 +14076,7 @@ impl ::std::fmt::Debug for GtkSpinButtonAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkSpinner {
     pub parent: GtkWidget,
     pub priv_: *mut GtkSpinnerPrivate,
@@ -14091,7 +14091,7 @@ impl ::std::fmt::Debug for GtkSpinner {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkSpinnerAccessible {
     pub parent: GtkWidgetAccessible,
     pub priv_: *mut GtkSpinnerAccessiblePrivate,
@@ -14163,7 +14163,7 @@ impl ::std::fmt::Debug for GtkStackSwitcher {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkStatusIcon {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkStatusIconPrivate,
@@ -14179,7 +14179,7 @@ impl ::std::fmt::Debug for GtkStatusIcon {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkStatusbar {
     pub parent_widget: GtkBox,
     pub priv_: *mut GtkStatusbarPrivate,
@@ -14194,7 +14194,7 @@ impl ::std::fmt::Debug for GtkStatusbar {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkStatusbarAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkStatusbarAccessiblePrivate,
@@ -14250,7 +14250,7 @@ impl ::std::fmt::Debug for GtkStyle {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkStyleContext {
     pub parent_object: gobject::GObject,
     pub priv_: *mut GtkStyleContextPrivate,
@@ -14266,7 +14266,7 @@ impl ::std::fmt::Debug for GtkStyleContext {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkStyleProperties {
     pub parent_object: gobject::GObject,
     pub priv_: *mut GtkStylePropertiesPrivate,
@@ -14280,7 +14280,7 @@ impl ::std::fmt::Debug for GtkStyleProperties {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkSwitch {
     pub parent_instance: GtkWidget,
     pub priv_: *mut GtkSwitchPrivate,
@@ -14294,7 +14294,7 @@ impl ::std::fmt::Debug for GtkSwitch {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkSwitchAccessible {
     pub parent: GtkWidgetAccessible,
     pub priv_: *mut GtkSwitchAccessiblePrivate,
@@ -14310,7 +14310,7 @@ impl ::std::fmt::Debug for GtkSwitchAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTable {
     pub container: GtkContainer,
     pub priv_: *mut GtkTablePrivate,
@@ -14325,7 +14325,7 @@ impl ::std::fmt::Debug for GtkTable {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTearoffMenuItem {
     pub menu_item: GtkMenuItem,
     pub priv_: *mut GtkTearoffMenuItemPrivate,
@@ -14340,7 +14340,7 @@ impl ::std::fmt::Debug for GtkTearoffMenuItem {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTextBuffer {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkTextBufferPrivate,
@@ -14356,7 +14356,7 @@ impl ::std::fmt::Debug for GtkTextBuffer {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTextCellAccessible {
     pub parent: GtkRendererCellAccessible,
     pub priv_: *mut GtkTextCellAccessiblePrivate,
@@ -14402,7 +14402,7 @@ impl ::std::fmt::Debug for GtkTextMark {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTextTag {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkTextTagPrivate,
@@ -14418,7 +14418,7 @@ impl ::std::fmt::Debug for GtkTextTag {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTextTagTable {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkTextTagTablePrivate,
@@ -14434,7 +14434,7 @@ impl ::std::fmt::Debug for GtkTextTagTable {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTextView {
     pub parent_instance: GtkContainer,
     pub priv_: *mut GtkTextViewPrivate,
@@ -14449,7 +14449,7 @@ impl ::std::fmt::Debug for GtkTextView {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTextViewAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkTextViewAccessiblePrivate,
@@ -14465,7 +14465,7 @@ impl ::std::fmt::Debug for GtkTextViewAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkThemingEngine {
     pub parent_object: gobject::GObject,
     pub priv_: *mut GtkThemingEnginePrivate,
@@ -14481,7 +14481,7 @@ impl ::std::fmt::Debug for GtkThemingEngine {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkToggleAction {
     pub parent: GtkAction,
     pub private_data: *mut GtkToggleActionPrivate,
@@ -14496,7 +14496,7 @@ impl ::std::fmt::Debug for GtkToggleAction {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkToggleButton {
     pub button: GtkButton,
     pub priv_: *mut GtkToggleButtonPrivate,
@@ -14510,7 +14510,7 @@ impl ::std::fmt::Debug for GtkToggleButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkToggleButtonAccessible {
     pub parent: GtkButtonAccessible,
     pub priv_: *mut GtkToggleButtonAccessiblePrivate,
@@ -14529,7 +14529,7 @@ impl ::std::fmt::Debug for GtkToggleButtonAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkToggleToolButton {
     pub parent: GtkToolButton,
     pub priv_: *mut GtkToggleToolButtonPrivate,
@@ -14544,7 +14544,7 @@ impl ::std::fmt::Debug for GtkToggleToolButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkToolButton {
     pub parent: GtkToolItem,
     pub priv_: *mut GtkToolButtonPrivate,
@@ -14559,7 +14559,7 @@ impl ::std::fmt::Debug for GtkToolButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkToolItem {
     pub parent: GtkBin,
     pub priv_: *mut GtkToolItemPrivate,
@@ -14574,7 +14574,7 @@ impl ::std::fmt::Debug for GtkToolItem {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkToolItemGroup {
     pub parent_instance: GtkContainer,
     pub priv_: *mut GtkToolItemGroupPrivate,
@@ -14590,7 +14590,7 @@ impl ::std::fmt::Debug for GtkToolItemGroup {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkToolPalette {
     pub parent_instance: GtkContainer,
     pub priv_: *mut GtkToolPalettePrivate,
@@ -14606,7 +14606,7 @@ impl ::std::fmt::Debug for GtkToolPalette {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkToolbar {
     pub container: GtkContainer,
     pub priv_: *mut GtkToolbarPrivate,
@@ -14632,7 +14632,7 @@ impl ::std::fmt::Debug for GtkTooltip {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkToplevelAccessible {
     pub parent: atk::AtkObject,
     pub priv_: *mut GtkToplevelAccessiblePrivate,
@@ -14648,7 +14648,7 @@ impl ::std::fmt::Debug for GtkToplevelAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTreeModelFilter {
     pub parent: gobject::GObject,
     pub priv_: *mut GtkTreeModelFilterPrivate,
@@ -14663,7 +14663,7 @@ impl ::std::fmt::Debug for GtkTreeModelFilter {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTreeModelSort {
     pub parent: gobject::GObject,
     pub priv_: *mut GtkTreeModelSortPrivate,
@@ -14678,7 +14678,7 @@ impl ::std::fmt::Debug for GtkTreeModelSort {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTreeSelection {
     pub parent: gobject::GObject,
     pub priv_: *mut GtkTreeSelectionPrivate,
@@ -14692,7 +14692,7 @@ impl ::std::fmt::Debug for GtkTreeSelection {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTreeStore {
     pub parent: gobject::GObject,
     pub priv_: *mut GtkTreeStorePrivate,
@@ -14708,7 +14708,7 @@ impl ::std::fmt::Debug for GtkTreeStore {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTreeView {
     pub parent: GtkContainer,
     pub priv_: *mut GtkTreeViewPrivate,
@@ -14723,7 +14723,7 @@ impl ::std::fmt::Debug for GtkTreeView {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTreeViewAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkTreeViewAccessiblePrivate,
@@ -14739,7 +14739,7 @@ impl ::std::fmt::Debug for GtkTreeViewAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkTreeViewColumn {
     pub parent_instance: gobject::GInitiallyUnowned,
     pub priv_: *mut GtkTreeViewColumnPrivate,
@@ -14755,7 +14755,7 @@ impl ::std::fmt::Debug for GtkTreeViewColumn {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkUIManager {
     pub parent: gobject::GObject,
     pub private_data: *mut GtkUIManagerPrivate,
@@ -14854,7 +14854,7 @@ impl ::std::fmt::Debug for GtkVSeparator {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkViewport {
     pub bin: GtkBin,
     pub priv_: *mut GtkViewportPrivate,
@@ -14883,7 +14883,7 @@ impl ::std::fmt::Debug for GtkVolumeButton {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkWidget {
     pub parent_instance: gobject::GInitiallyUnowned,
     pub priv_: *mut GtkWidgetPrivate,
@@ -14898,7 +14898,7 @@ impl ::std::fmt::Debug for GtkWidget {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkWidgetAccessible {
     pub parent: GtkAccessible,
     pub priv_: *mut GtkWidgetAccessiblePrivate,
@@ -14914,7 +14914,7 @@ impl ::std::fmt::Debug for GtkWidgetAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkWindow {
     pub bin: GtkBin,
     pub priv_: *mut GtkWindowPrivate,
@@ -14930,7 +14930,7 @@ impl ::std::fmt::Debug for GtkWindow {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkWindowAccessible {
     pub parent: GtkContainerAccessible,
     pub priv_: *mut GtkWindowAccessiblePrivate,
@@ -14946,7 +14946,7 @@ impl ::std::fmt::Debug for GtkWindowAccessible {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct GtkWindowGroup {
     pub parent_instance: gobject::GObject,
     pub priv_: *mut GtkWindowGroupPrivate,
diff --git a/gtk/sys/tests/abi.rs b/gtk/sys/tests/abi.rs
index 23b657ff0d6b..8bf13cd8d421 100644
--- a/gtk/sys/tests/abi.rs
+++ b/gtk/sys/tests/abi.rs
@@ -5,6 +5,7 @@
 use gtk_sys::*;
 use std::env;
 use std::error::Error;
+use std::ffi::OsString;
 use std::mem::{align_of, size_of};
 use std::path::Path;
 use std::process::Command;
@@ -69,7 +70,8 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     if packages.is_empty() {
         return Ok(Vec::new());
     }
-    let mut cmd = Command::new("pkg-config");
+    let pkg_config = env::var_os("PKG_CONFIG").unwrap_or_else(|| OsString::from("pkg-config"));
+    let mut cmd = Command::new(pkg_config);
     cmd.arg("--cflags");
     cmd.args(packages);
     let out = cmd.output()?;
diff --git a/gtk/sys/versions.txt b/gtk/sys/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/gtk/sys/versions.txt
+++ b/gtk/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/pango/src/auto/attribute.rs b/pango/src/auto/attribute.rs
index 11bfacf4d6bc..c9f09b1c9a47 100644
--- a/pango/src/auto/attribute.rs
+++ b/pango/src/auto/attribute.rs
@@ -12,7 +12,7 @@ glib::wrapper! {
     pub struct Attribute(Boxed<ffi::PangoAttribute>);
 
     match fn {
-        copy => |ptr| ffi::pango_attribute_copy(mut_override(ptr)),
+        copy => |ptr| ffi::pango_attribute_copy(ptr),
         free => |ptr| ffi::pango_attribute_destroy(ptr),
         get_type => || ffi::pango_attribute_get_type(),
     }
@@ -24,7 +24,7 @@ glib::wrapper! {
     pub struct Attribute(Boxed<ffi::PangoAttribute>);
 
     match fn {
-        copy => |ptr| ffi::pango_attribute_copy(mut_override(ptr)),
+        copy => |ptr| ffi::pango_attribute_copy(ptr),
         free => |ptr| ffi::pango_attribute_destroy(ptr),
     }
 }
diff --git a/pango/src/auto/color.rs b/pango/src/auto/color.rs
index 39b05cd447a8..853fe8630b98 100644
--- a/pango/src/auto/color.rs
+++ b/pango/src/auto/color.rs
@@ -13,7 +13,7 @@ glib::wrapper! {
     pub struct Color(Boxed<ffi::PangoColor>);
 
     match fn {
-        copy => |ptr| ffi::pango_color_copy(mut_override(ptr)),
+        copy => |ptr| ffi::pango_color_copy(ptr),
         free => |ptr| ffi::pango_color_free(ptr),
         get_type => || ffi::pango_color_get_type(),
     }
diff --git a/pango/src/auto/engine_lang.rs b/pango/src/auto/engine_lang.rs
index 527add1be880..1cd072721556 100644
--- a/pango/src/auto/engine_lang.rs
+++ b/pango/src/auto/engine_lang.rs
@@ -2,7 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
 use std::fmt;
 
 glib::wrapper! {
diff --git a/pango/src/auto/engine_shape.rs b/pango/src/auto/engine_shape.rs
index 5d31caef0d53..b6c9d2abb09a 100644
--- a/pango/src/auto/engine_shape.rs
+++ b/pango/src/auto/engine_shape.rs
@@ -2,7 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use glib::translate::*;
 use std::fmt;
 
 glib::wrapper! {
diff --git a/pango/src/auto/font_description.rs b/pango/src/auto/font_description.rs
index c5f7588e837b..1afd541b7214 100644
--- a/pango/src/auto/font_description.rs
+++ b/pango/src/auto/font_description.rs
@@ -17,7 +17,7 @@ glib::wrapper! {
     pub struct FontDescription(Boxed<ffi::PangoFontDescription>);
 
     match fn {
-        copy => |ptr| ffi::pango_font_description_copy(mut_override(ptr)),
+        copy => |ptr| ffi::pango_font_description_copy(ptr),
         free => |ptr| ffi::pango_font_description_free(ptr),
         get_type => || ffi::pango_font_description_get_type(),
     }
diff --git a/pango/src/auto/matrix.rs b/pango/src/auto/matrix.rs
index 3e98d1c04faa..ed5cd8d3dc9f 100644
--- a/pango/src/auto/matrix.rs
+++ b/pango/src/auto/matrix.rs
@@ -12,7 +12,7 @@ glib::wrapper! {
     pub struct Matrix(Boxed<ffi::PangoMatrix>);
 
     match fn {
-        copy => |ptr| ffi::pango_matrix_copy(mut_override(ptr)),
+        copy => |ptr| ffi::pango_matrix_copy(ptr),
         free => |ptr| ffi::pango_matrix_free(ptr),
         get_type => || ffi::pango_matrix_get_type(),
     }
diff --git a/pango/src/auto/versions.txt b/pango/src/auto/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/pango/src/auto/versions.txt
+++ b/pango/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/pango/sys/src/lib.rs b/pango/sys/src/lib.rs
index 4243419abacd..5dabd8850499 100644
--- a/pango/sys/src/lib.rs
+++ b/pango/sys/src/lib.rs
@@ -352,7 +352,7 @@ pub type PangoFontsetForeachFunc =
 
 // Records
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoAnalysis {
     pub shape_engine: *mut PangoEngineShape,
     pub lang_engine: *mut PangoEngineLang,
@@ -435,7 +435,7 @@ impl ::std::fmt::Debug for PangoAttrFloat {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoAttrFontDesc {
     pub attr: PangoAttribute,
     pub desc: *mut PangoFontDescription,
@@ -451,7 +451,7 @@ impl ::std::fmt::Debug for PangoAttrFontDesc {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoAttrFontFeatures {
     pub attr: PangoAttribute,
     pub features: *mut c_char,
@@ -493,7 +493,7 @@ impl ::std::fmt::Debug for PangoAttrIterator {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoAttrLanguage {
     pub attr: PangoAttribute,
     pub value: *mut PangoLanguage,
@@ -561,7 +561,7 @@ impl ::std::fmt::Debug for PangoAttrSize {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoAttrString {
     pub attr: PangoAttribute,
     pub value: *mut c_char,
@@ -577,7 +577,7 @@ impl ::std::fmt::Debug for PangoAttrString {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoAttribute {
     pub klass: *const PangoAttrClass,
     pub start_index: c_uint,
@@ -631,7 +631,7 @@ impl ::std::fmt::Debug for PangoEngineClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoEngineInfo {
     pub id: *const c_char,
     pub engine_type: *const c_char,
@@ -677,7 +677,7 @@ impl ::std::fmt::Debug for PangoEngineLangClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoEngineScriptInfo {
     pub script: PangoScript,
     pub langs: *const c_char,
@@ -831,7 +831,7 @@ impl ::std::fmt::Debug for PangoFontFamilyClass {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoFontMapClass {
     pub parent_class: gobject::GObjectClass,
     pub load_font: Option<
@@ -970,7 +970,7 @@ impl ::std::fmt::Debug for PangoGlyphInfo {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoGlyphItem {
     pub item: *mut PangoItem,
     pub glyphs: *mut PangoGlyphString,
@@ -986,7 +986,7 @@ impl ::std::fmt::Debug for PangoGlyphItem {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoGlyphItemIter {
     pub glyph_item: *mut PangoGlyphItem,
     pub text: *const c_char,
@@ -1014,7 +1014,7 @@ impl ::std::fmt::Debug for PangoGlyphItemIter {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoGlyphString {
     pub num_glyphs: c_int,
     pub glyphs: *mut PangoGlyphInfo,
@@ -1448,7 +1448,7 @@ impl ::std::fmt::Debug for PangoLayout {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone)]
+#[derive(Clone)]
 pub struct PangoRenderer {
     pub parent_instance: gobject::GObject,
     pub underline: PangoUnderline,
diff --git a/pango/sys/tests/abi.rs b/pango/sys/tests/abi.rs
index e18a9e75e43d..96237a3c4f0f 100644
--- a/pango/sys/tests/abi.rs
+++ b/pango/sys/tests/abi.rs
@@ -5,6 +5,7 @@
 use pango_sys::*;
 use std::env;
 use std::error::Error;
+use std::ffi::OsString;
 use std::mem::{align_of, size_of};
 use std::path::Path;
 use std::process::Command;
@@ -69,7 +70,8 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     if packages.is_empty() {
         return Ok(Vec::new());
     }
-    let mut cmd = Command::new("pkg-config");
+    let pkg_config = env::var_os("PKG_CONFIG").unwrap_or_else(|| OsString::from("pkg-config"));
+    let mut cmd = Command::new(pkg_config);
     cmd.arg("--cflags");
     cmd.args(packages);
     let out = cmd.output()?;
diff --git a/pango/sys/versions.txt b/pango/sys/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/pango/sys/versions.txt
+++ b/pango/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/pangocairo/src/auto/versions.txt b/pangocairo/src/auto/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/pangocairo/src/auto/versions.txt
+++ b/pangocairo/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)
diff --git a/pangocairo/sys/versions.txt b/pangocairo/sys/versions.txt
index 38fb0afb866d..a2247c143be6 100644
--- a/pangocairo/sys/versions.txt
+++ b/pangocairo/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 21213ed)
+Generated by gir (https://github.com/gtk-rs/gir @ cbdc2e47c+)
 from gir-files (https://github.com/gtk-rs/gir-files @ 21f7670)