diff --git a/atk/src/auto/mod.rs b/atk/src/auto/mod.rs
index 3ec19528c9fd..fb5cefd5c8d6 100644
--- a/atk/src/auto/mod.rs
+++ b/atk/src/auto/mod.rs
@@ -3,43 +3,33 @@
 // DO NOT EDIT
 
 mod action;
-pub use self::action::AtkActionExt;
 pub use self::action::{Action, NONE_ACTION};
 
 mod component;
-pub use self::component::ComponentExt;
 pub use self::component::{Component, NONE_COMPONENT};
 
 mod document;
-pub use self::document::DocumentExt;
 pub use self::document::{Document, NONE_DOCUMENT};
 
 mod editable_text;
-pub use self::editable_text::EditableTextExt;
 pub use self::editable_text::{EditableText, NONE_EDITABLE_TEXT};
 
 mod gobject_accessible;
-pub use self::gobject_accessible::GObjectAccessibleExt;
 pub use self::gobject_accessible::{GObjectAccessible, NONE_GOBJECT_ACCESSIBLE};
 
 mod hyperlink;
-pub use self::hyperlink::HyperlinkExt;
 pub use self::hyperlink::{Hyperlink, NONE_HYPERLINK};
 
 mod hyperlink_impl;
-pub use self::hyperlink_impl::HyperlinkImplExt;
 pub use self::hyperlink_impl::{HyperlinkImpl, NONE_HYPERLINK_IMPL};
 
 mod hypertext;
-pub use self::hypertext::HypertextExt;
 pub use self::hypertext::{Hypertext, NONE_HYPERTEXT};
 
 mod image;
-pub use self::image::AtkImageExt;
 pub use self::image::{Image, NONE_IMAGE};
 
 mod misc;
-pub use self::misc::AtkMiscExt;
 pub use self::misc::{Misc, NONE_MISC};
 
 mod no_op_object;
@@ -49,66 +39,51 @@ mod no_op_object_factory;
 pub use self::no_op_object_factory::{NoOpObjectFactory, NONE_NO_OP_OBJECT_FACTORY};
 
 mod object;
-pub use self::object::AtkObjectExt;
 pub use self::object::{Object, NONE_OBJECT};
 
 mod object_factory;
-pub use self::object_factory::ObjectFactoryExt;
 pub use self::object_factory::{ObjectFactory, NONE_OBJECT_FACTORY};
 
 mod plug;
-pub use self::plug::AtkPlugExt;
 pub use self::plug::{Plug, NONE_PLUG};
 
 mod registry;
-pub use self::registry::RegistryExt;
 pub use self::registry::{Registry, NONE_REGISTRY};
 
 mod relation;
-pub use self::relation::RelationExt;
 pub use self::relation::{Relation, NONE_RELATION};
 
 mod relation_set;
-pub use self::relation_set::RelationSetExt;
 pub use self::relation_set::{RelationSet, NONE_RELATION_SET};
 
 mod selection;
-pub use self::selection::SelectionExt;
 pub use self::selection::{Selection, NONE_SELECTION};
 
 mod socket;
-pub use self::socket::AtkSocketExt;
 pub use self::socket::{Socket, NONE_SOCKET};
 
 mod state_set;
-pub use self::state_set::StateSetExt;
 pub use self::state_set::{StateSet, NONE_STATE_SET};
 
 mod streamable_content;
-pub use self::streamable_content::StreamableContentExt;
 pub use self::streamable_content::{StreamableContent, NONE_STREAMABLE_CONTENT};
 
 mod table;
-pub use self::table::TableExt;
 pub use self::table::{Table, NONE_TABLE};
 
 mod table_cell;
-pub use self::table_cell::TableCellExt;
 pub use self::table_cell::{TableCell, NONE_TABLE_CELL};
 
 mod text;
-pub use self::text::TextExt;
 pub use self::text::{Text, NONE_TEXT};
 
 mod util;
 pub use self::util::{Util, NONE_UTIL};
 
 mod value;
-pub use self::value::ValueExt;
 pub use self::value::{Value, NONE_VALUE};
 
 mod window;
-pub use self::window::AtkWindowExt;
 pub use self::window::{Window, NONE_WINDOW};
 
 mod range;
@@ -143,29 +118,29 @@ pub use self::alias::State;
 
 #[doc(hidden)]
 pub mod traits {
-    pub use super::AtkActionExt;
-    pub use super::AtkImageExt;
-    pub use super::AtkMiscExt;
-    pub use super::AtkObjectExt;
-    pub use super::AtkPlugExt;
-    pub use super::AtkSocketExt;
-    pub use super::AtkWindowExt;
-    pub use super::ComponentExt;
-    pub use super::DocumentExt;
-    pub use super::EditableTextExt;
-    pub use super::GObjectAccessibleExt;
-    pub use super::HyperlinkExt;
-    pub use super::HyperlinkImplExt;
-    pub use super::HypertextExt;
-    pub use super::ObjectFactoryExt;
-    pub use super::RegistryExt;
-    pub use super::RelationExt;
-    pub use super::RelationSetExt;
-    pub use super::SelectionExt;
-    pub use super::StateSetExt;
-    pub use super::StreamableContentExt;
-    pub use super::TableCellExt;
-    pub use super::TableExt;
-    pub use super::TextExt;
-    pub use super::ValueExt;
+    pub use super::action::AtkActionExt;
+    pub use super::component::ComponentExt;
+    pub use super::document::DocumentExt;
+    pub use super::editable_text::EditableTextExt;
+    pub use super::gobject_accessible::GObjectAccessibleExt;
+    pub use super::hyperlink::HyperlinkExt;
+    pub use super::hyperlink_impl::HyperlinkImplExt;
+    pub use super::hypertext::HypertextExt;
+    pub use super::image::AtkImageExt;
+    pub use super::misc::AtkMiscExt;
+    pub use super::object::AtkObjectExt;
+    pub use super::object_factory::ObjectFactoryExt;
+    pub use super::plug::AtkPlugExt;
+    pub use super::registry::RegistryExt;
+    pub use super::relation::RelationExt;
+    pub use super::relation_set::RelationSetExt;
+    pub use super::selection::SelectionExt;
+    pub use super::socket::AtkSocketExt;
+    pub use super::state_set::StateSetExt;
+    pub use super::streamable_content::StreamableContentExt;
+    pub use super::table::TableExt;
+    pub use super::table_cell::TableCellExt;
+    pub use super::text::TextExt;
+    pub use super::value::ValueExt;
+    pub use super::window::AtkWindowExt;
 }
diff --git a/atk/src/auto/versions.txt b/atk/src/auto/versions.txt
index 7ac3d16a8636..91fd75ea23fb 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 @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/atk/sys/versions.txt b/atk/sys/versions.txt
index 7ac3d16a8636..91fd75ea23fb 100644
--- a/atk/sys/versions.txt
+++ b/atk/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/examples/css/main.rs b/examples/css/main.rs
index 14842c72e3e3..215ed019672c 100644
--- a/examples/css/main.rs
+++ b/examples/css/main.rs
@@ -37,11 +37,11 @@ fn build_ui(application: &gtk::Application) {
     let label = gtk::Button::with_label("hover me!");
     // We need to name it in order to be able to use its name as a CSS label to
     // apply CSS on it.
-    gtk::WidgetExt::set_widget_name(&label, "label1");
+    label.set_widget_name("label1");
 
     let entry = gtk::Entry::new();
     // We need to name it in order to apply CSS on it.
-    gtk::WidgetExt::set_widget_name(&entry, "entry1");
+    entry.set_widget_name("entry1");
     entry.set_text("Some text");
 
     let combo = gtk::ComboBoxText::new();
diff --git a/examples/gio_task/file_size/ffi.rs b/examples/gio_task/file_size/ffi.rs
index 2554b97ed2dd..38a0dd15e7ae 100644
--- a/examples/gio_task/file_size/ffi.rs
+++ b/examples/gio_task/file_size/ffi.rs
@@ -1,9 +1,6 @@
 use gtk::glib::subclass::prelude::*;
 use gtk::glib::translate::*;
-use gtk::prelude::AsyncResultExt;
-use gtk::prelude::Cast;
-use gtk::prelude::FileExt;
-use gtk::prelude::ToValue;
+use gtk::prelude::*;
 use gtk::{gio, glib};
 
 pub type FileSize = <super::imp::FileSize as ObjectSubclass>::Instance;
diff --git a/examples/gio_task/file_size/mod.rs b/examples/gio_task/file_size/mod.rs
index f13dc51c39dc..0d9c399dc935 100644
--- a/examples/gio_task/file_size/mod.rs
+++ b/examples/gio_task/file_size/mod.rs
@@ -2,10 +2,7 @@ pub mod ffi;
 mod imp;
 
 use gtk::glib::subclass::prelude::*;
-use gtk::prelude::AsyncResultExt;
-use gtk::prelude::Cast;
-use gtk::prelude::FileExt;
-use gtk::prelude::ToValue;
+use gtk::prelude::*;
 use gtk::{gio, glib};
 
 glib::wrapper! {
diff --git a/examples/overlay/main.rs b/examples/overlay/main.rs
index 00ea40a16075..8d6e6f02bdbf 100644
--- a/examples/overlay/main.rs
+++ b/examples/overlay/main.rs
@@ -21,7 +21,7 @@ fn build_ui(application: &gtk::Application) {
     // The overlay label.
     let overlay_text = gtk::Label::new(Some("0"));
     // We need to name it in order to apply CSS on it.
-    gtk::WidgetExt::set_widget_name(&overlay_text, "overlay-label");
+    overlay_text.set_widget_name("overlay-label");
     // We put the overlay in the top-right corner of the window.
     overlay_text.set_halign(gtk::Align::End);
     overlay_text.set_valign(gtk::Align::Start);
diff --git a/gdk-pixbuf/src/auto/mod.rs b/gdk-pixbuf/src/auto/mod.rs
index 083d2876a12a..50777a33e2f0 100644
--- a/gdk-pixbuf/src/auto/mod.rs
+++ b/gdk-pixbuf/src/auto/mod.rs
@@ -6,11 +6,9 @@ mod pixbuf;
 pub use self::pixbuf::Pixbuf;
 
 mod pixbuf_animation;
-pub use self::pixbuf_animation::PixbufAnimationExt;
 pub use self::pixbuf_animation::{PixbufAnimation, NONE_PIXBUF_ANIMATION};
 
 mod pixbuf_loader;
-pub use self::pixbuf_loader::PixbufLoaderExt;
 pub use self::pixbuf_loader::{PixbufLoader, NONE_PIXBUF_LOADER};
 
 mod pixbuf_simple_anim;
@@ -28,6 +26,6 @@ pub use self::enums::PixbufRotation;
 
 #[doc(hidden)]
 pub mod traits {
-    pub use super::PixbufAnimationExt;
-    pub use super::PixbufLoaderExt;
+    pub use super::pixbuf_animation::PixbufAnimationExt;
+    pub use super::pixbuf_loader::PixbufLoaderExt;
 }
diff --git a/gdk-pixbuf/src/auto/pixbuf.rs b/gdk-pixbuf/src/auto/pixbuf.rs
index d958d40b1f37..ce301d2a5515 100644
--- a/gdk-pixbuf/src/auto/pixbuf.rs
+++ b/gdk-pixbuf/src/auto/pixbuf.rs
@@ -72,7 +72,7 @@ impl Pixbuf {
     //    unsafe { TODO: call ffi:gdk_pixbuf_new_from_data() }
     //}
 
-    #[cfg_attr(feature = "v2_32", deprecated)]
+    #[cfg_attr(feature = "v2_32", deprecated = "Since 2.32")]
     #[doc(alias = "gdk_pixbuf_new_from_inline")]
     pub fn from_inline(data: &[u8], copy_pixels: bool) -> Result<Pixbuf, glib::Error> {
         let data_length = data.len() as i32;
diff --git a/gdk-pixbuf/src/auto/versions.txt b/gdk-pixbuf/src/auto/versions.txt
index 7ac3d16a8636..91fd75ea23fb 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 @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/gdk-pixbuf/sys/versions.txt b/gdk-pixbuf/sys/versions.txt
index 7ac3d16a8636..91fd75ea23fb 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 @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/gdk/src/auto/cursor.rs b/gdk/src/auto/cursor.rs
index 94c88e4ebbed..23526cef1db7 100644
--- a/gdk/src/auto/cursor.rs
+++ b/gdk/src/auto/cursor.rs
@@ -17,7 +17,7 @@ glib::wrapper! {
 }
 
 impl Cursor {
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gdk_cursor_new")]
     pub fn new(cursor_type: CursorType) -> Cursor {
         assert_initialized_main_thread!();
diff --git a/gdk/src/auto/device.rs b/gdk/src/auto/device.rs
index a8e5967d8a68..a8cbb6a72f66 100644
--- a/gdk/src/auto/device.rs
+++ b/gdk/src/auto/device.rs
@@ -233,7 +233,7 @@ impl Device {
         }
     }
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gdk_device_grab")]
     pub fn grab(
         &self,
@@ -299,7 +299,7 @@ impl Device {
         }
     }
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gdk_device_ungrab")]
     pub fn ungrab(&self, time_: u32) {
         unsafe {
@@ -432,7 +432,7 @@ impl Device {
         }
     }
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gdk_device_grab_info_libgtk_only")]
     pub fn grab_info_libgtk_only(display: &Display, device: &Device) -> Option<(Window, bool)> {
         skip_assert_initialized!();
diff --git a/gdk/src/auto/device_manager.rs b/gdk/src/auto/device_manager.rs
index 9730210aa974..9aaaaacd2783 100644
--- a/gdk/src/auto/device_manager.rs
+++ b/gdk/src/auto/device_manager.rs
@@ -22,7 +22,7 @@ glib::wrapper! {
 }
 
 impl DeviceManager {
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gdk_device_manager_get_client_pointer")]
     pub fn client_pointer(&self) -> Option<Device> {
         unsafe {
@@ -37,7 +37,7 @@ impl DeviceManager {
         unsafe { from_glib_none(ffi::gdk_device_manager_get_display(self.to_glib_none().0)) }
     }
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gdk_device_manager_list_devices")]
     pub fn list_devices(&self, type_: DeviceType) -> Vec<Device> {
         unsafe {
diff --git a/gdk/src/auto/display.rs b/gdk/src/auto/display.rs
index 106b6b20f904..6efcfee4bbf9 100644
--- a/gdk/src/auto/display.rs
+++ b/gdk/src/auto/display.rs
@@ -95,7 +95,7 @@ impl Display {
         unsafe { from_glib_none(ffi::gdk_display_get_default_seat(self.to_glib_none().0)) }
     }
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gdk_display_get_device_manager")]
     pub fn device_manager(&self) -> Option<DeviceManager> {
         unsafe { from_glib_none(ffi::gdk_display_get_device_manager(self.to_glib_none().0)) }
@@ -178,7 +178,7 @@ impl Display {
         unsafe { from_glib_none(ffi::gdk_display_get_primary_monitor(self.to_glib_none().0)) }
     }
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gdk_display_get_screen")]
     pub fn screen(&self, screen_num: i32) -> Screen {
         unsafe {
@@ -279,7 +279,7 @@ impl Display {
         }
     }
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gdk_display_supports_composite")]
     pub fn supports_composite(&self) -> bool {
         unsafe { from_glib(ffi::gdk_display_supports_composite(self.to_glib_none().0)) }
@@ -345,7 +345,7 @@ impl Display {
         unsafe { from_glib_none(ffi::gdk_display_open(display_name.to_glib_none().0)) }
     }
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gdk_display_open_default_libgtk_only")]
     pub fn open_default_libgtk_only() -> Option<Display> {
         assert_initialized_main_thread!();
diff --git a/gdk/src/auto/functions.rs b/gdk/src/auto/functions.rs
index cae272d038b9..a18a0dc0e685 100644
--- a/gdk/src/auto/functions.rs
+++ b/gdk/src/auto/functions.rs
@@ -15,7 +15,7 @@ use glib::translate::*;
 use std::mem;
 use std::ptr;
 
-//#[cfg_attr(feature = "v3_16", deprecated)]
+//#[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
 //#[doc(alias = "gdk_add_option_entries_libgtk_only")]
 //pub fn add_option_entries_libgtk_only(group: /*Ignored*/&glib::OptionGroup) {
 //    unsafe { TODO: call ffi:gdk_add_option_entries_libgtk_only() }
@@ -191,7 +191,7 @@ pub fn keyval_to_upper(keyval: u32) -> u32 {
     unsafe { ffi::gdk_keyval_to_upper(keyval) }
 }
 
-#[cfg_attr(feature = "v3_22", deprecated)]
+#[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
 #[doc(alias = "gdk_list_visuals")]
 pub fn list_visuals() -> Vec<Visual> {
     assert_initialized_main_thread!();
@@ -272,7 +272,7 @@ pub fn pixbuf_get_from_surface(
     }
 }
 
-#[cfg_attr(feature = "v3_16", deprecated)]
+#[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
 #[doc(alias = "gdk_pre_parse_libgtk_only")]
 pub fn pre_parse_libgtk_only() {
     assert_initialized_main_thread!();
@@ -329,7 +329,7 @@ pub fn property_get(
     }
 }
 
-#[cfg_attr(feature = "v3_22", deprecated)]
+#[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
 #[doc(alias = "gdk_query_depths")]
 pub fn query_depths() -> Vec<i32> {
     assert_initialized_main_thread!();
@@ -341,7 +341,7 @@ pub fn query_depths() -> Vec<i32> {
     }
 }
 
-//#[cfg_attr(feature = "v3_22", deprecated)]
+//#[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
 //#[doc(alias = "gdk_query_visual_types")]
 //pub fn query_visual_types(visual_types: /*Unimplemented*/CArray TypeId { ns_id: 1, id: 99 }) -> i32 {
 //    unsafe { TODO: call ffi:gdk_query_visual_types() }
diff --git a/gdk/src/auto/keymap.rs b/gdk/src/auto/keymap.rs
index a0aa330a306d..fea34d5e8032 100644
--- a/gdk/src/auto/keymap.rs
+++ b/gdk/src/auto/keymap.rs
@@ -110,7 +110,7 @@ impl Keymap {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_keymap_get_default")]
     pub fn default() -> Option<Keymap> {
         assert_initialized_main_thread!();
diff --git a/gdk/src/auto/mod.rs b/gdk/src/auto/mod.rs
index 1a4401b7ed2f..be581aa8c75b 100644
--- a/gdk/src/auto/mod.rs
+++ b/gdk/src/auto/mod.rs
@@ -19,9 +19,6 @@ pub use self::device_manager::DeviceManager;
 mod device_pad;
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_22")))]
-pub use self::device_pad::DevicePadExt;
-#[cfg(any(feature = "v3_22", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_22")))]
 pub use self::device_pad::{DevicePad, NONE_DEVICE_PAD};
 
 #[cfg(any(feature = "v3_22", feature = "dox"))]
@@ -157,5 +154,5 @@ pub mod functions;
 pub mod traits {
     #[cfg(any(feature = "v3_22", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_22")))]
-    pub use super::DevicePadExt;
+    pub use super::device_pad::DevicePadExt;
 }
diff --git a/gdk/src/auto/screen.rs b/gdk/src/auto/screen.rs
index 59b59531fcf7..85ff37073705 100644
--- a/gdk/src/auto/screen.rs
+++ b/gdk/src/auto/screen.rs
@@ -23,7 +23,7 @@ glib::wrapper! {
 }
 
 impl Screen {
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_active_window")]
     pub fn active_window(&self) -> Option<Window> {
         unsafe { from_glib_full(ffi::gdk_screen_get_active_window(self.to_glib_none().0)) }
@@ -34,25 +34,25 @@ impl Screen {
         unsafe { from_glib_none(ffi::gdk_screen_get_display(self.to_glib_none().0)) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_height")]
     pub fn height(&self) -> i32 {
         unsafe { ffi::gdk_screen_get_height(self.to_glib_none().0) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_height_mm")]
     pub fn height_mm(&self) -> i32 {
         unsafe { ffi::gdk_screen_get_height_mm(self.to_glib_none().0) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_monitor_at_point")]
     pub fn monitor_at_point(&self, x: i32, y: i32) -> i32 {
         unsafe { ffi::gdk_screen_get_monitor_at_point(self.to_glib_none().0, x, y) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_monitor_at_window")]
     pub fn monitor_at_window(&self, window: &Window) -> i32 {
         unsafe {
@@ -60,7 +60,7 @@ impl Screen {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_monitor_geometry")]
     pub fn monitor_geometry(&self, monitor_num: i32) -> Rectangle {
         unsafe {
@@ -74,13 +74,13 @@ impl Screen {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_monitor_height_mm")]
     pub fn monitor_height_mm(&self, monitor_num: i32) -> i32 {
         unsafe { ffi::gdk_screen_get_monitor_height_mm(self.to_glib_none().0, monitor_num) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_monitor_plug_name")]
     pub fn monitor_plug_name(&self, monitor_num: i32) -> Option<glib::GString> {
         unsafe {
@@ -91,19 +91,19 @@ impl Screen {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_monitor_scale_factor")]
     pub fn monitor_scale_factor(&self, monitor_num: i32) -> i32 {
         unsafe { ffi::gdk_screen_get_monitor_scale_factor(self.to_glib_none().0, monitor_num) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_monitor_width_mm")]
     pub fn monitor_width_mm(&self, monitor_num: i32) -> i32 {
         unsafe { ffi::gdk_screen_get_monitor_width_mm(self.to_glib_none().0, monitor_num) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_monitor_workarea")]
     pub fn monitor_workarea(&self, monitor_num: i32) -> Rectangle {
         unsafe {
@@ -117,19 +117,19 @@ impl Screen {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_n_monitors")]
     pub fn n_monitors(&self) -> i32 {
         unsafe { ffi::gdk_screen_get_n_monitors(self.to_glib_none().0) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_number")]
     pub fn number(&self) -> i32 {
         unsafe { ffi::gdk_screen_get_number(self.to_glib_none().0) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_primary_monitor")]
     pub fn primary_monitor(&self) -> i32 {
         unsafe { ffi::gdk_screen_get_primary_monitor(self.to_glib_none().0) }
@@ -164,13 +164,13 @@ impl Screen {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_width")]
     pub fn width(&self) -> i32 {
         unsafe { ffi::gdk_screen_get_width(self.to_glib_none().0) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_get_width_mm")]
     pub fn width_mm(&self) -> i32 {
         unsafe { ffi::gdk_screen_get_width_mm(self.to_glib_none().0) }
@@ -199,7 +199,7 @@ impl Screen {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_make_display_name")]
     pub fn make_display_name(&self) -> glib::GString {
         unsafe { from_glib_full(ffi::gdk_screen_make_display_name(self.to_glib_none().0)) }
@@ -225,28 +225,28 @@ impl Screen {
         unsafe { from_glib_none(ffi::gdk_screen_get_default()) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_height")]
     pub fn screen_height() -> i32 {
         assert_initialized_main_thread!();
         unsafe { ffi::gdk_screen_height() }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_height_mm")]
     pub fn screen_height_mm() -> i32 {
         assert_initialized_main_thread!();
         unsafe { ffi::gdk_screen_height_mm() }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_width")]
     pub fn screen_width() -> i32 {
         assert_initialized_main_thread!();
         unsafe { ffi::gdk_screen_width() }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_screen_width_mm")]
     pub fn screen_width_mm() -> i32 {
         assert_initialized_main_thread!();
diff --git a/gdk/src/auto/versions.txt b/gdk/src/auto/versions.txt
index 7ac3d16a8636..91fd75ea23fb 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 @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/gdk/src/auto/visual.rs b/gdk/src/auto/visual.rs
index 4dae600218fb..8ab894f5fb20 100644
--- a/gdk/src/auto/visual.rs
+++ b/gdk/src/auto/visual.rs
@@ -18,7 +18,7 @@ glib::wrapper! {
 }
 
 impl Visual {
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_visual_get_bits_per_rgb")]
     pub fn bits_per_rgb(&self) -> i32 {
         unsafe { ffi::gdk_visual_get_bits_per_rgb(self.to_glib_none().0) }
@@ -43,13 +43,13 @@ impl Visual {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_visual_get_byte_order")]
     pub fn byte_order(&self) -> ByteOrder {
         unsafe { from_glib(ffi::gdk_visual_get_byte_order(self.to_glib_none().0)) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_visual_get_colormap_size")]
     pub fn colormap_size(&self) -> i32 {
         unsafe { ffi::gdk_visual_get_colormap_size(self.to_glib_none().0) }
@@ -108,28 +108,28 @@ impl Visual {
         unsafe { from_glib(ffi::gdk_visual_get_visual_type(self.to_glib_none().0)) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_visual_get_best")]
     pub fn best() -> Visual {
         assert_initialized_main_thread!();
         unsafe { from_glib_none(ffi::gdk_visual_get_best()) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_visual_get_best_depth")]
     pub fn best_depth() -> i32 {
         assert_initialized_main_thread!();
         unsafe { ffi::gdk_visual_get_best_depth() }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_visual_get_best_type")]
     pub fn best_type() -> VisualType {
         assert_initialized_main_thread!();
         unsafe { from_glib(ffi::gdk_visual_get_best_type()) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_visual_get_best_with_both")]
     pub fn best_with_both(depth: i32, visual_type: VisualType) -> Option<Visual> {
         assert_initialized_main_thread!();
@@ -141,21 +141,21 @@ impl Visual {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_visual_get_best_with_depth")]
     pub fn best_with_depth(depth: i32) -> Option<Visual> {
         assert_initialized_main_thread!();
         unsafe { from_glib_none(ffi::gdk_visual_get_best_with_depth(depth)) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_visual_get_best_with_type")]
     pub fn best_with_type(visual_type: VisualType) -> Option<Visual> {
         assert_initialized_main_thread!();
         unsafe { from_glib_none(ffi::gdk_visual_get_best_with_type(visual_type.to_glib())) }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_visual_get_system")]
     pub fn system() -> Visual {
         assert_initialized_main_thread!();
diff --git a/gdk/src/auto/window.rs b/gdk/src/auto/window.rs
index 64b8f44d0536..7be01cec0b96 100644
--- a/gdk/src/auto/window.rs
+++ b/gdk/src/auto/window.rs
@@ -113,7 +113,7 @@ impl Window {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_window_begin_paint_rect")]
     pub fn begin_paint_rect(&self, rectangle: &Rectangle) {
         unsafe {
@@ -121,7 +121,7 @@ impl Window {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_window_begin_paint_region")]
     pub fn begin_paint_region(&self, region: &cairo::Region) {
         unsafe {
@@ -273,7 +273,7 @@ impl Window {
         }
     }
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gdk_window_freeze_toplevel_updates_libgtk_only")]
     pub fn freeze_toplevel_updates_libgtk_only(&self) {
         unsafe {
@@ -335,7 +335,7 @@ impl Window {
         unsafe { from_glib_full(ffi::gdk_window_get_clip_region(self.to_glib_none().0)) }
     }
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gdk_window_get_composited")]
     pub fn is_composited(&self) -> bool {
         unsafe { from_glib(ffi::gdk_window_get_composited(self.to_glib_none().0)) }
@@ -879,7 +879,7 @@ impl Window {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_window_process_updates")]
     pub fn process_updates(&self, update_children: bool) {
         unsafe {
@@ -945,7 +945,7 @@ impl Window {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_window_set_background_rgba")]
     pub fn set_background_rgba(&self, rgba: &RGBA) {
         unsafe {
@@ -967,7 +967,7 @@ impl Window {
         }
     }
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gdk_window_set_composited")]
     pub fn set_composited(&self, composited: bool) {
         unsafe {
@@ -1189,7 +1189,7 @@ impl Window {
         }
     }
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gdk_window_set_static_gravities")]
     pub fn set_static_gravities(&self, use_static: bool) -> bool {
         unsafe {
@@ -1286,7 +1286,7 @@ impl Window {
         }
     }
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gdk_window_thaw_toplevel_updates_libgtk_only")]
     pub fn thaw_toplevel_updates_libgtk_only(&self) {
         unsafe {
@@ -1354,7 +1354,7 @@ impl Window {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_window_process_all_updates")]
     pub fn process_all_updates() {
         assert_initialized_main_thread!();
@@ -1363,7 +1363,7 @@ impl Window {
         }
     }
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gdk_window_set_debug_updates")]
     pub fn set_debug_updates(setting: bool) {
         assert_initialized_main_thread!();
diff --git a/gdk/sys/versions.txt b/gdk/sys/versions.txt
index 7ac3d16a8636..91fd75ea23fb 100644
--- a/gdk/sys/versions.txt
+++ b/gdk/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/gdkx11/src/auto/functions.rs b/gdkx11/src/auto/functions.rs
index f17ebe0aa3d4..1e079e2dd015 100644
--- a/gdkx11/src/auto/functions.rs
+++ b/gdkx11/src/auto/functions.rs
@@ -56,7 +56,7 @@ pub fn x11_get_default_screen() -> i32 {
     unsafe { ffi::gdk_x11_get_default_screen() }
 }
 
-//#[cfg_attr(feature = "v3_24", deprecated)]
+//#[cfg_attr(feature = "v3_24", deprecated = "Since 3.24")]
 //#[cfg(any(feature = "v3_24_2", feature = "dox"))]
 //#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_24_2")))]
 //#[doc(alias = "gdk_x11_get_parent_relative_pattern")]
diff --git a/gdkx11/src/auto/versions.txt b/gdkx11/src/auto/versions.txt
index 7ac3d16a8636..91fd75ea23fb 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 @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/gdkx11/sys/versions.txt b/gdkx11/sys/versions.txt
index 7ac3d16a8636..91fd75ea23fb 100644
--- a/gdkx11/sys/versions.txt
+++ b/gdkx11/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/gio/src/auto/constants.rs b/gio/src/auto/constants.rs
index 487ac8b8f837..92790291f833 100644
--- a/gio/src/auto/constants.rs
+++ b/gio/src/auto/constants.rs
@@ -724,7 +724,7 @@ pub static VOLUME_IDENTIFIER_KIND_CLASS: once_cell::sync::Lazy<&'static str> =
             .to_str()
             .unwrap()
     });
-#[cfg_attr(feature = "v2_58", deprecated)]
+#[cfg_attr(feature = "v2_58", deprecated = "Since 2.58")]
 #[doc(alias = "G_VOLUME_IDENTIFIER_KIND_HAL_UDI")]
 pub static VOLUME_IDENTIFIER_KIND_HAL_UDI: once_cell::sync::Lazy<&'static str> =
     once_cell::sync::Lazy::new(|| unsafe {
diff --git a/gio/src/auto/enums.rs b/gio/src/auto/enums.rs
index f18e400ede1f..439d5fe0194f 100644
--- a/gio/src/auto/enums.rs
+++ b/gio/src/auto/enums.rs
@@ -3397,7 +3397,7 @@ impl ToValue for TlsInteractionResult {
     }
 }
 
-#[cfg_attr(feature = "v2_60", deprecated)]
+#[cfg_attr(feature = "v2_60", deprecated = "Since 2.60")]
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
 #[non_exhaustive]
 #[doc(alias = "GTlsRehandshakeMode")]
diff --git a/gio/src/auto/functions.rs b/gio/src/auto/functions.rs
index f5fc9d1abb24..4cf94d20ac94 100644
--- a/gio/src/auto/functions.rs
+++ b/gio/src/auto/functions.rs
@@ -583,19 +583,19 @@ pub fn resources_unregister(resource: &Resource) {
     }
 }
 
-//#[cfg_attr(feature = "v2_46", deprecated)]
+//#[cfg_attr(feature = "v2_46", deprecated = "Since 2.46")]
 //#[doc(alias = "g_simple_async_report_error_in_idle")]
 //pub fn simple_async_report_error_in_idle<P: IsA<glib::Object>, Q: FnOnce(Result<(), glib::Error>) + 'static>(object: Option<&P>, callback: Q, domain: glib::Quark, code: i32, format: &str, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) {
 //    unsafe { TODO: call ffi:g_simple_async_report_error_in_idle() }
 //}
 
-//#[cfg_attr(feature = "v2_46", deprecated)]
+//#[cfg_attr(feature = "v2_46", deprecated = "Since 2.46")]
 //#[doc(alias = "g_simple_async_report_gerror_in_idle")]
 //pub fn simple_async_report_gerror_in_idle<P: IsA<glib::Object>, Q: FnOnce(Result<(), glib::Error>) + 'static>(object: Option<&P>, callback: Q, error: &glib::Error) {
 //    unsafe { TODO: call ffi:g_simple_async_report_gerror_in_idle() }
 //}
 
-//#[cfg_attr(feature = "v2_46", deprecated)]
+//#[cfg_attr(feature = "v2_46", deprecated = "Since 2.46")]
 //#[doc(alias = "g_simple_async_report_take_gerror_in_idle")]
 //pub fn simple_async_report_take_gerror_in_idle<P: IsA<glib::Object>, Q: FnOnce(Result<(), glib::Error>) + 'static>(object: Option<&P>, callback: Q, error: &mut glib::Error) {
 //    unsafe { TODO: call ffi:g_simple_async_report_take_gerror_in_idle() }
diff --git a/gio/src/auto/mod.rs b/gio/src/auto/mod.rs
index c8cadc9bab66..01f18614dda6 100644
--- a/gio/src/auto/mod.rs
+++ b/gio/src/auto/mod.rs
@@ -3,56 +3,45 @@
 // DO NOT EDIT
 
 mod action;
-pub use self::action::ActionExt;
 pub use self::action::{Action, NONE_ACTION};
 
 mod action_group;
-pub use self::action_group::ActionGroupExt;
 pub use self::action_group::{ActionGroup, NONE_ACTION_GROUP};
 
 mod action_map;
-pub use self::action_map::ActionMapExt;
 pub use self::action_map::{ActionMap, NONE_ACTION_MAP};
 
 mod app_info;
-pub use self::app_info::AppInfoExt;
 pub use self::app_info::{AppInfo, NONE_APP_INFO};
 
 mod app_info_monitor;
 pub use self::app_info_monitor::AppInfoMonitor;
 
 mod app_launch_context;
-pub use self::app_launch_context::AppLaunchContextExt;
 pub use self::app_launch_context::{AppLaunchContext, NONE_APP_LAUNCH_CONTEXT};
 
 mod application;
 pub use self::application::ApplicationBuilder;
-pub use self::application::ApplicationExt;
 pub use self::application::{Application, NONE_APPLICATION};
 
 mod application_command_line;
-pub use self::application_command_line::ApplicationCommandLineExt;
 pub use self::application_command_line::{ApplicationCommandLine, NONE_APPLICATION_COMMAND_LINE};
 
 mod async_result;
-pub use self::async_result::AsyncResultExt;
 pub use self::async_result::{AsyncResult, NONE_ASYNC_RESULT};
 
 mod buffered_input_stream;
 pub use self::buffered_input_stream::BufferedInputStreamBuilder;
-pub use self::buffered_input_stream::BufferedInputStreamExt;
 pub use self::buffered_input_stream::{BufferedInputStream, NONE_BUFFERED_INPUT_STREAM};
 
 mod buffered_output_stream;
 pub use self::buffered_output_stream::BufferedOutputStreamBuilder;
-pub use self::buffered_output_stream::BufferedOutputStreamExt;
 pub use self::buffered_output_stream::{BufferedOutputStream, NONE_BUFFERED_OUTPUT_STREAM};
 
 mod bytes_icon;
 pub use self::bytes_icon::BytesIcon;
 
 mod cancellable;
-pub use self::cancellable::CancellableExt;
 pub use self::cancellable::{Cancellable, NONE_CANCELLABLE};
 
 mod charset_converter;
@@ -60,17 +49,14 @@ pub use self::charset_converter::CharsetConverter;
 pub use self::charset_converter::CharsetConverterBuilder;
 
 mod converter;
-pub use self::converter::ConverterExt;
 pub use self::converter::{Converter, NONE_CONVERTER};
 
 mod converter_input_stream;
 pub use self::converter_input_stream::ConverterInputStreamBuilder;
-pub use self::converter_input_stream::ConverterInputStreamExt;
 pub use self::converter_input_stream::{ConverterInputStream, NONE_CONVERTER_INPUT_STREAM};
 
 mod converter_output_stream;
 pub use self::converter_output_stream::ConverterOutputStreamBuilder;
-pub use self::converter_output_stream::ConverterOutputStreamExt;
 pub use self::converter_output_stream::{ConverterOutputStream, NONE_CONVERTER_OUTPUT_STREAM};
 
 mod credentials;
@@ -86,11 +72,9 @@ mod dbus_connection;
 pub use self::dbus_connection::DBusConnection;
 
 mod dbus_interface;
-pub use self::dbus_interface::DBusInterfaceExt;
 pub use self::dbus_interface::{DBusInterface, NONE_DBUS_INTERFACE};
 
 mod dbus_interface_skeleton;
-pub use self::dbus_interface_skeleton::DBusInterfaceSkeletonExt;
 pub use self::dbus_interface_skeleton::{DBusInterfaceSkeleton, NONE_DBUS_INTERFACE_SKELETON};
 
 mod dbus_menu_model;
@@ -103,11 +87,9 @@ mod dbus_method_invocation;
 pub use self::dbus_method_invocation::DBusMethodInvocation;
 
 mod dbus_object;
-pub use self::dbus_object::DBusObjectExt;
 pub use self::dbus_object::{DBusObject, NONE_DBUS_OBJECT};
 
 mod dbus_proxy;
-pub use self::dbus_proxy::DBusProxyExt;
 pub use self::dbus_proxy::{DBusProxy, NONE_DBUS_PROXY};
 
 mod dbus_server;
@@ -115,12 +97,10 @@ pub use self::dbus_server::DBusServer;
 
 mod data_input_stream;
 pub use self::data_input_stream::DataInputStreamBuilder;
-pub use self::data_input_stream::DataInputStreamExt;
 pub use self::data_input_stream::{DataInputStream, NONE_DATA_INPUT_STREAM};
 
 mod data_output_stream;
 pub use self::data_output_stream::DataOutputStreamBuilder;
-pub use self::data_output_stream::DataOutputStreamExt;
 pub use self::data_output_stream::{DataOutputStream, NONE_DATA_OUTPUT_STREAM};
 
 #[cfg(any(all(not(windows), not(target_os = "macos")), feature = "dox"))]
@@ -131,26 +111,21 @@ mod desktop_app_info;
 pub use self::desktop_app_info::DesktopAppInfo;
 
 mod drive;
-pub use self::drive::DriveExt;
 pub use self::drive::{Drive, NONE_DRIVE};
 
 mod emblem;
 pub use self::emblem::Emblem;
 
 mod emblemed_icon;
-pub use self::emblemed_icon::EmblemedIconExt;
 pub use self::emblemed_icon::{EmblemedIcon, NONE_EMBLEMED_ICON};
 
 mod file;
-pub use self::file::FileExt;
 pub use self::file::{File, NONE_FILE};
 
 mod file_enumerator;
-pub use self::file_enumerator::FileEnumeratorExt;
 pub use self::file_enumerator::{FileEnumerator, NONE_FILE_ENUMERATOR};
 
 mod file_io_stream;
-pub use self::file_io_stream::FileIOStreamExt;
 pub use self::file_io_stream::{FileIOStream, NONE_FILE_IO_STREAM};
 
 mod file_icon;
@@ -160,50 +135,39 @@ mod file_info;
 pub use self::file_info::FileInfo;
 
 mod file_input_stream;
-pub use self::file_input_stream::FileInputStreamExt;
 pub use self::file_input_stream::{FileInputStream, NONE_FILE_INPUT_STREAM};
 
 mod file_monitor;
-pub use self::file_monitor::FileMonitorExt;
 pub use self::file_monitor::{FileMonitor, NONE_FILE_MONITOR};
 
 mod file_output_stream;
-pub use self::file_output_stream::FileOutputStreamExt;
 pub use self::file_output_stream::{FileOutputStream, NONE_FILE_OUTPUT_STREAM};
 
 mod filename_completer;
 pub use self::filename_completer::FilenameCompleter;
 
 mod filter_input_stream;
-pub use self::filter_input_stream::FilterInputStreamExt;
 pub use self::filter_input_stream::{FilterInputStream, NONE_FILTER_INPUT_STREAM};
 
 mod filter_output_stream;
-pub use self::filter_output_stream::FilterOutputStreamExt;
 pub use self::filter_output_stream::{FilterOutputStream, NONE_FILTER_OUTPUT_STREAM};
 
 mod io_stream;
-pub use self::io_stream::IOStreamExt;
 pub use self::io_stream::{IOStream, NONE_IO_STREAM};
 
 mod icon;
-pub use self::icon::IconExt;
 pub use self::icon::{Icon, NONE_ICON};
 
 mod inet_address;
-pub use self::inet_address::InetAddressExt;
 pub use self::inet_address::{InetAddress, NONE_INET_ADDRESS};
 
 mod inet_address_mask;
-pub use self::inet_address_mask::InetAddressMaskExt;
 pub use self::inet_address_mask::{InetAddressMask, NONE_INET_ADDRESS_MASK};
 
 mod inet_socket_address;
-pub use self::inet_socket_address::InetSocketAddressExt;
 pub use self::inet_socket_address::{InetSocketAddress, NONE_INET_SOCKET_ADDRESS};
 
 mod input_stream;
-pub use self::input_stream::InputStreamExt;
 pub use self::input_stream::{InputStream, NONE_INPUT_STREAM};
 
 #[cfg(any(feature = "v2_44", feature = "dox"))]
@@ -211,9 +175,6 @@ pub use self::input_stream::{InputStream, NONE_INPUT_STREAM};
 mod list_model;
 #[cfg(any(feature = "v2_44", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_44")))]
-pub use self::list_model::ListModelExt;
-#[cfg(any(feature = "v2_44", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_44")))]
 pub use self::list_model::{ListModel, NONE_LIST_MODEL};
 
 #[cfg(any(feature = "v2_44", feature = "dox"))]
@@ -227,11 +188,9 @@ pub use self::list_store::ListStore;
 pub use self::list_store::ListStoreBuilder;
 
 mod loadable_icon;
-pub use self::loadable_icon::LoadableIconExt;
 pub use self::loadable_icon::{LoadableIcon, NONE_LOADABLE_ICON};
 
 mod memory_input_stream;
-pub use self::memory_input_stream::MemoryInputStreamExt;
 pub use self::memory_input_stream::{MemoryInputStream, NONE_MEMORY_INPUT_STREAM};
 
 #[cfg(any(feature = "v2_64", feature = "dox"))]
@@ -239,105 +198,81 @@ pub use self::memory_input_stream::{MemoryInputStream, NONE_MEMORY_INPUT_STREAM}
 mod memory_monitor;
 #[cfg(any(feature = "v2_64", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_64")))]
-pub use self::memory_monitor::MemoryMonitorExt;
-#[cfg(any(feature = "v2_64", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_64")))]
 pub use self::memory_monitor::{MemoryMonitor, NONE_MEMORY_MONITOR};
 
 mod memory_output_stream;
-pub use self::memory_output_stream::MemoryOutputStreamExt;
 pub use self::memory_output_stream::{MemoryOutputStream, NONE_MEMORY_OUTPUT_STREAM};
 
 mod menu;
 pub use self::menu::Menu;
 
 mod menu_attribute_iter;
-pub use self::menu_attribute_iter::MenuAttributeIterExt;
 pub use self::menu_attribute_iter::{MenuAttributeIter, NONE_MENU_ATTRIBUTE_ITER};
 
 mod menu_item;
 pub use self::menu_item::MenuItem;
 
 mod menu_link_iter;
-pub use self::menu_link_iter::MenuLinkIterExt;
 pub use self::menu_link_iter::{MenuLinkIter, NONE_MENU_LINK_ITER};
 
 mod menu_model;
-pub use self::menu_model::MenuModelExt;
 pub use self::menu_model::{MenuModel, NONE_MENU_MODEL};
 
 mod mount;
-pub use self::mount::MountExt;
 pub use self::mount::{Mount, NONE_MOUNT};
 
 mod mount_operation;
-pub use self::mount_operation::MountOperationExt;
 pub use self::mount_operation::{MountOperation, NONE_MOUNT_OPERATION};
 
 mod network_address;
-pub use self::network_address::NetworkAddressExt;
 pub use self::network_address::{NetworkAddress, NONE_NETWORK_ADDRESS};
 
 mod network_monitor;
-pub use self::network_monitor::NetworkMonitorExt;
 pub use self::network_monitor::{NetworkMonitor, NONE_NETWORK_MONITOR};
 
 mod network_service;
-pub use self::network_service::NetworkServiceExt;
 pub use self::network_service::{NetworkService, NONE_NETWORK_SERVICE};
 
 mod notification;
 pub use self::notification::Notification;
 
 mod output_stream;
-pub use self::output_stream::OutputStreamExt;
 pub use self::output_stream::{OutputStream, NONE_OUTPUT_STREAM};
 
 mod permission;
-pub use self::permission::PermissionExt;
 pub use self::permission::{Permission, NONE_PERMISSION};
 
 mod pollable_input_stream;
-pub use self::pollable_input_stream::PollableInputStreamExt;
 pub use self::pollable_input_stream::{PollableInputStream, NONE_POLLABLE_INPUT_STREAM};
 
 mod pollable_output_stream;
-pub use self::pollable_output_stream::PollableOutputStreamExt;
 pub use self::pollable_output_stream::{PollableOutputStream, NONE_POLLABLE_OUTPUT_STREAM};
 
 mod property_action;
 pub use self::property_action::PropertyAction;
 
 mod proxy;
-pub use self::proxy::ProxyExt;
 pub use self::proxy::{Proxy, NONE_PROXY};
 
 mod proxy_address;
-pub use self::proxy_address::ProxyAddressExt;
 pub use self::proxy_address::{ProxyAddress, NONE_PROXY_ADDRESS};
 
 mod proxy_resolver;
-pub use self::proxy_resolver::ProxyResolverExt;
 pub use self::proxy_resolver::{ProxyResolver, NONE_PROXY_RESOLVER};
 
 mod remote_action_group;
-pub use self::remote_action_group::RemoteActionGroupExt;
 pub use self::remote_action_group::{RemoteActionGroup, NONE_REMOTE_ACTION_GROUP};
 
 mod resolver;
-pub use self::resolver::ResolverExt;
 pub use self::resolver::{Resolver, NONE_RESOLVER};
 
 mod seekable;
-pub use self::seekable::SeekableExt;
 pub use self::seekable::{Seekable, NONE_SEEKABLE};
 
 mod settings;
-pub use self::settings::SettingsExt;
 pub use self::settings::{Settings, NONE_SETTINGS};
 
 mod settings_backend;
-pub use self::settings_backend::SettingsBackendExt;
 pub use self::settings_backend::{SettingsBackend, NONE_SETTINGS_BACKEND};
 
 mod simple_action;
@@ -357,37 +292,29 @@ mod simple_permission;
 pub use self::simple_permission::SimplePermission;
 
 mod socket;
-pub use self::socket::SocketExt;
 pub use self::socket::{Socket, NONE_SOCKET};
 
 mod socket_address;
-pub use self::socket_address::SocketAddressExt;
 pub use self::socket_address::{SocketAddress, NONE_SOCKET_ADDRESS};
 
 mod socket_address_enumerator;
-pub use self::socket_address_enumerator::SocketAddressEnumeratorExt;
 pub use self::socket_address_enumerator::{
     SocketAddressEnumerator, NONE_SOCKET_ADDRESS_ENUMERATOR,
 };
 
 mod socket_client;
-pub use self::socket_client::SocketClientExt;
 pub use self::socket_client::{SocketClient, NONE_SOCKET_CLIENT};
 
 mod socket_connectable;
-pub use self::socket_connectable::SocketConnectableExt;
 pub use self::socket_connectable::{SocketConnectable, NONE_SOCKET_CONNECTABLE};
 
 mod socket_connection;
-pub use self::socket_connection::SocketConnectionExt;
 pub use self::socket_connection::{SocketConnection, NONE_SOCKET_CONNECTION};
 
 mod socket_listener;
-pub use self::socket_listener::SocketListenerExt;
 pub use self::socket_listener::{SocketListener, NONE_SOCKET_LISTENER};
 
 mod socket_service;
-pub use self::socket_service::SocketServiceExt;
 pub use self::socket_service::{SocketService, NONE_SOCKET_SERVICE};
 
 mod subprocess;
@@ -400,50 +327,39 @@ mod task;
 pub use self::task::Task;
 
 mod tcp_connection;
-pub use self::tcp_connection::TcpConnectionExt;
 pub use self::tcp_connection::{TcpConnection, NONE_TCP_CONNECTION};
 
 mod themed_icon;
 pub use self::themed_icon::ThemedIcon;
 
 mod threaded_socket_service;
-pub use self::threaded_socket_service::ThreadedSocketServiceExt;
 pub use self::threaded_socket_service::{ThreadedSocketService, NONE_THREADED_SOCKET_SERVICE};
 
 mod tls_backend;
-pub use self::tls_backend::TlsBackendExt;
 pub use self::tls_backend::{TlsBackend, NONE_TLS_BACKEND};
 
 mod tls_certificate;
-pub use self::tls_certificate::TlsCertificateExt;
 pub use self::tls_certificate::{TlsCertificate, NONE_TLS_CERTIFICATE};
 
 mod tls_client_connection;
-pub use self::tls_client_connection::TlsClientConnectionExt;
 pub use self::tls_client_connection::{TlsClientConnection, NONE_TLS_CLIENT_CONNECTION};
 
 mod tls_connection;
-pub use self::tls_connection::TlsConnectionExt;
 pub use self::tls_connection::{TlsConnection, NONE_TLS_CONNECTION};
 
 mod tls_database;
-pub use self::tls_database::TlsDatabaseExt;
 pub use self::tls_database::{TlsDatabase, NONE_TLS_DATABASE};
 
 mod tls_file_database;
-pub use self::tls_file_database::TlsFileDatabaseExt;
 pub use self::tls_file_database::{TlsFileDatabase, NONE_TLS_FILE_DATABASE};
 
 mod tls_interaction;
-pub use self::tls_interaction::TlsInteractionExt;
 pub use self::tls_interaction::{TlsInteraction, NONE_TLS_INTERACTION};
 
 mod tls_password;
-pub use self::tls_password::TlsPasswordExt;
 pub use self::tls_password::{TlsPassword, NONE_TLS_PASSWORD};
 
 mod tls_server_connection;
-pub use self::tls_server_connection::TlsServerConnectionExt;
 pub use self::tls_server_connection::{TlsServerConnection, NONE_TLS_SERVER_CONNECTION};
 
 #[cfg(any(unix, feature = "dox"))]
@@ -451,9 +367,6 @@ pub use self::tls_server_connection::{TlsServerConnection, NONE_TLS_SERVER_CONNE
 mod unix_fd_list;
 #[cfg(any(unix, feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(unix)))]
-pub use self::unix_fd_list::UnixFDListExt;
-#[cfg(any(unix, feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(unix)))]
 pub use self::unix_fd_list::{UnixFDList, NONE_UNIX_FD_LIST};
 
 #[cfg(any(unix, feature = "dox"))]
@@ -461,9 +374,6 @@ pub use self::unix_fd_list::{UnixFDList, NONE_UNIX_FD_LIST};
 mod unix_input_stream;
 #[cfg(any(unix, feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(unix)))]
-pub use self::unix_input_stream::UnixInputStreamExt;
-#[cfg(any(unix, feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(unix)))]
 pub use self::unix_input_stream::{UnixInputStream, NONE_UNIX_INPUT_STREAM};
 
 #[cfg(any(unix, feature = "dox"))]
@@ -471,9 +381,6 @@ pub use self::unix_input_stream::{UnixInputStream, NONE_UNIX_INPUT_STREAM};
 mod unix_output_stream;
 #[cfg(any(unix, feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(unix)))]
-pub use self::unix_output_stream::UnixOutputStreamExt;
-#[cfg(any(unix, feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(unix)))]
 pub use self::unix_output_stream::{UnixOutputStream, NONE_UNIX_OUTPUT_STREAM};
 
 #[cfg(any(unix, feature = "dox"))]
@@ -481,21 +388,15 @@ pub use self::unix_output_stream::{UnixOutputStream, NONE_UNIX_OUTPUT_STREAM};
 mod unix_socket_address;
 #[cfg(any(unix, feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(unix)))]
-pub use self::unix_socket_address::UnixSocketAddressExt;
-#[cfg(any(unix, feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(unix)))]
 pub use self::unix_socket_address::{UnixSocketAddress, NONE_UNIX_SOCKET_ADDRESS};
 
 mod vfs;
-pub use self::vfs::VfsExt;
 pub use self::vfs::{Vfs, NONE_VFS};
 
 mod volume;
-pub use self::volume::VolumeExt;
 pub use self::volume::{Volume, NONE_VOLUME};
 
 mod volume_monitor;
-pub use self::volume_monitor::VolumeMonitorExt;
 pub use self::volume_monitor::{VolumeMonitor, NONE_VOLUME_MONITOR};
 
 mod zlib_compressor;
@@ -769,103 +670,103 @@ pub use self::constants::VOLUME_MONITOR_EXTENSION_POINT_NAME;
 
 #[doc(hidden)]
 pub mod traits {
-    pub use super::ActionExt;
-    pub use super::ActionGroupExt;
-    pub use super::ActionMapExt;
-    pub use super::AppInfoExt;
-    pub use super::AppLaunchContextExt;
-    pub use super::ApplicationCommandLineExt;
-    pub use super::ApplicationExt;
-    pub use super::AsyncResultExt;
-    pub use super::BufferedInputStreamExt;
-    pub use super::BufferedOutputStreamExt;
-    pub use super::CancellableExt;
-    pub use super::ConverterExt;
-    pub use super::ConverterInputStreamExt;
-    pub use super::ConverterOutputStreamExt;
-    pub use super::DBusInterfaceExt;
-    pub use super::DBusInterfaceSkeletonExt;
-    pub use super::DBusObjectExt;
-    pub use super::DBusProxyExt;
-    pub use super::DataInputStreamExt;
-    pub use super::DataOutputStreamExt;
-    pub use super::DriveExt;
-    pub use super::EmblemedIconExt;
-    pub use super::FileEnumeratorExt;
-    pub use super::FileExt;
-    pub use super::FileIOStreamExt;
-    pub use super::FileInputStreamExt;
-    pub use super::FileMonitorExt;
-    pub use super::FileOutputStreamExt;
-    pub use super::FilterInputStreamExt;
-    pub use super::FilterOutputStreamExt;
-    pub use super::IOStreamExt;
-    pub use super::IconExt;
-    pub use super::InetAddressExt;
-    pub use super::InetAddressMaskExt;
-    pub use super::InetSocketAddressExt;
-    pub use super::InputStreamExt;
+    pub use super::action::ActionExt;
+    pub use super::action_group::ActionGroupExt;
+    pub use super::action_map::ActionMapExt;
+    pub use super::app_info::AppInfoExt;
+    pub use super::app_launch_context::AppLaunchContextExt;
+    pub use super::application::ApplicationExt;
+    pub use super::application_command_line::ApplicationCommandLineExt;
+    pub use super::async_result::AsyncResultExt;
+    pub use super::buffered_input_stream::BufferedInputStreamExt;
+    pub use super::buffered_output_stream::BufferedOutputStreamExt;
+    pub use super::cancellable::CancellableExt;
+    pub use super::converter::ConverterExt;
+    pub use super::converter_input_stream::ConverterInputStreamExt;
+    pub use super::converter_output_stream::ConverterOutputStreamExt;
+    pub use super::data_input_stream::DataInputStreamExt;
+    pub use super::data_output_stream::DataOutputStreamExt;
+    pub use super::dbus_interface::DBusInterfaceExt;
+    pub use super::dbus_interface_skeleton::DBusInterfaceSkeletonExt;
+    pub use super::dbus_object::DBusObjectExt;
+    pub use super::dbus_proxy::DBusProxyExt;
+    pub use super::drive::DriveExt;
+    pub use super::emblemed_icon::EmblemedIconExt;
+    pub use super::file::FileExt;
+    pub use super::file_enumerator::FileEnumeratorExt;
+    pub use super::file_input_stream::FileInputStreamExt;
+    pub use super::file_io_stream::FileIOStreamExt;
+    pub use super::file_monitor::FileMonitorExt;
+    pub use super::file_output_stream::FileOutputStreamExt;
+    pub use super::filter_input_stream::FilterInputStreamExt;
+    pub use super::filter_output_stream::FilterOutputStreamExt;
+    pub use super::icon::IconExt;
+    pub use super::inet_address::InetAddressExt;
+    pub use super::inet_address_mask::InetAddressMaskExt;
+    pub use super::inet_socket_address::InetSocketAddressExt;
+    pub use super::input_stream::InputStreamExt;
+    pub use super::io_stream::IOStreamExt;
     #[cfg(any(feature = "v2_44", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_44")))]
-    pub use super::ListModelExt;
-    pub use super::LoadableIconExt;
-    pub use super::MemoryInputStreamExt;
+    pub use super::list_model::ListModelExt;
+    pub use super::loadable_icon::LoadableIconExt;
+    pub use super::memory_input_stream::MemoryInputStreamExt;
     #[cfg(any(feature = "v2_64", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_64")))]
-    pub use super::MemoryMonitorExt;
-    pub use super::MemoryOutputStreamExt;
-    pub use super::MenuAttributeIterExt;
-    pub use super::MenuLinkIterExt;
-    pub use super::MenuModelExt;
-    pub use super::MountExt;
-    pub use super::MountOperationExt;
-    pub use super::NetworkAddressExt;
-    pub use super::NetworkMonitorExt;
-    pub use super::NetworkServiceExt;
-    pub use super::OutputStreamExt;
-    pub use super::PermissionExt;
-    pub use super::PollableInputStreamExt;
-    pub use super::PollableOutputStreamExt;
-    pub use super::ProxyAddressExt;
-    pub use super::ProxyExt;
-    pub use super::ProxyResolverExt;
-    pub use super::RemoteActionGroupExt;
-    pub use super::ResolverExt;
-    pub use super::SeekableExt;
-    pub use super::SettingsBackendExt;
-    pub use super::SettingsExt;
-    pub use super::SocketAddressEnumeratorExt;
-    pub use super::SocketAddressExt;
-    pub use super::SocketClientExt;
-    pub use super::SocketConnectableExt;
-    pub use super::SocketConnectionExt;
-    pub use super::SocketExt;
-    pub use super::SocketListenerExt;
-    pub use super::SocketServiceExt;
-    pub use super::TcpConnectionExt;
-    pub use super::ThreadedSocketServiceExt;
-    pub use super::TlsBackendExt;
-    pub use super::TlsCertificateExt;
-    pub use super::TlsClientConnectionExt;
-    pub use super::TlsConnectionExt;
-    pub use super::TlsDatabaseExt;
-    pub use super::TlsFileDatabaseExt;
-    pub use super::TlsInteractionExt;
-    pub use super::TlsPasswordExt;
-    pub use super::TlsServerConnectionExt;
+    pub use super::memory_monitor::MemoryMonitorExt;
+    pub use super::memory_output_stream::MemoryOutputStreamExt;
+    pub use super::menu_attribute_iter::MenuAttributeIterExt;
+    pub use super::menu_link_iter::MenuLinkIterExt;
+    pub use super::menu_model::MenuModelExt;
+    pub use super::mount::MountExt;
+    pub use super::mount_operation::MountOperationExt;
+    pub use super::network_address::NetworkAddressExt;
+    pub use super::network_monitor::NetworkMonitorExt;
+    pub use super::network_service::NetworkServiceExt;
+    pub use super::output_stream::OutputStreamExt;
+    pub use super::permission::PermissionExt;
+    pub use super::pollable_input_stream::PollableInputStreamExt;
+    pub use super::pollable_output_stream::PollableOutputStreamExt;
+    pub use super::proxy::ProxyExt;
+    pub use super::proxy_address::ProxyAddressExt;
+    pub use super::proxy_resolver::ProxyResolverExt;
+    pub use super::remote_action_group::RemoteActionGroupExt;
+    pub use super::resolver::ResolverExt;
+    pub use super::seekable::SeekableExt;
+    pub use super::settings::SettingsExt;
+    pub use super::settings_backend::SettingsBackendExt;
+    pub use super::socket::SocketExt;
+    pub use super::socket_address::SocketAddressExt;
+    pub use super::socket_address_enumerator::SocketAddressEnumeratorExt;
+    pub use super::socket_client::SocketClientExt;
+    pub use super::socket_connectable::SocketConnectableExt;
+    pub use super::socket_connection::SocketConnectionExt;
+    pub use super::socket_listener::SocketListenerExt;
+    pub use super::socket_service::SocketServiceExt;
+    pub use super::tcp_connection::TcpConnectionExt;
+    pub use super::threaded_socket_service::ThreadedSocketServiceExt;
+    pub use super::tls_backend::TlsBackendExt;
+    pub use super::tls_certificate::TlsCertificateExt;
+    pub use super::tls_client_connection::TlsClientConnectionExt;
+    pub use super::tls_connection::TlsConnectionExt;
+    pub use super::tls_database::TlsDatabaseExt;
+    pub use super::tls_file_database::TlsFileDatabaseExt;
+    pub use super::tls_interaction::TlsInteractionExt;
+    pub use super::tls_password::TlsPasswordExt;
+    pub use super::tls_server_connection::TlsServerConnectionExt;
     #[cfg(any(unix, feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(unix)))]
-    pub use super::UnixFDListExt;
+    pub use super::unix_fd_list::UnixFDListExt;
     #[cfg(any(unix, feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(unix)))]
-    pub use super::UnixInputStreamExt;
+    pub use super::unix_input_stream::UnixInputStreamExt;
     #[cfg(any(unix, feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(unix)))]
-    pub use super::UnixOutputStreamExt;
+    pub use super::unix_output_stream::UnixOutputStreamExt;
     #[cfg(any(unix, feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(unix)))]
-    pub use super::UnixSocketAddressExt;
-    pub use super::VfsExt;
-    pub use super::VolumeExt;
-    pub use super::VolumeMonitorExt;
+    pub use super::unix_socket_address::UnixSocketAddressExt;
+    pub use super::vfs::VfsExt;
+    pub use super::volume::VolumeExt;
+    pub use super::volume_monitor::VolumeMonitorExt;
 }
diff --git a/gio/src/auto/settings.rs b/gio/src/auto/settings.rs
index 9ffaec4ff73a..5d8411614acd 100644
--- a/gio/src/auto/settings.rs
+++ b/gio/src/auto/settings.rs
@@ -177,7 +177,7 @@ pub trait SettingsExt: 'static {
     #[doc(alias = "g_settings_list_children")]
     fn list_children(&self) -> Vec<glib::GString>;
 
-    #[cfg_attr(feature = "v2_46", deprecated)]
+    #[cfg_attr(feature = "v2_46", deprecated = "Since 2.46")]
     #[doc(alias = "g_settings_list_keys")]
     fn list_keys(&self) -> Vec<glib::GString>;
 
diff --git a/gio/src/auto/tls_client_connection.rs b/gio/src/auto/tls_client_connection.rs
index b67466018413..7b8e31e26b44 100644
--- a/gio/src/auto/tls_client_connection.rs
+++ b/gio/src/auto/tls_client_connection.rs
@@ -60,7 +60,7 @@ pub trait TlsClientConnectionExt: 'static {
     #[doc(alias = "g_tls_client_connection_get_server_identity")]
     fn server_identity(&self) -> Option<SocketConnectable>;
 
-    #[cfg_attr(feature = "v2_56", deprecated)]
+    #[cfg_attr(feature = "v2_56", deprecated = "Since 2.56")]
     #[doc(alias = "g_tls_client_connection_get_use_ssl3")]
     fn uses_ssl3(&self) -> bool;
 
@@ -70,7 +70,7 @@ pub trait TlsClientConnectionExt: 'static {
     #[doc(alias = "g_tls_client_connection_set_server_identity")]
     fn set_server_identity<P: IsA<SocketConnectable>>(&self, identity: &P);
 
-    #[cfg_attr(feature = "v2_56", deprecated)]
+    #[cfg_attr(feature = "v2_56", deprecated = "Since 2.56")]
     #[doc(alias = "g_tls_client_connection_set_use_ssl3")]
     fn set_use_ssl3(&self, use_ssl3: bool);
 
@@ -85,7 +85,7 @@ pub trait TlsClientConnectionExt: 'static {
         f: F,
     ) -> SignalHandlerId;
 
-    #[cfg_attr(feature = "v2_56", deprecated)]
+    #[cfg_attr(feature = "v2_56", deprecated = "Since 2.56")]
     fn connect_property_use_ssl3_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
     fn connect_property_validation_flags_notify<F: Fn(&Self) + 'static>(
diff --git a/gio/src/auto/tls_connection.rs b/gio/src/auto/tls_connection.rs
index c1bb0791f7c2..3b9e4f1fa1ba 100644
--- a/gio/src/auto/tls_connection.rs
+++ b/gio/src/auto/tls_connection.rs
@@ -61,7 +61,7 @@ pub trait TlsConnectionExt: 'static {
     #[doc(alias = "g_tls_connection_get_peer_certificate_errors")]
     fn peer_certificate_errors(&self) -> TlsCertificateFlags;
 
-    #[cfg_attr(feature = "v2_60", deprecated)]
+    #[cfg_attr(feature = "v2_60", deprecated = "Since 2.60")]
     #[doc(alias = "g_tls_connection_get_rehandshake_mode")]
     fn rehandshake_mode(&self) -> TlsRehandshakeMode;
 
@@ -98,7 +98,7 @@ pub trait TlsConnectionExt: 'static {
     #[doc(alias = "g_tls_connection_set_interaction")]
     fn set_interaction<P: IsA<TlsInteraction>>(&self, interaction: Option<&P>);
 
-    #[cfg_attr(feature = "v2_60", deprecated)]
+    #[cfg_attr(feature = "v2_60", deprecated = "Since 2.60")]
     #[doc(alias = "g_tls_connection_set_rehandshake_mode")]
     fn set_rehandshake_mode(&self, mode: TlsRehandshakeMode);
 
@@ -150,7 +150,7 @@ pub trait TlsConnectionExt: 'static {
         f: F,
     ) -> SignalHandlerId;
 
-    #[cfg_attr(feature = "v2_60", deprecated)]
+    #[cfg_attr(feature = "v2_60", deprecated = "Since 2.60")]
     fn connect_property_rehandshake_mode_notify<F: Fn(&Self) + 'static>(
         &self,
         f: F,
diff --git a/gio/src/auto/versions.txt b/gio/src/auto/versions.txt
index 7ac3d16a8636..91fd75ea23fb 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 @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/gio/src/cancellable.rs b/gio/src/cancellable.rs
index 6f35073f74d1..02fb4b05cf7c 100644
--- a/gio/src/cancellable.rs
+++ b/gio/src/cancellable.rs
@@ -1,6 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use crate::CancellableExt;
+use crate::prelude::*;
 
 #[test]
 fn check_callback() {
diff --git a/gio/src/file_enumerator.rs b/gio/src/file_enumerator.rs
index 00928a0adae2..b3836eea4796 100644
--- a/gio/src/file_enumerator.rs
+++ b/gio/src/file_enumerator.rs
@@ -1,7 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+use crate::prelude::*;
 use crate::FileEnumerator;
-use crate::FileEnumeratorExt;
 use crate::FileInfo;
 use std::iter::Iterator;
 
diff --git a/gio/src/gio_future.rs b/gio/src/gio_future.rs
index 9d19349b524e..a4609210ca65 100644
--- a/gio/src/gio_future.rs
+++ b/gio/src/gio_future.rs
@@ -5,8 +5,8 @@ use futures_core::task::{Context, Poll};
 use std::future::Future;
 use std::pin::{self, Pin};
 
+use crate::prelude::*;
 use crate::Cancellable;
-use crate::CancellableExt;
 
 pub struct GioFuture<F, O, T, E> {
     obj: O,
diff --git a/gio/src/inet_address.rs b/gio/src/inet_address.rs
index 072363a01613..cf483bb752eb 100644
--- a/gio/src/inet_address.rs
+++ b/gio/src/inet_address.rs
@@ -1,7 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+use crate::prelude::*;
 use crate::InetAddress;
-use crate::InetAddressExt;
 use crate::SocketFamily;
 use glib::object::IsA;
 use glib::translate::*;
diff --git a/gio/src/inet_socket_address.rs b/gio/src/inet_socket_address.rs
index 34f6263a6901..66c5deac80fa 100644
--- a/gio/src/inet_socket_address.rs
+++ b/gio/src/inet_socket_address.rs
@@ -1,8 +1,8 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+use crate::prelude::*;
 use crate::InetAddress;
 use crate::InetSocketAddress;
-use crate::InetSocketAddressExt;
 
 use std::net::SocketAddr;
 
diff --git a/gio/src/input_stream.rs b/gio/src/input_stream.rs
index 3bc6afb5c813..b141d9f95523 100644
--- a/gio/src/input_stream.rs
+++ b/gio/src/input_stream.rs
@@ -1,10 +1,10 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 use crate::error::to_std_io_result;
+use crate::prelude::*;
 use crate::Cancellable;
 use crate::InputStream;
 use crate::Seekable;
-use crate::SeekableExt;
 use futures_core::task::{Context, Poll};
 use futures_io::{AsyncBufRead, AsyncRead};
 use glib::object::IsA;
diff --git a/gio/src/io_stream.rs b/gio/src/io_stream.rs
index 1b6ec88f5322..466e90e98943 100644
--- a/gio/src/io_stream.rs
+++ b/gio/src/io_stream.rs
@@ -1,9 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use crate::pollable_input_stream::PollableInputStreamExtManual;
-use crate::pollable_output_stream::PollableOutputStreamExtManual;
+use crate::prelude::*;
 use crate::IOStream;
-use crate::IOStreamExt;
 use crate::InputStreamAsyncRead;
 use crate::OutputStreamAsyncWrite;
 use crate::PollableInputStream;
diff --git a/gio/src/output_stream.rs b/gio/src/output_stream.rs
index 42e55923b97b..8f645b7a80f9 100644
--- a/gio/src/output_stream.rs
+++ b/gio/src/output_stream.rs
@@ -5,7 +5,6 @@ use crate::prelude::*;
 use crate::Cancellable;
 use crate::OutputStream;
 use crate::Seekable;
-use crate::SeekableExt;
 use glib::object::IsA;
 use glib::translate::*;
 use glib::Priority;
diff --git a/gio/src/pollable_input_stream.rs b/gio/src/pollable_input_stream.rs
index 7edb4ea11e3a..7e78fa46dcac 100644
--- a/gio/src/pollable_input_stream.rs
+++ b/gio/src/pollable_input_stream.rs
@@ -1,8 +1,8 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+use crate::prelude::*;
 use crate::Cancellable;
 use crate::PollableInputStream;
-use crate::PollableInputStreamExt;
 use futures_core::task::{Context, Poll};
 use futures_io::AsyncRead;
 use glib::object::{Cast, IsA};
diff --git a/gio/src/pollable_output_stream.rs b/gio/src/pollable_output_stream.rs
index 7b2981a5f232..97fe98e175a9 100644
--- a/gio/src/pollable_output_stream.rs
+++ b/gio/src/pollable_output_stream.rs
@@ -1,10 +1,9 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 use crate::error::to_std_io_result;
+use crate::prelude::*;
 use crate::Cancellable;
-use crate::OutputStreamExt;
 use crate::PollableOutputStream;
-use crate::PollableOutputStreamExt;
 use futures_channel::oneshot;
 use futures_core::task::{Context, Poll};
 use futures_core::Future;
diff --git a/gio/src/settings.rs b/gio/src/settings.rs
index 876ccf1482de..81b72dd353da 100644
--- a/gio/src/settings.rs
+++ b/gio/src/settings.rs
@@ -1,7 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use crate::{Settings, SettingsBindFlags, SettingsExt};
-use glib::prelude::*;
+use crate::prelude::*;
+use crate::{Settings, SettingsBindFlags};
 use glib::translate::{from_glib_borrow, from_glib_none, ToGlib, ToGlibPtr};
 use glib::variant::FromVariant;
 use glib::{BoolError, IsA, ToVariant};
diff --git a/gio/src/task.rs b/gio/src/task.rs
index adce3c615301..4c6ba93a6c37 100644
--- a/gio/src/task.rs
+++ b/gio/src/task.rs
@@ -90,10 +90,8 @@ impl Task {
 #[cfg(test)]
 mod test {
     use super::*;
+    use crate::prelude::*;
     use crate::test_util::run_async_local;
-    use crate::CancellableExt;
-    use glib::Cast;
-    use glib::ToValue;
 
     #[test]
     fn test_int_async_result() {
diff --git a/gio/src/tls_connection.rs b/gio/src/tls_connection.rs
index 5a9dca794b12..94d6bdd5e0a7 100644
--- a/gio/src/tls_connection.rs
+++ b/gio/src/tls_connection.rs
@@ -1,8 +1,8 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #[cfg(any(feature = "v2_66", feature = "dox"))]
-use crate::auto::TlsChannelBindingType;
-use crate::auto::TlsConnection;
+use crate::TlsChannelBindingType;
+use crate::TlsConnection;
 #[cfg(any(feature = "v2_66", feature = "dox"))]
 use glib::translate::*;
 use glib::IsA;
diff --git a/gio/src/unix_socket_address.rs b/gio/src/unix_socket_address.rs
index 26d384d74179..8e4c2dfda270 100644
--- a/gio/src/unix_socket_address.rs
+++ b/gio/src/unix_socket_address.rs
@@ -1,10 +1,9 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+use crate::prelude::*;
 use crate::SocketAddress;
 use crate::UnixSocketAddress;
-use crate::UnixSocketAddressExt;
 use crate::UnixSocketAddressType;
-use glib::object::{Cast, IsA};
 use glib::translate::*;
 #[cfg(not(feature = "dox"))]
 use std::ffi::OsStr;
diff --git a/gio/sys/versions.txt b/gio/sys/versions.txt
index 7ac3d16a8636..91fd75ea23fb 100644
--- a/gio/sys/versions.txt
+++ b/gio/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/gir b/gir
index a01a90fb9ccd..7a92c16ac438 160000
--- a/gir
+++ b/gir
@@ -1 +1 @@
-Subproject commit a01a90fb9ccd146827a8d1fcdf9766799ad88ab0
+Subproject commit 7a92c16ac4381e94e6d3b07ae5a6fd9a99866e00
diff --git a/glib/gobject-sys/versions.txt b/glib/gobject-sys/versions.txt
index 7ac3d16a8636..91fd75ea23fb 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 @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/glib/src/auto/date_time.rs b/glib/src/auto/date_time.rs
index 1e4b9f752bd1..c356fa9c17a5 100644
--- a/glib/src/auto/date_time.rs
+++ b/glib/src/auto/date_time.rs
@@ -59,13 +59,13 @@ impl DateTime {
         }
     }
 
-    //#[cfg_attr(feature = "v2_62", deprecated)]
+    //#[cfg_attr(feature = "v2_62", deprecated = "Since 2.62")]
     //#[doc(alias = "g_date_time_new_from_timeval_local")]
     //pub fn from_timeval_local(tv: /*Ignored*/&TimeVal) -> Result<DateTime, BoolError> {
     //    unsafe { TODO: call ffi:g_date_time_new_from_timeval_local() }
     //}
 
-    //#[cfg_attr(feature = "v2_62", deprecated)]
+    //#[cfg_attr(feature = "v2_62", deprecated = "Since 2.62")]
     //#[doc(alias = "g_date_time_new_from_timeval_utc")]
     //pub fn from_timeval_utc(tv: /*Ignored*/&TimeVal) -> Result<DateTime, BoolError> {
     //    unsafe { TODO: call ffi:g_date_time_new_from_timeval_utc() }
@@ -407,7 +407,7 @@ impl DateTime {
         }
     }
 
-    //#[cfg_attr(feature = "v2_62", deprecated)]
+    //#[cfg_attr(feature = "v2_62", deprecated = "Since 2.62")]
     //#[doc(alias = "g_date_time_to_timeval")]
     //pub fn to_timeval(&self, tv: /*Ignored*/&mut TimeVal) -> bool {
     //    unsafe { TODO: call ffi:g_date_time_to_timeval() }
diff --git a/glib/src/auto/functions.rs b/glib/src/auto/functions.rs
index 36dfdd1a255a..1c529dda6b32 100644
--- a/glib/src/auto/functions.rs
+++ b/glib/src/auto/functions.rs
@@ -687,7 +687,7 @@ pub fn console_charset() -> Option<crate::GString> {
     }
 }
 
-//#[cfg_attr(feature = "v2_62", deprecated)]
+//#[cfg_attr(feature = "v2_62", deprecated = "Since 2.62")]
 //#[doc(alias = "g_get_current_time")]
 //pub fn current_time(result: /*Ignored*/&mut TimeVal) {
 //    unsafe { TODO: call ffi:g_get_current_time() }
@@ -954,13 +954,13 @@ pub fn markup_escape_text(text: &str) -> crate::GString {
 //    unsafe { TODO: call ffi:g_markup_vprintf_escaped() }
 //}
 
-#[cfg_attr(feature = "v2_46", deprecated)]
+#[cfg_attr(feature = "v2_46", deprecated = "Since 2.46")]
 #[doc(alias = "g_mem_is_system_malloc")]
 pub fn mem_is_system_malloc() -> bool {
     unsafe { from_glib(ffi::g_mem_is_system_malloc()) }
 }
 
-#[cfg_attr(feature = "v2_46", deprecated)]
+#[cfg_attr(feature = "v2_46", deprecated = "Since 2.46")]
 #[doc(alias = "g_mem_profile")]
 pub fn mem_profile() {
     unsafe {
@@ -968,13 +968,13 @@ pub fn mem_profile() {
     }
 }
 
-//#[cfg_attr(feature = "v2_46", deprecated)]
+//#[cfg_attr(feature = "v2_46", deprecated = "Since 2.46")]
 //#[doc(alias = "g_mem_set_vtable")]
 //pub fn mem_set_vtable(vtable: /*Ignored*/&mut MemVTable) {
 //    unsafe { TODO: call ffi:g_mem_set_vtable() }
 //}
 
-//#[cfg_attr(feature = "v2_68", deprecated)]
+//#[cfg_attr(feature = "v2_68", deprecated = "Since 2.68")]
 //#[doc(alias = "g_memdup")]
 //pub fn memdup(mem: /*Unimplemented*/Option<Fundamental: Pointer>, byte_size: u32) -> /*Unimplemented*/Option<Fundamental: Pointer> {
 //    unsafe { TODO: call ffi:g_memdup() }
diff --git a/glib/src/auto/main_context.rs b/glib/src/auto/main_context.rs
index 32819492af51..b9f9d085761d 100644
--- a/glib/src/auto/main_context.rs
+++ b/glib/src/auto/main_context.rs
@@ -114,7 +114,7 @@ impl MainContext {
     //    unsafe { TODO: call ffi:g_main_context_set_poll_func() }
     //}
 
-    //#[cfg_attr(feature = "v2_58", deprecated)]
+    //#[cfg_attr(feature = "v2_58", deprecated = "Since 2.58")]
     //#[doc(alias = "g_main_context_wait")]
     //pub fn wait(&self, cond: /*Ignored*/&mut Cond, mutex: /*Ignored*/&mut Mutex) -> bool {
     //    unsafe { TODO: call ffi:g_main_context_wait() }
diff --git a/glib/src/auto/time_zone.rs b/glib/src/auto/time_zone.rs
index 3aac8db7edac..81120d567611 100644
--- a/glib/src/auto/time_zone.rs
+++ b/glib/src/auto/time_zone.rs
@@ -17,7 +17,7 @@ crate::wrapper! {
 }
 
 impl TimeZone {
-    #[cfg_attr(feature = "v2_68", deprecated)]
+    #[cfg_attr(feature = "v2_68", deprecated = "Since 2.68")]
     #[doc(alias = "g_time_zone_new")]
     pub fn new(identifier: Option<&str>) -> TimeZone {
         unsafe { from_glib_full(ffi::g_time_zone_new(identifier.to_glib_none().0)) }
diff --git a/glib/src/auto/versions.txt b/glib/src/auto/versions.txt
index 7ac3d16a8636..91fd75ea23fb 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 @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/glib/sys/versions.txt b/glib/sys/versions.txt
index 7ac3d16a8636..91fd75ea23fb 100644
--- a/glib/sys/versions.txt
+++ b/glib/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/graphene/src/auto/rect.rs b/graphene/src/auto/rect.rs
index 52416dfea989..8e362a85442e 100644
--- a/graphene/src/auto/rect.rs
+++ b/graphene/src/auto/rect.rs
@@ -238,7 +238,7 @@ impl Rect {
         }
     }
 
-    #[cfg_attr(feature = "v1_10", deprecated)]
+    #[cfg_attr(feature = "v1_10", deprecated = "Since 1.10")]
     #[doc(alias = "graphene_rect_round")]
     pub fn round(&self) -> Rect {
         unsafe {
diff --git a/graphene/src/auto/versions.txt b/graphene/src/auto/versions.txt
index 7ac3d16a8636..91fd75ea23fb 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 @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/graphene/sys/versions.txt b/graphene/sys/versions.txt
index 7ac3d16a8636..91fd75ea23fb 100644
--- a/graphene/sys/versions.txt
+++ b/graphene/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/gtk/src/application.rs b/gtk/src/application.rs
index 9cc43805d00f..a6970b4d16a6 100644
--- a/gtk/src/application.rs
+++ b/gtk/src/application.rs
@@ -2,11 +2,10 @@
 
 use crate::rt;
 use crate::Application;
-use gio::ApplicationExt;
+use gio::prelude::*;
 use gio::ApplicationFlags;
 use glib::signal::SignalHandlerId;
 use glib::translate::*;
-use glib::ObjectExt;
 
 use std::cell::RefCell;
 use std::rc::Rc;
diff --git a/gtk/src/auto/adjustment.rs b/gtk/src/auto/adjustment.rs
index 0fb8fdd8f15e..686b7608a659 100644
--- a/gtk/src/auto/adjustment.rs
+++ b/gtk/src/auto/adjustment.rs
@@ -118,7 +118,7 @@ impl AdjustmentBuilder {
 pub const NONE_ADJUSTMENT: Option<&Adjustment> = None;
 
 pub trait AdjustmentExt: 'static {
-    #[cfg_attr(feature = "v3_18", deprecated)]
+    #[cfg_attr(feature = "v3_18", deprecated = "Since 3.18")]
     #[doc(alias = "gtk_adjustment_changed")]
     fn changed(&self);
 
@@ -175,7 +175,7 @@ pub trait AdjustmentExt: 'static {
     #[doc(alias = "gtk_adjustment_set_value")]
     fn set_value(&self, value: f64);
 
-    #[cfg_attr(feature = "v3_18", deprecated)]
+    #[cfg_attr(feature = "v3_18", deprecated = "Since 3.18")]
     #[doc(alias = "gtk_adjustment_value_changed")]
     fn value_changed(&self);
 
diff --git a/gtk/src/auto/button.rs b/gtk/src/auto/button.rs
index 24cd7cda52b2..321cc1e44441 100644
--- a/gtk/src/auto/button.rs
+++ b/gtk/src/auto/button.rs
@@ -496,7 +496,7 @@ pub trait ButtonExt: 'static {
     #[doc(alias = "gtk_button_get_event_window")]
     fn event_window(&self) -> Option<gdk::Window>;
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[cfg(any(not(feature = "v3_20"), feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(not(feature = "v3_20"))))]
     #[doc(alias = "gtk_button_get_focus_on_click")]
@@ -520,7 +520,7 @@ pub trait ButtonExt: 'static {
     #[doc(alias = "gtk_button_set_always_show_image")]
     fn set_always_show_image(&self, always_show: bool);
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[cfg(any(not(feature = "v3_20"), feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(not(feature = "v3_20"))))]
     #[doc(alias = "gtk_button_set_focus_on_click")]
diff --git a/gtk/src/auto/cell_renderer_pixbuf.rs b/gtk/src/auto/cell_renderer_pixbuf.rs
index d18d36c92879..e72ee4da220b 100644
--- a/gtk/src/auto/cell_renderer_pixbuf.rs
+++ b/gtk/src/auto/cell_renderer_pixbuf.rs
@@ -263,11 +263,11 @@ impl CellRendererPixbufBuilder {
 pub const NONE_CELL_RENDERER_PIXBUF: Option<&CellRendererPixbuf> = None;
 
 pub trait CellRendererPixbufExt: 'static {
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "get_property_follow_state")]
     fn follows_state(&self) -> bool;
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "set_property_follow_state")]
     fn set_follow_state(&self, follow_state: bool);
 
@@ -313,7 +313,7 @@ pub trait CellRendererPixbufExt: 'static {
     #[doc(alias = "set_property_surface")]
     fn set_surface(&self, surface: Option<&cairo::Surface>);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     fn connect_property_follow_state_notify<F: Fn(&Self) + 'static>(&self, f: F)
         -> SignalHandlerId;
 
diff --git a/gtk/src/auto/combo_box.rs b/gtk/src/auto/combo_box.rs
index 2c69b4c40f72..278e0af5aed3 100644
--- a/gtk/src/auto/combo_box.rs
+++ b/gtk/src/auto/combo_box.rs
@@ -579,7 +579,7 @@ pub trait ComboBoxExt: 'static {
     #[doc(alias = "gtk_combo_box_get_entry_text_column")]
     fn entry_text_column(&self) -> i32;
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[cfg(any(not(feature = "v3_20"), feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(not(feature = "v3_20"))))]
     #[doc(alias = "gtk_combo_box_get_focus_on_click")]
@@ -633,7 +633,7 @@ pub trait ComboBoxExt: 'static {
     #[doc(alias = "gtk_combo_box_set_entry_text_column")]
     fn set_entry_text_column(&self, text_column: i32);
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[cfg(any(not(feature = "v3_20"), feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(not(feature = "v3_20"))))]
     #[doc(alias = "gtk_combo_box_set_focus_on_click")]
diff --git a/gtk/src/auto/constants.rs b/gtk/src/auto/constants.rs
index bb86faed62e6..326969b8b28c 100644
--- a/gtk/src/auto/constants.rs
+++ b/gtk/src/auto/constants.rs
@@ -902,7 +902,7 @@ pub static STYLE_PROPERTY_PADDING: once_cell::sync::Lazy<&'static str> =
             .to_str()
             .unwrap()
     });
-#[cfg_attr(feature = "v3_20", deprecated)]
+#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 #[doc(alias = "GTK_STYLE_REGION_COLUMN")]
 pub static STYLE_REGION_COLUMN: once_cell::sync::Lazy<&'static str> =
     once_cell::sync::Lazy::new(|| unsafe {
@@ -910,7 +910,7 @@ pub static STYLE_REGION_COLUMN: once_cell::sync::Lazy<&'static str> =
             .to_str()
             .unwrap()
     });
-#[cfg_attr(feature = "v3_20", deprecated)]
+#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 #[doc(alias = "GTK_STYLE_REGION_COLUMN_HEADER")]
 pub static STYLE_REGION_COLUMN_HEADER: once_cell::sync::Lazy<&'static str> =
     once_cell::sync::Lazy::new(|| unsafe {
@@ -918,13 +918,13 @@ pub static STYLE_REGION_COLUMN_HEADER: once_cell::sync::Lazy<&'static str> =
             .to_str()
             .unwrap()
     });
-#[cfg_attr(feature = "v3_20", deprecated)]
+#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 #[doc(alias = "GTK_STYLE_REGION_ROW")]
 pub static STYLE_REGION_ROW: once_cell::sync::Lazy<&'static str> =
     once_cell::sync::Lazy::new(|| unsafe {
         CStr::from_ptr(ffi::GTK_STYLE_REGION_ROW).to_str().unwrap()
     });
-#[cfg_attr(feature = "v3_20", deprecated)]
+#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 #[doc(alias = "GTK_STYLE_REGION_TAB")]
 pub static STYLE_REGION_TAB: once_cell::sync::Lazy<&'static str> =
     once_cell::sync::Lazy::new(|| unsafe {
diff --git a/gtk/src/auto/container.rs b/gtk/src/auto/container.rs
index 88cca2c18fbc..6f30307af666 100644
--- a/gtk/src/auto/container.rs
+++ b/gtk/src/auto/container.rs
@@ -73,7 +73,7 @@ pub trait ContainerExt: 'static {
     #[doc(alias = "gtk_container_get_children")]
     fn children(&self) -> Vec<Widget>;
 
-    //#[cfg_attr(feature = "v3_24", deprecated)]
+    //#[cfg_attr(feature = "v3_24", deprecated = "Since 3.24")]
     //#[doc(alias = "gtk_container_get_focus_chain")]
     //fn focus_chain(&self, focusable_widgets: /*Unimplemented*/Vec<Widget>) -> bool;
 
@@ -98,7 +98,7 @@ pub trait ContainerExt: 'static {
     #[doc(alias = "gtk_container_set_border_width")]
     fn set_border_width(&self, border_width: u32);
 
-    #[cfg_attr(feature = "v3_24", deprecated)]
+    #[cfg_attr(feature = "v3_24", deprecated = "Since 3.24")]
     #[doc(alias = "gtk_container_set_focus_chain")]
     fn set_focus_chain(&self, focusable_widgets: &[Widget]);
 
@@ -111,7 +111,7 @@ pub trait ContainerExt: 'static {
     #[doc(alias = "gtk_container_set_focus_vadjustment")]
     fn set_focus_vadjustment<P: IsA<Adjustment>>(&self, adjustment: &P);
 
-    #[cfg_attr(feature = "v3_24", deprecated)]
+    #[cfg_attr(feature = "v3_24", deprecated = "Since 3.24")]
     #[doc(alias = "gtk_container_unset_focus_chain")]
     fn unset_focus_chain(&self);
 
diff --git a/gtk/src/auto/css_provider.rs b/gtk/src/auto/css_provider.rs
index 5fe8ff70e065..b5a14400807d 100644
--- a/gtk/src/auto/css_provider.rs
+++ b/gtk/src/auto/css_provider.rs
@@ -29,7 +29,7 @@ impl CssProvider {
         unsafe { from_glib_full(ffi::gtk_css_provider_new()) }
     }
 
-    #[cfg_attr(feature = "v3_24", deprecated)]
+    #[cfg_attr(feature = "v3_24", deprecated = "Since 3.24")]
     #[doc(alias = "gtk_css_provider_get_default")]
     pub fn default() -> Option<CssProvider> {
         assert_initialized_main_thread!();
diff --git a/gtk/src/auto/entry.rs b/gtk/src/auto/entry.rs
index a547a445e3c8..84dd5cd84a57 100644
--- a/gtk/src/auto/entry.rs
+++ b/gtk/src/auto/entry.rs
@@ -1114,11 +1114,11 @@ pub trait EntryExt: 'static {
     #[doc(alias = "get_property_selection_bound")]
     fn selection_bound(&self) -> i32;
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "get_property_shadow_type")]
     fn shadow_type(&self) -> ShadowType;
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "set_property_shadow_type")]
     fn set_shadow_type(&self, shadow_type: ShadowType);
 
@@ -1375,7 +1375,7 @@ pub trait EntryExt: 'static {
         f: F,
     ) -> SignalHandlerId;
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     fn connect_property_shadow_type_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
     fn connect_property_show_emoji_icon_notify<F: Fn(&Self) + 'static>(
diff --git a/gtk/src/auto/enums.rs b/gtk/src/auto/enums.rs
index c71162f40ddc..1d00e76d002b 100644
--- a/gtk/src/auto/enums.rs
+++ b/gtk/src/auto/enums.rs
@@ -2334,7 +2334,7 @@ impl ToValue for FileChooserError {
     }
 }
 
-#[deprecated]
+#[deprecated = "Since 3.10"]
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
 #[non_exhaustive]
 #[doc(alias = "GtkIMPreeditStyle")]
@@ -2424,7 +2424,7 @@ impl ToValue for IMPreeditStyle {
     }
 }
 
-#[deprecated]
+#[deprecated = "Since 3.10"]
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
 #[non_exhaustive]
 #[doc(alias = "GtkIMStatusStyle")]
@@ -7692,7 +7692,7 @@ impl ToValue for StackTransitionType {
     }
 }
 
-#[deprecated]
+#[deprecated = "Since 3.14"]
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
 #[non_exhaustive]
 #[doc(alias = "GtkStateType")]
diff --git a/gtk/src/auto/expander.rs b/gtk/src/auto/expander.rs
index 24deb89677bd..5f4a72103067 100644
--- a/gtk/src/auto/expander.rs
+++ b/gtk/src/auto/expander.rs
@@ -473,7 +473,7 @@ pub trait ExpanderExt: 'static {
     #[doc(alias = "gtk_expander_get_resize_toplevel")]
     fn resizes_toplevel(&self) -> bool;
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gtk_expander_get_spacing")]
     fn spacing(&self) -> i32;
 
@@ -498,7 +498,7 @@ pub trait ExpanderExt: 'static {
     #[doc(alias = "gtk_expander_set_resize_toplevel")]
     fn set_resize_toplevel(&self, resize_toplevel: bool);
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gtk_expander_set_spacing")]
     fn set_spacing(&self, spacing: i32);
 
@@ -526,7 +526,7 @@ pub trait ExpanderExt: 'static {
         f: F,
     ) -> SignalHandlerId;
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     fn connect_property_spacing_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
     fn connect_property_use_markup_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
diff --git a/gtk/src/auto/file_chooser_button.rs b/gtk/src/auto/file_chooser_button.rs
index 9df3c76fbf14..5f65d061cda1 100644
--- a/gtk/src/auto/file_chooser_button.rs
+++ b/gtk/src/auto/file_chooser_button.rs
@@ -560,7 +560,7 @@ impl FileChooserButtonBuilder {
 pub const NONE_FILE_CHOOSER_BUTTON: Option<&FileChooserButton> = None;
 
 pub trait FileChooserButtonExt: 'static {
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[cfg(any(not(feature = "v3_20"), feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(not(feature = "v3_20"))))]
     #[doc(alias = "gtk_file_chooser_button_get_focus_on_click")]
@@ -572,7 +572,7 @@ pub trait FileChooserButtonExt: 'static {
     #[doc(alias = "gtk_file_chooser_button_get_width_chars")]
     fn width_chars(&self) -> i32;
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[cfg(any(not(feature = "v3_20"), feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(not(feature = "v3_20"))))]
     #[doc(alias = "gtk_file_chooser_button_set_focus_on_click")]
diff --git a/gtk/src/auto/font_button.rs b/gtk/src/auto/font_button.rs
index 6e0f3a7bf337..b21a06067d90 100644
--- a/gtk/src/auto/font_button.rs
+++ b/gtk/src/auto/font_button.rs
@@ -589,7 +589,7 @@ impl FontButtonBuilder {
 pub const NONE_FONT_BUTTON: Option<&FontButton> = None;
 
 pub trait FontButtonExt: 'static {
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gtk_font_button_get_font_name")]
     fn font_name(&self) -> Option<glib::GString>;
 
@@ -608,7 +608,7 @@ pub trait FontButtonExt: 'static {
     #[doc(alias = "gtk_font_button_get_use_size")]
     fn uses_size(&self) -> bool;
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gtk_font_button_set_font_name")]
     fn set_font_name(&self, fontname: &str) -> bool;
 
@@ -629,7 +629,7 @@ pub trait FontButtonExt: 'static {
 
     fn connect_font_set<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     fn connect_property_font_name_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
     fn connect_property_show_size_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
diff --git a/gtk/src/auto/functions.rs b/gtk/src/auto/functions.rs
index b0fd9b5bafc7..f5a93f6dc0e7 100644
--- a/gtk/src/auto/functions.rs
+++ b/gtk/src/auto/functions.rs
@@ -682,7 +682,7 @@ pub fn render_frame<P: IsA<StyleContext>>(
     }
 }
 
-#[cfg_attr(feature = "v3_24", deprecated)]
+#[cfg_attr(feature = "v3_24", deprecated = "Since 3.24")]
 #[doc(alias = "gtk_render_frame_gap")]
 pub fn render_frame_gap<P: IsA<StyleContext>>(
     context: &P,
@@ -1100,7 +1100,7 @@ pub fn targets_include_uri(targets: &[&gdk::Atom]) -> bool {
     }
 }
 
-#[cfg_attr(feature = "v3_20", deprecated)]
+#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 #[doc(alias = "gtk_test_create_simple_window")]
 pub fn test_create_simple_window(window_title: &str, dialog_text: &str) -> Option<Widget> {
     assert_initialized_main_thread!();
@@ -1112,13 +1112,13 @@ pub fn test_create_simple_window(window_title: &str, dialog_text: &str) -> Optio
     }
 }
 
-//#[cfg_attr(feature = "v3_20", deprecated)]
+//#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 //#[doc(alias = "gtk_test_create_widget")]
 //pub fn test_create_widget(widget_type: glib::types::Type, first_property_name: Option<&str>, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> Option<Widget> {
 //    unsafe { TODO: call ffi:gtk_test_create_widget() }
 //}
 
-//#[cfg_attr(feature = "v3_20", deprecated)]
+//#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 //#[doc(alias = "gtk_test_display_button_window")]
 //pub fn test_display_button_window(window_title: &str, dialog_text: &str, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> Option<Widget> {
 //    unsafe { TODO: call ffi:gtk_test_display_button_window() }
@@ -1183,14 +1183,14 @@ pub fn test_register_all_types() {
     }
 }
 
-#[cfg_attr(feature = "v3_20", deprecated)]
+#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 #[doc(alias = "gtk_test_slider_get_value")]
 pub fn test_slider_get_value<P: IsA<Widget>>(widget: &P) -> f64 {
     skip_assert_initialized!();
     unsafe { ffi::gtk_test_slider_get_value(widget.as_ref().to_glib_none().0) }
 }
 
-#[cfg_attr(feature = "v3_20", deprecated)]
+#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 #[doc(alias = "gtk_test_slider_set_perc")]
 pub fn test_slider_set_perc<P: IsA<Widget>>(widget: &P, percentage: f64) {
     skip_assert_initialized!();
@@ -1199,7 +1199,7 @@ pub fn test_slider_set_perc<P: IsA<Widget>>(widget: &P, percentage: f64) {
     }
 }
 
-#[cfg_attr(feature = "v3_20", deprecated)]
+#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 #[doc(alias = "gtk_test_spin_button_click")]
 pub fn test_spin_button_click<P: IsA<SpinButton>>(spinner: &P, button: u32, upwards: bool) -> bool {
     skip_assert_initialized!();
@@ -1212,14 +1212,14 @@ pub fn test_spin_button_click<P: IsA<SpinButton>>(spinner: &P, button: u32, upwa
     }
 }
 
-#[cfg_attr(feature = "v3_20", deprecated)]
+#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 #[doc(alias = "gtk_test_text_get")]
 pub fn test_text_get<P: IsA<Widget>>(widget: &P) -> Option<glib::GString> {
     skip_assert_initialized!();
     unsafe { from_glib_full(ffi::gtk_test_text_get(widget.as_ref().to_glib_none().0)) }
 }
 
-#[cfg_attr(feature = "v3_20", deprecated)]
+#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 #[doc(alias = "gtk_test_text_set")]
 pub fn test_text_set<P: IsA<Widget>>(widget: &P, string: &str) {
     skip_assert_initialized!();
@@ -1228,7 +1228,7 @@ pub fn test_text_set<P: IsA<Widget>>(widget: &P, string: &str) {
     }
 }
 
-#[cfg_attr(feature = "v3_20", deprecated)]
+#[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
 #[doc(alias = "gtk_test_widget_click")]
 pub fn test_widget_click<P: IsA<Widget>>(
     widget: &P,
diff --git a/gtk/src/auto/menu.rs b/gtk/src/auto/menu.rs
index d6a6d2f91114..142e8da9bf81 100644
--- a/gtk/src/auto/menu.rs
+++ b/gtk/src/auto/menu.rs
@@ -566,7 +566,7 @@ pub trait GtkMenuExt: 'static {
     #[doc(alias = "gtk_menu_popdown")]
     fn popdown(&self);
 
-    //#[cfg_attr(feature = "v3_22", deprecated)]
+    //#[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     //#[doc(alias = "gtk_menu_popup")]
     //fn popup<P: IsA<Widget>, Q: IsA<Widget>>(&self, parent_menu_shell: Option<&P>, parent_menu_item: Option<&Q>, func: Option<Box_<dyn FnOnce(&Menu, i32, i32, bool) + 'static>>, button: u32, activate_time: u32);
 
@@ -598,7 +598,7 @@ pub trait GtkMenuExt: 'static {
         trigger_event: Option<&gdk::Event>,
     );
 
-    //#[cfg_attr(feature = "v3_22", deprecated)]
+    //#[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     //#[doc(alias = "gtk_menu_popup_for_device")]
     //fn popup_for_device<P: IsA<Widget>, Q: IsA<Widget>>(&self, device: Option<&gdk::Device>, parent_menu_shell: Option<&P>, parent_menu_item: Option<&Q>, func: Option<Box_<dyn Fn(&Menu, i32, i32, bool) + 'static>>, button: u32, activate_time: u32);
 
diff --git a/gtk/src/auto/mod.rs b/gtk/src/auto/mod.rs
index e2fe519da4e1..f4b25422c87b 100644
--- a/gtk/src/auto/mod.rs
+++ b/gtk/src/auto/mod.rs
@@ -4,167 +4,132 @@
 
 mod about_dialog;
 pub use self::about_dialog::AboutDialogBuilder;
-pub use self::about_dialog::AboutDialogExt;
 pub use self::about_dialog::{AboutDialog, NONE_ABOUT_DIALOG};
 
 mod accel_group;
-pub use self::accel_group::AccelGroupExt;
 pub use self::accel_group::{AccelGroup, NONE_ACCEL_GROUP};
 
 mod accel_label;
 pub use self::accel_label::AccelLabelBuilder;
-pub use self::accel_label::AccelLabelExt;
 pub use self::accel_label::{AccelLabel, NONE_ACCEL_LABEL};
 
 mod action_bar;
 pub use self::action_bar::ActionBarBuilder;
-pub use self::action_bar::ActionBarExt;
 pub use self::action_bar::{ActionBar, NONE_ACTION_BAR};
 
 mod actionable;
-pub use self::actionable::ActionableExt;
 pub use self::actionable::{Actionable, NONE_ACTIONABLE};
 
 mod adjustment;
 pub use self::adjustment::AdjustmentBuilder;
-pub use self::adjustment::AdjustmentExt;
 pub use self::adjustment::{Adjustment, NONE_ADJUSTMENT};
 
 mod app_chooser_button;
 pub use self::app_chooser_button::AppChooserButtonBuilder;
-pub use self::app_chooser_button::AppChooserButtonExt;
 pub use self::app_chooser_button::{AppChooserButton, NONE_APP_CHOOSER_BUTTON};
 
 mod app_chooser_dialog;
 pub use self::app_chooser_dialog::AppChooserDialogBuilder;
-pub use self::app_chooser_dialog::AppChooserDialogExt;
 pub use self::app_chooser_dialog::{AppChooserDialog, NONE_APP_CHOOSER_DIALOG};
 
 mod app_chooser_widget;
 pub use self::app_chooser_widget::AppChooserWidgetBuilder;
-pub use self::app_chooser_widget::AppChooserWidgetExt;
 pub use self::app_chooser_widget::{AppChooserWidget, NONE_APP_CHOOSER_WIDGET};
 
 mod application;
 pub use self::application::ApplicationBuilder;
-pub use self::application::GtkApplicationExt;
 pub use self::application::{Application, NONE_APPLICATION};
 
 mod application_window;
 pub use self::application_window::ApplicationWindowBuilder;
-pub use self::application_window::ApplicationWindowExt;
 pub use self::application_window::{ApplicationWindow, NONE_APPLICATION_WINDOW};
 
 mod aspect_frame;
 pub use self::aspect_frame::AspectFrameBuilder;
-pub use self::aspect_frame::AspectFrameExt;
 pub use self::aspect_frame::{AspectFrame, NONE_ASPECT_FRAME};
 
 mod assistant;
 pub use self::assistant::AssistantBuilder;
-pub use self::assistant::AssistantExt;
 pub use self::assistant::{Assistant, NONE_ASSISTANT};
 
 mod bin;
-pub use self::bin::BinExt;
 pub use self::bin::{Bin, NONE_BIN};
 
 mod box_;
 pub use self::box_::BoxBuilder;
-pub use self::box_::BoxExt;
 pub use self::box_::{Box, NONE_BOX};
 
 mod buildable;
-pub use self::buildable::BuildableExt;
 pub use self::buildable::{Buildable, NONE_BUILDABLE};
 
 mod builder;
-pub use self::builder::BuilderExt;
 pub use self::builder::{Builder, NONE_BUILDER};
 
 mod button;
 pub use self::button::ButtonBuilder;
-pub use self::button::ButtonExt;
 pub use self::button::{Button, NONE_BUTTON};
 
 mod button_box;
 pub use self::button_box::ButtonBoxBuilder;
-pub use self::button_box::ButtonBoxExt;
 pub use self::button_box::{ButtonBox, NONE_BUTTON_BOX};
 
 mod calendar;
 pub use self::calendar::CalendarBuilder;
-pub use self::calendar::CalendarExt;
 pub use self::calendar::{Calendar, NONE_CALENDAR};
 
 mod cell_area;
-pub use self::cell_area::CellAreaExt;
 pub use self::cell_area::{CellArea, NONE_CELL_AREA};
 
 mod cell_area_box;
 pub use self::cell_area_box::CellAreaBoxBuilder;
-pub use self::cell_area_box::CellAreaBoxExt;
 pub use self::cell_area_box::{CellAreaBox, NONE_CELL_AREA_BOX};
 
 mod cell_area_context;
-pub use self::cell_area_context::CellAreaContextExt;
 pub use self::cell_area_context::{CellAreaContext, NONE_CELL_AREA_CONTEXT};
 
 mod cell_editable;
-pub use self::cell_editable::CellEditableExt;
 pub use self::cell_editable::{CellEditable, NONE_CELL_EDITABLE};
 
 mod cell_layout;
-pub use self::cell_layout::CellLayoutExt;
 pub use self::cell_layout::{CellLayout, NONE_CELL_LAYOUT};
 
 mod cell_renderer;
-pub use self::cell_renderer::CellRendererExt;
 pub use self::cell_renderer::{CellRenderer, NONE_CELL_RENDERER};
 
 mod cell_renderer_accel;
 pub use self::cell_renderer_accel::CellRendererAccelBuilder;
-pub use self::cell_renderer_accel::CellRendererAccelExt;
 pub use self::cell_renderer_accel::{CellRendererAccel, NONE_CELL_RENDERER_ACCEL};
 
 mod cell_renderer_combo;
 pub use self::cell_renderer_combo::CellRendererComboBuilder;
-pub use self::cell_renderer_combo::CellRendererComboExt;
 pub use self::cell_renderer_combo::{CellRendererCombo, NONE_CELL_RENDERER_COMBO};
 
 mod cell_renderer_pixbuf;
 pub use self::cell_renderer_pixbuf::CellRendererPixbufBuilder;
-pub use self::cell_renderer_pixbuf::CellRendererPixbufExt;
 pub use self::cell_renderer_pixbuf::{CellRendererPixbuf, NONE_CELL_RENDERER_PIXBUF};
 
 mod cell_renderer_progress;
 pub use self::cell_renderer_progress::CellRendererProgressBuilder;
-pub use self::cell_renderer_progress::CellRendererProgressExt;
 pub use self::cell_renderer_progress::{CellRendererProgress, NONE_CELL_RENDERER_PROGRESS};
 
 mod cell_renderer_spin;
 pub use self::cell_renderer_spin::CellRendererSpinBuilder;
-pub use self::cell_renderer_spin::CellRendererSpinExt;
 pub use self::cell_renderer_spin::{CellRendererSpin, NONE_CELL_RENDERER_SPIN};
 
 mod cell_renderer_spinner;
 pub use self::cell_renderer_spinner::CellRendererSpinnerBuilder;
-pub use self::cell_renderer_spinner::CellRendererSpinnerExt;
 pub use self::cell_renderer_spinner::{CellRendererSpinner, NONE_CELL_RENDERER_SPINNER};
 
 mod cell_renderer_text;
 pub use self::cell_renderer_text::CellRendererTextBuilder;
-pub use self::cell_renderer_text::CellRendererTextExt;
 pub use self::cell_renderer_text::{CellRendererText, NONE_CELL_RENDERER_TEXT};
 
 mod cell_renderer_toggle;
 pub use self::cell_renderer_toggle::CellRendererToggleBuilder;
-pub use self::cell_renderer_toggle::CellRendererToggleExt;
 pub use self::cell_renderer_toggle::{CellRendererToggle, NONE_CELL_RENDERER_TOGGLE};
 
 mod cell_view;
 pub use self::cell_view::CellViewBuilder;
-pub use self::cell_view::CellViewExt;
 pub use self::cell_view::{CellView, NONE_CELL_VIEW};
 
 mod check_button;
@@ -173,7 +138,6 @@ pub use self::check_button::{CheckButton, NONE_CHECK_BUTTON};
 
 mod check_menu_item;
 pub use self::check_menu_item::CheckMenuItemBuilder;
-pub use self::check_menu_item::CheckMenuItemExt;
 pub use self::check_menu_item::{CheckMenuItem, NONE_CHECK_MENU_ITEM};
 
 mod clipboard;
@@ -181,44 +145,35 @@ pub use self::clipboard::Clipboard;
 
 mod color_button;
 pub use self::color_button::ColorButtonBuilder;
-pub use self::color_button::ColorButtonExt;
 pub use self::color_button::{ColorButton, NONE_COLOR_BUTTON};
 
 mod color_chooser;
-pub use self::color_chooser::ColorChooserExt;
 pub use self::color_chooser::{ColorChooser, NONE_COLOR_CHOOSER};
 
 mod color_chooser_dialog;
 pub use self::color_chooser_dialog::ColorChooserDialogBuilder;
-pub use self::color_chooser_dialog::ColorChooserDialogExt;
 pub use self::color_chooser_dialog::{ColorChooserDialog, NONE_COLOR_CHOOSER_DIALOG};
 
 mod color_chooser_widget;
 pub use self::color_chooser_widget::ColorChooserWidgetBuilder;
-pub use self::color_chooser_widget::ColorChooserWidgetExt;
 pub use self::color_chooser_widget::{ColorChooserWidget, NONE_COLOR_CHOOSER_WIDGET};
 
 mod combo_box;
 pub use self::combo_box::ComboBoxBuilder;
-pub use self::combo_box::ComboBoxExt;
 pub use self::combo_box::{ComboBox, NONE_COMBO_BOX};
 
 mod combo_box_text;
 pub use self::combo_box_text::ComboBoxTextBuilder;
-pub use self::combo_box_text::ComboBoxTextExt;
 pub use self::combo_box_text::{ComboBoxText, NONE_COMBO_BOX_TEXT};
 
 mod container;
-pub use self::container::ContainerExt;
 pub use self::container::{Container, NONE_CONTAINER};
 
 mod css_provider;
-pub use self::css_provider::CssProviderExt;
 pub use self::css_provider::{CssProvider, NONE_CSS_PROVIDER};
 
 mod dialog;
 pub use self::dialog::DialogBuilder;
-pub use self::dialog::DialogExt;
 pub use self::dialog::{Dialog, NONE_DIALOG};
 
 mod drawing_area;
@@ -226,26 +181,21 @@ pub use self::drawing_area::DrawingAreaBuilder;
 pub use self::drawing_area::{DrawingArea, NONE_DRAWING_AREA};
 
 mod editable;
-pub use self::editable::EditableExt;
 pub use self::editable::{Editable, NONE_EDITABLE};
 
 mod entry;
 pub use self::entry::EntryBuilder;
-pub use self::entry::EntryExt;
 pub use self::entry::{Entry, NONE_ENTRY};
 
 mod entry_completion;
 pub use self::entry_completion::EntryCompletionBuilder;
-pub use self::entry_completion::EntryCompletionExt;
 pub use self::entry_completion::{EntryCompletion, NONE_ENTRY_COMPLETION};
 
 mod event_box;
 pub use self::event_box::EventBoxBuilder;
-pub use self::event_box::EventBoxExt;
 pub use self::event_box::{EventBox, NONE_EVENT_BOX};
 
 mod event_controller;
-pub use self::event_controller::EventControllerExt;
 pub use self::event_controller::{EventController, NONE_EVENT_CONTROLLER};
 
 #[cfg(any(feature = "v3_24", feature = "dox"))]
@@ -271,16 +221,13 @@ pub use self::event_controller_scroll::EventControllerScroll;
 
 mod expander;
 pub use self::expander::ExpanderBuilder;
-pub use self::expander::ExpanderExt;
 pub use self::expander::{Expander, NONE_EXPANDER};
 
 mod file_chooser;
-pub use self::file_chooser::FileChooserExt;
 pub use self::file_chooser::{FileChooser, NONE_FILE_CHOOSER};
 
 mod file_chooser_button;
 pub use self::file_chooser_button::FileChooserButtonBuilder;
-pub use self::file_chooser_button::FileChooserButtonExt;
 pub use self::file_chooser_button::{FileChooserButton, NONE_FILE_CHOOSER_BUTTON};
 
 mod file_chooser_dialog;
@@ -299,7 +246,6 @@ pub use self::file_chooser_native::FileChooserNativeBuilder;
 
 mod file_chooser_widget;
 pub use self::file_chooser_widget::FileChooserWidgetBuilder;
-pub use self::file_chooser_widget::FileChooserWidgetExt;
 pub use self::file_chooser_widget::{FileChooserWidget, NONE_FILE_CHOOSER_WIDGET};
 
 mod file_filter;
@@ -307,26 +253,21 @@ pub use self::file_filter::FileFilter;
 
 mod fixed;
 pub use self::fixed::FixedBuilder;
-pub use self::fixed::FixedExt;
 pub use self::fixed::{Fixed, NONE_FIXED};
 
 mod flow_box;
 pub use self::flow_box::FlowBoxBuilder;
-pub use self::flow_box::FlowBoxExt;
 pub use self::flow_box::{FlowBox, NONE_FLOW_BOX};
 
 mod flow_box_child;
 pub use self::flow_box_child::FlowBoxChildBuilder;
-pub use self::flow_box_child::FlowBoxChildExt;
 pub use self::flow_box_child::{FlowBoxChild, NONE_FLOW_BOX_CHILD};
 
 mod font_button;
 pub use self::font_button::FontButtonBuilder;
-pub use self::font_button::FontButtonExt;
 pub use self::font_button::{FontButton, NONE_FONT_BUTTON};
 
 mod font_chooser;
-pub use self::font_chooser::FontChooserExt;
 pub use self::font_chooser::{FontChooser, NONE_FONT_CHOOSER};
 
 mod font_chooser_dialog;
@@ -335,12 +276,10 @@ pub use self::font_chooser_dialog::{FontChooserDialog, NONE_FONT_CHOOSER_DIALOG}
 
 mod font_chooser_widget;
 pub use self::font_chooser_widget::FontChooserWidgetBuilder;
-pub use self::font_chooser_widget::FontChooserWidgetExt;
 pub use self::font_chooser_widget::{FontChooserWidget, NONE_FONT_CHOOSER_WIDGET};
 
 mod frame;
 pub use self::frame::FrameBuilder;
-pub use self::frame::FrameExt;
 pub use self::frame::{Frame, NONE_FRAME};
 
 #[cfg(any(feature = "v3_16", feature = "dox"))]
@@ -351,18 +290,13 @@ mod gl_area;
 pub use self::gl_area::GLAreaBuilder;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
-pub use self::gl_area::GLAreaExt;
-#[cfg(any(feature = "v3_16", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
 pub use self::gl_area::{GLArea, NONE_GL_AREA};
 
 mod gesture;
-pub use self::gesture::GestureExt;
 pub use self::gesture::{Gesture, NONE_GESTURE};
 
 mod gesture_drag;
 pub use self::gesture_drag::GestureDragBuilder;
-pub use self::gesture_drag::GestureDragExt;
 pub use self::gesture_drag::{GestureDrag, NONE_GESTURE_DRAG};
 
 mod gesture_long_press;
@@ -382,7 +316,6 @@ pub use self::gesture_rotate::GestureRotate;
 pub use self::gesture_rotate::GestureRotateBuilder;
 
 mod gesture_single;
-pub use self::gesture_single::GestureSingleExt;
 pub use self::gesture_single::{GestureSingle, NONE_GESTURE_SINGLE};
 
 #[cfg(any(feature = "v3_24", feature = "dox"))]
@@ -402,16 +335,13 @@ pub use self::gesture_zoom::GestureZoomBuilder;
 
 mod grid;
 pub use self::grid::GridBuilder;
-pub use self::grid::GridExt;
 pub use self::grid::{Grid, NONE_GRID};
 
 mod header_bar;
 pub use self::header_bar::HeaderBarBuilder;
-pub use self::header_bar::HeaderBarExt;
 pub use self::header_bar::{HeaderBar, NONE_HEADER_BAR};
 
 mod im_context;
-pub use self::im_context::IMContextExt;
 pub use self::im_context::{IMContext, NONE_IM_CONTEXT};
 
 mod im_context_simple;
@@ -420,107 +350,86 @@ pub use self::im_context_simple::{IMContextSimple, NONE_IM_CONTEXT_SIMPLE};
 
 mod im_multicontext;
 pub use self::im_multicontext::IMMulticontextBuilder;
-pub use self::im_multicontext::IMMulticontextExt;
 pub use self::im_multicontext::{IMMulticontext, NONE_IM_MULTICONTEXT};
 
 mod icon_info;
 pub use self::icon_info::IconInfo;
 
 mod icon_theme;
-pub use self::icon_theme::IconThemeExt;
 pub use self::icon_theme::{IconTheme, NONE_ICON_THEME};
 
 mod icon_view;
 pub use self::icon_view::IconViewBuilder;
-pub use self::icon_view::IconViewExt;
 pub use self::icon_view::{IconView, NONE_ICON_VIEW};
 
 mod image;
 pub use self::image::ImageBuilder;
-pub use self::image::ImageExt;
 pub use self::image::{Image, NONE_IMAGE};
 
 mod info_bar;
 pub use self::info_bar::InfoBarBuilder;
-pub use self::info_bar::InfoBarExt;
 pub use self::info_bar::{InfoBar, NONE_INFO_BAR};
 
 mod invisible;
 pub use self::invisible::InvisibleBuilder;
-pub use self::invisible::InvisibleExt;
 pub use self::invisible::{Invisible, NONE_INVISIBLE};
 
 mod label;
 pub use self::label::LabelBuilder;
-pub use self::label::LabelExt;
 pub use self::label::{Label, NONE_LABEL};
 
 mod layout;
 pub use self::layout::LayoutBuilder;
-pub use self::layout::LayoutExt;
 pub use self::layout::{Layout, NONE_LAYOUT};
 
 mod level_bar;
 pub use self::level_bar::LevelBarBuilder;
-pub use self::level_bar::LevelBarExt;
 pub use self::level_bar::{LevelBar, NONE_LEVEL_BAR};
 
 mod link_button;
 pub use self::link_button::LinkButtonBuilder;
-pub use self::link_button::LinkButtonExt;
 pub use self::link_button::{LinkButton, NONE_LINK_BUTTON};
 
 mod list_box;
 pub use self::list_box::ListBoxBuilder;
-pub use self::list_box::ListBoxExt;
 pub use self::list_box::{ListBox, NONE_LIST_BOX};
 
 mod list_box_row;
 pub use self::list_box_row::ListBoxRowBuilder;
-pub use self::list_box_row::ListBoxRowExt;
 pub use self::list_box_row::{ListBoxRow, NONE_LIST_BOX_ROW};
 
 mod list_store;
-pub use self::list_store::GtkListStoreExt;
 pub use self::list_store::{ListStore, NONE_LIST_STORE};
 
 mod lock_button;
 pub use self::lock_button::LockButtonBuilder;
-pub use self::lock_button::LockButtonExt;
 pub use self::lock_button::{LockButton, NONE_LOCK_BUTTON};
 
 mod menu;
-pub use self::menu::GtkMenuExt;
 pub use self::menu::MenuBuilder;
 pub use self::menu::{Menu, NONE_MENU};
 
 mod menu_bar;
 pub use self::menu_bar::MenuBarBuilder;
-pub use self::menu_bar::MenuBarExt;
 pub use self::menu_bar::{MenuBar, NONE_MENU_BAR};
 
 mod menu_button;
 pub use self::menu_button::MenuButtonBuilder;
-pub use self::menu_button::MenuButtonExt;
 pub use self::menu_button::{MenuButton, NONE_MENU_BUTTON};
 
 mod menu_item;
-pub use self::menu_item::GtkMenuItemExt;
 pub use self::menu_item::MenuItemBuilder;
 pub use self::menu_item::{MenuItem, NONE_MENU_ITEM};
 
 mod menu_shell;
-pub use self::menu_shell::MenuShellExt;
 pub use self::menu_shell::{MenuShell, NONE_MENU_SHELL};
 
 mod menu_tool_button;
 pub use self::menu_tool_button::MenuToolButtonBuilder;
-pub use self::menu_tool_button::MenuToolButtonExt;
 pub use self::menu_tool_button::{MenuToolButton, NONE_MENU_TOOL_BUTTON};
 
 mod message_dialog;
 pub use self::message_dialog::MessageDialogBuilder;
-pub use self::message_dialog::MessageDialogExt;
 pub use self::message_dialog::{MessageDialog, NONE_MESSAGE_DIALOG};
 
 mod misc;
@@ -538,7 +447,6 @@ pub use self::model_button::ModelButtonBuilder;
 
 mod mount_operation;
 pub use self::mount_operation::MountOperationBuilder;
-pub use self::mount_operation::MountOperationExt;
 pub use self::mount_operation::{MountOperation, NONE_MOUNT_OPERATION};
 
 #[cfg(any(feature = "v3_20", feature = "dox"))]
@@ -546,28 +454,21 @@ pub use self::mount_operation::{MountOperation, NONE_MOUNT_OPERATION};
 mod native_dialog;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_20")))]
-pub use self::native_dialog::NativeDialogExt;
-#[cfg(any(feature = "v3_20", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_20")))]
 pub use self::native_dialog::{NativeDialog, NONE_NATIVE_DIALOG};
 
 mod notebook;
 pub use self::notebook::NotebookBuilder;
-pub use self::notebook::NotebookExt;
 pub use self::notebook::{Notebook, NONE_NOTEBOOK};
 
 mod offscreen_window;
 pub use self::offscreen_window::OffscreenWindowBuilder;
-pub use self::offscreen_window::OffscreenWindowExt;
 pub use self::offscreen_window::{OffscreenWindow, NONE_OFFSCREEN_WINDOW};
 
 mod orientable;
-pub use self::orientable::OrientableExt;
 pub use self::orientable::{Orientable, NONE_ORIENTABLE};
 
 mod overlay;
 pub use self::overlay::OverlayBuilder;
-pub use self::overlay::OverlayExt;
 pub use self::overlay::{Overlay, NONE_OVERLAY};
 
 #[cfg(any(feature = "v3_22", feature = "dox"))]
@@ -585,7 +486,6 @@ pub use self::page_setup::PageSetup;
 
 mod paned;
 pub use self::paned::PanedBuilder;
-pub use self::paned::PanedExt;
 pub use self::paned::{Paned, NONE_PANED};
 
 mod places_sidebar;
@@ -600,14 +500,10 @@ mod plug;
 pub use self::plug::PlugBuilder;
 #[cfg(any(gdk_backend = "x11", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(gdk_backend = "x11")))]
-pub use self::plug::PlugExt;
-#[cfg(any(gdk_backend = "x11", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(gdk_backend = "x11")))]
 pub use self::plug::{Plug, NONE_PLUG};
 
 mod popover;
 pub use self::popover::PopoverBuilder;
-pub use self::popover::PopoverExt;
 pub use self::popover::{Popover, NONE_POPOVER};
 
 #[cfg(any(feature = "v3_16", feature = "dox"))]
@@ -625,11 +521,9 @@ pub use self::print_context::PrintContext;
 
 mod print_operation;
 pub use self::print_operation::PrintOperationBuilder;
-pub use self::print_operation::PrintOperationExt;
 pub use self::print_operation::{PrintOperation, NONE_PRINT_OPERATION};
 
 mod print_operation_preview;
-pub use self::print_operation_preview::PrintOperationPreviewExt;
 pub use self::print_operation_preview::{PrintOperationPreview, NONE_PRINT_OPERATION_PREVIEW};
 
 mod print_settings;
@@ -637,30 +531,24 @@ pub use self::print_settings::PrintSettings;
 
 mod progress_bar;
 pub use self::progress_bar::ProgressBarBuilder;
-pub use self::progress_bar::ProgressBarExt;
 pub use self::progress_bar::{ProgressBar, NONE_PROGRESS_BAR};
 
 mod radio_button;
 pub use self::radio_button::RadioButtonBuilder;
-pub use self::radio_button::RadioButtonExt;
 pub use self::radio_button::{RadioButton, NONE_RADIO_BUTTON};
 
 mod radio_menu_item;
 pub use self::radio_menu_item::RadioMenuItemBuilder;
-pub use self::radio_menu_item::RadioMenuItemExt;
 pub use self::radio_menu_item::{RadioMenuItem, NONE_RADIO_MENU_ITEM};
 
 mod radio_tool_button;
 pub use self::radio_tool_button::RadioToolButtonBuilder;
-pub use self::radio_tool_button::RadioToolButtonExt;
 pub use self::radio_tool_button::{RadioToolButton, NONE_RADIO_TOOL_BUTTON};
 
 mod range;
-pub use self::range::RangeExt;
 pub use self::range::{Range, NONE_RANGE};
 
 mod recent_chooser;
-pub use self::recent_chooser::RecentChooserExt;
 pub use self::recent_chooser::{RecentChooser, NONE_RECENT_CHOOSER};
 
 mod recent_chooser_dialog;
@@ -669,7 +557,6 @@ pub use self::recent_chooser_dialog::{RecentChooserDialog, NONE_RECENT_CHOOSER_D
 
 mod recent_chooser_menu;
 pub use self::recent_chooser_menu::RecentChooserMenuBuilder;
-pub use self::recent_chooser_menu::RecentChooserMenuExt;
 pub use self::recent_chooser_menu::{RecentChooserMenu, NONE_RECENT_CHOOSER_MENU};
 
 mod recent_chooser_widget;
@@ -681,26 +568,21 @@ pub use self::recent_filter::RecentFilter;
 
 mod recent_manager;
 pub use self::recent_manager::RecentManagerBuilder;
-pub use self::recent_manager::RecentManagerExt;
 pub use self::recent_manager::{RecentManager, NONE_RECENT_MANAGER};
 
 mod revealer;
 pub use self::revealer::RevealerBuilder;
-pub use self::revealer::RevealerExt;
 pub use self::revealer::{Revealer, NONE_REVEALER};
 
 mod scale;
 pub use self::scale::ScaleBuilder;
-pub use self::scale::ScaleExt;
 pub use self::scale::{Scale, NONE_SCALE};
 
 mod scale_button;
 pub use self::scale_button::ScaleButtonBuilder;
-pub use self::scale_button::ScaleButtonExt;
 pub use self::scale_button::{ScaleButton, NONE_SCALE_BUTTON};
 
 mod scrollable;
-pub use self::scrollable::ScrollableExt;
 pub use self::scrollable::{Scrollable, NONE_SCROLLABLE};
 
 mod scrollbar;
@@ -709,17 +591,14 @@ pub use self::scrollbar::{Scrollbar, NONE_SCROLLBAR};
 
 mod scrolled_window;
 pub use self::scrolled_window::ScrolledWindowBuilder;
-pub use self::scrolled_window::ScrolledWindowExt;
 pub use self::scrolled_window::{ScrolledWindow, NONE_SCROLLED_WINDOW};
 
 mod search_bar;
 pub use self::search_bar::SearchBarBuilder;
-pub use self::search_bar::SearchBarExt;
 pub use self::search_bar::{SearchBar, NONE_SEARCH_BAR};
 
 mod search_entry;
 pub use self::search_entry::SearchEntryBuilder;
-pub use self::search_entry::SearchEntryExt;
 pub use self::search_entry::{SearchEntry, NONE_SEARCH_ENTRY};
 
 mod separator;
@@ -732,11 +611,9 @@ pub use self::separator_menu_item::{SeparatorMenuItem, NONE_SEPARATOR_MENU_ITEM}
 
 mod separator_tool_item;
 pub use self::separator_tool_item::SeparatorToolItemBuilder;
-pub use self::separator_tool_item::SeparatorToolItemExt;
 pub use self::separator_tool_item::{SeparatorToolItem, NONE_SEPARATOR_TOOL_ITEM};
 
 mod settings;
-pub use self::settings::SettingsExt;
 pub use self::settings::{Settings, NONE_SETTINGS};
 
 #[cfg(any(feature = "v3_22", feature = "dox"))]
@@ -787,14 +664,10 @@ mod shortcuts_window;
 pub use self::shortcuts_window::ShortcutsWindowBuilder;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_20")))]
-pub use self::shortcuts_window::ShortcutsWindowExt;
-#[cfg(any(feature = "v3_20", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_20")))]
 pub use self::shortcuts_window::{ShortcutsWindow, NONE_SHORTCUTS_WINDOW};
 
 mod size_group;
 pub use self::size_group::SizeGroupBuilder;
-pub use self::size_group::SizeGroupExt;
 pub use self::size_group::{SizeGroup, NONE_SIZE_GROUP};
 
 #[cfg(any(gdk_backend = "x11", feature = "dox"))]
@@ -802,9 +675,6 @@ pub use self::size_group::{SizeGroup, NONE_SIZE_GROUP};
 mod socket;
 #[cfg(any(gdk_backend = "x11", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(gdk_backend = "x11")))]
-pub use self::socket::GtkSocketExt;
-#[cfg(any(gdk_backend = "x11", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(gdk_backend = "x11")))]
 pub use self::socket::SocketBuilder;
 #[cfg(any(gdk_backend = "x11", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(gdk_backend = "x11")))]
@@ -812,17 +682,14 @@ pub use self::socket::{Socket, NONE_SOCKET};
 
 mod spin_button;
 pub use self::spin_button::SpinButtonBuilder;
-pub use self::spin_button::SpinButtonExt;
 pub use self::spin_button::{SpinButton, NONE_SPIN_BUTTON};
 
 mod spinner;
 pub use self::spinner::SpinnerBuilder;
-pub use self::spinner::SpinnerExt;
 pub use self::spinner::{Spinner, NONE_SPINNER};
 
 mod stack;
 pub use self::stack::StackBuilder;
-pub use self::stack::StackExt;
 pub use self::stack::{Stack, NONE_STACK};
 
 #[cfg(any(feature = "v3_16", feature = "dox"))]
@@ -833,172 +700,136 @@ mod stack_sidebar;
 pub use self::stack_sidebar::StackSidebarBuilder;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
-pub use self::stack_sidebar::StackSidebarExt;
-#[cfg(any(feature = "v3_16", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
 pub use self::stack_sidebar::{StackSidebar, NONE_STACK_SIDEBAR};
 
 mod stack_switcher;
 pub use self::stack_switcher::StackSwitcherBuilder;
-pub use self::stack_switcher::StackSwitcherExt;
 pub use self::stack_switcher::{StackSwitcher, NONE_STACK_SWITCHER};
 
 mod statusbar;
 pub use self::statusbar::StatusbarBuilder;
-pub use self::statusbar::StatusbarExt;
 pub use self::statusbar::{Statusbar, NONE_STATUSBAR};
 
 mod style_context;
 pub use self::style_context::StyleContextBuilder;
-pub use self::style_context::StyleContextExt;
 pub use self::style_context::{StyleContext, NONE_STYLE_CONTEXT};
 
+#[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
 mod style_properties;
-pub use self::style_properties::StylePropertiesExt;
+#[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
 pub use self::style_properties::{StyleProperties, NONE_STYLE_PROPERTIES};
 
 mod style_provider;
-pub use self::style_provider::StyleProviderExt;
 pub use self::style_provider::{StyleProvider, NONE_STYLE_PROVIDER};
 
 mod switch;
 pub use self::switch::SwitchBuilder;
-pub use self::switch::SwitchExt;
 pub use self::switch::{Switch, NONE_SWITCH};
 
 mod text_buffer;
 pub use self::text_buffer::TextBufferBuilder;
-pub use self::text_buffer::TextBufferExt;
 pub use self::text_buffer::{TextBuffer, NONE_TEXT_BUFFER};
 
 mod text_child_anchor;
-pub use self::text_child_anchor::TextChildAnchorExt;
 pub use self::text_child_anchor::{TextChildAnchor, NONE_TEXT_CHILD_ANCHOR};
 
 mod text_mark;
 pub use self::text_mark::TextMarkBuilder;
-pub use self::text_mark::TextMarkExt;
 pub use self::text_mark::{TextMark, NONE_TEXT_MARK};
 
 mod text_tag;
 pub use self::text_tag::TextTagBuilder;
-pub use self::text_tag::TextTagExt;
 pub use self::text_tag::{TextTag, NONE_TEXT_TAG};
 
 mod text_tag_table;
-pub use self::text_tag_table::TextTagTableExt;
 pub use self::text_tag_table::{TextTagTable, NONE_TEXT_TAG_TABLE};
 
 mod text_view;
 pub use self::text_view::TextViewBuilder;
-pub use self::text_view::TextViewExt;
 pub use self::text_view::{TextView, NONE_TEXT_VIEW};
 
 mod toggle_button;
 pub use self::toggle_button::ToggleButtonBuilder;
-pub use self::toggle_button::ToggleButtonExt;
 pub use self::toggle_button::{ToggleButton, NONE_TOGGLE_BUTTON};
 
 mod toggle_tool_button;
 pub use self::toggle_tool_button::ToggleToolButtonBuilder;
-pub use self::toggle_tool_button::ToggleToolButtonExt;
 pub use self::toggle_tool_button::{ToggleToolButton, NONE_TOGGLE_TOOL_BUTTON};
 
 mod tool_button;
 pub use self::tool_button::ToolButtonBuilder;
-pub use self::tool_button::ToolButtonExt;
 pub use self::tool_button::{ToolButton, NONE_TOOL_BUTTON};
 
 mod tool_item;
 pub use self::tool_item::ToolItemBuilder;
-pub use self::tool_item::ToolItemExt;
 pub use self::tool_item::{ToolItem, NONE_TOOL_ITEM};
 
 mod tool_item_group;
 pub use self::tool_item_group::ToolItemGroupBuilder;
-pub use self::tool_item_group::ToolItemGroupExt;
 pub use self::tool_item_group::{ToolItemGroup, NONE_TOOL_ITEM_GROUP};
 
 mod tool_palette;
 pub use self::tool_palette::ToolPaletteBuilder;
-pub use self::tool_palette::ToolPaletteExt;
 pub use self::tool_palette::{ToolPalette, NONE_TOOL_PALETTE};
 
 mod tool_shell;
-pub use self::tool_shell::ToolShellExt;
 pub use self::tool_shell::{ToolShell, NONE_TOOL_SHELL};
 
 mod toolbar;
 pub use self::toolbar::ToolbarBuilder;
-pub use self::toolbar::ToolbarExt;
 pub use self::toolbar::{Toolbar, NONE_TOOLBAR};
 
 mod tooltip;
 pub use self::tooltip::Tooltip;
 
 mod tree_drag_dest;
-pub use self::tree_drag_dest::TreeDragDestExt;
 pub use self::tree_drag_dest::{TreeDragDest, NONE_TREE_DRAG_DEST};
 
 mod tree_drag_source;
-pub use self::tree_drag_source::TreeDragSourceExt;
 pub use self::tree_drag_source::{TreeDragSource, NONE_TREE_DRAG_SOURCE};
 
 mod tree_model;
-pub use self::tree_model::TreeModelExt;
 pub use self::tree_model::{TreeModel, NONE_TREE_MODEL};
 
 mod tree_model_filter;
-pub use self::tree_model_filter::TreeModelFilterExt;
 pub use self::tree_model_filter::{TreeModelFilter, NONE_TREE_MODEL_FILTER};
 
 mod tree_model_sort;
-pub use self::tree_model_sort::TreeModelSortExt;
 pub use self::tree_model_sort::{TreeModelSort, NONE_TREE_MODEL_SORT};
 
 mod tree_selection;
-pub use self::tree_selection::TreeSelectionExt;
 pub use self::tree_selection::{TreeSelection, NONE_TREE_SELECTION};
 
 mod tree_sortable;
-pub use self::tree_sortable::TreeSortableExt;
 pub use self::tree_sortable::{TreeSortable, NONE_TREE_SORTABLE};
 
 mod tree_store;
-pub use self::tree_store::TreeStoreExt;
 pub use self::tree_store::{TreeStore, NONE_TREE_STORE};
 
 mod tree_view;
 pub use self::tree_view::TreeViewBuilder;
-pub use self::tree_view::TreeViewExt;
 pub use self::tree_view::{TreeView, NONE_TREE_VIEW};
 
 mod tree_view_column;
 pub use self::tree_view_column::TreeViewColumnBuilder;
-pub use self::tree_view_column::TreeViewColumnExt;
 pub use self::tree_view_column::{TreeViewColumn, NONE_TREE_VIEW_COLUMN};
 
 mod viewport;
 pub use self::viewport::ViewportBuilder;
-pub use self::viewport::ViewportExt;
 pub use self::viewport::{Viewport, NONE_VIEWPORT};
 
 mod volume_button;
 pub use self::volume_button::VolumeButtonBuilder;
-pub use self::volume_button::VolumeButtonExt;
 pub use self::volume_button::{VolumeButton, NONE_VOLUME_BUTTON};
 
 mod widget;
-pub use self::widget::WidgetExt;
 pub use self::widget::{Widget, NONE_WIDGET};
 
 mod window;
-pub use self::window::GtkWindowExt;
 pub use self::window::WindowBuilder;
 pub use self::window::{Window, NONE_WINDOW};
 
 mod window_group;
-pub use self::window_group::WindowGroupExt;
 pub use self::window_group::{WindowGroup, NONE_WINDOW_GROUP};
 
 mod css_section;
@@ -1325,175 +1156,176 @@ pub use self::constants::STYLE_REGION_TAB;
 
 #[doc(hidden)]
 pub mod traits {
-    pub use super::AboutDialogExt;
-    pub use super::AccelGroupExt;
-    pub use super::AccelLabelExt;
-    pub use super::ActionBarExt;
-    pub use super::ActionableExt;
-    pub use super::AdjustmentExt;
-    pub use super::AppChooserButtonExt;
-    pub use super::AppChooserDialogExt;
-    pub use super::AppChooserWidgetExt;
-    pub use super::ApplicationWindowExt;
-    pub use super::AspectFrameExt;
-    pub use super::AssistantExt;
-    pub use super::BinExt;
-    pub use super::BoxExt;
-    pub use super::BuildableExt;
-    pub use super::BuilderExt;
-    pub use super::ButtonBoxExt;
-    pub use super::ButtonExt;
-    pub use super::CalendarExt;
-    pub use super::CellAreaBoxExt;
-    pub use super::CellAreaContextExt;
-    pub use super::CellAreaExt;
-    pub use super::CellEditableExt;
-    pub use super::CellLayoutExt;
-    pub use super::CellRendererAccelExt;
-    pub use super::CellRendererComboExt;
-    pub use super::CellRendererExt;
-    pub use super::CellRendererPixbufExt;
-    pub use super::CellRendererProgressExt;
-    pub use super::CellRendererSpinExt;
-    pub use super::CellRendererSpinnerExt;
-    pub use super::CellRendererTextExt;
-    pub use super::CellRendererToggleExt;
-    pub use super::CellViewExt;
-    pub use super::CheckMenuItemExt;
-    pub use super::ColorButtonExt;
-    pub use super::ColorChooserDialogExt;
-    pub use super::ColorChooserExt;
-    pub use super::ColorChooserWidgetExt;
-    pub use super::ComboBoxExt;
-    pub use super::ComboBoxTextExt;
-    pub use super::ContainerExt;
-    pub use super::CssProviderExt;
-    pub use super::DialogExt;
-    pub use super::EditableExt;
-    pub use super::EntryCompletionExt;
-    pub use super::EntryExt;
-    pub use super::EventBoxExt;
-    pub use super::EventControllerExt;
-    pub use super::ExpanderExt;
-    pub use super::FileChooserButtonExt;
-    pub use super::FileChooserExt;
-    pub use super::FileChooserWidgetExt;
-    pub use super::FixedExt;
-    pub use super::FlowBoxChildExt;
-    pub use super::FlowBoxExt;
-    pub use super::FontButtonExt;
-    pub use super::FontChooserExt;
-    pub use super::FontChooserWidgetExt;
-    pub use super::FrameExt;
+    pub use super::about_dialog::AboutDialogExt;
+    pub use super::accel_group::AccelGroupExt;
+    pub use super::accel_label::AccelLabelExt;
+    pub use super::action_bar::ActionBarExt;
+    pub use super::actionable::ActionableExt;
+    pub use super::adjustment::AdjustmentExt;
+    pub use super::app_chooser_button::AppChooserButtonExt;
+    pub use super::app_chooser_dialog::AppChooserDialogExt;
+    pub use super::app_chooser_widget::AppChooserWidgetExt;
+    pub use super::application::GtkApplicationExt;
+    pub use super::application_window::ApplicationWindowExt;
+    pub use super::aspect_frame::AspectFrameExt;
+    pub use super::assistant::AssistantExt;
+    pub use super::bin::BinExt;
+    pub use super::box_::BoxExt;
+    pub use super::buildable::BuildableExt;
+    pub use super::builder::BuilderExt;
+    pub use super::button::ButtonExt;
+    pub use super::button_box::ButtonBoxExt;
+    pub use super::calendar::CalendarExt;
+    pub use super::cell_area::CellAreaExt;
+    pub use super::cell_area_box::CellAreaBoxExt;
+    pub use super::cell_area_context::CellAreaContextExt;
+    pub use super::cell_editable::CellEditableExt;
+    pub use super::cell_layout::CellLayoutExt;
+    pub use super::cell_renderer::CellRendererExt;
+    pub use super::cell_renderer_accel::CellRendererAccelExt;
+    pub use super::cell_renderer_combo::CellRendererComboExt;
+    pub use super::cell_renderer_pixbuf::CellRendererPixbufExt;
+    pub use super::cell_renderer_progress::CellRendererProgressExt;
+    pub use super::cell_renderer_spin::CellRendererSpinExt;
+    pub use super::cell_renderer_spinner::CellRendererSpinnerExt;
+    pub use super::cell_renderer_text::CellRendererTextExt;
+    pub use super::cell_renderer_toggle::CellRendererToggleExt;
+    pub use super::cell_view::CellViewExt;
+    pub use super::check_menu_item::CheckMenuItemExt;
+    pub use super::color_button::ColorButtonExt;
+    pub use super::color_chooser::ColorChooserExt;
+    pub use super::color_chooser_dialog::ColorChooserDialogExt;
+    pub use super::color_chooser_widget::ColorChooserWidgetExt;
+    pub use super::combo_box::ComboBoxExt;
+    pub use super::combo_box_text::ComboBoxTextExt;
+    pub use super::container::ContainerExt;
+    pub use super::css_provider::CssProviderExt;
+    pub use super::dialog::DialogExt;
+    pub use super::editable::EditableExt;
+    pub use super::entry::EntryExt;
+    pub use super::entry_completion::EntryCompletionExt;
+    pub use super::event_box::EventBoxExt;
+    pub use super::event_controller::EventControllerExt;
+    pub use super::expander::ExpanderExt;
+    pub use super::file_chooser::FileChooserExt;
+    pub use super::file_chooser_button::FileChooserButtonExt;
+    pub use super::file_chooser_widget::FileChooserWidgetExt;
+    pub use super::fixed::FixedExt;
+    pub use super::flow_box::FlowBoxExt;
+    pub use super::flow_box_child::FlowBoxChildExt;
+    pub use super::font_button::FontButtonExt;
+    pub use super::font_chooser::FontChooserExt;
+    pub use super::font_chooser_widget::FontChooserWidgetExt;
+    pub use super::frame::FrameExt;
+    pub use super::gesture::GestureExt;
+    pub use super::gesture_drag::GestureDragExt;
+    pub use super::gesture_single::GestureSingleExt;
     #[cfg(any(feature = "v3_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
-    pub use super::GLAreaExt;
-    pub use super::GestureDragExt;
-    pub use super::GestureExt;
-    pub use super::GestureSingleExt;
-    pub use super::GridExt;
-    pub use super::GtkApplicationExt;
-    pub use super::GtkListStoreExt;
-    pub use super::GtkMenuExt;
-    pub use super::GtkMenuItemExt;
-    #[cfg(any(gdk_backend = "x11", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(gdk_backend = "x11")))]
-    pub use super::GtkSocketExt;
-    pub use super::GtkWindowExt;
-    pub use super::HeaderBarExt;
-    pub use super::IMContextExt;
-    pub use super::IMMulticontextExt;
-    pub use super::IconThemeExt;
-    pub use super::IconViewExt;
-    pub use super::ImageExt;
-    pub use super::InfoBarExt;
-    pub use super::InvisibleExt;
-    pub use super::LabelExt;
-    pub use super::LayoutExt;
-    pub use super::LevelBarExt;
-    pub use super::LinkButtonExt;
-    pub use super::ListBoxExt;
-    pub use super::ListBoxRowExt;
-    pub use super::LockButtonExt;
-    pub use super::MenuBarExt;
-    pub use super::MenuButtonExt;
-    pub use super::MenuShellExt;
-    pub use super::MenuToolButtonExt;
-    pub use super::MessageDialogExt;
-    pub use super::MountOperationExt;
+    pub use super::gl_area::GLAreaExt;
+    pub use super::grid::GridExt;
+    pub use super::header_bar::HeaderBarExt;
+    pub use super::icon_theme::IconThemeExt;
+    pub use super::icon_view::IconViewExt;
+    pub use super::im_context::IMContextExt;
+    pub use super::im_multicontext::IMMulticontextExt;
+    pub use super::image::ImageExt;
+    pub use super::info_bar::InfoBarExt;
+    pub use super::invisible::InvisibleExt;
+    pub use super::label::LabelExt;
+    pub use super::layout::LayoutExt;
+    pub use super::level_bar::LevelBarExt;
+    pub use super::link_button::LinkButtonExt;
+    pub use super::list_box::ListBoxExt;
+    pub use super::list_box_row::ListBoxRowExt;
+    pub use super::list_store::GtkListStoreExt;
+    pub use super::lock_button::LockButtonExt;
+    pub use super::menu::GtkMenuExt;
+    pub use super::menu_bar::MenuBarExt;
+    pub use super::menu_button::MenuButtonExt;
+    pub use super::menu_item::GtkMenuItemExt;
+    pub use super::menu_shell::MenuShellExt;
+    pub use super::menu_tool_button::MenuToolButtonExt;
+    pub use super::message_dialog::MessageDialogExt;
+    pub use super::mount_operation::MountOperationExt;
     #[cfg(any(feature = "v3_20", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_20")))]
-    pub use super::NativeDialogExt;
-    pub use super::NotebookExt;
-    pub use super::OffscreenWindowExt;
-    pub use super::OrientableExt;
-    pub use super::OverlayExt;
-    pub use super::PanedExt;
+    pub use super::native_dialog::NativeDialogExt;
+    pub use super::notebook::NotebookExt;
+    pub use super::offscreen_window::OffscreenWindowExt;
+    pub use super::orientable::OrientableExt;
+    pub use super::overlay::OverlayExt;
+    pub use super::paned::PanedExt;
     #[cfg(any(gdk_backend = "x11", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(gdk_backend = "x11")))]
-    pub use super::PlugExt;
-    pub use super::PopoverExt;
-    pub use super::PrintOperationExt;
-    pub use super::PrintOperationPreviewExt;
-    pub use super::ProgressBarExt;
-    pub use super::RadioButtonExt;
-    pub use super::RadioMenuItemExt;
-    pub use super::RadioToolButtonExt;
-    pub use super::RangeExt;
-    pub use super::RecentChooserExt;
-    pub use super::RecentChooserMenuExt;
-    pub use super::RecentManagerExt;
-    pub use super::RevealerExt;
-    pub use super::ScaleButtonExt;
-    pub use super::ScaleExt;
-    pub use super::ScrollableExt;
-    pub use super::ScrolledWindowExt;
-    pub use super::SearchBarExt;
-    pub use super::SearchEntryExt;
-    pub use super::SeparatorToolItemExt;
-    pub use super::SettingsExt;
+    pub use super::plug::PlugExt;
+    pub use super::popover::PopoverExt;
+    pub use super::print_operation::PrintOperationExt;
+    pub use super::print_operation_preview::PrintOperationPreviewExt;
+    pub use super::progress_bar::ProgressBarExt;
+    pub use super::radio_button::RadioButtonExt;
+    pub use super::radio_menu_item::RadioMenuItemExt;
+    pub use super::radio_tool_button::RadioToolButtonExt;
+    pub use super::range::RangeExt;
+    pub use super::recent_chooser::RecentChooserExt;
+    pub use super::recent_chooser_menu::RecentChooserMenuExt;
+    pub use super::recent_manager::RecentManagerExt;
+    pub use super::revealer::RevealerExt;
+    pub use super::scale::ScaleExt;
+    pub use super::scale_button::ScaleButtonExt;
+    pub use super::scrollable::ScrollableExt;
+    pub use super::scrolled_window::ScrolledWindowExt;
+    pub use super::search_bar::SearchBarExt;
+    pub use super::search_entry::SearchEntryExt;
+    pub use super::separator_tool_item::SeparatorToolItemExt;
+    pub use super::settings::SettingsExt;
     #[cfg(any(feature = "v3_20", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_20")))]
-    pub use super::ShortcutsWindowExt;
-    pub use super::SizeGroupExt;
-    pub use super::SpinButtonExt;
-    pub use super::SpinnerExt;
-    pub use super::StackExt;
+    pub use super::shortcuts_window::ShortcutsWindowExt;
+    pub use super::size_group::SizeGroupExt;
+    #[cfg(any(gdk_backend = "x11", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(gdk_backend = "x11")))]
+    pub use super::socket::GtkSocketExt;
+    pub use super::spin_button::SpinButtonExt;
+    pub use super::spinner::SpinnerExt;
+    pub use super::stack::StackExt;
     #[cfg(any(feature = "v3_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
-    pub use super::StackSidebarExt;
-    pub use super::StackSwitcherExt;
-    pub use super::StatusbarExt;
-    pub use super::StyleContextExt;
-    pub use super::StylePropertiesExt;
-    pub use super::StyleProviderExt;
-    pub use super::SwitchExt;
-    pub use super::TextBufferExt;
-    pub use super::TextChildAnchorExt;
-    pub use super::TextMarkExt;
-    pub use super::TextTagExt;
-    pub use super::TextTagTableExt;
-    pub use super::TextViewExt;
-    pub use super::ToggleButtonExt;
-    pub use super::ToggleToolButtonExt;
-    pub use super::ToolButtonExt;
-    pub use super::ToolItemExt;
-    pub use super::ToolItemGroupExt;
-    pub use super::ToolPaletteExt;
-    pub use super::ToolShellExt;
-    pub use super::ToolbarExt;
-    pub use super::TreeDragDestExt;
-    pub use super::TreeDragSourceExt;
-    pub use super::TreeModelExt;
-    pub use super::TreeModelFilterExt;
-    pub use super::TreeModelSortExt;
-    pub use super::TreeSelectionExt;
-    pub use super::TreeSortableExt;
-    pub use super::TreeStoreExt;
-    pub use super::TreeViewColumnExt;
-    pub use super::TreeViewExt;
-    pub use super::ViewportExt;
-    pub use super::VolumeButtonExt;
-    pub use super::WidgetExt;
-    pub use super::WindowGroupExt;
+    pub use super::stack_sidebar::StackSidebarExt;
+    pub use super::stack_switcher::StackSwitcherExt;
+    pub use super::statusbar::StatusbarExt;
+    pub use super::style_context::StyleContextExt;
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
+    pub use super::style_properties::StylePropertiesExt;
+    pub use super::style_provider::StyleProviderExt;
+    pub use super::switch::SwitchExt;
+    pub use super::text_buffer::TextBufferExt;
+    pub use super::text_child_anchor::TextChildAnchorExt;
+    pub use super::text_mark::TextMarkExt;
+    pub use super::text_tag::TextTagExt;
+    pub use super::text_tag_table::TextTagTableExt;
+    pub use super::text_view::TextViewExt;
+    pub use super::toggle_button::ToggleButtonExt;
+    pub use super::toggle_tool_button::ToggleToolButtonExt;
+    pub use super::tool_button::ToolButtonExt;
+    pub use super::tool_item::ToolItemExt;
+    pub use super::tool_item_group::ToolItemGroupExt;
+    pub use super::tool_palette::ToolPaletteExt;
+    pub use super::tool_shell::ToolShellExt;
+    pub use super::toolbar::ToolbarExt;
+    pub use super::tree_drag_dest::TreeDragDestExt;
+    pub use super::tree_drag_source::TreeDragSourceExt;
+    pub use super::tree_model::TreeModelExt;
+    pub use super::tree_model_filter::TreeModelFilterExt;
+    pub use super::tree_model_sort::TreeModelSortExt;
+    pub use super::tree_selection::TreeSelectionExt;
+    pub use super::tree_sortable::TreeSortableExt;
+    pub use super::tree_store::TreeStoreExt;
+    pub use super::tree_view::TreeViewExt;
+    pub use super::tree_view_column::TreeViewColumnExt;
+    pub use super::viewport::ViewportExt;
+    pub use super::volume_button::VolumeButtonExt;
+    pub use super::widget::WidgetExt;
+    pub use super::window::GtkWindowExt;
+    pub use super::window_group::WindowGroupExt;
 }
diff --git a/gtk/src/auto/places_sidebar.rs b/gtk/src/auto/places_sidebar.rs
index 5be02ce4495c..aa137bc3f84f 100644
--- a/gtk/src/auto/places_sidebar.rs
+++ b/gtk/src/auto/places_sidebar.rs
@@ -84,7 +84,7 @@ impl PlacesSidebar {
         }
     }
 
-    #[cfg_attr(feature = "v3_18", deprecated)]
+    #[cfg_attr(feature = "v3_18", deprecated = "Since 3.18")]
     #[doc(alias = "gtk_places_sidebar_get_show_connect_to_server")]
     pub fn shows_connect_to_server(&self) -> bool {
         unsafe {
@@ -212,7 +212,7 @@ impl PlacesSidebar {
         }
     }
 
-    #[cfg_attr(feature = "v3_18", deprecated)]
+    #[cfg_attr(feature = "v3_18", deprecated = "Since 3.18")]
     #[doc(alias = "gtk_places_sidebar_set_show_connect_to_server")]
     pub fn set_show_connect_to_server(&self, show_connect_to_server: bool) {
         unsafe {
@@ -476,7 +476,7 @@ impl PlacesSidebar {
     //    Ignored selected_volume: Gio.Volume
     //}
 
-    #[cfg_attr(feature = "v3_18", deprecated)]
+    #[cfg_attr(feature = "v3_18", deprecated = "Since 3.18")]
     pub fn connect_show_connect_to_server<F: Fn(&PlacesSidebar) + 'static>(
         &self,
         f: F,
@@ -557,7 +557,7 @@ impl PlacesSidebar {
         }
     }
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[cfg(any(feature = "v3_18", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_18")))]
     pub fn connect_show_other_locations<F: Fn(&PlacesSidebar) + 'static>(
diff --git a/gtk/src/auto/popover.rs b/gtk/src/auto/popover.rs
index 0e44d1a22690..717b2a52b56c 100644
--- a/gtk/src/auto/popover.rs
+++ b/gtk/src/auto/popover.rs
@@ -487,7 +487,7 @@ pub trait PopoverExt: 'static {
     #[doc(alias = "gtk_popover_get_relative_to")]
     fn relative_to(&self) -> Option<Widget>;
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[cfg(any(feature = "v3_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
     #[doc(alias = "gtk_popover_get_transitions_enabled")]
@@ -525,7 +525,7 @@ pub trait PopoverExt: 'static {
     #[doc(alias = "gtk_popover_set_relative_to")]
     fn set_relative_to<P: IsA<Widget>>(&self, relative_to: Option<&P>);
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[cfg(any(feature = "v3_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
     #[doc(alias = "gtk_popover_set_transitions_enabled")]
@@ -546,7 +546,7 @@ pub trait PopoverExt: 'static {
 
     fn connect_property_relative_to_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[cfg(any(feature = "v3_16", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v3_16")))]
     fn connect_property_transitions_enabled_notify<F: Fn(&Self) + 'static>(
diff --git a/gtk/src/auto/range.rs b/gtk/src/auto/range.rs
index 1091a918b4b2..821813ad97a2 100644
--- a/gtk/src/auto/range.rs
+++ b/gtk/src/auto/range.rs
@@ -45,7 +45,7 @@ pub trait RangeExt: 'static {
     #[doc(alias = "gtk_range_get_lower_stepper_sensitivity")]
     fn lower_stepper_sensitivity(&self) -> SensitivityType;
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gtk_range_get_min_slider_size")]
     fn min_slider_size(&self) -> i32;
 
@@ -91,7 +91,7 @@ pub trait RangeExt: 'static {
     #[doc(alias = "gtk_range_set_lower_stepper_sensitivity")]
     fn set_lower_stepper_sensitivity(&self, sensitivity: SensitivityType);
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gtk_range_set_min_slider_size")]
     fn set_min_slider_size(&self, min_size: i32);
 
diff --git a/gtk/src/auto/settings.rs b/gtk/src/auto/settings.rs
index 2a7377edf747..89a1181a729a 100644
--- a/gtk/src/auto/settings.rs
+++ b/gtk/src/auto/settings.rs
@@ -44,19 +44,19 @@ pub trait SettingsExt: 'static {
     #[doc(alias = "gtk_settings_reset_property")]
     fn reset_property(&self, name: &str);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_settings_set_double_property")]
     fn set_double_property(&self, name: &str, v_double: f64, origin: &str);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_settings_set_long_property")]
     fn set_long_property(&self, name: &str, v_long: libc::c_long, origin: &str);
 
-    //#[cfg_attr(feature = "v3_16", deprecated)]
+    //#[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     //#[doc(alias = "gtk_settings_set_property_value")]
     //fn set_property_value(&self, name: &str, svalue: /*Ignored*/&SettingsValue);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_settings_set_string_property")]
     fn set_string_property(&self, name: &str, v_string: &str, origin: &str);
 
diff --git a/gtk/src/auto/size_group.rs b/gtk/src/auto/size_group.rs
index 7c46ffe983c8..87d5655717ab 100644
--- a/gtk/src/auto/size_group.rs
+++ b/gtk/src/auto/size_group.rs
@@ -72,7 +72,7 @@ pub trait SizeGroupExt: 'static {
     #[doc(alias = "gtk_size_group_add_widget")]
     fn add_widget<P: IsA<Widget>>(&self, widget: &P);
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gtk_size_group_get_ignore_hidden")]
     fn ignores_hidden(&self) -> bool;
 
@@ -85,14 +85,14 @@ pub trait SizeGroupExt: 'static {
     #[doc(alias = "gtk_size_group_remove_widget")]
     fn remove_widget<P: IsA<Widget>>(&self, widget: &P);
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gtk_size_group_set_ignore_hidden")]
     fn set_ignore_hidden(&self, ignore_hidden: bool);
 
     #[doc(alias = "gtk_size_group_set_mode")]
     fn set_mode(&self, mode: SizeGroupMode);
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     fn connect_property_ignore_hidden_notify<F: Fn(&Self) + 'static>(
         &self,
         f: F,
diff --git a/gtk/src/auto/style_context.rs b/gtk/src/auto/style_context.rs
index b2dd3b7b8c5e..e7c1da9a6171 100644
--- a/gtk/src/auto/style_context.rs
+++ b/gtk/src/auto/style_context.rs
@@ -144,14 +144,14 @@ pub trait StyleContextExt: 'static {
     //#[doc(alias = "gtk_style_context_get")]
     //fn get(&self, state: StateFlags, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_style_context_get_background_color")]
     fn background_color(&self, state: StateFlags) -> gdk::RGBA;
 
     #[doc(alias = "gtk_style_context_get_border")]
     fn border(&self, state: StateFlags) -> Border;
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_style_context_get_border_color")]
     fn border_color(&self, state: StateFlags) -> gdk::RGBA;
 
@@ -224,7 +224,7 @@ pub trait StyleContextExt: 'static {
     #[doc(alias = "gtk_style_context_save")]
     fn save(&self);
 
-    #[cfg_attr(feature = "v3_18", deprecated)]
+    #[cfg_attr(feature = "v3_18", deprecated = "Since 3.18")]
     #[doc(alias = "gtk_style_context_set_background")]
     fn set_background(&self, window: &gdk::Window);
 
diff --git a/gtk/src/auto/style_properties.rs b/gtk/src/auto/style_properties.rs
index 1a58005b37ea..632e2da1a761 100644
--- a/gtk/src/auto/style_properties.rs
+++ b/gtk/src/auto/style_properties.rs
@@ -17,7 +17,7 @@ glib::wrapper! {
 }
 
 impl StyleProperties {
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_style_properties_new")]
     pub fn new() -> StyleProperties {
         assert_initialized_main_thread!();
@@ -34,39 +34,39 @@ impl Default for StyleProperties {
 pub const NONE_STYLE_PROPERTIES: Option<&StyleProperties> = None;
 
 pub trait StylePropertiesExt: 'static {
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_style_properties_clear")]
     fn clear(&self);
 
-    //#[cfg_attr(feature = "v3_16", deprecated)]
+    //#[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     //#[doc(alias = "gtk_style_properties_get")]
     //fn get(&self, state: StateFlags, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_style_properties_get_property")]
     fn property(&self, property: &str, state: StateFlags) -> Option<glib::Value>;
 
-    //#[cfg_attr(feature = "v3_16", deprecated)]
+    //#[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     //#[doc(alias = "gtk_style_properties_get_valist")]
     //fn valist(&self, state: StateFlags, args: /*Unknown conversion*//*Unimplemented*/Unsupported);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_style_properties_merge")]
     fn merge<P: IsA<StyleProperties>>(&self, props_to_merge: &P, replace: bool);
 
-    //#[cfg_attr(feature = "v3_16", deprecated)]
+    //#[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     //#[doc(alias = "gtk_style_properties_set")]
     //fn set(&self, state: StateFlags, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_style_properties_set_property")]
     fn set_property(&self, property: &str, state: StateFlags, value: &glib::Value);
 
-    //#[cfg_attr(feature = "v3_16", deprecated)]
+    //#[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     //#[doc(alias = "gtk_style_properties_set_valist")]
     //fn set_valist(&self, state: StateFlags, args: /*Unknown conversion*//*Unimplemented*/Unsupported);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_style_properties_unset_property")]
     fn unset_property(&self, property: &str, state: StateFlags);
 }
diff --git a/gtk/src/auto/text_iter.rs b/gtk/src/auto/text_iter.rs
index d6654bd0bb5d..bdf335f2b9b1 100644
--- a/gtk/src/auto/text_iter.rs
+++ b/gtk/src/auto/text_iter.rs
@@ -241,7 +241,7 @@ impl TextIter {
         }
     }
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gtk_text_iter_begins_tag")]
     pub fn begins_tag<P: IsA<TextTag>>(&self, tag: Option<&P>) -> bool {
         unsafe {
diff --git a/gtk/src/auto/versions.txt b/gtk/src/auto/versions.txt
index 7ac3d16a8636..91fd75ea23fb 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 @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/gtk/src/auto/widget.rs b/gtk/src/auto/widget.rs
index 910cb02e6ca2..63b31f467949 100644
--- a/gtk/src/auto/widget.rs
+++ b/gtk/src/auto/widget.rs
@@ -160,7 +160,7 @@ pub trait WidgetExt: 'static {
     #[doc(alias = "gtk_drag_dest_get_track_motion")]
     fn drag_dest_get_track_motion(&self) -> bool;
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gtk_drag_dest_set_proxy")]
     fn drag_dest_set_proxy(
         &self,
@@ -491,7 +491,7 @@ pub trait WidgetExt: 'static {
     #[doc(alias = "gtk_widget_is_ancestor")]
     fn is_ancestor<P: IsA<Widget>>(&self, ancestor: &P) -> bool;
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gtk_widget_is_composited")]
     fn is_composited(&self) -> bool;
 
@@ -530,23 +530,23 @@ pub trait WidgetExt: 'static {
     #[doc(alias = "gtk_widget_mnemonic_activate")]
     fn mnemonic_activate(&self, group_cycling: bool) -> bool;
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_widget_override_background_color")]
     fn override_background_color(&self, state: StateFlags, color: Option<&gdk::RGBA>);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_widget_override_color")]
     fn override_color(&self, state: StateFlags, color: Option<&gdk::RGBA>);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_widget_override_cursor")]
     fn override_cursor(&self, cursor: Option<&gdk::RGBA>, secondary_cursor: Option<&gdk::RGBA>);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_widget_override_font")]
     fn override_font(&self, font_desc: &pango::FontDescription);
 
-    #[cfg_attr(feature = "v3_16", deprecated)]
+    #[cfg_attr(feature = "v3_16", deprecated = "Since 3.16")]
     #[doc(alias = "gtk_widget_override_symbolic_color")]
     fn override_symbolic_color(&self, name: &str, color: Option<&gdk::RGBA>);
 
@@ -593,7 +593,7 @@ pub trait WidgetExt: 'static {
     #[doc(alias = "gtk_widget_reset_style")]
     fn reset_style(&self);
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gtk_widget_send_expose")]
     fn send_expose(&self, event: &gdk::Event) -> i32;
 
@@ -857,10 +857,10 @@ pub trait WidgetExt: 'static {
         f: F,
     ) -> SignalHandlerId;
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     fn connect_composited_changed<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     fn emit_composited_changed(&self);
 
     fn connect_configure_event<F: Fn(&Self, &gdk::EventConfigure) -> bool + 'static>(
diff --git a/gtk/src/auto/window.rs b/gtk/src/auto/window.rs
index be1b7a26af08..5731ff7a2740 100644
--- a/gtk/src/auto/window.rs
+++ b/gtk/src/auto/window.rs
@@ -877,7 +877,7 @@ pub trait GtkWindowExt: 'static {
     #[doc(alias = "gtk_window_move")]
     fn move_(&self, x: i32, y: i32);
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gtk_window_parse_geometry")]
     fn parse_geometry(&self, geometry: &str) -> bool;
 
@@ -896,7 +896,7 @@ pub trait GtkWindowExt: 'static {
     #[doc(alias = "gtk_window_resize")]
     fn resize(&self, width: i32, height: i32);
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gtk_window_resize_to_geometry")]
     fn resize_to_geometry(&self, width: i32, height: i32);
 
@@ -915,7 +915,7 @@ pub trait GtkWindowExt: 'static {
     #[doc(alias = "gtk_window_set_default")]
     fn set_default<P: IsA<Widget>>(&self, default_widget: Option<&P>);
 
-    #[cfg_attr(feature = "v3_20", deprecated)]
+    #[cfg_attr(feature = "v3_20", deprecated = "Since 3.20")]
     #[doc(alias = "gtk_window_set_default_geometry")]
     fn set_default_geometry(&self, width: i32, height: i32);
 
@@ -1018,7 +1018,7 @@ pub trait GtkWindowExt: 'static {
     #[doc(alias = "gtk_window_set_urgency_hint")]
     fn set_urgency_hint(&self, setting: bool);
 
-    #[cfg_attr(feature = "v3_22", deprecated)]
+    #[cfg_attr(feature = "v3_22", deprecated = "Since 3.22")]
     #[doc(alias = "gtk_window_set_wmclass")]
     fn set_wmclass(&self, wmclass_name: &str, wmclass_class: &str);
 
diff --git a/gtk/src/builder.rs b/gtk/src/builder.rs
index 63f3a2697372..cdc6f4083eb3 100644
--- a/gtk/src/builder.rs
+++ b/gtk/src/builder.rs
@@ -1,11 +1,10 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 use crate::Builder;
-use glib::object::{Cast, IsA};
+use glib::prelude::*;
 use glib::translate::*;
 use glib::GString;
 use glib::Object;
-use glib::ObjectExt;
 use std::path::Path;
 
 impl Builder {
diff --git a/gtk/src/dialog.rs b/gtk/src/dialog.rs
index 55c594ec756d..fb9eb5410475 100644
--- a/gtk/src/dialog.rs
+++ b/gtk/src/dialog.rs
@@ -1,16 +1,12 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use crate::auto::DialogExt;
+use crate::prelude::*;
 use crate::Dialog;
 use crate::DialogFlags;
 use crate::ResponseType;
 use crate::Widget;
-use crate::WidgetExt;
 use crate::Window;
-use glib::object::Cast;
 use glib::translate::*;
-use glib::IsA;
-use glib::ObjectExt;
 use std::cell::Cell;
 use std::future::Future;
 use std::pin::Pin;
diff --git a/gtk/src/style_context.rs b/gtk/src/style_context.rs
index 82643d206954..60c5eba5c27d 100644
--- a/gtk/src/style_context.rs
+++ b/gtk/src/style_context.rs
@@ -2,8 +2,7 @@
 
 use crate::StateFlags;
 use crate::StyleContext;
-use crate::StyleContextExt;
-use glib::object::IsA;
+use glib::prelude::*;
 use pango::FontDescription;
 
 pub trait StyleContextExtManual: 'static {
@@ -12,7 +11,7 @@ pub trait StyleContextExtManual: 'static {
 
 impl<O: IsA<StyleContext>> StyleContextExtManual for O {
     fn font(&self, state: StateFlags) -> FontDescription {
-        self.property("font", state)
+        <Self as crate::prelude::StyleContextExt>::property(self, "font", state)
             .get()
             .expect("font property is not pango::FontDescription")
     }
diff --git a/gtk/src/subclass/widget.rs b/gtk/src/subclass/widget.rs
index fe3f2c0ea4c8..75858c774049 100644
--- a/gtk/src/subclass/widget.rs
+++ b/gtk/src/subclass/widget.rs
@@ -7,8 +7,9 @@ use glib::translate::*;
 
 use glib::prelude::*;
 use glib::subclass::prelude::*;
-use glib::{Cast, Object};
+use glib::Object;
 
+use crate::prelude::*;
 use crate::Allocation;
 use crate::DragResult;
 use crate::Inhibit;
@@ -17,7 +18,6 @@ use crate::SelectionData;
 use crate::SizeRequestMode;
 use crate::TextDirection;
 use crate::Widget;
-use crate::WidgetExt;
 
 pub trait WidgetImpl: WidgetImplExt + ObjectImpl {
     fn adjust_baseline_allocation(&self, widget: &Self::Type, baseline: &mut i32) {
diff --git a/gtk/src/widget.rs b/gtk/src/widget.rs
index 29c942566417..04cb7ed5bd3b 100644
--- a/gtk/src/widget.rs
+++ b/gtk/src/widget.rs
@@ -2,19 +2,18 @@
 
 use gdk::{DragAction, Event, ModifierType};
 use glib::ffi::gboolean;
-use glib::object::{Cast, IsA, WeakRef};
 use glib::signal::{connect_raw, Inhibit, SignalHandlerId};
 use glib::translate::*;
 use glib::Continue;
-use glib::ObjectExt;
 use std::mem::transmute;
 use std::ptr;
 
-use crate::{DestDefaults, Rectangle, TargetEntry, Widget, WidgetExt};
+use crate::prelude::*;
+use crate::{DestDefaults, Rectangle, TargetEntry, Widget};
 
 pub struct TickCallbackId {
     id: u32,
-    widget: WeakRef<Widget>,
+    widget: glib::WeakRef<Widget>,
 }
 
 impl TickCallbackId {
diff --git a/gtk/sys/versions.txt b/gtk/sys/versions.txt
index 7ac3d16a8636..91fd75ea23fb 100644
--- a/gtk/sys/versions.txt
+++ b/gtk/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/pango/src/auto/constants.rs b/pango/src/auto/constants.rs
index 60d822bcccf0..6e5abec35f41 100644
--- a/pango/src/auto/constants.rs
+++ b/pango/src/auto/constants.rs
@@ -4,7 +4,7 @@
 
 use std::ffi::CStr;
 
-#[cfg_attr(feature = "v1_38", deprecated)]
+#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 #[doc(alias = "PANGO_ENGINE_TYPE_LANG")]
 pub static ENGINE_TYPE_LANG: once_cell::sync::Lazy<&'static str> =
     once_cell::sync::Lazy::new(|| unsafe {
@@ -12,7 +12,7 @@ pub static ENGINE_TYPE_LANG: once_cell::sync::Lazy<&'static str> =
             .to_str()
             .unwrap()
     });
-#[cfg_attr(feature = "v1_38", deprecated)]
+#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 #[doc(alias = "PANGO_ENGINE_TYPE_SHAPE")]
 pub static ENGINE_TYPE_SHAPE: once_cell::sync::Lazy<&'static str> =
     once_cell::sync::Lazy::new(|| unsafe {
@@ -20,7 +20,7 @@ pub static ENGINE_TYPE_SHAPE: once_cell::sync::Lazy<&'static str> =
             .to_str()
             .unwrap()
     });
-#[cfg_attr(feature = "v1_38", deprecated)]
+#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 #[doc(alias = "PANGO_RENDER_TYPE_NONE")]
 pub static RENDER_TYPE_NONE: once_cell::sync::Lazy<&'static str> =
     once_cell::sync::Lazy::new(|| unsafe {
diff --git a/pango/src/auto/enums.rs b/pango/src/auto/enums.rs
index bd694fc4291a..b7a392c1bb34 100644
--- a/pango/src/auto/enums.rs
+++ b/pango/src/auto/enums.rs
@@ -332,7 +332,7 @@ impl ToValue for AttrType {
     }
 }
 
-#[cfg_attr(feature = "v1_44", deprecated)]
+#[cfg_attr(feature = "v1_44", deprecated = "Since 1.44")]
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
 #[non_exhaustive]
 #[doc(alias = "PangoBidiType")]
@@ -1462,7 +1462,7 @@ pub enum Script {
 }
 
 impl Script {
-    #[cfg_attr(feature = "v1_44", deprecated)]
+    #[cfg_attr(feature = "v1_44", deprecated = "Since 1.44")]
     #[doc(alias = "pango_script_for_unichar")]
     pub fn for_unichar(ch: char) -> Script {
         unsafe { from_glib(ffi::pango_script_for_unichar(ch.to_glib())) }
diff --git a/pango/src/auto/functions.rs b/pango/src/auto/functions.rs
index cbd171ee07d1..bdb64fc965b3 100644
--- a/pango/src/auto/functions.rs
+++ b/pango/src/auto/functions.rs
@@ -18,7 +18,7 @@ use glib::translate::*;
 use std::mem;
 use std::ptr;
 
-//#[cfg_attr(feature = "v1_44", deprecated)]
+//#[cfg_attr(feature = "v1_44", deprecated = "Since 1.44")]
 //#[doc(alias = "pango_break")]
 //pub fn break_(text: &str, analysis: &mut Analysis, attrs: /*Ignored*/&[&LogAttr]) {
 //    unsafe { TODO: call ffi:pango_break() }
@@ -45,7 +45,7 @@ pub fn find_base_dir(text: &str) -> Direction {
     unsafe { from_glib(ffi::pango_find_base_dir(text.to_glib_none().0, length)) }
 }
 
-//#[cfg_attr(feature = "v1_38", deprecated)]
+//#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 //#[doc(alias = "pango_find_map")]
 //pub fn find_map(language: &mut Language, engine_type_id: u32, render_type_id: u32) -> /*Ignored*/Option<Map> {
 //    unsafe { TODO: call ffi:pango_find_map() }
@@ -133,13 +133,13 @@ pub fn itemize_with_base_dir(
 //    unsafe { TODO: call ffi:pango_markup_parser_new() }
 //}
 
-//#[cfg_attr(feature = "v1_38", deprecated)]
+//#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 //#[doc(alias = "pango_module_register")]
 //pub fn module_register(module: /*Ignored*/&mut IncludedModule) {
 //    unsafe { TODO: call ffi:pango_module_register() }
 //}
 
-#[cfg_attr(feature = "v1_38", deprecated)]
+#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 #[doc(alias = "pango_parse_enum")]
 pub fn parse_enum(
     type_: glib::types::Type,
@@ -278,25 +278,25 @@ pub fn quantize_line_geometry(thickness: &mut i32, position: &mut i32) {
     }
 }
 
-//#[cfg_attr(feature = "v1_38", deprecated)]
+//#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 //#[doc(alias = "pango_read_line")]
 //pub fn read_line(stream: /*Unimplemented*/Option<Fundamental: Pointer>, str: /*Ignored*/&mut glib::String) -> i32 {
 //    unsafe { TODO: call ffi:pango_read_line() }
 //}
 
-//#[cfg_attr(feature = "v1_38", deprecated)]
+//#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 //#[doc(alias = "pango_scan_int")]
 //pub fn scan_int(pos: /*Unimplemented*/glib::GString) -> Option<i32> {
 //    unsafe { TODO: call ffi:pango_scan_int() }
 //}
 
-//#[cfg_attr(feature = "v1_38", deprecated)]
+//#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 //#[doc(alias = "pango_scan_string")]
 //pub fn scan_string(pos: /*Unimplemented*/glib::GString, out: /*Ignored*/&mut glib::String) -> bool {
 //    unsafe { TODO: call ffi:pango_scan_string() }
 //}
 
-//#[cfg_attr(feature = "v1_38", deprecated)]
+//#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 //#[doc(alias = "pango_scan_word")]
 //pub fn scan_word(pos: /*Unimplemented*/glib::GString, out: /*Ignored*/&mut glib::String) -> bool {
 //    unsafe { TODO: call ffi:pango_scan_word() }
@@ -315,13 +315,13 @@ pub fn shape(text: &str, analysis: &Analysis, glyphs: &mut GlyphString) {
     }
 }
 
-//#[cfg_attr(feature = "v1_38", deprecated)]
+//#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 //#[doc(alias = "pango_skip_space")]
 //pub fn skip_space(pos: /*Unimplemented*/glib::GString) -> bool {
 //    unsafe { TODO: call ffi:pango_skip_space() }
 //}
 
-#[cfg_attr(feature = "v1_38", deprecated)]
+#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 #[doc(alias = "pango_split_file_list")]
 pub fn split_file_list(str: &str) -> Vec<glib::GString> {
     unsafe {
@@ -336,7 +336,7 @@ pub fn split_file_list(str: &str) -> Vec<glib::GString> {
 //    unsafe { TODO: call ffi:pango_tailor_break() }
 //}
 
-#[cfg_attr(feature = "v1_38", deprecated)]
+#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 #[doc(alias = "pango_trim_string")]
 pub fn trim_string(str: &str) -> Option<glib::GString> {
     unsafe { from_glib_full(ffi::pango_trim_string(str.to_glib_none().0)) }
diff --git a/pango/src/auto/mod.rs b/pango/src/auto/mod.rs
index 3dce3b00cec8..1d72df734cfa 100644
--- a/pango/src/auto/mod.rs
+++ b/pango/src/auto/mod.rs
@@ -5,30 +5,29 @@
 mod context;
 pub use self::context::Context;
 
+#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 mod engine_lang;
+#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 pub use self::engine_lang::{EngineLang, NONE_ENGINE_LANG};
 
+#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 mod engine_shape;
+#[cfg_attr(feature = "v1_38", deprecated = "Since 1.38")]
 pub use self::engine_shape::{EngineShape, NONE_ENGINE_SHAPE};
 
 mod font;
-pub use self::font::FontExt;
 pub use self::font::{Font, NONE_FONT};
 
 mod font_face;
-pub use self::font_face::FontFaceExt;
 pub use self::font_face::{FontFace, NONE_FONT_FACE};
 
 mod font_family;
-pub use self::font_family::FontFamilyExt;
 pub use self::font_family::{FontFamily, NONE_FONT_FAMILY};
 
 mod font_map;
-pub use self::font_map::FontMapExt;
 pub use self::font_map::{FontMap, NONE_FONT_MAP};
 
 mod fontset;
-pub use self::fontset::FontsetExt;
 pub use self::fontset::{Fontset, NONE_FONTSET};
 
 mod fontset_simple;
@@ -38,7 +37,6 @@ mod layout;
 pub use self::layout::Layout;
 
 mod renderer;
-pub use self::renderer::RendererExt;
 pub use self::renderer::{Renderer, NONE_RENDERER};
 
 mod attr_iterator;
@@ -128,10 +126,10 @@ pub use self::constants::RENDER_TYPE_NONE;
 
 #[doc(hidden)]
 pub mod traits {
-    pub use super::FontExt;
-    pub use super::FontFaceExt;
-    pub use super::FontFamilyExt;
-    pub use super::FontMapExt;
-    pub use super::FontsetExt;
-    pub use super::RendererExt;
+    pub use super::font::FontExt;
+    pub use super::font_face::FontFaceExt;
+    pub use super::font_family::FontFamilyExt;
+    pub use super::font_map::FontMapExt;
+    pub use super::fontset::FontsetExt;
+    pub use super::renderer::RendererExt;
 }
diff --git a/pango/src/auto/versions.txt b/pango/src/auto/versions.txt
index 7ac3d16a8636..91fd75ea23fb 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 @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/pango/sys/versions.txt b/pango/sys/versions.txt
index 7ac3d16a8636..91fd75ea23fb 100644
--- a/pango/sys/versions.txt
+++ b/pango/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/pangocairo/src/auto/mod.rs b/pangocairo/src/auto/mod.rs
index 0d3c057d0dbc..bf9786b5f35d 100644
--- a/pangocairo/src/auto/mod.rs
+++ b/pangocairo/src/auto/mod.rs
@@ -3,17 +3,15 @@
 // DO NOT EDIT
 
 mod font;
-pub use self::font::FontExt;
 pub use self::font::{Font, NONE_FONT};
 
 mod font_map;
-pub use self::font_map::FontMapExt;
 pub use self::font_map::{FontMap, NONE_FONT_MAP};
 
 pub mod functions;
 
 #[doc(hidden)]
 pub mod traits {
-    pub use super::FontExt;
-    pub use super::FontMapExt;
+    pub use super::font::FontExt;
+    pub use super::font_map::FontMapExt;
 }
diff --git a/pangocairo/src/auto/versions.txt b/pangocairo/src/auto/versions.txt
index 7ac3d16a8636..91fd75ea23fb 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 @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)
diff --git a/pangocairo/sys/versions.txt b/pangocairo/sys/versions.txt
index 7ac3d16a8636..91fd75ea23fb 100644
--- a/pangocairo/sys/versions.txt
+++ b/pangocairo/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ a01a90f)
+Generated by gir (https://github.com/gtk-rs/gir @ 7a92c16)
 from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6)