diff --git a/atk/src/auto/gobject_accessible.rs b/atk/src/auto/gobject_accessible.rs
index abd73487979e..07d1d0dde803 100644
--- a/atk/src/auto/gobject_accessible.rs
+++ b/atk/src/auto/gobject_accessible.rs
@@ -10,7 +10,7 @@ use std::fmt;
 use Object;
 
 glib_wrapper! {
-    pub struct GObjectAccessible(Object<atk_sys::AtkGObjectAccessible, atk_sys::AtkGObjectAccessibleClass, GObjectAccessibleClass>) @extends Object;
+    pub struct GObjectAccessible(Object<atk_sys::AtkGObjectAccessible, atk_sys::AtkGObjectAccessibleClass>) @extends Object;
 
     match fn {
         get_type => || atk_sys::atk_gobject_accessible_get_type(),
diff --git a/atk/src/auto/hyperlink.rs b/atk/src/auto/hyperlink.rs
index 7b6a936a2f6a..ca6cc36ec45c 100644
--- a/atk/src/auto/hyperlink.rs
+++ b/atk/src/auto/hyperlink.rs
@@ -20,7 +20,7 @@ use Action;
 use Object;
 
 glib_wrapper! {
-    pub struct Hyperlink(Object<atk_sys::AtkHyperlink, atk_sys::AtkHyperlinkClass, HyperlinkClass>) @implements Action;
+    pub struct Hyperlink(Object<atk_sys::AtkHyperlink, atk_sys::AtkHyperlinkClass>) @implements Action;
 
     match fn {
         get_type => || atk_sys::atk_hyperlink_get_type(),
diff --git a/atk/src/auto/misc.rs b/atk/src/auto/misc.rs
index 2bc90be5685e..e7893414d1bc 100644
--- a/atk/src/auto/misc.rs
+++ b/atk/src/auto/misc.rs
@@ -8,7 +8,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct Misc(Object<atk_sys::AtkMisc, atk_sys::AtkMiscClass, MiscClass>);
+    pub struct Misc(Object<atk_sys::AtkMisc, atk_sys::AtkMiscClass>);
 
     match fn {
         get_type => || atk_sys::atk_misc_get_type(),
diff --git a/atk/src/auto/mod.rs b/atk/src/auto/mod.rs
index 82531647f5f0..3268a86c4062 100644
--- a/atk/src/auto/mod.rs
+++ b/atk/src/auto/mod.rs
@@ -20,13 +20,11 @@ pub use self::editable_text::{EditableText, NONE_EDITABLE_TEXT};
 
 mod gobject_accessible;
 pub use self::gobject_accessible::GObjectAccessibleExt;
-pub use self::gobject_accessible::{
-    GObjectAccessible, GObjectAccessibleClass, NONE_GOBJECT_ACCESSIBLE,
-};
+pub use self::gobject_accessible::{GObjectAccessible, NONE_GOBJECT_ACCESSIBLE};
 
 mod hyperlink;
 pub use self::hyperlink::HyperlinkExt;
-pub use self::hyperlink::{Hyperlink, HyperlinkClass, NONE_HYPERLINK};
+pub use self::hyperlink::{Hyperlink, NONE_HYPERLINK};
 
 mod hyperlink_impl;
 pub use self::hyperlink_impl::HyperlinkImplExt;
@@ -42,39 +40,37 @@ pub use self::image::{Image, NONE_IMAGE};
 
 mod misc;
 pub use self::misc::AtkMiscExt;
-pub use self::misc::{Misc, MiscClass, NONE_MISC};
+pub use self::misc::{Misc, NONE_MISC};
 
 mod no_op_object;
-pub use self::no_op_object::{NoOpObject, NoOpObjectClass, NONE_NO_OP_OBJECT};
+pub use self::no_op_object::{NoOpObject, NONE_NO_OP_OBJECT};
 
 mod no_op_object_factory;
-pub use self::no_op_object_factory::{
-    NoOpObjectFactory, NoOpObjectFactoryClass, NONE_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, ObjectClass, NONE_OBJECT};
+pub use self::object::{Object, NONE_OBJECT};
 
 mod object_factory;
 pub use self::object_factory::ObjectFactoryExt;
-pub use self::object_factory::{ObjectFactory, ObjectFactoryClass, NONE_OBJECT_FACTORY};
+pub use self::object_factory::{ObjectFactory, NONE_OBJECT_FACTORY};
 
 mod plug;
 pub use self::plug::AtkPlugExt;
-pub use self::plug::{Plug, PlugClass, NONE_PLUG};
+pub use self::plug::{Plug, NONE_PLUG};
 
 mod registry;
 pub use self::registry::RegistryExt;
-pub use self::registry::{Registry, RegistryClass, NONE_REGISTRY};
+pub use self::registry::{Registry, NONE_REGISTRY};
 
 mod relation;
 pub use self::relation::RelationExt;
-pub use self::relation::{Relation, RelationClass, NONE_RELATION};
+pub use self::relation::{Relation, NONE_RELATION};
 
 mod relation_set;
 pub use self::relation_set::RelationSetExt;
-pub use self::relation_set::{RelationSet, RelationSetClass, NONE_RELATION_SET};
+pub use self::relation_set::{RelationSet, NONE_RELATION_SET};
 
 mod selection;
 pub use self::selection::SelectionExt;
@@ -82,11 +78,11 @@ pub use self::selection::{Selection, NONE_SELECTION};
 
 mod socket;
 pub use self::socket::AtkSocketExt;
-pub use self::socket::{Socket, SocketClass, NONE_SOCKET};
+pub use self::socket::{Socket, NONE_SOCKET};
 
 mod state_set;
 pub use self::state_set::StateSetExt;
-pub use self::state_set::{StateSet, StateSetClass, NONE_STATE_SET};
+pub use self::state_set::{StateSet, NONE_STATE_SET};
 
 mod streamable_content;
 pub use self::streamable_content::StreamableContentExt;
@@ -105,7 +101,7 @@ pub use self::text::TextExt;
 pub use self::text::{Text, NONE_TEXT};
 
 mod util;
-pub use self::util::{Util, UtilClass, NONE_UTIL};
+pub use self::util::{Util, NONE_UTIL};
 
 mod value;
 pub use self::value::ValueExt;
diff --git a/atk/src/auto/no_op_object.rs b/atk/src/auto/no_op_object.rs
index de91495de672..067bc0c649b2 100644
--- a/atk/src/auto/no_op_object.rs
+++ b/atk/src/auto/no_op_object.rs
@@ -23,7 +23,7 @@ use Value;
 use Window;
 
 glib_wrapper! {
-    pub struct NoOpObject(Object<atk_sys::AtkNoOpObject, atk_sys::AtkNoOpObjectClass, NoOpObjectClass>) @extends Object, @implements Action, Component, Document, EditableText, Hypertext, Image, Selection, Table, TableCell, Text, Value, Window;
+    pub struct NoOpObject(Object<atk_sys::AtkNoOpObject, atk_sys::AtkNoOpObjectClass>) @extends Object, @implements Action, Component, Document, EditableText, Hypertext, Image, Selection, Table, TableCell, Text, Value, Window;
 
     match fn {
         get_type => || atk_sys::atk_no_op_object_get_type(),
diff --git a/atk/src/auto/no_op_object_factory.rs b/atk/src/auto/no_op_object_factory.rs
index 40b05e1a278b..bbebd7ada0b8 100644
--- a/atk/src/auto/no_op_object_factory.rs
+++ b/atk/src/auto/no_op_object_factory.rs
@@ -9,7 +9,7 @@ use std::fmt;
 use ObjectFactory;
 
 glib_wrapper! {
-    pub struct NoOpObjectFactory(Object<atk_sys::AtkNoOpObjectFactory, atk_sys::AtkNoOpObjectFactoryClass, NoOpObjectFactoryClass>) @extends ObjectFactory;
+    pub struct NoOpObjectFactory(Object<atk_sys::AtkNoOpObjectFactory, atk_sys::AtkNoOpObjectFactoryClass>) @extends ObjectFactory;
 
     match fn {
         get_type => || atk_sys::atk_no_op_object_factory_get_type(),
diff --git a/atk/src/auto/object.rs b/atk/src/auto/object.rs
index 1da110b963e3..9a96f49c81ca 100644
--- a/atk/src/auto/object.rs
+++ b/atk/src/auto/object.rs
@@ -26,7 +26,7 @@ use State;
 use StateSet;
 
 glib_wrapper! {
-    pub struct Object(Object<atk_sys::AtkObject, atk_sys::AtkObjectClass, ObjectClass>);
+    pub struct Object(Object<atk_sys::AtkObject, atk_sys::AtkObjectClass>);
 
     match fn {
         get_type => || atk_sys::atk_object_get_type(),
diff --git a/atk/src/auto/object_factory.rs b/atk/src/auto/object_factory.rs
index 18fcac3ec0a9..039c52b3c2b8 100644
--- a/atk/src/auto/object_factory.rs
+++ b/atk/src/auto/object_factory.rs
@@ -10,7 +10,7 @@ use std::fmt;
 use Object;
 
 glib_wrapper! {
-    pub struct ObjectFactory(Object<atk_sys::AtkObjectFactory, atk_sys::AtkObjectFactoryClass, ObjectFactoryClass>);
+    pub struct ObjectFactory(Object<atk_sys::AtkObjectFactory, atk_sys::AtkObjectFactoryClass>);
 
     match fn {
         get_type => || atk_sys::atk_object_factory_get_type(),
diff --git a/atk/src/auto/plug.rs b/atk/src/auto/plug.rs
index 63b1699974a6..d1c6628b7f30 100644
--- a/atk/src/auto/plug.rs
+++ b/atk/src/auto/plug.rs
@@ -12,7 +12,7 @@ use Component;
 use Object;
 
 glib_wrapper! {
-    pub struct Plug(Object<atk_sys::AtkPlug, atk_sys::AtkPlugClass, PlugClass>) @extends Object, @implements Component;
+    pub struct Plug(Object<atk_sys::AtkPlug, atk_sys::AtkPlugClass>) @extends Object, @implements Component;
 
     match fn {
         get_type => || atk_sys::atk_plug_get_type(),
diff --git a/atk/src/auto/registry.rs b/atk/src/auto/registry.rs
index 7eb2b31cd414..b8b75580223f 100644
--- a/atk/src/auto/registry.rs
+++ b/atk/src/auto/registry.rs
@@ -10,7 +10,7 @@ use std::fmt;
 use ObjectFactory;
 
 glib_wrapper! {
-    pub struct Registry(Object<atk_sys::AtkRegistry, atk_sys::AtkRegistryClass, RegistryClass>);
+    pub struct Registry(Object<atk_sys::AtkRegistry, atk_sys::AtkRegistryClass>);
 
     match fn {
         get_type => || atk_sys::atk_registry_get_type(),
diff --git a/atk/src/auto/relation.rs b/atk/src/auto/relation.rs
index 0782ff2e1c1f..a6c89e7db997 100644
--- a/atk/src/auto/relation.rs
+++ b/atk/src/auto/relation.rs
@@ -19,7 +19,7 @@ use Object;
 use RelationType;
 
 glib_wrapper! {
-    pub struct Relation(Object<atk_sys::AtkRelation, atk_sys::AtkRelationClass, RelationClass>);
+    pub struct Relation(Object<atk_sys::AtkRelation, atk_sys::AtkRelationClass>);
 
     match fn {
         get_type => || atk_sys::atk_relation_get_type(),
diff --git a/atk/src/auto/relation_set.rs b/atk/src/auto/relation_set.rs
index 02f4e7fdb9f5..4cd905a958f7 100644
--- a/atk/src/auto/relation_set.rs
+++ b/atk/src/auto/relation_set.rs
@@ -11,7 +11,7 @@ use Relation;
 use RelationType;
 
 glib_wrapper! {
-    pub struct RelationSet(Object<atk_sys::AtkRelationSet, atk_sys::AtkRelationSetClass, RelationSetClass>);
+    pub struct RelationSet(Object<atk_sys::AtkRelationSet, atk_sys::AtkRelationSetClass>);
 
     match fn {
         get_type => || atk_sys::atk_relation_set_get_type(),
diff --git a/atk/src/auto/socket.rs b/atk/src/auto/socket.rs
index f8dd8846ebee..811612554c46 100644
--- a/atk/src/auto/socket.rs
+++ b/atk/src/auto/socket.rs
@@ -11,7 +11,7 @@ use Component;
 use Object;
 
 glib_wrapper! {
-    pub struct Socket(Object<atk_sys::AtkSocket, atk_sys::AtkSocketClass, SocketClass>) @extends Object, @implements Component;
+    pub struct Socket(Object<atk_sys::AtkSocket, atk_sys::AtkSocketClass>) @extends Object, @implements Component;
 
     match fn {
         get_type => || atk_sys::atk_socket_get_type(),
diff --git a/atk/src/auto/state_set.rs b/atk/src/auto/state_set.rs
index f1c96f64340f..7240775c4d44 100644
--- a/atk/src/auto/state_set.rs
+++ b/atk/src/auto/state_set.rs
@@ -9,7 +9,7 @@ use std::fmt;
 use StateType;
 
 glib_wrapper! {
-    pub struct StateSet(Object<atk_sys::AtkStateSet, atk_sys::AtkStateSetClass, StateSetClass>);
+    pub struct StateSet(Object<atk_sys::AtkStateSet, atk_sys::AtkStateSetClass>);
 
     match fn {
         get_type => || atk_sys::atk_state_set_get_type(),
diff --git a/atk/src/auto/util.rs b/atk/src/auto/util.rs
index f45bfa29b065..8c0b0c687dfe 100644
--- a/atk/src/auto/util.rs
+++ b/atk/src/auto/util.rs
@@ -7,7 +7,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct Util(Object<atk_sys::AtkUtil, atk_sys::AtkUtilClass, UtilClass>);
+    pub struct Util(Object<atk_sys::AtkUtil, atk_sys::AtkUtilClass>);
 
     match fn {
         get_type => || atk_sys::atk_util_get_type(),
diff --git a/atk/src/auto/versions.txt b/atk/src/auto/versions.txt
index 8f042be52d08..62b9885a87fa 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 @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/atk/sys/versions.txt b/atk/sys/versions.txt
index 8f042be52d08..62b9885a87fa 100644
--- a/atk/sys/versions.txt
+++ b/atk/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/examples/src/bin/basic_subclass.rs b/examples/src/bin/basic_subclass.rs
index ce2a43418879..5c2427b7ec98 100644
--- a/examples/src/bin/basic_subclass.rs
+++ b/examples/src/bin/basic_subclass.rs
@@ -194,7 +194,7 @@ mod imp_app {
 }
 
 glib_wrapper! {
-    pub struct SimpleApplication(ObjectSubclass<imp_app::SimpleApplication, SimpleApplicationClass>)
+    pub struct SimpleApplication(ObjectSubclass<imp_app::SimpleApplication>)
         @extends gio::Application, gtk::Application;
 }
 
diff --git a/gdk-pixbuf/src/auto/mod.rs b/gdk-pixbuf/src/auto/mod.rs
index de2616c26365..083d2876a12a 100644
--- a/gdk-pixbuf/src/auto/mod.rs
+++ b/gdk-pixbuf/src/auto/mod.rs
@@ -3,18 +3,18 @@
 // DO NOT EDIT
 
 mod pixbuf;
-pub use self::pixbuf::{Pixbuf, PixbufClass};
+pub use self::pixbuf::Pixbuf;
 
 mod pixbuf_animation;
 pub use self::pixbuf_animation::PixbufAnimationExt;
-pub use self::pixbuf_animation::{PixbufAnimation, PixbufAnimationClass, NONE_PIXBUF_ANIMATION};
+pub use self::pixbuf_animation::{PixbufAnimation, NONE_PIXBUF_ANIMATION};
 
 mod pixbuf_loader;
 pub use self::pixbuf_loader::PixbufLoaderExt;
-pub use self::pixbuf_loader::{PixbufLoader, PixbufLoaderClass, NONE_PIXBUF_LOADER};
+pub use self::pixbuf_loader::{PixbufLoader, NONE_PIXBUF_LOADER};
 
 mod pixbuf_simple_anim;
-pub use self::pixbuf_simple_anim::{PixbufSimpleAnim, PixbufSimpleAnimClass};
+pub use self::pixbuf_simple_anim::PixbufSimpleAnim;
 
 mod pixbuf_format;
 pub use self::pixbuf_format::PixbufFormat;
diff --git a/gdk-pixbuf/src/auto/pixbuf.rs b/gdk-pixbuf/src/auto/pixbuf.rs
index 6b2a9d0e8792..33cae2eb62f0 100644
--- a/gdk-pixbuf/src/auto/pixbuf.rs
+++ b/gdk-pixbuf/src/auto/pixbuf.rs
@@ -20,7 +20,7 @@ use PixbufFormat;
 use PixbufRotation;
 
 glib_wrapper! {
-    pub struct Pixbuf(Object<gdk_pixbuf_sys::GdkPixbuf, PixbufClass>) @implements gio::Icon, gio::LoadableIcon;
+    pub struct Pixbuf(Object<gdk_pixbuf_sys::GdkPixbuf>) @implements gio::Icon, gio::LoadableIcon;
 
     match fn {
         get_type => || gdk_pixbuf_sys::gdk_pixbuf_get_type(),
diff --git a/gdk-pixbuf/src/auto/pixbuf_animation.rs b/gdk-pixbuf/src/auto/pixbuf_animation.rs
index 99fd089b59cf..ba9cb498c49e 100644
--- a/gdk-pixbuf/src/auto/pixbuf_animation.rs
+++ b/gdk-pixbuf/src/auto/pixbuf_animation.rs
@@ -18,7 +18,7 @@ use std::ptr;
 use Pixbuf;
 
 glib_wrapper! {
-    pub struct PixbufAnimation(Object<gdk_pixbuf_sys::GdkPixbufAnimation, PixbufAnimationClass>);
+    pub struct PixbufAnimation(Object<gdk_pixbuf_sys::GdkPixbufAnimation>);
 
     match fn {
         get_type => || gdk_pixbuf_sys::gdk_pixbuf_animation_get_type(),
diff --git a/gdk-pixbuf/src/auto/pixbuf_loader.rs b/gdk-pixbuf/src/auto/pixbuf_loader.rs
index 62360f8e5c55..020112d429ac 100644
--- a/gdk-pixbuf/src/auto/pixbuf_loader.rs
+++ b/gdk-pixbuf/src/auto/pixbuf_loader.rs
@@ -20,7 +20,7 @@ use PixbufAnimation;
 use PixbufFormat;
 
 glib_wrapper! {
-    pub struct PixbufLoader(Object<gdk_pixbuf_sys::GdkPixbufLoader, gdk_pixbuf_sys::GdkPixbufLoaderClass, PixbufLoaderClass>);
+    pub struct PixbufLoader(Object<gdk_pixbuf_sys::GdkPixbufLoader, gdk_pixbuf_sys::GdkPixbufLoaderClass>);
 
     match fn {
         get_type => || gdk_pixbuf_sys::gdk_pixbuf_loader_get_type(),
diff --git a/gdk-pixbuf/src/auto/pixbuf_simple_anim.rs b/gdk-pixbuf/src/auto/pixbuf_simple_anim.rs
index 40405126ac1e..ecfb3f227703 100644
--- a/gdk-pixbuf/src/auto/pixbuf_simple_anim.rs
+++ b/gdk-pixbuf/src/auto/pixbuf_simple_anim.rs
@@ -15,7 +15,7 @@ use Pixbuf;
 use PixbufAnimation;
 
 glib_wrapper! {
-    pub struct PixbufSimpleAnim(Object<gdk_pixbuf_sys::GdkPixbufSimpleAnim, gdk_pixbuf_sys::GdkPixbufSimpleAnimClass, PixbufSimpleAnimClass>) @extends PixbufAnimation;
+    pub struct PixbufSimpleAnim(Object<gdk_pixbuf_sys::GdkPixbufSimpleAnim, gdk_pixbuf_sys::GdkPixbufSimpleAnimClass>) @extends PixbufAnimation;
 
     match fn {
         get_type => || gdk_pixbuf_sys::gdk_pixbuf_simple_anim_get_type(),
diff --git a/gdk-pixbuf/src/auto/versions.txt b/gdk-pixbuf/src/auto/versions.txt
index 8f042be52d08..62b9885a87fa 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 @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/gdk-pixbuf/src/pixbuf_animation_iter.rs b/gdk-pixbuf/src/pixbuf_animation_iter.rs
index af47ffd8af19..1d488eb1ad15 100644
--- a/gdk-pixbuf/src/pixbuf_animation_iter.rs
+++ b/gdk-pixbuf/src/pixbuf_animation_iter.rs
@@ -9,7 +9,7 @@ use glib::translate::*;
 use std::time::SystemTime;
 
 glib_wrapper! {
-    pub struct PixbufAnimationIter(Object<gdk_pixbuf_sys::GdkPixbufAnimationIter, PixbufAnimationIterClass>);
+    pub struct PixbufAnimationIter(Object<gdk_pixbuf_sys::GdkPixbufAnimationIter>);
 
     match fn {
         get_type => || gdk_pixbuf_sys::gdk_pixbuf_animation_iter_get_type(),
diff --git a/gdk-pixbuf/sys/versions.txt b/gdk-pixbuf/sys/versions.txt
index 8f042be52d08..62b9885a87fa 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 @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/gdk/src/auto/app_launch_context.rs b/gdk/src/auto/app_launch_context.rs
index 88f23813c381..ee8e2f6fe345 100644
--- a/gdk/src/auto/app_launch_context.rs
+++ b/gdk/src/auto/app_launch_context.rs
@@ -15,7 +15,7 @@ use Display;
 use Screen;
 
 glib_wrapper! {
-    pub struct AppLaunchContext(Object<gdk_sys::GdkAppLaunchContext, AppLaunchContextClass>) @extends gio::AppLaunchContext;
+    pub struct AppLaunchContext(Object<gdk_sys::GdkAppLaunchContext>) @extends gio::AppLaunchContext;
 
     match fn {
         get_type => || gdk_sys::gdk_app_launch_context_get_type(),
diff --git a/gdk/src/auto/cursor.rs b/gdk/src/auto/cursor.rs
index 00817b2f63b8..bb07dd7a6732 100644
--- a/gdk/src/auto/cursor.rs
+++ b/gdk/src/auto/cursor.rs
@@ -12,7 +12,7 @@ use CursorType;
 use Display;
 
 glib_wrapper! {
-    pub struct Cursor(Object<gdk_sys::GdkCursor, CursorClass>);
+    pub struct Cursor(Object<gdk_sys::GdkCursor>);
 
     match fn {
         get_type => || gdk_sys::gdk_cursor_get_type(),
diff --git a/gdk/src/auto/device.rs b/gdk/src/auto/device.rs
index 211a89ebb08a..5aea2acc7197 100644
--- a/gdk/src/auto/device.rs
+++ b/gdk/src/auto/device.rs
@@ -40,7 +40,7 @@ use Seat;
 use Window;
 
 glib_wrapper! {
-    pub struct Device(Object<gdk_sys::GdkDevice, DeviceClass>);
+    pub struct Device(Object<gdk_sys::GdkDevice>);
 
     match fn {
         get_type => || gdk_sys::gdk_device_get_type(),
diff --git a/gdk/src/auto/device_manager.rs b/gdk/src/auto/device_manager.rs
index a0f0a3fc2fc2..5a7d25cdddee 100644
--- a/gdk/src/auto/device_manager.rs
+++ b/gdk/src/auto/device_manager.rs
@@ -16,7 +16,7 @@ use DeviceType;
 use Display;
 
 glib_wrapper! {
-    pub struct DeviceManager(Object<gdk_sys::GdkDeviceManager, DeviceManagerClass>);
+    pub struct DeviceManager(Object<gdk_sys::GdkDeviceManager>);
 
     match fn {
         get_type => || gdk_sys::gdk_device_manager_get_type(),
diff --git a/gdk/src/auto/device_tool.rs b/gdk/src/auto/device_tool.rs
index 057bbf8ab31f..f543063ab93b 100644
--- a/gdk/src/auto/device_tool.rs
+++ b/gdk/src/auto/device_tool.rs
@@ -13,7 +13,7 @@ use AxisFlags;
 use DeviceToolType;
 
 glib_wrapper! {
-    pub struct DeviceTool(Object<gdk_sys::GdkDeviceTool, DeviceToolClass>);
+    pub struct DeviceTool(Object<gdk_sys::GdkDeviceTool>);
 
     match fn {
         get_type => || gdk_sys::gdk_device_tool_get_type(),
diff --git a/gdk/src/auto/display.rs b/gdk/src/auto/display.rs
index 5f56c2bae948..0cc14d0d85d9 100644
--- a/gdk/src/auto/display.rs
+++ b/gdk/src/auto/display.rs
@@ -27,7 +27,7 @@ use Seat;
 use Window;
 
 glib_wrapper! {
-    pub struct Display(Object<gdk_sys::GdkDisplay, DisplayClass>);
+    pub struct Display(Object<gdk_sys::GdkDisplay>);
 
     match fn {
         get_type => || gdk_sys::gdk_display_get_type(),
diff --git a/gdk/src/auto/display_manager.rs b/gdk/src/auto/display_manager.rs
index 1b2a946c6ebe..5a26e62197cb 100644
--- a/gdk/src/auto/display_manager.rs
+++ b/gdk/src/auto/display_manager.rs
@@ -14,7 +14,7 @@ use std::mem::transmute;
 use Display;
 
 glib_wrapper! {
-    pub struct DisplayManager(Object<gdk_sys::GdkDisplayManager, DisplayManagerClass>);
+    pub struct DisplayManager(Object<gdk_sys::GdkDisplayManager>);
 
     match fn {
         get_type => || gdk_sys::gdk_display_manager_get_type(),
diff --git a/gdk/src/auto/drag_context.rs b/gdk/src/auto/drag_context.rs
index 1f5f2161ea8c..180e64290d2f 100644
--- a/gdk/src/auto/drag_context.rs
+++ b/gdk/src/auto/drag_context.rs
@@ -30,7 +30,7 @@ use DragProtocol;
 use Window;
 
 glib_wrapper! {
-    pub struct DragContext(Object<gdk_sys::GdkDragContext, DragContextClass>);
+    pub struct DragContext(Object<gdk_sys::GdkDragContext>);
 
     match fn {
         get_type => || gdk_sys::gdk_drag_context_get_type(),
diff --git a/gdk/src/auto/drawing_context.rs b/gdk/src/auto/drawing_context.rs
index 42590809afe0..f2f6bce40ff9 100644
--- a/gdk/src/auto/drawing_context.rs
+++ b/gdk/src/auto/drawing_context.rs
@@ -11,7 +11,7 @@ use std::fmt;
 use Window;
 
 glib_wrapper! {
-    pub struct DrawingContext(Object<gdk_sys::GdkDrawingContext, gdk_sys::GdkDrawingContextClass, DrawingContextClass>);
+    pub struct DrawingContext(Object<gdk_sys::GdkDrawingContext, gdk_sys::GdkDrawingContextClass>);
 
     match fn {
         get_type => || gdk_sys::gdk_drawing_context_get_type(),
diff --git a/gdk/src/auto/frame_clock.rs b/gdk/src/auto/frame_clock.rs
index 325bf6379cc0..7bc3e91e215a 100644
--- a/gdk/src/auto/frame_clock.rs
+++ b/gdk/src/auto/frame_clock.rs
@@ -15,7 +15,7 @@ use FrameClockPhase;
 use FrameTimings;
 
 glib_wrapper! {
-    pub struct FrameClock(Object<gdk_sys::GdkFrameClock, gdk_sys::GdkFrameClockClass, FrameClockClass>);
+    pub struct FrameClock(Object<gdk_sys::GdkFrameClock, gdk_sys::GdkFrameClockClass>);
 
     match fn {
         get_type => || gdk_sys::gdk_frame_clock_get_type(),
diff --git a/gdk/src/auto/gl_context.rs b/gdk/src/auto/gl_context.rs
index 2e86c649adf0..b0fdde54ae50 100644
--- a/gdk/src/auto/gl_context.rs
+++ b/gdk/src/auto/gl_context.rs
@@ -17,7 +17,7 @@ use Display;
 use Window;
 
 glib_wrapper! {
-    pub struct GLContext(Object<gdk_sys::GdkGLContext, GLContextClass>);
+    pub struct GLContext(Object<gdk_sys::GdkGLContext>);
 
     match fn {
         get_type => || gdk_sys::gdk_gl_context_get_type(),
diff --git a/gdk/src/auto/keymap.rs b/gdk/src/auto/keymap.rs
index 60554e369b33..0e9d982f60ba 100644
--- a/gdk/src/auto/keymap.rs
+++ b/gdk/src/auto/keymap.rs
@@ -19,7 +19,7 @@ use ModifierIntent;
 use ModifierType;
 
 glib_wrapper! {
-    pub struct Keymap(Object<gdk_sys::GdkKeymap, KeymapClass>);
+    pub struct Keymap(Object<gdk_sys::GdkKeymap>);
 
     match fn {
         get_type => || gdk_sys::gdk_keymap_get_type(),
diff --git a/gdk/src/auto/mod.rs b/gdk/src/auto/mod.rs
index 6c5304fb99ee..5250bde57c35 100644
--- a/gdk/src/auto/mod.rs
+++ b/gdk/src/auto/mod.rs
@@ -3,16 +3,16 @@
 // DO NOT EDIT
 
 mod app_launch_context;
-pub use self::app_launch_context::{AppLaunchContext, AppLaunchContextClass};
+pub use self::app_launch_context::AppLaunchContext;
 
 mod cursor;
-pub use self::cursor::{Cursor, CursorClass};
+pub use self::cursor::Cursor;
 
 mod device;
-pub use self::device::{Device, DeviceClass};
+pub use self::device::Device;
 
 mod device_manager;
-pub use self::device_manager::{DeviceManager, DeviceManagerClass};
+pub use self::device_manager::DeviceManager;
 
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 mod device_pad;
@@ -24,52 +24,52 @@ pub use self::device_pad::{DevicePad, NONE_DEVICE_PAD};
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 mod device_tool;
 #[cfg(any(feature = "v3_22", feature = "dox"))]
-pub use self::device_tool::{DeviceTool, DeviceToolClass};
+pub use self::device_tool::DeviceTool;
 
 mod display;
-pub use self::display::{Display, DisplayClass};
+pub use self::display::Display;
 
 mod display_manager;
-pub use self::display_manager::{DisplayManager, DisplayManagerClass};
+pub use self::display_manager::DisplayManager;
 
 mod drag_context;
-pub use self::drag_context::{DragContext, DragContextClass};
+pub use self::drag_context::DragContext;
 
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 mod drawing_context;
 #[cfg(any(feature = "v3_22", feature = "dox"))]
-pub use self::drawing_context::{DrawingContext, DrawingContextClass};
+pub use self::drawing_context::DrawingContext;
 
 mod frame_clock;
-pub use self::frame_clock::{FrameClock, FrameClockClass};
+pub use self::frame_clock::FrameClock;
 
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 mod gl_context;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
-pub use self::gl_context::{GLContext, GLContextClass};
+pub use self::gl_context::GLContext;
 
 mod keymap;
-pub use self::keymap::{Keymap, KeymapClass};
+pub use self::keymap::Keymap;
 
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 mod monitor;
 #[cfg(any(feature = "v3_22", feature = "dox"))]
-pub use self::monitor::{Monitor, MonitorClass};
+pub use self::monitor::Monitor;
 
 mod screen;
-pub use self::screen::{Screen, ScreenClass};
+pub use self::screen::Screen;
 
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 mod seat;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
-pub use self::seat::{Seat, SeatClass};
+pub use self::seat::Seat;
 
 mod visual;
-pub use self::visual::{Visual, VisualClass};
+pub use self::visual::Visual;
 
 mod window;
 pub use self::window::WindowExt;
-pub use self::window::{Window, WindowClass, NONE_WINDOW};
+pub use self::window::{Window, NONE_WINDOW};
 
 mod event_sequence;
 pub use self::event_sequence::EventSequence;
diff --git a/gdk/src/auto/monitor.rs b/gdk/src/auto/monitor.rs
index 8b05c453322e..b389ac5ebb39 100644
--- a/gdk/src/auto/monitor.rs
+++ b/gdk/src/auto/monitor.rs
@@ -22,7 +22,7 @@ use Rectangle;
 use SubpixelLayout;
 
 glib_wrapper! {
-    pub struct Monitor(Object<gdk_sys::GdkMonitor, gdk_sys::GdkMonitorClass, MonitorClass>);
+    pub struct Monitor(Object<gdk_sys::GdkMonitor, gdk_sys::GdkMonitorClass>);
 
     match fn {
         get_type => || gdk_sys::gdk_monitor_get_type(),
diff --git a/gdk/src/auto/screen.rs b/gdk/src/auto/screen.rs
index d891c039e8e3..cabb44990c8e 100644
--- a/gdk/src/auto/screen.rs
+++ b/gdk/src/auto/screen.rs
@@ -20,7 +20,7 @@ use Visual;
 use Window;
 
 glib_wrapper! {
-    pub struct Screen(Object<gdk_sys::GdkScreen, ScreenClass>);
+    pub struct Screen(Object<gdk_sys::GdkScreen>);
 
     match fn {
         get_type => || gdk_sys::gdk_screen_get_type(),
diff --git a/gdk/src/auto/seat.rs b/gdk/src/auto/seat.rs
index 43e90fed9258..a6ee3587df8e 100644
--- a/gdk/src/auto/seat.rs
+++ b/gdk/src/auto/seat.rs
@@ -37,7 +37,7 @@ use SeatCapabilities;
 use Window;
 
 glib_wrapper! {
-    pub struct Seat(Object<gdk_sys::GdkSeat, SeatClass>);
+    pub struct Seat(Object<gdk_sys::GdkSeat>);
 
     match fn {
         get_type => || gdk_sys::gdk_seat_get_type(),
diff --git a/gdk/src/auto/versions.txt b/gdk/src/auto/versions.txt
index 8f042be52d08..62b9885a87fa 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 @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/gdk/src/auto/visual.rs b/gdk/src/auto/visual.rs
index c273b0b263aa..775aefab3a5d 100644
--- a/gdk/src/auto/visual.rs
+++ b/gdk/src/auto/visual.rs
@@ -11,7 +11,7 @@ use Screen;
 use VisualType;
 
 glib_wrapper! {
-    pub struct Visual(Object<gdk_sys::GdkVisual, VisualClass>);
+    pub struct Visual(Object<gdk_sys::GdkVisual>);
 
     match fn {
         get_type => || gdk_sys::gdk_visual_get_type(),
diff --git a/gdk/src/auto/window.rs b/gdk/src/auto/window.rs
index ef1cb07f2431..84c89e1bbe44 100644
--- a/gdk/src/auto/window.rs
+++ b/gdk/src/auto/window.rs
@@ -52,7 +52,7 @@ use WindowTypeHint;
 use RGBA;
 
 glib_wrapper! {
-    pub struct Window(Object<gdk_sys::GdkWindow, gdk_sys::GdkWindowClass, WindowClass>);
+    pub struct Window(Object<gdk_sys::GdkWindow, gdk_sys::GdkWindowClass>);
 
     match fn {
         get_type => || gdk_sys::gdk_window_get_type(),
diff --git a/gdk/sys/versions.txt b/gdk/sys/versions.txt
index 8f042be52d08..62b9885a87fa 100644
--- a/gdk/sys/versions.txt
+++ b/gdk/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/gdkx11/src/auto/mod.rs b/gdkx11/src/auto/mod.rs
index 127f99395439..d999b1c97f5b 100644
--- a/gdkx11/src/auto/mod.rs
+++ b/gdkx11/src/auto/mod.rs
@@ -3,57 +3,55 @@
 // DO NOT EDIT
 
 mod x11_app_launch_context;
-pub use self::x11_app_launch_context::{X11AppLaunchContext, X11AppLaunchContextClass};
+pub use self::x11_app_launch_context::X11AppLaunchContext;
 
 mod x11_cursor;
-pub use self::x11_cursor::{X11Cursor, X11CursorClass};
+pub use self::x11_cursor::X11Cursor;
 
 mod x11_device_core;
-pub use self::x11_device_core::{X11DeviceCore, X11DeviceCoreClass};
+pub use self::x11_device_core::X11DeviceCore;
 
 mod x11_device_manager_core;
-pub use self::x11_device_manager_core::{
-    X11DeviceManagerCore, X11DeviceManagerCoreClass, NONE_X11_DEVICE_MANAGER_CORE,
-};
+pub use self::x11_device_manager_core::{X11DeviceManagerCore, NONE_X11_DEVICE_MANAGER_CORE};
 
 mod x11_device_manager_xi2;
+pub use self::x11_device_manager_xi2::X11DeviceManagerXI2;
 pub use self::x11_device_manager_xi2::X11DeviceManagerXI2Builder;
-pub use self::x11_device_manager_xi2::{X11DeviceManagerXI2, X11DeviceManagerXI2Class};
 
 mod x11_device_xi2;
+pub use self::x11_device_xi2::X11DeviceXI2;
 pub use self::x11_device_xi2::X11DeviceXI2Builder;
-pub use self::x11_device_xi2::{X11DeviceXI2, X11DeviceXI2Class};
 
 mod x11_display;
-pub use self::x11_display::{X11Display, X11DisplayClass};
+pub use self::x11_display::X11Display;
 
 mod x11_display_manager;
-pub use self::x11_display_manager::{X11DisplayManager, X11DisplayManagerClass};
+pub use self::x11_display_manager::X11DisplayManager;
 
 mod x11_drag_context;
-pub use self::x11_drag_context::{X11DragContext, X11DragContextClass};
+pub use self::x11_drag_context::X11DragContext;
 
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 mod x11gl_context;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
-pub use self::x11gl_context::{X11GLContext, X11GLContextClass};
+pub use self::x11gl_context::X11GLContext;
 
 mod x11_keymap;
-pub use self::x11_keymap::{X11Keymap, X11KeymapClass};
+pub use self::x11_keymap::X11Keymap;
 
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 mod x11_monitor;
 #[cfg(any(feature = "v3_22", feature = "dox"))]
-pub use self::x11_monitor::{X11Monitor, X11MonitorClass};
+pub use self::x11_monitor::X11Monitor;
 
 mod x11_screen;
-pub use self::x11_screen::{X11Screen, X11ScreenClass};
+pub use self::x11_screen::X11Screen;
 
 mod x11_visual;
-pub use self::x11_visual::{X11Visual, X11VisualClass};
+pub use self::x11_visual::X11Visual;
 
 mod x11_window;
-pub use self::x11_window::{X11Window, X11WindowClass};
+pub use self::x11_window::X11Window;
 
 pub mod functions;
 
diff --git a/gdkx11/src/auto/versions.txt b/gdkx11/src/auto/versions.txt
index 8f042be52d08..62b9885a87fa 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 @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/gdkx11/src/auto/x11_app_launch_context.rs b/gdkx11/src/auto/x11_app_launch_context.rs
index 19356fe27d54..325bdcc1edd7 100644
--- a/gdkx11/src/auto/x11_app_launch_context.rs
+++ b/gdkx11/src/auto/x11_app_launch_context.rs
@@ -9,7 +9,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct X11AppLaunchContext(Object<gdk_x11_sys::GdkX11AppLaunchContext, gdk_x11_sys::GdkX11AppLaunchContextClass, X11AppLaunchContextClass>) @extends gdk::AppLaunchContext, gio::AppLaunchContext;
+    pub struct X11AppLaunchContext(Object<gdk_x11_sys::GdkX11AppLaunchContext, gdk_x11_sys::GdkX11AppLaunchContextClass>) @extends gdk::AppLaunchContext, gio::AppLaunchContext;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_app_launch_context_get_type(),
diff --git a/gdkx11/src/auto/x11_cursor.rs b/gdkx11/src/auto/x11_cursor.rs
index a3a751da7817..44e7ec7429b0 100644
--- a/gdkx11/src/auto/x11_cursor.rs
+++ b/gdkx11/src/auto/x11_cursor.rs
@@ -9,7 +9,7 @@ use std::fmt;
 use xlib;
 
 glib_wrapper! {
-    pub struct X11Cursor(Object<gdk_x11_sys::GdkX11Cursor, gdk_x11_sys::GdkX11CursorClass, X11CursorClass>) @extends gdk::Cursor;
+    pub struct X11Cursor(Object<gdk_x11_sys::GdkX11Cursor, gdk_x11_sys::GdkX11CursorClass>) @extends gdk::Cursor;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_cursor_get_type(),
diff --git a/gdkx11/src/auto/x11_device_core.rs b/gdkx11/src/auto/x11_device_core.rs
index 1dd2c5a3f531..67f6b66cc27e 100644
--- a/gdkx11/src/auto/x11_device_core.rs
+++ b/gdkx11/src/auto/x11_device_core.rs
@@ -8,7 +8,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct X11DeviceCore(Object<gdk_x11_sys::GdkX11DeviceCore, gdk_x11_sys::GdkX11DeviceCoreClass, X11DeviceCoreClass>) @extends gdk::Device;
+    pub struct X11DeviceCore(Object<gdk_x11_sys::GdkX11DeviceCore, gdk_x11_sys::GdkX11DeviceCoreClass>) @extends gdk::Device;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_device_core_get_type(),
diff --git a/gdkx11/src/auto/x11_device_manager_core.rs b/gdkx11/src/auto/x11_device_manager_core.rs
index 3e7f26a1477b..df3a70aff21d 100644
--- a/gdkx11/src/auto/x11_device_manager_core.rs
+++ b/gdkx11/src/auto/x11_device_manager_core.rs
@@ -8,7 +8,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct X11DeviceManagerCore(Object<gdk_x11_sys::GdkX11DeviceManagerCore, gdk_x11_sys::GdkX11DeviceManagerCoreClass, X11DeviceManagerCoreClass>) @extends gdk::DeviceManager;
+    pub struct X11DeviceManagerCore(Object<gdk_x11_sys::GdkX11DeviceManagerCore, gdk_x11_sys::GdkX11DeviceManagerCoreClass>) @extends gdk::DeviceManager;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_device_manager_core_get_type(),
diff --git a/gdkx11/src/auto/x11_device_manager_xi2.rs b/gdkx11/src/auto/x11_device_manager_xi2.rs
index ba2725b842fc..f01d9230c2c4 100644
--- a/gdkx11/src/auto/x11_device_manager_xi2.rs
+++ b/gdkx11/src/auto/x11_device_manager_xi2.rs
@@ -16,7 +16,7 @@ use std::fmt;
 use X11DeviceManagerCore;
 
 glib_wrapper! {
-    pub struct X11DeviceManagerXI2(Object<gdk_x11_sys::GdkX11DeviceManagerXI2, gdk_x11_sys::GdkX11DeviceManagerXI2Class, X11DeviceManagerXI2Class>) @extends X11DeviceManagerCore, gdk::DeviceManager;
+    pub struct X11DeviceManagerXI2(Object<gdk_x11_sys::GdkX11DeviceManagerXI2, gdk_x11_sys::GdkX11DeviceManagerXI2Class>) @extends X11DeviceManagerCore, gdk::DeviceManager;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_device_manager_xi2_get_type(),
diff --git a/gdkx11/src/auto/x11_device_xi2.rs b/gdkx11/src/auto/x11_device_xi2.rs
index 0a7106860827..f9ae01e7afaa 100644
--- a/gdkx11/src/auto/x11_device_xi2.rs
+++ b/gdkx11/src/auto/x11_device_xi2.rs
@@ -15,7 +15,7 @@ use gobject_sys;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct X11DeviceXI2(Object<gdk_x11_sys::GdkX11DeviceXI2, gdk_x11_sys::GdkX11DeviceXI2Class, X11DeviceXI2Class>) @extends gdk::Device;
+    pub struct X11DeviceXI2(Object<gdk_x11_sys::GdkX11DeviceXI2, gdk_x11_sys::GdkX11DeviceXI2Class>) @extends gdk::Device;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_device_xi2_get_type(),
diff --git a/gdkx11/src/auto/x11_display.rs b/gdkx11/src/auto/x11_display.rs
index 4f5ea75a94a0..e5cf5b5a159d 100644
--- a/gdkx11/src/auto/x11_display.rs
+++ b/gdkx11/src/auto/x11_display.rs
@@ -13,7 +13,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct X11Display(Object<gdk_x11_sys::GdkX11Display, gdk_x11_sys::GdkX11DisplayClass, X11DisplayClass>) @extends gdk::Display;
+    pub struct X11Display(Object<gdk_x11_sys::GdkX11Display, gdk_x11_sys::GdkX11DisplayClass>) @extends gdk::Display;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_display_get_type(),
diff --git a/gdkx11/src/auto/x11_display_manager.rs b/gdkx11/src/auto/x11_display_manager.rs
index 12dc1f56414a..257de5cc3dd6 100644
--- a/gdkx11/src/auto/x11_display_manager.rs
+++ b/gdkx11/src/auto/x11_display_manager.rs
@@ -8,7 +8,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct X11DisplayManager(Object<gdk_x11_sys::GdkX11DisplayManager, gdk_x11_sys::GdkX11DisplayManagerClass, X11DisplayManagerClass>) @extends gdk::DisplayManager;
+    pub struct X11DisplayManager(Object<gdk_x11_sys::GdkX11DisplayManager, gdk_x11_sys::GdkX11DisplayManagerClass>) @extends gdk::DisplayManager;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_display_manager_get_type(),
diff --git a/gdkx11/src/auto/x11_drag_context.rs b/gdkx11/src/auto/x11_drag_context.rs
index 334b61fc18ef..2f4a41daf406 100644
--- a/gdkx11/src/auto/x11_drag_context.rs
+++ b/gdkx11/src/auto/x11_drag_context.rs
@@ -8,7 +8,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct X11DragContext(Object<gdk_x11_sys::GdkX11DragContext, gdk_x11_sys::GdkX11DragContextClass, X11DragContextClass>) @extends gdk::DragContext;
+    pub struct X11DragContext(Object<gdk_x11_sys::GdkX11DragContext, gdk_x11_sys::GdkX11DragContextClass>) @extends gdk::DragContext;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_drag_context_get_type(),
diff --git a/gdkx11/src/auto/x11_keymap.rs b/gdkx11/src/auto/x11_keymap.rs
index 4423488c7216..eb0e7b242489 100644
--- a/gdkx11/src/auto/x11_keymap.rs
+++ b/gdkx11/src/auto/x11_keymap.rs
@@ -8,7 +8,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct X11Keymap(Object<gdk_x11_sys::GdkX11Keymap, gdk_x11_sys::GdkX11KeymapClass, X11KeymapClass>) @extends gdk::Keymap;
+    pub struct X11Keymap(Object<gdk_x11_sys::GdkX11Keymap, gdk_x11_sys::GdkX11KeymapClass>) @extends gdk::Keymap;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_keymap_get_type(),
diff --git a/gdkx11/src/auto/x11_monitor.rs b/gdkx11/src/auto/x11_monitor.rs
index 1356ad2ae287..9737b6187190 100644
--- a/gdkx11/src/auto/x11_monitor.rs
+++ b/gdkx11/src/auto/x11_monitor.rs
@@ -10,7 +10,7 @@ use std::fmt;
 use xlib;
 
 glib_wrapper! {
-    pub struct X11Monitor(Object<gdk_x11_sys::GdkX11Monitor, gdk_x11_sys::GdkX11MonitorClass, X11MonitorClass>) @extends gdk::Monitor;
+    pub struct X11Monitor(Object<gdk_x11_sys::GdkX11Monitor, gdk_x11_sys::GdkX11MonitorClass>) @extends gdk::Monitor;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_monitor_get_type(),
diff --git a/gdkx11/src/auto/x11_screen.rs b/gdkx11/src/auto/x11_screen.rs
index a1692636b9b0..6e167ec3b205 100644
--- a/gdkx11/src/auto/x11_screen.rs
+++ b/gdkx11/src/auto/x11_screen.rs
@@ -17,7 +17,7 @@ use xlib;
 use X11Visual;
 
 glib_wrapper! {
-    pub struct X11Screen(Object<gdk_x11_sys::GdkX11Screen, gdk_x11_sys::GdkX11ScreenClass, X11ScreenClass>) @extends gdk::Screen;
+    pub struct X11Screen(Object<gdk_x11_sys::GdkX11Screen, gdk_x11_sys::GdkX11ScreenClass>) @extends gdk::Screen;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_screen_get_type(),
diff --git a/gdkx11/src/auto/x11_visual.rs b/gdkx11/src/auto/x11_visual.rs
index 89ecd7931635..d9e3bf40c813 100644
--- a/gdkx11/src/auto/x11_visual.rs
+++ b/gdkx11/src/auto/x11_visual.rs
@@ -8,7 +8,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct X11Visual(Object<gdk_x11_sys::GdkX11Visual, gdk_x11_sys::GdkX11VisualClass, X11VisualClass>) @extends gdk::Visual;
+    pub struct X11Visual(Object<gdk_x11_sys::GdkX11Visual, gdk_x11_sys::GdkX11VisualClass>) @extends gdk::Visual;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_visual_get_type(),
diff --git a/gdkx11/src/auto/x11_window.rs b/gdkx11/src/auto/x11_window.rs
index 10be44195626..7d7a7561034b 100644
--- a/gdkx11/src/auto/x11_window.rs
+++ b/gdkx11/src/auto/x11_window.rs
@@ -11,7 +11,7 @@ use xlib;
 use X11Display;
 
 glib_wrapper! {
-    pub struct X11Window(Object<gdk_x11_sys::GdkX11Window, gdk_x11_sys::GdkX11WindowClass, X11WindowClass>) @extends gdk::Window;
+    pub struct X11Window(Object<gdk_x11_sys::GdkX11Window, gdk_x11_sys::GdkX11WindowClass>) @extends gdk::Window;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_window_get_type(),
diff --git a/gdkx11/src/auto/x11gl_context.rs b/gdkx11/src/auto/x11gl_context.rs
index e2aeed7f3750..358e5ec58f80 100644
--- a/gdkx11/src/auto/x11gl_context.rs
+++ b/gdkx11/src/auto/x11gl_context.rs
@@ -8,7 +8,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct X11GLContext(Object<gdk_x11_sys::GdkX11GLContext, gdk_x11_sys::GdkX11GLContextClass, X11GLContextClass>) @extends gdk::GLContext;
+    pub struct X11GLContext(Object<gdk_x11_sys::GdkX11GLContext, gdk_x11_sys::GdkX11GLContextClass>) @extends gdk::GLContext;
 
     match fn {
         get_type => || gdk_x11_sys::gdk_x11_gl_context_get_type(),
diff --git a/gdkx11/sys/versions.txt b/gdkx11/sys/versions.txt
index 8f042be52d08..62b9885a87fa 100644
--- a/gdkx11/sys/versions.txt
+++ b/gdkx11/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/gio/src/auto/app_info_monitor.rs b/gio/src/auto/app_info_monitor.rs
index 60b14906dcc7..7384a0f4c300 100644
--- a/gio/src/auto/app_info_monitor.rs
+++ b/gio/src/auto/app_info_monitor.rs
@@ -13,7 +13,7 @@ use std::fmt;
 use std::mem::transmute;
 
 glib_wrapper! {
-    pub struct AppInfoMonitor(Object<gio_sys::GAppInfoMonitor, AppInfoMonitorClass>);
+    pub struct AppInfoMonitor(Object<gio_sys::GAppInfoMonitor>);
 
     match fn {
         get_type => || gio_sys::g_app_info_monitor_get_type(),
diff --git a/gio/src/auto/app_launch_context.rs b/gio/src/auto/app_launch_context.rs
index eef99b0a4b1c..66da5154938e 100644
--- a/gio/src/auto/app_launch_context.rs
+++ b/gio/src/auto/app_launch_context.rs
@@ -20,7 +20,7 @@ use AppInfo;
 use File;
 
 glib_wrapper! {
-    pub struct AppLaunchContext(Object<gio_sys::GAppLaunchContext, gio_sys::GAppLaunchContextClass, AppLaunchContextClass>);
+    pub struct AppLaunchContext(Object<gio_sys::GAppLaunchContext, gio_sys::GAppLaunchContextClass>);
 
     match fn {
         get_type => || gio_sys::g_app_launch_context_get_type(),
diff --git a/gio/src/auto/application.rs b/gio/src/auto/application.rs
index 1b6005d9d07c..f9c94d94c3b4 100644
--- a/gio/src/auto/application.rs
+++ b/gio/src/auto/application.rs
@@ -31,7 +31,7 @@ use File;
 use Notification;
 
 glib_wrapper! {
-    pub struct Application(Object<gio_sys::GApplication, gio_sys::GApplicationClass, ApplicationClass>) @implements ActionGroup, ActionMap;
+    pub struct Application(Object<gio_sys::GApplication, gio_sys::GApplicationClass>) @implements ActionGroup, ActionMap;
 
     match fn {
         get_type => || gio_sys::g_application_get_type(),
diff --git a/gio/src/auto/application_command_line.rs b/gio/src/auto/application_command_line.rs
index c7168aa414a5..97ce6066ad42 100644
--- a/gio/src/auto/application_command_line.rs
+++ b/gio/src/auto/application_command_line.rs
@@ -20,7 +20,7 @@ use File;
 use InputStream;
 
 glib_wrapper! {
-    pub struct ApplicationCommandLine(Object<gio_sys::GApplicationCommandLine, gio_sys::GApplicationCommandLineClass, ApplicationCommandLineClass>);
+    pub struct ApplicationCommandLine(Object<gio_sys::GApplicationCommandLine, gio_sys::GApplicationCommandLineClass>);
 
     match fn {
         get_type => || gio_sys::g_application_command_line_get_type(),
diff --git a/gio/src/auto/buffered_input_stream.rs b/gio/src/auto/buffered_input_stream.rs
index 9d313aee4917..307c5826b18b 100644
--- a/gio/src/auto/buffered_input_stream.rs
+++ b/gio/src/auto/buffered_input_stream.rs
@@ -25,7 +25,7 @@ use InputStream;
 use Seekable;
 
 glib_wrapper! {
-    pub struct BufferedInputStream(Object<gio_sys::GBufferedInputStream, gio_sys::GBufferedInputStreamClass, BufferedInputStreamClass>) @extends FilterInputStream, InputStream, @implements Seekable;
+    pub struct BufferedInputStream(Object<gio_sys::GBufferedInputStream, gio_sys::GBufferedInputStreamClass>) @extends FilterInputStream, InputStream, @implements Seekable;
 
     match fn {
         get_type => || gio_sys::g_buffered_input_stream_get_type(),
diff --git a/gio/src/auto/buffered_output_stream.rs b/gio/src/auto/buffered_output_stream.rs
index 6d31a5aac0ee..019bf013a07d 100644
--- a/gio/src/auto/buffered_output_stream.rs
+++ b/gio/src/auto/buffered_output_stream.rs
@@ -19,7 +19,7 @@ use OutputStream;
 use Seekable;
 
 glib_wrapper! {
-    pub struct BufferedOutputStream(Object<gio_sys::GBufferedOutputStream, gio_sys::GBufferedOutputStreamClass, BufferedOutputStreamClass>) @extends FilterOutputStream, OutputStream, @implements Seekable;
+    pub struct BufferedOutputStream(Object<gio_sys::GBufferedOutputStream, gio_sys::GBufferedOutputStreamClass>) @extends FilterOutputStream, OutputStream, @implements Seekable;
 
     match fn {
         get_type => || gio_sys::g_buffered_output_stream_get_type(),
diff --git a/gio/src/auto/bytes_icon.rs b/gio/src/auto/bytes_icon.rs
index bbd5f94b3224..8d63dfea4b4d 100644
--- a/gio/src/auto/bytes_icon.rs
+++ b/gio/src/auto/bytes_icon.rs
@@ -10,7 +10,7 @@ use Icon;
 use LoadableIcon;
 
 glib_wrapper! {
-    pub struct BytesIcon(Object<gio_sys::GBytesIcon, BytesIconClass>) @implements Icon, LoadableIcon;
+    pub struct BytesIcon(Object<gio_sys::GBytesIcon>) @implements Icon, LoadableIcon;
 
     match fn {
         get_type => || gio_sys::g_bytes_icon_get_type(),
diff --git a/gio/src/auto/cancellable.rs b/gio/src/auto/cancellable.rs
index 8646553964fa..5c2826d2afdf 100644
--- a/gio/src/auto/cancellable.rs
+++ b/gio/src/auto/cancellable.rs
@@ -17,7 +17,7 @@ use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct Cancellable(Object<gio_sys::GCancellable, gio_sys::GCancellableClass, CancellableClass>);
+    pub struct Cancellable(Object<gio_sys::GCancellable, gio_sys::GCancellableClass>);
 
     match fn {
         get_type => || gio_sys::g_cancellable_get_type(),
diff --git a/gio/src/auto/charset_converter.rs b/gio/src/auto/charset_converter.rs
index 1fcaacf9135a..da4694635641 100644
--- a/gio/src/auto/charset_converter.rs
+++ b/gio/src/auto/charset_converter.rs
@@ -22,7 +22,7 @@ use std::ptr;
 use Converter;
 
 glib_wrapper! {
-    pub struct CharsetConverter(Object<gio_sys::GCharsetConverter, gio_sys::GCharsetConverterClass, CharsetConverterClass>) @implements Converter;
+    pub struct CharsetConverter(Object<gio_sys::GCharsetConverter, gio_sys::GCharsetConverterClass>) @implements Converter;
 
     match fn {
         get_type => || gio_sys::g_charset_converter_get_type(),
diff --git a/gio/src/auto/converter_input_stream.rs b/gio/src/auto/converter_input_stream.rs
index 591da67f0e84..5c782805917d 100644
--- a/gio/src/auto/converter_input_stream.rs
+++ b/gio/src/auto/converter_input_stream.rs
@@ -15,7 +15,7 @@ use InputStream;
 use PollableInputStream;
 
 glib_wrapper! {
-    pub struct ConverterInputStream(Object<gio_sys::GConverterInputStream, gio_sys::GConverterInputStreamClass, ConverterInputStreamClass>) @extends FilterInputStream, InputStream, @implements PollableInputStream;
+    pub struct ConverterInputStream(Object<gio_sys::GConverterInputStream, gio_sys::GConverterInputStreamClass>) @extends FilterInputStream, InputStream, @implements PollableInputStream;
 
     match fn {
         get_type => || gio_sys::g_converter_input_stream_get_type(),
diff --git a/gio/src/auto/converter_output_stream.rs b/gio/src/auto/converter_output_stream.rs
index e3ecae12bc3c..a49ab8f9f98d 100644
--- a/gio/src/auto/converter_output_stream.rs
+++ b/gio/src/auto/converter_output_stream.rs
@@ -15,7 +15,7 @@ use OutputStream;
 use PollableOutputStream;
 
 glib_wrapper! {
-    pub struct ConverterOutputStream(Object<gio_sys::GConverterOutputStream, gio_sys::GConverterOutputStreamClass, ConverterOutputStreamClass>) @extends FilterOutputStream, OutputStream, @implements PollableOutputStream;
+    pub struct ConverterOutputStream(Object<gio_sys::GConverterOutputStream, gio_sys::GConverterOutputStreamClass>) @extends FilterOutputStream, OutputStream, @implements PollableOutputStream;
 
     match fn {
         get_type => || gio_sys::g_converter_output_stream_get_type(),
diff --git a/gio/src/auto/credentials.rs b/gio/src/auto/credentials.rs
index 5b844ad8e20d..223ab4c97e38 100644
--- a/gio/src/auto/credentials.rs
+++ b/gio/src/auto/credentials.rs
@@ -10,7 +10,7 @@ use std::fmt;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct Credentials(Object<gio_sys::GCredentials, gio_sys::GCredentialsClass, CredentialsClass>);
+    pub struct Credentials(Object<gio_sys::GCredentials, gio_sys::GCredentialsClass>);
 
     match fn {
         get_type => || gio_sys::g_credentials_get_type(),
diff --git a/gio/src/auto/data_input_stream.rs b/gio/src/auto/data_input_stream.rs
index d07cee8f8e65..28b33d4827d4 100644
--- a/gio/src/auto/data_input_stream.rs
+++ b/gio/src/auto/data_input_stream.rs
@@ -25,7 +25,7 @@ use InputStream;
 use Seekable;
 
 glib_wrapper! {
-    pub struct DataInputStream(Object<gio_sys::GDataInputStream, gio_sys::GDataInputStreamClass, DataInputStreamClass>) @extends BufferedInputStream, FilterInputStream, InputStream, @implements Seekable;
+    pub struct DataInputStream(Object<gio_sys::GDataInputStream, gio_sys::GDataInputStreamClass>) @extends BufferedInputStream, FilterInputStream, InputStream, @implements Seekable;
 
     match fn {
         get_type => || gio_sys::g_data_input_stream_get_type(),
diff --git a/gio/src/auto/data_output_stream.rs b/gio/src/auto/data_output_stream.rs
index aee5738f63a5..545c4fa4e060 100644
--- a/gio/src/auto/data_output_stream.rs
+++ b/gio/src/auto/data_output_stream.rs
@@ -23,7 +23,7 @@ use OutputStream;
 use Seekable;
 
 glib_wrapper! {
-    pub struct DataOutputStream(Object<gio_sys::GDataOutputStream, gio_sys::GDataOutputStreamClass, DataOutputStreamClass>) @extends FilterOutputStream, OutputStream, @implements Seekable;
+    pub struct DataOutputStream(Object<gio_sys::GDataOutputStream, gio_sys::GDataOutputStreamClass>) @extends FilterOutputStream, OutputStream, @implements Seekable;
 
     match fn {
         get_type => || gio_sys::g_data_output_stream_get_type(),
diff --git a/gio/src/auto/dbus_auth_observer.rs b/gio/src/auto/dbus_auth_observer.rs
index 58b66dbc979d..916328b531c5 100644
--- a/gio/src/auto/dbus_auth_observer.rs
+++ b/gio/src/auto/dbus_auth_observer.rs
@@ -18,7 +18,7 @@ use Credentials;
 use IOStream;
 
 glib_wrapper! {
-    pub struct DBusAuthObserver(Object<gio_sys::GDBusAuthObserver, DBusAuthObserverClass>);
+    pub struct DBusAuthObserver(Object<gio_sys::GDBusAuthObserver>);
 
     match fn {
         get_type => || gio_sys::g_dbus_auth_observer_get_type(),
diff --git a/gio/src/auto/dbus_connection.rs b/gio/src/auto/dbus_connection.rs
index 290f243618b7..6e7e7a28715a 100644
--- a/gio/src/auto/dbus_connection.rs
+++ b/gio/src/auto/dbus_connection.rs
@@ -33,7 +33,7 @@ use IOStream;
 use UnixFDList;
 
 glib_wrapper! {
-    pub struct DBusConnection(Object<gio_sys::GDBusConnection, DBusConnectionClass>);
+    pub struct DBusConnection(Object<gio_sys::GDBusConnection>);
 
     match fn {
         get_type => || gio_sys::g_dbus_connection_get_type(),
diff --git a/gio/src/auto/dbus_interface_skeleton.rs b/gio/src/auto/dbus_interface_skeleton.rs
index ebb4f8e592a1..9c3af374bcb9 100644
--- a/gio/src/auto/dbus_interface_skeleton.rs
+++ b/gio/src/auto/dbus_interface_skeleton.rs
@@ -24,7 +24,7 @@ use DBusInterfaceSkeletonFlags;
 use DBusMethodInvocation;
 
 glib_wrapper! {
-    pub struct DBusInterfaceSkeleton(Object<gio_sys::GDBusInterfaceSkeleton, gio_sys::GDBusInterfaceSkeletonClass, DBusInterfaceSkeletonClass>) @implements DBusInterface;
+    pub struct DBusInterfaceSkeleton(Object<gio_sys::GDBusInterfaceSkeleton, gio_sys::GDBusInterfaceSkeletonClass>) @implements DBusInterface;
 
     match fn {
         get_type => || gio_sys::g_dbus_interface_skeleton_get_type(),
diff --git a/gio/src/auto/dbus_menu_model.rs b/gio/src/auto/dbus_menu_model.rs
index 8dbfdadceddb..c8e6b6fc7514 100644
--- a/gio/src/auto/dbus_menu_model.rs
+++ b/gio/src/auto/dbus_menu_model.rs
@@ -9,7 +9,7 @@ use DBusConnection;
 use MenuModel;
 
 glib_wrapper! {
-    pub struct DBusMenuModel(Object<gio_sys::GDBusMenuModel, DBusMenuModelClass>) @extends MenuModel;
+    pub struct DBusMenuModel(Object<gio_sys::GDBusMenuModel>) @extends MenuModel;
 
     match fn {
         get_type => || gio_sys::g_dbus_menu_model_get_type(),
diff --git a/gio/src/auto/dbus_message.rs b/gio/src/auto/dbus_message.rs
index 08491485bc34..51f9b32a8314 100644
--- a/gio/src/auto/dbus_message.rs
+++ b/gio/src/auto/dbus_message.rs
@@ -25,7 +25,7 @@ use DBusMessageType;
 use UnixFDList;
 
 glib_wrapper! {
-    pub struct DBusMessage(Object<gio_sys::GDBusMessage, DBusMessageClass>);
+    pub struct DBusMessage(Object<gio_sys::GDBusMessage>);
 
     match fn {
         get_type => || gio_sys::g_dbus_message_get_type(),
diff --git a/gio/src/auto/dbus_method_invocation.rs b/gio/src/auto/dbus_method_invocation.rs
index a5b20372df72..197c218b6d97 100644
--- a/gio/src/auto/dbus_method_invocation.rs
+++ b/gio/src/auto/dbus_method_invocation.rs
@@ -17,7 +17,7 @@ use DBusPropertyInfo;
 use UnixFDList;
 
 glib_wrapper! {
-    pub struct DBusMethodInvocation(Object<gio_sys::GDBusMethodInvocation, DBusMethodInvocationClass>);
+    pub struct DBusMethodInvocation(Object<gio_sys::GDBusMethodInvocation>);
 
     match fn {
         get_type => || gio_sys::g_dbus_method_invocation_get_type(),
diff --git a/gio/src/auto/dbus_proxy.rs b/gio/src/auto/dbus_proxy.rs
index 53cfd29c32c9..9980ffef1d85 100644
--- a/gio/src/auto/dbus_proxy.rs
+++ b/gio/src/auto/dbus_proxy.rs
@@ -30,7 +30,7 @@ use DBusProxyFlags;
 use UnixFDList;
 
 glib_wrapper! {
-    pub struct DBusProxy(Object<gio_sys::GDBusProxy, gio_sys::GDBusProxyClass, DBusProxyClass>) @implements DBusInterface;
+    pub struct DBusProxy(Object<gio_sys::GDBusProxy, gio_sys::GDBusProxyClass>) @implements DBusInterface;
 
     match fn {
         get_type => || gio_sys::g_dbus_proxy_get_type(),
diff --git a/gio/src/auto/dbus_server.rs b/gio/src/auto/dbus_server.rs
index 5ef1ca705bcd..64bf7ef3cc26 100644
--- a/gio/src/auto/dbus_server.rs
+++ b/gio/src/auto/dbus_server.rs
@@ -24,7 +24,7 @@ use DBusConnection;
 use DBusServerFlags;
 
 glib_wrapper! {
-    pub struct DBusServer(Object<gio_sys::GDBusServer, DBusServerClass>);
+    pub struct DBusServer(Object<gio_sys::GDBusServer>);
 
     match fn {
         get_type => || gio_sys::g_dbus_server_get_type(),
diff --git a/gio/src/auto/desktop_app_info.rs b/gio/src/auto/desktop_app_info.rs
index e3bb250d85e0..93b2d69e5359 100644
--- a/gio/src/auto/desktop_app_info.rs
+++ b/gio/src/auto/desktop_app_info.rs
@@ -17,7 +17,7 @@ use AppInfo;
 use AppLaunchContext;
 
 glib_wrapper! {
-    pub struct DesktopAppInfo(Object<gio_sys::GDesktopAppInfo, gio_sys::GDesktopAppInfoClass, DesktopAppInfoClass>) @implements AppInfo;
+    pub struct DesktopAppInfo(Object<gio_sys::GDesktopAppInfo, gio_sys::GDesktopAppInfoClass>) @implements AppInfo;
 
     match fn {
         get_type => || gio_sys::g_desktop_app_info_get_type(),
diff --git a/gio/src/auto/emblem.rs b/gio/src/auto/emblem.rs
index 70d30be58047..64c09704cdcd 100644
--- a/gio/src/auto/emblem.rs
+++ b/gio/src/auto/emblem.rs
@@ -10,7 +10,7 @@ use EmblemOrigin;
 use Icon;
 
 glib_wrapper! {
-    pub struct Emblem(Object<gio_sys::GEmblem, gio_sys::GEmblemClass, EmblemClass>) @implements Icon;
+    pub struct Emblem(Object<gio_sys::GEmblem, gio_sys::GEmblemClass>) @implements Icon;
 
     match fn {
         get_type => || gio_sys::g_emblem_get_type(),
diff --git a/gio/src/auto/emblemed_icon.rs b/gio/src/auto/emblemed_icon.rs
index cd6702da77e7..2b1a03a47850 100644
--- a/gio/src/auto/emblemed_icon.rs
+++ b/gio/src/auto/emblemed_icon.rs
@@ -13,7 +13,7 @@ use Emblem;
 use Icon;
 
 glib_wrapper! {
-    pub struct EmblemedIcon(Object<gio_sys::GEmblemedIcon, gio_sys::GEmblemedIconClass, EmblemedIconClass>) @implements Icon;
+    pub struct EmblemedIcon(Object<gio_sys::GEmblemedIcon, gio_sys::GEmblemedIconClass>) @implements Icon;
 
     match fn {
         get_type => || gio_sys::g_emblemed_icon_get_type(),
diff --git a/gio/src/auto/enums.rs b/gio/src/auto/enums.rs
index 6a7e1c9c0e99..6aa415f17e50 100644
--- a/gio/src/auto/enums.rs
+++ b/gio/src/auto/enums.rs
@@ -2909,7 +2909,6 @@ pub enum TlsRehandshakeMode {
     __Unknown(i32),
 }
 
-#[cfg_attr(feature = "v2_60", deprecated)]
 impl fmt::Display for TlsRehandshakeMode {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(
@@ -2925,7 +2924,6 @@ impl fmt::Display for TlsRehandshakeMode {
     }
 }
 
-#[cfg_attr(feature = "v2_60", deprecated)]
 #[doc(hidden)]
 impl ToGlib for TlsRehandshakeMode {
     type GlibType = gio_sys::GTlsRehandshakeMode;
@@ -2940,7 +2938,6 @@ impl ToGlib for TlsRehandshakeMode {
     }
 }
 
-#[cfg_attr(feature = "v2_60", deprecated)]
 #[doc(hidden)]
 impl FromGlib<gio_sys::GTlsRehandshakeMode> for TlsRehandshakeMode {
     fn from_glib(value: gio_sys::GTlsRehandshakeMode) -> Self {
@@ -2953,28 +2950,24 @@ impl FromGlib<gio_sys::GTlsRehandshakeMode> for TlsRehandshakeMode {
     }
 }
 
-#[cfg_attr(feature = "v2_60", deprecated)]
 impl StaticType for TlsRehandshakeMode {
     fn static_type() -> Type {
         unsafe { from_glib(gio_sys::g_tls_rehandshake_mode_get_type()) }
     }
 }
 
-#[cfg_attr(feature = "v2_60", deprecated)]
 impl<'a> FromValueOptional<'a> for TlsRehandshakeMode {
     unsafe fn from_value_optional(value: &Value) -> Option<Self> {
         Some(FromValue::from_value(value))
     }
 }
 
-#[cfg_attr(feature = "v2_60", deprecated)]
 impl<'a> FromValue<'a> for TlsRehandshakeMode {
     unsafe fn from_value(value: &Value) -> Self {
         from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0))
     }
 }
 
-#[cfg_attr(feature = "v2_60", deprecated)]
 impl SetValue for TlsRehandshakeMode {
     unsafe fn set_value(value: &mut Value, this: &Self) {
         gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib())
diff --git a/gio/src/auto/file_enumerator.rs b/gio/src/auto/file_enumerator.rs
index ef0a51457821..4849fd4f7642 100644
--- a/gio/src/auto/file_enumerator.rs
+++ b/gio/src/auto/file_enumerator.rs
@@ -17,7 +17,7 @@ use File;
 use FileInfo;
 
 glib_wrapper! {
-    pub struct FileEnumerator(Object<gio_sys::GFileEnumerator, gio_sys::GFileEnumeratorClass, FileEnumeratorClass>);
+    pub struct FileEnumerator(Object<gio_sys::GFileEnumerator, gio_sys::GFileEnumeratorClass>);
 
     match fn {
         get_type => || gio_sys::g_file_enumerator_get_type(),
diff --git a/gio/src/auto/file_icon.rs b/gio/src/auto/file_icon.rs
index 1c920b39d393..644fed1a52e9 100644
--- a/gio/src/auto/file_icon.rs
+++ b/gio/src/auto/file_icon.rs
@@ -11,7 +11,7 @@ use Icon;
 use LoadableIcon;
 
 glib_wrapper! {
-    pub struct FileIcon(Object<gio_sys::GFileIcon, gio_sys::GFileIconClass, FileIconClass>) @implements Icon, LoadableIcon;
+    pub struct FileIcon(Object<gio_sys::GFileIcon, gio_sys::GFileIconClass>) @implements Icon, LoadableIcon;
 
     match fn {
         get_type => || gio_sys::g_file_icon_get_type(),
diff --git a/gio/src/auto/file_info.rs b/gio/src/auto/file_info.rs
index ee9e2243b0df..314b6fc4f634 100644
--- a/gio/src/auto/file_info.rs
+++ b/gio/src/auto/file_info.rs
@@ -16,7 +16,7 @@ use FileType;
 use Icon;
 
 glib_wrapper! {
-    pub struct FileInfo(Object<gio_sys::GFileInfo, gio_sys::GFileInfoClass, FileInfoClass>);
+    pub struct FileInfo(Object<gio_sys::GFileInfo, gio_sys::GFileInfoClass>);
 
     match fn {
         get_type => || gio_sys::g_file_info_get_type(),
diff --git a/gio/src/auto/file_input_stream.rs b/gio/src/auto/file_input_stream.rs
index 53b03723fb1c..f559a1c51827 100644
--- a/gio/src/auto/file_input_stream.rs
+++ b/gio/src/auto/file_input_stream.rs
@@ -18,7 +18,7 @@ use InputStream;
 use Seekable;
 
 glib_wrapper! {
-    pub struct FileInputStream(Object<gio_sys::GFileInputStream, gio_sys::GFileInputStreamClass, FileInputStreamClass>) @extends InputStream, @implements Seekable;
+    pub struct FileInputStream(Object<gio_sys::GFileInputStream, gio_sys::GFileInputStreamClass>) @extends InputStream, @implements Seekable;
 
     match fn {
         get_type => || gio_sys::g_file_input_stream_get_type(),
diff --git a/gio/src/auto/file_io_stream.rs b/gio/src/auto/file_io_stream.rs
index 67b4603ad835..021cbb9a42fc 100644
--- a/gio/src/auto/file_io_stream.rs
+++ b/gio/src/auto/file_io_stream.rs
@@ -19,7 +19,7 @@ use IOStream;
 use Seekable;
 
 glib_wrapper! {
-    pub struct FileIOStream(Object<gio_sys::GFileIOStream, gio_sys::GFileIOStreamClass, FileIOStreamClass>) @extends IOStream, @implements Seekable;
+    pub struct FileIOStream(Object<gio_sys::GFileIOStream, gio_sys::GFileIOStreamClass>) @extends IOStream, @implements Seekable;
 
     match fn {
         get_type => || gio_sys::g_file_io_stream_get_type(),
diff --git a/gio/src/auto/file_monitor.rs b/gio/src/auto/file_monitor.rs
index 28899f17579a..ef876e630d43 100644
--- a/gio/src/auto/file_monitor.rs
+++ b/gio/src/auto/file_monitor.rs
@@ -19,7 +19,7 @@ use File;
 use FileMonitorEvent;
 
 glib_wrapper! {
-    pub struct FileMonitor(Object<gio_sys::GFileMonitor, gio_sys::GFileMonitorClass, FileMonitorClass>);
+    pub struct FileMonitor(Object<gio_sys::GFileMonitor, gio_sys::GFileMonitorClass>);
 
     match fn {
         get_type => || gio_sys::g_file_monitor_get_type(),
diff --git a/gio/src/auto/file_output_stream.rs b/gio/src/auto/file_output_stream.rs
index e190b93dee8c..8a8df0362ce3 100644
--- a/gio/src/auto/file_output_stream.rs
+++ b/gio/src/auto/file_output_stream.rs
@@ -19,7 +19,7 @@ use OutputStream;
 use Seekable;
 
 glib_wrapper! {
-    pub struct FileOutputStream(Object<gio_sys::GFileOutputStream, gio_sys::GFileOutputStreamClass, FileOutputStreamClass>) @extends OutputStream, @implements Seekable;
+    pub struct FileOutputStream(Object<gio_sys::GFileOutputStream, gio_sys::GFileOutputStreamClass>) @extends OutputStream, @implements Seekable;
 
     match fn {
         get_type => || gio_sys::g_file_output_stream_get_type(),
diff --git a/gio/src/auto/filename_completer.rs b/gio/src/auto/filename_completer.rs
index 1b2f0597085f..5b39a2a33502 100644
--- a/gio/src/auto/filename_completer.rs
+++ b/gio/src/auto/filename_completer.rs
@@ -15,7 +15,7 @@ use std::fmt;
 use std::mem::transmute;
 
 glib_wrapper! {
-    pub struct FilenameCompleter(Object<gio_sys::GFilenameCompleter, gio_sys::GFilenameCompleterClass, FilenameCompleterClass>);
+    pub struct FilenameCompleter(Object<gio_sys::GFilenameCompleter, gio_sys::GFilenameCompleterClass>);
 
     match fn {
         get_type => || gio_sys::g_filename_completer_get_type(),
diff --git a/gio/src/auto/filter_input_stream.rs b/gio/src/auto/filter_input_stream.rs
index 7053fab3ecaa..ea65d24ada2c 100644
--- a/gio/src/auto/filter_input_stream.rs
+++ b/gio/src/auto/filter_input_stream.rs
@@ -15,7 +15,7 @@ use std::mem::transmute;
 use InputStream;
 
 glib_wrapper! {
-    pub struct FilterInputStream(Object<gio_sys::GFilterInputStream, gio_sys::GFilterInputStreamClass, FilterInputStreamClass>) @extends InputStream;
+    pub struct FilterInputStream(Object<gio_sys::GFilterInputStream, gio_sys::GFilterInputStreamClass>) @extends InputStream;
 
     match fn {
         get_type => || gio_sys::g_filter_input_stream_get_type(),
diff --git a/gio/src/auto/filter_output_stream.rs b/gio/src/auto/filter_output_stream.rs
index 91491b43660c..0a3c566760f6 100644
--- a/gio/src/auto/filter_output_stream.rs
+++ b/gio/src/auto/filter_output_stream.rs
@@ -15,7 +15,7 @@ use std::mem::transmute;
 use OutputStream;
 
 glib_wrapper! {
-    pub struct FilterOutputStream(Object<gio_sys::GFilterOutputStream, gio_sys::GFilterOutputStreamClass, FilterOutputStreamClass>) @extends OutputStream;
+    pub struct FilterOutputStream(Object<gio_sys::GFilterOutputStream, gio_sys::GFilterOutputStreamClass>) @extends OutputStream;
 
     match fn {
         get_type => || gio_sys::g_filter_output_stream_get_type(),
diff --git a/gio/src/auto/inet_address.rs b/gio/src/auto/inet_address.rs
index a4c93edf4b0a..62195be59f82 100644
--- a/gio/src/auto/inet_address.rs
+++ b/gio/src/auto/inet_address.rs
@@ -16,7 +16,7 @@ use std::mem::transmute;
 use SocketFamily;
 
 glib_wrapper! {
-    pub struct InetAddress(Object<gio_sys::GInetAddress, gio_sys::GInetAddressClass, InetAddressClass>);
+    pub struct InetAddress(Object<gio_sys::GInetAddress, gio_sys::GInetAddressClass>);
 
     match fn {
         get_type => || gio_sys::g_inet_address_get_type(),
diff --git a/gio/src/auto/inet_address_mask.rs b/gio/src/auto/inet_address_mask.rs
index 0057973cdd00..ea8aa6ed1aaf 100644
--- a/gio/src/auto/inet_address_mask.rs
+++ b/gio/src/auto/inet_address_mask.rs
@@ -22,7 +22,7 @@ use InetAddress;
 use SocketFamily;
 
 glib_wrapper! {
-    pub struct InetAddressMask(Object<gio_sys::GInetAddressMask, gio_sys::GInetAddressMaskClass, InetAddressMaskClass>);
+    pub struct InetAddressMask(Object<gio_sys::GInetAddressMask, gio_sys::GInetAddressMaskClass>);
 
     match fn {
         get_type => || gio_sys::g_inet_address_mask_get_type(),
diff --git a/gio/src/auto/inet_socket_address.rs b/gio/src/auto/inet_socket_address.rs
index f7d0d8ca6074..093f9a3445a8 100644
--- a/gio/src/auto/inet_socket_address.rs
+++ b/gio/src/auto/inet_socket_address.rs
@@ -12,7 +12,7 @@ use SocketAddress;
 use SocketConnectable;
 
 glib_wrapper! {
-    pub struct InetSocketAddress(Object<gio_sys::GInetSocketAddress, gio_sys::GInetSocketAddressClass, InetSocketAddressClass>) @extends SocketAddress, @implements SocketConnectable;
+    pub struct InetSocketAddress(Object<gio_sys::GInetSocketAddress, gio_sys::GInetSocketAddressClass>) @extends SocketAddress, @implements SocketConnectable;
 
     match fn {
         get_type => || gio_sys::g_inet_socket_address_get_type(),
diff --git a/gio/src/auto/input_stream.rs b/gio/src/auto/input_stream.rs
index 98867fd7971f..987a3cf1b9e0 100644
--- a/gio/src/auto/input_stream.rs
+++ b/gio/src/auto/input_stream.rs
@@ -15,7 +15,7 @@ use std::ptr;
 use Cancellable;
 
 glib_wrapper! {
-    pub struct InputStream(Object<gio_sys::GInputStream, gio_sys::GInputStreamClass, InputStreamClass>);
+    pub struct InputStream(Object<gio_sys::GInputStream, gio_sys::GInputStreamClass>);
 
     match fn {
         get_type => || gio_sys::g_input_stream_get_type(),
diff --git a/gio/src/auto/io_stream.rs b/gio/src/auto/io_stream.rs
index 2b2cf341ca2d..0bcfbfd50c99 100644
--- a/gio/src/auto/io_stream.rs
+++ b/gio/src/auto/io_stream.rs
@@ -23,7 +23,7 @@ use InputStream;
 use OutputStream;
 
 glib_wrapper! {
-    pub struct IOStream(Object<gio_sys::GIOStream, gio_sys::GIOStreamClass, IOStreamClass>);
+    pub struct IOStream(Object<gio_sys::GIOStream, gio_sys::GIOStreamClass>);
 
     match fn {
         get_type => || gio_sys::g_io_stream_get_type(),
diff --git a/gio/src/auto/list_store.rs b/gio/src/auto/list_store.rs
index 4eea536ad7b3..6685679a583a 100644
--- a/gio/src/auto/list_store.rs
+++ b/gio/src/auto/list_store.rs
@@ -16,7 +16,7 @@ use std::mem;
 use ListModel;
 
 glib_wrapper! {
-    pub struct ListStore(Object<gio_sys::GListStore, gio_sys::GListStoreClass, ListStoreClass>) @implements ListModel;
+    pub struct ListStore(Object<gio_sys::GListStore, gio_sys::GListStoreClass>) @implements ListModel;
 
     match fn {
         get_type => || gio_sys::g_list_store_get_type(),
diff --git a/gio/src/auto/memory_input_stream.rs b/gio/src/auto/memory_input_stream.rs
index f1ea841c3ff1..b23fdafe1efa 100644
--- a/gio/src/auto/memory_input_stream.rs
+++ b/gio/src/auto/memory_input_stream.rs
@@ -13,7 +13,7 @@ use PollableInputStream;
 use Seekable;
 
 glib_wrapper! {
-    pub struct MemoryInputStream(Object<gio_sys::GMemoryInputStream, gio_sys::GMemoryInputStreamClass, MemoryInputStreamClass>) @extends InputStream, @implements PollableInputStream, Seekable;
+    pub struct MemoryInputStream(Object<gio_sys::GMemoryInputStream, gio_sys::GMemoryInputStreamClass>) @extends InputStream, @implements PollableInputStream, Seekable;
 
     match fn {
         get_type => || gio_sys::g_memory_input_stream_get_type(),
diff --git a/gio/src/auto/memory_output_stream.rs b/gio/src/auto/memory_output_stream.rs
index 5005785cb6ee..6bbcb2b03645 100644
--- a/gio/src/auto/memory_output_stream.rs
+++ b/gio/src/auto/memory_output_stream.rs
@@ -18,7 +18,7 @@ use PollableOutputStream;
 use Seekable;
 
 glib_wrapper! {
-    pub struct MemoryOutputStream(Object<gio_sys::GMemoryOutputStream, gio_sys::GMemoryOutputStreamClass, MemoryOutputStreamClass>) @extends OutputStream, @implements PollableOutputStream, Seekable;
+    pub struct MemoryOutputStream(Object<gio_sys::GMemoryOutputStream, gio_sys::GMemoryOutputStreamClass>) @extends OutputStream, @implements PollableOutputStream, Seekable;
 
     match fn {
         get_type => || gio_sys::g_memory_output_stream_get_type(),
diff --git a/gio/src/auto/menu.rs b/gio/src/auto/menu.rs
index d8e1306e8bae..ed277feaaca1 100644
--- a/gio/src/auto/menu.rs
+++ b/gio/src/auto/menu.rs
@@ -10,7 +10,7 @@ use MenuItem;
 use MenuModel;
 
 glib_wrapper! {
-    pub struct Menu(Object<gio_sys::GMenu, MenuClass>) @extends MenuModel;
+    pub struct Menu(Object<gio_sys::GMenu>) @extends MenuModel;
 
     match fn {
         get_type => || gio_sys::g_menu_get_type(),
diff --git a/gio/src/auto/menu_attribute_iter.rs b/gio/src/auto/menu_attribute_iter.rs
index 025f420a2575..46d3105b2df8 100644
--- a/gio/src/auto/menu_attribute_iter.rs
+++ b/gio/src/auto/menu_attribute_iter.rs
@@ -11,7 +11,7 @@ use std::fmt;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct MenuAttributeIter(Object<gio_sys::GMenuAttributeIter, gio_sys::GMenuAttributeIterClass, MenuAttributeIterClass>);
+    pub struct MenuAttributeIter(Object<gio_sys::GMenuAttributeIter, gio_sys::GMenuAttributeIterClass>);
 
     match fn {
         get_type => || gio_sys::g_menu_attribute_iter_get_type(),
diff --git a/gio/src/auto/menu_item.rs b/gio/src/auto/menu_item.rs
index e517f529df42..9bf6fb40605f 100644
--- a/gio/src/auto/menu_item.rs
+++ b/gio/src/auto/menu_item.rs
@@ -11,7 +11,7 @@ use Icon;
 use MenuModel;
 
 glib_wrapper! {
-    pub struct MenuItem(Object<gio_sys::GMenuItem, MenuItemClass>);
+    pub struct MenuItem(Object<gio_sys::GMenuItem>);
 
     match fn {
         get_type => || gio_sys::g_menu_item_get_type(),
diff --git a/gio/src/auto/menu_link_iter.rs b/gio/src/auto/menu_link_iter.rs
index 48931bd486d9..d953fe447f07 100644
--- a/gio/src/auto/menu_link_iter.rs
+++ b/gio/src/auto/menu_link_iter.rs
@@ -11,7 +11,7 @@ use std::ptr;
 use MenuModel;
 
 glib_wrapper! {
-    pub struct MenuLinkIter(Object<gio_sys::GMenuLinkIter, gio_sys::GMenuLinkIterClass, MenuLinkIterClass>);
+    pub struct MenuLinkIter(Object<gio_sys::GMenuLinkIter, gio_sys::GMenuLinkIterClass>);
 
     match fn {
         get_type => || gio_sys::g_menu_link_iter_get_type(),
diff --git a/gio/src/auto/menu_model.rs b/gio/src/auto/menu_model.rs
index 95244168a0a3..86ab131cbb10 100644
--- a/gio/src/auto/menu_model.rs
+++ b/gio/src/auto/menu_model.rs
@@ -18,7 +18,7 @@ use MenuAttributeIter;
 use MenuLinkIter;
 
 glib_wrapper! {
-    pub struct MenuModel(Object<gio_sys::GMenuModel, gio_sys::GMenuModelClass, MenuModelClass>);
+    pub struct MenuModel(Object<gio_sys::GMenuModel, gio_sys::GMenuModelClass>);
 
     match fn {
         get_type => || gio_sys::g_menu_model_get_type(),
diff --git a/gio/src/auto/mod.rs b/gio/src/auto/mod.rs
index 5a67b62e699f..c6478e469af0 100644
--- a/gio/src/auto/mod.rs
+++ b/gio/src/auto/mod.rs
@@ -19,52 +19,42 @@ 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, AppInfoMonitorClass};
+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, AppLaunchContextClass, NONE_APP_LAUNCH_CONTEXT,
-};
+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, ApplicationClass, NONE_APPLICATION};
+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, ApplicationCommandLineClass, NONE_APPLICATION_COMMAND_LINE,
-};
+pub use self::application_command_line::{ApplicationCommandLine, NONE_APPLICATION_COMMAND_LINE};
 
 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, BufferedInputStreamClass, NONE_BUFFERED_INPUT_STREAM,
-};
+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, BufferedOutputStreamClass, NONE_BUFFERED_OUTPUT_STREAM,
-};
+pub use self::buffered_output_stream::{BufferedOutputStream, NONE_BUFFERED_OUTPUT_STREAM};
 
 mod bytes_icon;
-pub use self::bytes_icon::{BytesIcon, BytesIconClass};
+pub use self::bytes_icon::BytesIcon;
 
 mod cancellable;
 pub use self::cancellable::CancellableExt;
-pub use self::cancellable::{Cancellable, CancellableClass, NONE_CANCELLABLE};
+pub use self::cancellable::{Cancellable, NONE_CANCELLABLE};
 
 mod charset_converter;
 pub use self::charset_converter::CharsetConverterBuilder;
 pub use self::charset_converter::CharsetConverterExt;
-pub use self::charset_converter::{
-    CharsetConverter, CharsetConverterClass, NONE_CHARSET_CONVERTER,
-};
+pub use self::charset_converter::{CharsetConverter, NONE_CHARSET_CONVERTER};
 
 mod converter;
 pub use self::converter::ConverterExt;
@@ -73,25 +63,21 @@ 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, ConverterInputStreamClass, NONE_CONVERTER_INPUT_STREAM,
-};
+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, ConverterOutputStreamClass, NONE_CONVERTER_OUTPUT_STREAM,
-};
+pub use self::converter_output_stream::{ConverterOutputStream, NONE_CONVERTER_OUTPUT_STREAM};
 
 mod credentials;
-pub use self::credentials::{Credentials, CredentialsClass};
+pub use self::credentials::Credentials;
 
 mod dbus_auth_observer;
-pub use self::dbus_auth_observer::{DBusAuthObserver, DBusAuthObserverClass};
+pub use self::dbus_auth_observer::DBusAuthObserver;
 
 mod dbus_connection;
-pub use self::dbus_connection::{DBusConnection, DBusConnectionClass};
+pub use self::dbus_connection::DBusConnection;
 
 mod dbus_interface;
 pub use self::dbus_interface::DBusInterfaceExt;
@@ -99,18 +85,16 @@ 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, DBusInterfaceSkeletonClass, NONE_DBUS_INTERFACE_SKELETON,
-};
+pub use self::dbus_interface_skeleton::{DBusInterfaceSkeleton, NONE_DBUS_INTERFACE_SKELETON};
 
 mod dbus_menu_model;
-pub use self::dbus_menu_model::{DBusMenuModel, DBusMenuModelClass};
+pub use self::dbus_menu_model::DBusMenuModel;
 
 mod dbus_message;
-pub use self::dbus_message::{DBusMessage, DBusMessageClass};
+pub use self::dbus_message::DBusMessage;
 
 mod dbus_method_invocation;
-pub use self::dbus_method_invocation::{DBusMethodInvocation, DBusMethodInvocationClass};
+pub use self::dbus_method_invocation::DBusMethodInvocation;
 
 mod dbus_object;
 pub use self::dbus_object::DBusObjectExt;
@@ -118,40 +102,38 @@ pub use self::dbus_object::{DBusObject, NONE_DBUS_OBJECT};
 
 mod dbus_proxy;
 pub use self::dbus_proxy::DBusProxyExt;
-pub use self::dbus_proxy::{DBusProxy, DBusProxyClass, NONE_DBUS_PROXY};
+pub use self::dbus_proxy::{DBusProxy, NONE_DBUS_PROXY};
 
 mod dbus_server;
-pub use self::dbus_server::{DBusServer, DBusServerClass};
+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, DataInputStreamClass, NONE_DATA_INPUT_STREAM};
+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, DataOutputStreamClass, NONE_DATA_OUTPUT_STREAM,
-};
+pub use self::data_output_stream::{DataOutputStream, NONE_DATA_OUTPUT_STREAM};
 
 #[cfg(any(all(not(windows), not(target_os = "macos")), feature = "dox"))]
 mod desktop_app_info;
 #[cfg(any(all(not(windows), not(target_os = "macos")), feature = "dox"))]
 pub use self::desktop_app_info::DesktopAppInfoExt;
 #[cfg(any(all(not(windows), not(target_os = "macos")), feature = "dox"))]
-pub use self::desktop_app_info::{DesktopAppInfo, DesktopAppInfoClass, NONE_DESKTOP_APP_INFO};
+pub use self::desktop_app_info::{DesktopAppInfo, NONE_DESKTOP_APP_INFO};
 
 mod drive;
 pub use self::drive::DriveExt;
 pub use self::drive::{Drive, NONE_DRIVE};
 
 mod emblem;
-pub use self::emblem::{Emblem, EmblemClass};
+pub use self::emblem::Emblem;
 
 mod emblemed_icon;
 pub use self::emblemed_icon::EmblemedIconExt;
-pub use self::emblemed_icon::{EmblemedIcon, EmblemedIconClass, NONE_EMBLEMED_ICON};
+pub use self::emblemed_icon::{EmblemedIcon, NONE_EMBLEMED_ICON};
 
 mod file;
 pub use self::file::FileExt;
@@ -159,53 +141,45 @@ pub use self::file::{File, NONE_FILE};
 
 mod file_enumerator;
 pub use self::file_enumerator::FileEnumeratorExt;
-pub use self::file_enumerator::{FileEnumerator, FileEnumeratorClass, NONE_FILE_ENUMERATOR};
+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, FileIOStreamClass, NONE_FILE_IO_STREAM};
+pub use self::file_io_stream::{FileIOStream, NONE_FILE_IO_STREAM};
 
 mod file_icon;
-pub use self::file_icon::{FileIcon, FileIconClass};
+pub use self::file_icon::FileIcon;
 
 mod file_info;
-pub use self::file_info::{FileInfo, FileInfoClass};
+pub use self::file_info::FileInfo;
 
 mod file_input_stream;
 pub use self::file_input_stream::FileInputStreamExt;
-pub use self::file_input_stream::{FileInputStream, FileInputStreamClass, NONE_FILE_INPUT_STREAM};
+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, FileMonitorClass, NONE_FILE_MONITOR};
+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, FileOutputStreamClass, NONE_FILE_OUTPUT_STREAM,
-};
+pub use self::file_output_stream::{FileOutputStream, NONE_FILE_OUTPUT_STREAM};
 
 mod filename_completer;
 pub use self::filename_completer::FilenameCompleterExt;
-pub use self::filename_completer::{
-    FilenameCompleter, FilenameCompleterClass, NONE_FILENAME_COMPLETER,
-};
+pub use self::filename_completer::{FilenameCompleter, NONE_FILENAME_COMPLETER};
 
 mod filter_input_stream;
 pub use self::filter_input_stream::FilterInputStreamExt;
-pub use self::filter_input_stream::{
-    FilterInputStream, FilterInputStreamClass, NONE_FILTER_INPUT_STREAM,
-};
+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, FilterOutputStreamClass, NONE_FILTER_OUTPUT_STREAM,
-};
+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, IOStreamClass, NONE_IO_STREAM};
+pub use self::io_stream::{IOStream, NONE_IO_STREAM};
 
 mod icon;
 pub use self::icon::IconExt;
@@ -213,21 +187,19 @@ pub use self::icon::{Icon, NONE_ICON};
 
 mod inet_address;
 pub use self::inet_address::InetAddressExt;
-pub use self::inet_address::{InetAddress, InetAddressClass, NONE_INET_ADDRESS};
+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, InetAddressMaskClass, NONE_INET_ADDRESS_MASK};
+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, InetSocketAddressClass, NONE_INET_SOCKET_ADDRESS,
-};
+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, InputStreamClass, NONE_INPUT_STREAM};
+pub use self::input_stream::{InputStream, NONE_INPUT_STREAM};
 
 #[cfg(any(feature = "v2_44", feature = "dox"))]
 mod list_model;
@@ -243,7 +215,7 @@ pub use self::list_store::ListStoreBuilder;
 #[cfg(any(feature = "v2_44", feature = "dox"))]
 pub use self::list_store::ListStoreExt;
 #[cfg(any(feature = "v2_44", feature = "dox"))]
-pub use self::list_store::{ListStore, ListStoreClass, NONE_LIST_STORE};
+pub use self::list_store::{ListStore, NONE_LIST_STORE};
 
 mod loadable_icon;
 pub use self::loadable_icon::LoadableIconExt;
@@ -251,9 +223,7 @@ 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, MemoryInputStreamClass, NONE_MEMORY_INPUT_STREAM,
-};
+pub use self::memory_input_stream::{MemoryInputStream, NONE_MEMORY_INPUT_STREAM};
 
 #[cfg(any(feature = "v2_64", feature = "dox"))]
 mod memory_monitor;
@@ -264,29 +234,25 @@ 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, MemoryOutputStreamClass, NONE_MEMORY_OUTPUT_STREAM,
-};
+pub use self::memory_output_stream::{MemoryOutputStream, NONE_MEMORY_OUTPUT_STREAM};
 
 mod menu;
-pub use self::menu::{Menu, MenuClass};
+pub use self::menu::Menu;
 
 mod menu_attribute_iter;
 pub use self::menu_attribute_iter::MenuAttributeIterExt;
-pub use self::menu_attribute_iter::{
-    MenuAttributeIter, MenuAttributeIterClass, NONE_MENU_ATTRIBUTE_ITER,
-};
+pub use self::menu_attribute_iter::{MenuAttributeIter, NONE_MENU_ATTRIBUTE_ITER};
 
 mod menu_item;
-pub use self::menu_item::{MenuItem, MenuItemClass};
+pub use self::menu_item::MenuItem;
 
 mod menu_link_iter;
 pub use self::menu_link_iter::MenuLinkIterExt;
-pub use self::menu_link_iter::{MenuLinkIter, MenuLinkIterClass, NONE_MENU_LINK_ITER};
+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, MenuModelClass, NONE_MENU_MODEL};
+pub use self::menu_model::{MenuModel, NONE_MENU_MODEL};
 
 mod mount;
 pub use self::mount::MountExt;
@@ -294,11 +260,11 @@ pub use self::mount::{Mount, NONE_MOUNT};
 
 mod mount_operation;
 pub use self::mount_operation::MountOperationExt;
-pub use self::mount_operation::{MountOperation, MountOperationClass, NONE_MOUNT_OPERATION};
+pub use self::mount_operation::{MountOperation, NONE_MOUNT_OPERATION};
 
 mod network_address;
 pub use self::network_address::NetworkAddressExt;
-pub use self::network_address::{NetworkAddress, NetworkAddressClass, NONE_NETWORK_ADDRESS};
+pub use self::network_address::{NetworkAddress, NONE_NETWORK_ADDRESS};
 
 mod network_monitor;
 pub use self::network_monitor::NetworkMonitorExt;
@@ -306,18 +272,18 @@ pub use self::network_monitor::{NetworkMonitor, NONE_NETWORK_MONITOR};
 
 mod network_service;
 pub use self::network_service::NetworkServiceExt;
-pub use self::network_service::{NetworkService, NetworkServiceClass, NONE_NETWORK_SERVICE};
+pub use self::network_service::{NetworkService, NONE_NETWORK_SERVICE};
 
 mod notification;
-pub use self::notification::{Notification, NotificationClass};
+pub use self::notification::Notification;
 
 mod output_stream;
 pub use self::output_stream::OutputStreamExt;
-pub use self::output_stream::{OutputStream, OutputStreamClass, NONE_OUTPUT_STREAM};
+pub use self::output_stream::{OutputStream, NONE_OUTPUT_STREAM};
 
 mod permission;
 pub use self::permission::PermissionExt;
-pub use self::permission::{Permission, PermissionClass, NONE_PERMISSION};
+pub use self::permission::{Permission, NONE_PERMISSION};
 
 mod pollable_input_stream;
 pub use self::pollable_input_stream::PollableInputStreamExt;
@@ -328,7 +294,7 @@ 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, PropertyActionClass};
+pub use self::property_action::PropertyAction;
 
 mod proxy;
 pub use self::proxy::ProxyExt;
@@ -336,7 +302,7 @@ pub use self::proxy::{Proxy, NONE_PROXY};
 
 mod proxy_address;
 pub use self::proxy_address::ProxyAddressExt;
-pub use self::proxy_address::{ProxyAddress, ProxyAddressClass, NONE_PROXY_ADDRESS};
+pub use self::proxy_address::{ProxyAddress, NONE_PROXY_ADDRESS};
 
 mod proxy_resolver;
 pub use self::proxy_resolver::ProxyResolverExt;
@@ -348,7 +314,7 @@ pub use self::remote_action_group::{RemoteActionGroup, NONE_REMOTE_ACTION_GROUP}
 
 mod resolver;
 pub use self::resolver::ResolverExt;
-pub use self::resolver::{Resolver, ResolverClass, NONE_RESOLVER};
+pub use self::resolver::{Resolver, NONE_RESOLVER};
 
 mod seekable;
 pub use self::seekable::SeekableExt;
@@ -356,45 +322,43 @@ pub use self::seekable::{Seekable, NONE_SEEKABLE};
 
 mod settings;
 pub use self::settings::SettingsExt;
-pub use self::settings::{Settings, SettingsClass, NONE_SETTINGS};
+pub use self::settings::{Settings, NONE_SETTINGS};
 
 mod settings_backend;
 pub use self::settings_backend::SettingsBackendExt;
-pub use self::settings_backend::{SettingsBackend, SettingsBackendClass, NONE_SETTINGS_BACKEND};
+pub use self::settings_backend::{SettingsBackend, NONE_SETTINGS_BACKEND};
 
 mod simple_action;
-pub use self::simple_action::{SimpleAction, SimpleActionClass};
+pub use self::simple_action::SimpleAction;
 
 mod simple_action_group;
-pub use self::simple_action_group::{
-    SimpleActionGroup, SimpleActionGroupClass, NONE_SIMPLE_ACTION_GROUP,
-};
+pub use self::simple_action_group::{SimpleActionGroup, NONE_SIMPLE_ACTION_GROUP};
 
 #[cfg(any(feature = "v2_44", feature = "dox"))]
 mod simple_io_stream;
 #[cfg(any(feature = "v2_44", feature = "dox"))]
-pub use self::simple_io_stream::{SimpleIOStream, SimpleIOStreamClass};
+pub use self::simple_io_stream::SimpleIOStream;
 
 mod simple_permission;
-pub use self::simple_permission::{SimplePermission, SimplePermissionClass};
+pub use self::simple_permission::SimplePermission;
 
 mod socket;
 pub use self::socket::SocketExt;
-pub use self::socket::{Socket, SocketClass, NONE_SOCKET};
+pub use self::socket::{Socket, NONE_SOCKET};
 
 mod socket_address;
 pub use self::socket_address::SocketAddressExt;
-pub use self::socket_address::{SocketAddress, SocketAddressClass, NONE_SOCKET_ADDRESS};
+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, SocketAddressEnumeratorClass, NONE_SOCKET_ADDRESS_ENUMERATOR,
+    SocketAddressEnumerator, NONE_SOCKET_ADDRESS_ENUMERATOR,
 };
 
 mod socket_client;
 pub use self::socket_client::SocketClientExt;
-pub use self::socket_client::{SocketClient, SocketClientClass, NONE_SOCKET_CLIENT};
+pub use self::socket_client::{SocketClient, NONE_SOCKET_CLIENT};
 
 mod socket_connectable;
 pub use self::socket_connectable::SocketConnectableExt;
@@ -402,36 +366,32 @@ pub use self::socket_connectable::{SocketConnectable, NONE_SOCKET_CONNECTABLE};
 
 mod socket_connection;
 pub use self::socket_connection::SocketConnectionExt;
-pub use self::socket_connection::{
-    SocketConnection, SocketConnectionClass, NONE_SOCKET_CONNECTION,
-};
+pub use self::socket_connection::{SocketConnection, NONE_SOCKET_CONNECTION};
 
 mod socket_listener;
 pub use self::socket_listener::SocketListenerExt;
-pub use self::socket_listener::{SocketListener, SocketListenerClass, NONE_SOCKET_LISTENER};
+pub use self::socket_listener::{SocketListener, NONE_SOCKET_LISTENER};
 
 mod socket_service;
 pub use self::socket_service::SocketServiceExt;
-pub use self::socket_service::{SocketService, SocketServiceClass, NONE_SOCKET_SERVICE};
+pub use self::socket_service::{SocketService, NONE_SOCKET_SERVICE};
 
 mod subprocess;
-pub use self::subprocess::{Subprocess, SubprocessClass};
+pub use self::subprocess::Subprocess;
 
 mod subprocess_launcher;
-pub use self::subprocess_launcher::{SubprocessLauncher, SubprocessLauncherClass};
+pub use self::subprocess_launcher::SubprocessLauncher;
 
 mod tcp_connection;
 pub use self::tcp_connection::TcpConnectionExt;
-pub use self::tcp_connection::{TcpConnection, TcpConnectionClass, NONE_TCP_CONNECTION};
+pub use self::tcp_connection::{TcpConnection, NONE_TCP_CONNECTION};
 
 mod themed_icon;
-pub use self::themed_icon::{ThemedIcon, ThemedIconClass};
+pub use self::themed_icon::ThemedIcon;
 
 mod threaded_socket_service;
 pub use self::threaded_socket_service::ThreadedSocketServiceExt;
-pub use self::threaded_socket_service::{
-    ThreadedSocketService, ThreadedSocketServiceClass, NONE_THREADED_SOCKET_SERVICE,
-};
+pub use self::threaded_socket_service::{ThreadedSocketService, NONE_THREADED_SOCKET_SERVICE};
 
 mod tls_backend;
 pub use self::tls_backend::TlsBackendExt;
@@ -439,7 +399,7 @@ pub use self::tls_backend::{TlsBackend, NONE_TLS_BACKEND};
 
 mod tls_certificate;
 pub use self::tls_certificate::TlsCertificateExt;
-pub use self::tls_certificate::{TlsCertificate, TlsCertificateClass, NONE_TLS_CERTIFICATE};
+pub use self::tls_certificate::{TlsCertificate, NONE_TLS_CERTIFICATE};
 
 mod tls_client_connection;
 pub use self::tls_client_connection::TlsClientConnectionExt;
@@ -447,11 +407,11 @@ pub use self::tls_client_connection::{TlsClientConnection, NONE_TLS_CLIENT_CONNE
 
 mod tls_connection;
 pub use self::tls_connection::TlsConnectionExt;
-pub use self::tls_connection::{TlsConnection, TlsConnectionClass, NONE_TLS_CONNECTION};
+pub use self::tls_connection::{TlsConnection, NONE_TLS_CONNECTION};
 
 mod tls_database;
 pub use self::tls_database::TlsDatabaseExt;
-pub use self::tls_database::{TlsDatabase, TlsDatabaseClass, NONE_TLS_DATABASE};
+pub use self::tls_database::{TlsDatabase, NONE_TLS_DATABASE};
 
 mod tls_file_database;
 pub use self::tls_file_database::TlsFileDatabaseExt;
@@ -459,11 +419,11 @@ 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, TlsInteractionClass, NONE_TLS_INTERACTION};
+pub use self::tls_interaction::{TlsInteraction, NONE_TLS_INTERACTION};
 
 mod tls_password;
 pub use self::tls_password::TlsPasswordExt;
-pub use self::tls_password::{TlsPassword, TlsPasswordClass, NONE_TLS_PASSWORD};
+pub use self::tls_password::{TlsPassword, NONE_TLS_PASSWORD};
 
 mod tls_server_connection;
 pub use self::tls_server_connection::TlsServerConnectionExt;
@@ -474,36 +434,32 @@ mod unix_fd_list;
 #[cfg(any(unix, feature = "dox"))]
 pub use self::unix_fd_list::UnixFDListExt;
 #[cfg(any(unix, feature = "dox"))]
-pub use self::unix_fd_list::{UnixFDList, UnixFDListClass, NONE_UNIX_FD_LIST};
+pub use self::unix_fd_list::{UnixFDList, NONE_UNIX_FD_LIST};
 
 #[cfg(any(unix, feature = "dox"))]
 mod unix_input_stream;
 #[cfg(any(unix, feature = "dox"))]
 pub use self::unix_input_stream::UnixInputStreamExt;
 #[cfg(any(unix, feature = "dox"))]
-pub use self::unix_input_stream::{UnixInputStream, UnixInputStreamClass, NONE_UNIX_INPUT_STREAM};
+pub use self::unix_input_stream::{UnixInputStream, NONE_UNIX_INPUT_STREAM};
 
 #[cfg(any(unix, feature = "dox"))]
 mod unix_output_stream;
 #[cfg(any(unix, feature = "dox"))]
 pub use self::unix_output_stream::UnixOutputStreamExt;
 #[cfg(any(unix, feature = "dox"))]
-pub use self::unix_output_stream::{
-    UnixOutputStream, UnixOutputStreamClass, NONE_UNIX_OUTPUT_STREAM,
-};
+pub use self::unix_output_stream::{UnixOutputStream, NONE_UNIX_OUTPUT_STREAM};
 
 #[cfg(any(unix, feature = "dox"))]
 mod unix_socket_address;
 #[cfg(any(unix, feature = "dox"))]
 pub use self::unix_socket_address::UnixSocketAddressExt;
 #[cfg(any(unix, feature = "dox"))]
-pub use self::unix_socket_address::{
-    UnixSocketAddress, UnixSocketAddressClass, NONE_UNIX_SOCKET_ADDRESS,
-};
+pub use self::unix_socket_address::{UnixSocketAddress, NONE_UNIX_SOCKET_ADDRESS};
 
 mod vfs;
 pub use self::vfs::VfsExt;
-pub use self::vfs::{Vfs, VfsClass, NONE_VFS};
+pub use self::vfs::{Vfs, NONE_VFS};
 
 mod volume;
 pub use self::volume::VolumeExt;
@@ -511,17 +467,15 @@ pub use self::volume::{Volume, NONE_VOLUME};
 
 mod volume_monitor;
 pub use self::volume_monitor::VolumeMonitorExt;
-pub use self::volume_monitor::{VolumeMonitor, VolumeMonitorClass, NONE_VOLUME_MONITOR};
+pub use self::volume_monitor::{VolumeMonitor, NONE_VOLUME_MONITOR};
 
 mod zlib_compressor;
 pub use self::zlib_compressor::ZlibCompressorExt;
-pub use self::zlib_compressor::{ZlibCompressor, ZlibCompressorClass, NONE_ZLIB_COMPRESSOR};
+pub use self::zlib_compressor::{ZlibCompressor, NONE_ZLIB_COMPRESSOR};
 
 mod zlib_decompressor;
 pub use self::zlib_decompressor::ZlibDecompressorExt;
-pub use self::zlib_decompressor::{
-    ZlibDecompressor, ZlibDecompressorClass, NONE_ZLIB_DECOMPRESSOR,
-};
+pub use self::zlib_decompressor::{ZlibDecompressor, NONE_ZLIB_DECOMPRESSOR};
 
 mod dbus_arg_info;
 pub use self::dbus_arg_info::DBusArgInfo;
diff --git a/gio/src/auto/mount_operation.rs b/gio/src/auto/mount_operation.rs
index 7a5940bb811a..4e0b4281e33f 100644
--- a/gio/src/auto/mount_operation.rs
+++ b/gio/src/auto/mount_operation.rs
@@ -19,7 +19,7 @@ use MountOperationResult;
 use PasswordSave;
 
 glib_wrapper! {
-    pub struct MountOperation(Object<gio_sys::GMountOperation, gio_sys::GMountOperationClass, MountOperationClass>);
+    pub struct MountOperation(Object<gio_sys::GMountOperation, gio_sys::GMountOperationClass>);
 
     match fn {
         get_type => || gio_sys::g_mount_operation_get_type(),
diff --git a/gio/src/auto/network_address.rs b/gio/src/auto/network_address.rs
index 36d332b2f688..105420e31595 100644
--- a/gio/src/auto/network_address.rs
+++ b/gio/src/auto/network_address.rs
@@ -12,7 +12,7 @@ use std::ptr;
 use SocketConnectable;
 
 glib_wrapper! {
-    pub struct NetworkAddress(Object<gio_sys::GNetworkAddress, gio_sys::GNetworkAddressClass, NetworkAddressClass>) @implements SocketConnectable;
+    pub struct NetworkAddress(Object<gio_sys::GNetworkAddress, gio_sys::GNetworkAddressClass>) @implements SocketConnectable;
 
     match fn {
         get_type => || gio_sys::g_network_address_get_type(),
diff --git a/gio/src/auto/network_service.rs b/gio/src/auto/network_service.rs
index 09a403096ab4..7665c0f45860 100644
--- a/gio/src/auto/network_service.rs
+++ b/gio/src/auto/network_service.rs
@@ -16,7 +16,7 @@ use std::mem::transmute;
 use SocketConnectable;
 
 glib_wrapper! {
-    pub struct NetworkService(Object<gio_sys::GNetworkService, gio_sys::GNetworkServiceClass, NetworkServiceClass>) @implements SocketConnectable;
+    pub struct NetworkService(Object<gio_sys::GNetworkService, gio_sys::GNetworkServiceClass>) @implements SocketConnectable;
 
     match fn {
         get_type => || gio_sys::g_network_service_get_type(),
diff --git a/gio/src/auto/notification.rs b/gio/src/auto/notification.rs
index 47008aad63a0..f1ff798db473 100644
--- a/gio/src/auto/notification.rs
+++ b/gio/src/auto/notification.rs
@@ -11,7 +11,7 @@ use Icon;
 use NotificationPriority;
 
 glib_wrapper! {
-    pub struct Notification(Object<gio_sys::GNotification, NotificationClass>);
+    pub struct Notification(Object<gio_sys::GNotification>);
 
     match fn {
         get_type => || gio_sys::g_notification_get_type(),
diff --git a/gio/src/auto/output_stream.rs b/gio/src/auto/output_stream.rs
index 087e801771c6..c0dbfe814db8 100644
--- a/gio/src/auto/output_stream.rs
+++ b/gio/src/auto/output_stream.rs
@@ -17,7 +17,7 @@ use InputStream;
 use OutputStreamSpliceFlags;
 
 glib_wrapper! {
-    pub struct OutputStream(Object<gio_sys::GOutputStream, gio_sys::GOutputStreamClass, OutputStreamClass>);
+    pub struct OutputStream(Object<gio_sys::GOutputStream, gio_sys::GOutputStreamClass>);
 
     match fn {
         get_type => || gio_sys::g_output_stream_get_type(),
diff --git a/gio/src/auto/permission.rs b/gio/src/auto/permission.rs
index 16348cc38812..95c67992e153 100644
--- a/gio/src/auto/permission.rs
+++ b/gio/src/auto/permission.rs
@@ -19,7 +19,7 @@ use std::ptr;
 use Cancellable;
 
 glib_wrapper! {
-    pub struct Permission(Object<gio_sys::GPermission, gio_sys::GPermissionClass, PermissionClass>);
+    pub struct Permission(Object<gio_sys::GPermission, gio_sys::GPermissionClass>);
 
     match fn {
         get_type => || gio_sys::g_permission_get_type(),
diff --git a/gio/src/auto/property_action.rs b/gio/src/auto/property_action.rs
index 0144c1c1630a..d55491ccbcad 100644
--- a/gio/src/auto/property_action.rs
+++ b/gio/src/auto/property_action.rs
@@ -22,7 +22,7 @@ use std::mem::transmute;
 use Action;
 
 glib_wrapper! {
-    pub struct PropertyAction(Object<gio_sys::GPropertyAction, PropertyActionClass>) @implements Action;
+    pub struct PropertyAction(Object<gio_sys::GPropertyAction>) @implements Action;
 
     match fn {
         get_type => || gio_sys::g_property_action_get_type(),
diff --git a/gio/src/auto/proxy_address.rs b/gio/src/auto/proxy_address.rs
index 98c927a905fa..c8c110606bcb 100644
--- a/gio/src/auto/proxy_address.rs
+++ b/gio/src/auto/proxy_address.rs
@@ -14,7 +14,7 @@ use SocketAddress;
 use SocketConnectable;
 
 glib_wrapper! {
-    pub struct ProxyAddress(Object<gio_sys::GProxyAddress, gio_sys::GProxyAddressClass, ProxyAddressClass>) @extends InetSocketAddress, SocketAddress, @implements SocketConnectable;
+    pub struct ProxyAddress(Object<gio_sys::GProxyAddress, gio_sys::GProxyAddressClass>) @extends InetSocketAddress, SocketAddress, @implements SocketConnectable;
 
     match fn {
         get_type => || gio_sys::g_proxy_address_get_type(),
diff --git a/gio/src/auto/resolver.rs b/gio/src/auto/resolver.rs
index 265a9f2000df..76bcc16fa135 100644
--- a/gio/src/auto/resolver.rs
+++ b/gio/src/auto/resolver.rs
@@ -25,7 +25,7 @@ use ResolverRecordType;
 use SrvTarget;
 
 glib_wrapper! {
-    pub struct Resolver(Object<gio_sys::GResolver, gio_sys::GResolverClass, ResolverClass>);
+    pub struct Resolver(Object<gio_sys::GResolver, gio_sys::GResolverClass>);
 
     match fn {
         get_type => || gio_sys::g_resolver_get_type(),
diff --git a/gio/src/auto/settings.rs b/gio/src/auto/settings.rs
index cf57d71d9f0a..ac52fc39b212 100644
--- a/gio/src/auto/settings.rs
+++ b/gio/src/auto/settings.rs
@@ -24,7 +24,7 @@ use SettingsBindFlags;
 use SettingsSchema;
 
 glib_wrapper! {
-    pub struct Settings(Object<gio_sys::GSettings, gio_sys::GSettingsClass, SettingsClass>);
+    pub struct Settings(Object<gio_sys::GSettings, gio_sys::GSettingsClass>);
 
     match fn {
         get_type => || gio_sys::g_settings_get_type(),
diff --git a/gio/src/auto/settings_backend.rs b/gio/src/auto/settings_backend.rs
index d878c34522f4..adf082666b34 100644
--- a/gio/src/auto/settings_backend.rs
+++ b/gio/src/auto/settings_backend.rs
@@ -8,7 +8,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct SettingsBackend(Object<gio_sys::GSettingsBackend, gio_sys::GSettingsBackendClass, SettingsBackendClass>);
+    pub struct SettingsBackend(Object<gio_sys::GSettingsBackend, gio_sys::GSettingsBackendClass>);
 
     match fn {
         get_type => || gio_sys::g_settings_backend_get_type(),
diff --git a/gio/src/auto/simple_action.rs b/gio/src/auto/simple_action.rs
index c03f9f122420..c634f6c9d5cd 100644
--- a/gio/src/auto/simple_action.rs
+++ b/gio/src/auto/simple_action.rs
@@ -15,7 +15,7 @@ use std::mem::transmute;
 use Action;
 
 glib_wrapper! {
-    pub struct SimpleAction(Object<gio_sys::GSimpleAction, SimpleActionClass>) @implements Action;
+    pub struct SimpleAction(Object<gio_sys::GSimpleAction>) @implements Action;
 
     match fn {
         get_type => || gio_sys::g_simple_action_get_type(),
diff --git a/gio/src/auto/simple_action_group.rs b/gio/src/auto/simple_action_group.rs
index b85315a5e291..ddf56ca69091 100644
--- a/gio/src/auto/simple_action_group.rs
+++ b/gio/src/auto/simple_action_group.rs
@@ -9,7 +9,7 @@ use ActionGroup;
 use ActionMap;
 
 glib_wrapper! {
-    pub struct SimpleActionGroup(Object<gio_sys::GSimpleActionGroup, gio_sys::GSimpleActionGroupClass, SimpleActionGroupClass>) @implements ActionGroup, ActionMap;
+    pub struct SimpleActionGroup(Object<gio_sys::GSimpleActionGroup, gio_sys::GSimpleActionGroupClass>) @implements ActionGroup, ActionMap;
 
     match fn {
         get_type => || gio_sys::g_simple_action_group_get_type(),
diff --git a/gio/src/auto/simple_io_stream.rs b/gio/src/auto/simple_io_stream.rs
index 23e6e1958aa5..2821f1776fec 100644
--- a/gio/src/auto/simple_io_stream.rs
+++ b/gio/src/auto/simple_io_stream.rs
@@ -16,7 +16,7 @@ use InputStream;
 use OutputStream;
 
 glib_wrapper! {
-    pub struct SimpleIOStream(Object<gio_sys::GSimpleIOStream, SimpleIOStreamClass>) @extends IOStream;
+    pub struct SimpleIOStream(Object<gio_sys::GSimpleIOStream>) @extends IOStream;
 
     match fn {
         get_type => || gio_sys::g_simple_io_stream_get_type(),
diff --git a/gio/src/auto/simple_permission.rs b/gio/src/auto/simple_permission.rs
index 18c1f76fedf5..d084f144d5a1 100644
--- a/gio/src/auto/simple_permission.rs
+++ b/gio/src/auto/simple_permission.rs
@@ -9,7 +9,7 @@ use std::fmt;
 use Permission;
 
 glib_wrapper! {
-    pub struct SimplePermission(Object<gio_sys::GSimplePermission, SimplePermissionClass>) @extends Permission;
+    pub struct SimplePermission(Object<gio_sys::GSimplePermission>) @extends Permission;
 
     match fn {
         get_type => || gio_sys::g_simple_permission_get_type(),
diff --git a/gio/src/auto/socket.rs b/gio/src/auto/socket.rs
index c8648129b657..9cdbaece110f 100644
--- a/gio/src/auto/socket.rs
+++ b/gio/src/auto/socket.rs
@@ -29,7 +29,7 @@ use SocketProtocol;
 use SocketType;
 
 glib_wrapper! {
-    pub struct Socket(Object<gio_sys::GSocket, gio_sys::GSocketClass, SocketClass>);
+    pub struct Socket(Object<gio_sys::GSocket, gio_sys::GSocketClass>);
 
     match fn {
         get_type => || gio_sys::g_socket_get_type(),
diff --git a/gio/src/auto/socket_address.rs b/gio/src/auto/socket_address.rs
index cf2bbbfd3ac8..d8da540b7c18 100644
--- a/gio/src/auto/socket_address.rs
+++ b/gio/src/auto/socket_address.rs
@@ -16,7 +16,7 @@ use SocketConnectable;
 use SocketFamily;
 
 glib_wrapper! {
-    pub struct SocketAddress(Object<gio_sys::GSocketAddress, gio_sys::GSocketAddressClass, SocketAddressClass>) @implements SocketConnectable;
+    pub struct SocketAddress(Object<gio_sys::GSocketAddress, gio_sys::GSocketAddressClass>) @implements SocketConnectable;
 
     match fn {
         get_type => || gio_sys::g_socket_address_get_type(),
diff --git a/gio/src/auto/socket_address_enumerator.rs b/gio/src/auto/socket_address_enumerator.rs
index 0c412ba293f8..798daedfa959 100644
--- a/gio/src/auto/socket_address_enumerator.rs
+++ b/gio/src/auto/socket_address_enumerator.rs
@@ -16,7 +16,7 @@ use Cancellable;
 use SocketAddress;
 
 glib_wrapper! {
-    pub struct SocketAddressEnumerator(Object<gio_sys::GSocketAddressEnumerator, gio_sys::GSocketAddressEnumeratorClass, SocketAddressEnumeratorClass>);
+    pub struct SocketAddressEnumerator(Object<gio_sys::GSocketAddressEnumerator, gio_sys::GSocketAddressEnumeratorClass>);
 
     match fn {
         get_type => || gio_sys::g_socket_address_enumerator_get_type(),
diff --git a/gio/src/auto/socket_client.rs b/gio/src/auto/socket_client.rs
index edbbd3c0cf00..d152fd6adecc 100644
--- a/gio/src/auto/socket_client.rs
+++ b/gio/src/auto/socket_client.rs
@@ -31,7 +31,7 @@ use SocketType;
 use TlsCertificateFlags;
 
 glib_wrapper! {
-    pub struct SocketClient(Object<gio_sys::GSocketClient, gio_sys::GSocketClientClass, SocketClientClass>);
+    pub struct SocketClient(Object<gio_sys::GSocketClient, gio_sys::GSocketClientClass>);
 
     match fn {
         get_type => || gio_sys::g_socket_client_get_type(),
diff --git a/gio/src/auto/socket_connection.rs b/gio/src/auto/socket_connection.rs
index 1a5103cdc5b1..526a66e2052d 100644
--- a/gio/src/auto/socket_connection.rs
+++ b/gio/src/auto/socket_connection.rs
@@ -20,7 +20,7 @@ use SocketFamily;
 use SocketType;
 
 glib_wrapper! {
-    pub struct SocketConnection(Object<gio_sys::GSocketConnection, gio_sys::GSocketConnectionClass, SocketConnectionClass>) @extends IOStream;
+    pub struct SocketConnection(Object<gio_sys::GSocketConnection, gio_sys::GSocketConnectionClass>) @extends IOStream;
 
     match fn {
         get_type => || gio_sys::g_socket_connection_get_type(),
diff --git a/gio/src/auto/socket_listener.rs b/gio/src/auto/socket_listener.rs
index b0ec05280a09..dfa7721e14a8 100644
--- a/gio/src/auto/socket_listener.rs
+++ b/gio/src/auto/socket_listener.rs
@@ -28,7 +28,7 @@ use SocketProtocol;
 use SocketType;
 
 glib_wrapper! {
-    pub struct SocketListener(Object<gio_sys::GSocketListener, gio_sys::GSocketListenerClass, SocketListenerClass>);
+    pub struct SocketListener(Object<gio_sys::GSocketListener, gio_sys::GSocketListenerClass>);
 
     match fn {
         get_type => || gio_sys::g_socket_listener_get_type(),
diff --git a/gio/src/auto/socket_service.rs b/gio/src/auto/socket_service.rs
index 63935a5f10eb..72be77be512b 100644
--- a/gio/src/auto/socket_service.rs
+++ b/gio/src/auto/socket_service.rs
@@ -22,7 +22,7 @@ use SocketConnection;
 use SocketListener;
 
 glib_wrapper! {
-    pub struct SocketService(Object<gio_sys::GSocketService, gio_sys::GSocketServiceClass, SocketServiceClass>) @extends SocketListener;
+    pub struct SocketService(Object<gio_sys::GSocketService, gio_sys::GSocketServiceClass>) @extends SocketListener;
 
     match fn {
         get_type => || gio_sys::g_socket_service_get_type(),
diff --git a/gio/src/auto/subprocess.rs b/gio/src/auto/subprocess.rs
index 448d0f0c5869..ba7f89dd764a 100644
--- a/gio/src/auto/subprocess.rs
+++ b/gio/src/auto/subprocess.rs
@@ -20,7 +20,7 @@ use OutputStream;
 use SubprocessFlags;
 
 glib_wrapper! {
-    pub struct Subprocess(Object<gio_sys::GSubprocess, SubprocessClass>);
+    pub struct Subprocess(Object<gio_sys::GSubprocess>);
 
     match fn {
         get_type => || gio_sys::g_subprocess_get_type(),
diff --git a/gio/src/auto/subprocess_launcher.rs b/gio/src/auto/subprocess_launcher.rs
index 2292219ae6e0..e2ff57f405d7 100644
--- a/gio/src/auto/subprocess_launcher.rs
+++ b/gio/src/auto/subprocess_launcher.rs
@@ -14,7 +14,7 @@ use Subprocess;
 use SubprocessFlags;
 
 glib_wrapper! {
-    pub struct SubprocessLauncher(Object<gio_sys::GSubprocessLauncher, SubprocessLauncherClass>);
+    pub struct SubprocessLauncher(Object<gio_sys::GSubprocessLauncher>);
 
     match fn {
         get_type => || gio_sys::g_subprocess_launcher_get_type(),
diff --git a/gio/src/auto/tcp_connection.rs b/gio/src/auto/tcp_connection.rs
index 306c1efb6ead..6e2c2c8a12c8 100644
--- a/gio/src/auto/tcp_connection.rs
+++ b/gio/src/auto/tcp_connection.rs
@@ -16,7 +16,7 @@ use IOStream;
 use SocketConnection;
 
 glib_wrapper! {
-    pub struct TcpConnection(Object<gio_sys::GTcpConnection, gio_sys::GTcpConnectionClass, TcpConnectionClass>) @extends SocketConnection, IOStream;
+    pub struct TcpConnection(Object<gio_sys::GTcpConnection, gio_sys::GTcpConnectionClass>) @extends SocketConnection, IOStream;
 
     match fn {
         get_type => || gio_sys::g_tcp_connection_get_type(),
diff --git a/gio/src/auto/themed_icon.rs b/gio/src/auto/themed_icon.rs
index 84ce459d4969..6ad63c56dd5d 100644
--- a/gio/src/auto/themed_icon.rs
+++ b/gio/src/auto/themed_icon.rs
@@ -18,7 +18,7 @@ use std::mem::transmute;
 use Icon;
 
 glib_wrapper! {
-    pub struct ThemedIcon(Object<gio_sys::GThemedIcon, gio_sys::GThemedIconClass, ThemedIconClass>) @implements Icon;
+    pub struct ThemedIcon(Object<gio_sys::GThemedIcon, gio_sys::GThemedIconClass>) @implements Icon;
 
     match fn {
         get_type => || gio_sys::g_themed_icon_get_type(),
diff --git a/gio/src/auto/threaded_socket_service.rs b/gio/src/auto/threaded_socket_service.rs
index c18f265d1313..5f16b618c67c 100644
--- a/gio/src/auto/threaded_socket_service.rs
+++ b/gio/src/auto/threaded_socket_service.rs
@@ -21,7 +21,7 @@ use SocketListener;
 use SocketService;
 
 glib_wrapper! {
-    pub struct ThreadedSocketService(Object<gio_sys::GThreadedSocketService, gio_sys::GThreadedSocketServiceClass, ThreadedSocketServiceClass>) @extends SocketService, SocketListener;
+    pub struct ThreadedSocketService(Object<gio_sys::GThreadedSocketService, gio_sys::GThreadedSocketServiceClass>) @extends SocketService, SocketListener;
 
     match fn {
         get_type => || gio_sys::g_threaded_socket_service_get_type(),
diff --git a/gio/src/auto/tls_certificate.rs b/gio/src/auto/tls_certificate.rs
index 9a16fc76400e..b5c3714c43a9 100644
--- a/gio/src/auto/tls_certificate.rs
+++ b/gio/src/auto/tls_certificate.rs
@@ -17,7 +17,7 @@ use SocketConnectable;
 use TlsCertificateFlags;
 
 glib_wrapper! {
-    pub struct TlsCertificate(Object<gio_sys::GTlsCertificate, gio_sys::GTlsCertificateClass, TlsCertificateClass>);
+    pub struct TlsCertificate(Object<gio_sys::GTlsCertificate, gio_sys::GTlsCertificateClass>);
 
     match fn {
         get_type => || gio_sys::g_tls_certificate_get_type(),
diff --git a/gio/src/auto/tls_connection.rs b/gio/src/auto/tls_connection.rs
index ecfe1f658ced..22573500bc10 100644
--- a/gio/src/auto/tls_connection.rs
+++ b/gio/src/auto/tls_connection.rs
@@ -29,7 +29,7 @@ use TlsInteraction;
 use TlsRehandshakeMode;
 
 glib_wrapper! {
-    pub struct TlsConnection(Object<gio_sys::GTlsConnection, gio_sys::GTlsConnectionClass, TlsConnectionClass>) @extends IOStream;
+    pub struct TlsConnection(Object<gio_sys::GTlsConnection, gio_sys::GTlsConnectionClass>) @extends IOStream;
 
     match fn {
         get_type => || gio_sys::g_tls_connection_get_type(),
diff --git a/gio/src/auto/tls_database.rs b/gio/src/auto/tls_database.rs
index 74858f70e7eb..c40e7e439df8 100644
--- a/gio/src/auto/tls_database.rs
+++ b/gio/src/auto/tls_database.rs
@@ -22,7 +22,7 @@ use TlsDatabaseVerifyFlags;
 use TlsInteraction;
 
 glib_wrapper! {
-    pub struct TlsDatabase(Object<gio_sys::GTlsDatabase, gio_sys::GTlsDatabaseClass, TlsDatabaseClass>);
+    pub struct TlsDatabase(Object<gio_sys::GTlsDatabase, gio_sys::GTlsDatabaseClass>);
 
     match fn {
         get_type => || gio_sys::g_tls_database_get_type(),
diff --git a/gio/src/auto/tls_interaction.rs b/gio/src/auto/tls_interaction.rs
index bb3c560bf4f9..6e57c7bcafa1 100644
--- a/gio/src/auto/tls_interaction.rs
+++ b/gio/src/auto/tls_interaction.rs
@@ -19,7 +19,7 @@ use TlsInteractionResult;
 use TlsPassword;
 
 glib_wrapper! {
-    pub struct TlsInteraction(Object<gio_sys::GTlsInteraction, gio_sys::GTlsInteractionClass, TlsInteractionClass>);
+    pub struct TlsInteraction(Object<gio_sys::GTlsInteraction, gio_sys::GTlsInteractionClass>);
 
     match fn {
         get_type => || gio_sys::g_tls_interaction_get_type(),
diff --git a/gio/src/auto/tls_password.rs b/gio/src/auto/tls_password.rs
index fa71a7d6a508..8b4590d426a5 100644
--- a/gio/src/auto/tls_password.rs
+++ b/gio/src/auto/tls_password.rs
@@ -16,7 +16,7 @@ use std::mem::transmute;
 use TlsPasswordFlags;
 
 glib_wrapper! {
-    pub struct TlsPassword(Object<gio_sys::GTlsPassword, gio_sys::GTlsPasswordClass, TlsPasswordClass>);
+    pub struct TlsPassword(Object<gio_sys::GTlsPassword, gio_sys::GTlsPasswordClass>);
 
     match fn {
         get_type => || gio_sys::g_tls_password_get_type(),
diff --git a/gio/src/auto/unix_fd_list.rs b/gio/src/auto/unix_fd_list.rs
index 510b12724307..9d22d32fa8f2 100644
--- a/gio/src/auto/unix_fd_list.rs
+++ b/gio/src/auto/unix_fd_list.rs
@@ -8,7 +8,7 @@ use glib::translate::*;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct UnixFDList(Object<gio_sys::GUnixFDList, gio_sys::GUnixFDListClass, UnixFDListClass>);
+    pub struct UnixFDList(Object<gio_sys::GUnixFDList, gio_sys::GUnixFDListClass>);
 
     match fn {
         get_type => || gio_sys::g_unix_fd_list_get_type(),
diff --git a/gio/src/auto/unix_input_stream.rs b/gio/src/auto/unix_input_stream.rs
index 7469e6db1779..ce890bedd5b8 100644
--- a/gio/src/auto/unix_input_stream.rs
+++ b/gio/src/auto/unix_input_stream.rs
@@ -10,7 +10,7 @@ use InputStream;
 use PollableInputStream;
 
 glib_wrapper! {
-    pub struct UnixInputStream(Object<gio_sys::GUnixInputStream, gio_sys::GUnixInputStreamClass, UnixInputStreamClass>) @extends InputStream, @implements PollableInputStream;
+    pub struct UnixInputStream(Object<gio_sys::GUnixInputStream, gio_sys::GUnixInputStreamClass>) @extends InputStream, @implements PollableInputStream;
 
     match fn {
         get_type => || gio_sys::g_unix_input_stream_get_type(),
diff --git a/gio/src/auto/unix_output_stream.rs b/gio/src/auto/unix_output_stream.rs
index cc1ff6383391..5aaefc9a07ce 100644
--- a/gio/src/auto/unix_output_stream.rs
+++ b/gio/src/auto/unix_output_stream.rs
@@ -10,7 +10,7 @@ use OutputStream;
 use PollableOutputStream;
 
 glib_wrapper! {
-    pub struct UnixOutputStream(Object<gio_sys::GUnixOutputStream, gio_sys::GUnixOutputStreamClass, UnixOutputStreamClass>) @extends OutputStream, @implements PollableOutputStream;
+    pub struct UnixOutputStream(Object<gio_sys::GUnixOutputStream, gio_sys::GUnixOutputStreamClass>) @extends OutputStream, @implements PollableOutputStream;
 
     match fn {
         get_type => || gio_sys::g_unix_output_stream_get_type(),
diff --git a/gio/src/auto/unix_socket_address.rs b/gio/src/auto/unix_socket_address.rs
index 23d33892b0c7..fd8f7b4a20fa 100644
--- a/gio/src/auto/unix_socket_address.rs
+++ b/gio/src/auto/unix_socket_address.rs
@@ -15,7 +15,7 @@ use SocketConnectable;
 use UnixSocketAddressType;
 
 glib_wrapper! {
-    pub struct UnixSocketAddress(Object<gio_sys::GUnixSocketAddress, gio_sys::GUnixSocketAddressClass, UnixSocketAddressClass>) @extends SocketAddress, @implements SocketConnectable;
+    pub struct UnixSocketAddress(Object<gio_sys::GUnixSocketAddress, gio_sys::GUnixSocketAddressClass>) @extends SocketAddress, @implements SocketConnectable;
 
     match fn {
         get_type => || gio_sys::g_unix_socket_address_get_type(),
diff --git a/gio/src/auto/versions.txt b/gio/src/auto/versions.txt
index 8f042be52d08..62b9885a87fa 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 @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/gio/src/auto/vfs.rs b/gio/src/auto/vfs.rs
index 0e7075183316..104ed6fd7e64 100644
--- a/gio/src/auto/vfs.rs
+++ b/gio/src/auto/vfs.rs
@@ -12,7 +12,7 @@ use std::fmt;
 use File;
 
 glib_wrapper! {
-    pub struct Vfs(Object<gio_sys::GVfs, gio_sys::GVfsClass, VfsClass>);
+    pub struct Vfs(Object<gio_sys::GVfs, gio_sys::GVfsClass>);
 
     match fn {
         get_type => || gio_sys::g_vfs_get_type(),
diff --git a/gio/src/auto/volume_monitor.rs b/gio/src/auto/volume_monitor.rs
index 2b6a3cd37a33..5d08b21ed7c7 100644
--- a/gio/src/auto/volume_monitor.rs
+++ b/gio/src/auto/volume_monitor.rs
@@ -17,7 +17,7 @@ use Mount;
 use Volume;
 
 glib_wrapper! {
-    pub struct VolumeMonitor(Object<gio_sys::GVolumeMonitor, gio_sys::GVolumeMonitorClass, VolumeMonitorClass>);
+    pub struct VolumeMonitor(Object<gio_sys::GVolumeMonitor, gio_sys::GVolumeMonitorClass>);
 
     match fn {
         get_type => || gio_sys::g_volume_monitor_get_type(),
diff --git a/gio/src/auto/zlib_compressor.rs b/gio/src/auto/zlib_compressor.rs
index e17d3186d5bb..2cf38a4cd8d1 100644
--- a/gio/src/auto/zlib_compressor.rs
+++ b/gio/src/auto/zlib_compressor.rs
@@ -20,7 +20,7 @@ use FileInfo;
 use ZlibCompressorFormat;
 
 glib_wrapper! {
-    pub struct ZlibCompressor(Object<gio_sys::GZlibCompressor, gio_sys::GZlibCompressorClass, ZlibCompressorClass>) @implements Converter;
+    pub struct ZlibCompressor(Object<gio_sys::GZlibCompressor, gio_sys::GZlibCompressorClass>) @implements Converter;
 
     match fn {
         get_type => || gio_sys::g_zlib_compressor_get_type(),
diff --git a/gio/src/auto/zlib_decompressor.rs b/gio/src/auto/zlib_decompressor.rs
index 1f8cdffea729..e553998d1699 100644
--- a/gio/src/auto/zlib_decompressor.rs
+++ b/gio/src/auto/zlib_decompressor.rs
@@ -20,7 +20,7 @@ use FileInfo;
 use ZlibCompressorFormat;
 
 glib_wrapper! {
-    pub struct ZlibDecompressor(Object<gio_sys::GZlibDecompressor, gio_sys::GZlibDecompressorClass, ZlibDecompressorClass>) @implements Converter;
+    pub struct ZlibDecompressor(Object<gio_sys::GZlibDecompressor, gio_sys::GZlibDecompressorClass>) @implements Converter;
 
     match fn {
         get_type => || gio_sys::g_zlib_decompressor_get_type(),
diff --git a/gio/src/read_input_stream.rs b/gio/src/read_input_stream.rs
index 6feeae9deaba..53a97e1d4c55 100644
--- a/gio/src/read_input_stream.rs
+++ b/gio/src/read_input_stream.rs
@@ -7,7 +7,6 @@ use crate::subclass::prelude::*;
 use crate::InputStream;
 use glib;
 use glib::subclass;
-use glib::translate::*;
 
 use std::any::Any;
 use std::io::{Read, Seek};
@@ -165,11 +164,7 @@ mod imp {
 }
 
 glib_wrapper! {
-    pub struct ReadInputStream(Object<subclass::simple::InstanceStruct<imp::ReadInputStream>, subclass::simple::ClassStruct<imp::ReadInputStream>, ReadInputStreamClass>) @extends crate::InputStream, @implements crate::Seekable;
-
-    match fn {
-        get_type => || imp::ReadInputStream::get_type().to_glib(),
-    }
+    pub struct ReadInputStream(ObjectSubclass<imp::ReadInputStream>) @extends crate::InputStream, @implements crate::Seekable;
 }
 
 impl ReadInputStream {
diff --git a/gio/src/write_output_stream.rs b/gio/src/write_output_stream.rs
index 20005c855b8e..7198fdefcdcd 100644
--- a/gio/src/write_output_stream.rs
+++ b/gio/src/write_output_stream.rs
@@ -7,7 +7,6 @@ use crate::subclass::prelude::*;
 use crate::OutputStream;
 use glib;
 use glib::subclass;
-use glib::translate::*;
 
 use std::any::Any;
 use std::io::{Seek, Write};
@@ -192,11 +191,7 @@ mod imp {
 }
 
 glib_wrapper! {
-    pub struct WriteOutputStream(Object<subclass::simple::InstanceStruct<imp::WriteOutputStream>, subclass::simple::ClassStruct<imp::WriteOutputStream>, WriteOutputStreamClass>) @extends crate::OutputStream, @implements crate::Seekable;
-
-    match fn {
-        get_type => || imp::WriteOutputStream::get_type().to_glib(),
-    }
+    pub struct WriteOutputStream(ObjectSubclass<imp::WriteOutputStream>) @extends crate::OutputStream, @implements crate::Seekable;
 }
 
 impl WriteOutputStream {
diff --git a/gio/sys/versions.txt b/gio/sys/versions.txt
index 8f042be52d08..62b9885a87fa 100644
--- a/gio/sys/versions.txt
+++ b/gio/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/gir b/gir
index cea2f7c15c4f..db37199484c8 160000
--- a/gir
+++ b/gir
@@ -1 +1 @@
-Subproject commit cea2f7c15c4f0560635556474c66763941f98b5d
+Subproject commit db37199484c8ebe4e653321b2f80124e5d02d430
diff --git a/glib/gobject-sys/versions.txt b/glib/gobject-sys/versions.txt
index 8f042be52d08..62b9885a87fa 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 @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/glib/src/auto/versions.txt b/glib/src/auto/versions.txt
index 8f042be52d08..62b9885a87fa 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 @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/glib/src/gobject/auto/binding.rs b/glib/src/gobject/auto/binding.rs
index 1608bbab780a..373f0f149dbd 100644
--- a/glib/src/gobject/auto/binding.rs
+++ b/glib/src/gobject/auto/binding.rs
@@ -10,7 +10,7 @@ use GString;
 use Object;
 
 glib_wrapper! {
-    pub struct Binding(Object<gobject_sys::GBinding, BindingClass>);
+    pub struct Binding(Object<gobject_sys::GBinding>);
 
     match fn {
         get_type => || gobject_sys::g_binding_get_type(),
diff --git a/glib/src/gobject/auto/mod.rs b/glib/src/gobject/auto/mod.rs
index 593df65d9923..c9b4d7ac3b49 100644
--- a/glib/src/gobject/auto/mod.rs
+++ b/glib/src/gobject/auto/mod.rs
@@ -3,7 +3,7 @@
 // DO NOT EDIT
 
 mod binding;
-pub use self::binding::{Binding, BindingClass};
+pub use self::binding::Binding;
 
 mod flags;
 pub use self::flags::BindingFlags;
diff --git a/glib/src/lib.rs b/glib/src/lib.rs
index 026df8cf9bcf..c65d31959d84 100644
--- a/glib/src/lib.rs
+++ b/glib/src/lib.rs
@@ -104,8 +104,7 @@ pub use closure::Closure;
 pub use error::{BoolError, Error};
 pub use file_error::FileError;
 pub use object::{
-    Cast, Class, InitiallyUnowned, InitiallyUnownedClass, IsA, Object, ObjectClass, ObjectExt,
-    ObjectType, SendWeakRef, WeakRef,
+    Cast, Class, InitiallyUnowned, IsA, Object, ObjectExt, ObjectType, SendWeakRef, WeakRef,
 };
 pub use signal::{
     signal_handler_block, signal_handler_disconnect, signal_handler_unblock,
diff --git a/glib/src/object.rs b/glib/src/object.rs
index 74ca5a18ea78..af71ae8251fd 100644
--- a/glib/src/object.rs
+++ b/glib/src/object.rs
@@ -2199,7 +2199,7 @@ impl ObjectClass {
 }
 
 glib_wrapper! {
-    pub struct InitiallyUnowned(Object<gobject_sys::GInitiallyUnowned, gobject_sys::GInitiallyUnownedClass, InitiallyUnownedClass>);
+    pub struct InitiallyUnowned(Object<gobject_sys::GInitiallyUnowned, gobject_sys::GInitiallyUnownedClass>);
 
     match fn {
         get_type => || gobject_sys::g_initially_unowned_get_type(),
diff --git a/glib/src/subclass/object.rs b/glib/src/subclass/object.rs
index a3580f6c00b3..ed6c34a83da3 100644
--- a/glib/src/subclass/object.rs
+++ b/glib/src/subclass/object.rs
@@ -13,7 +13,7 @@ use std::fmt;
 use std::mem;
 use std::ptr;
 use translate::*;
-use {Object, ObjectClass, ObjectType, SignalFlags, Type, Value};
+use {Object, ObjectType, SignalFlags, Type, Value};
 
 /// Trait for implementors of `glib::Object` subclasses.
 ///
@@ -267,7 +267,7 @@ pub unsafe trait ObjectClassSubclassExt: Sized + 'static {
     }
 }
 
-unsafe impl ObjectClassSubclassExt for ObjectClass {}
+unsafe impl ObjectClassSubclassExt for ::Class<Object> {}
 
 unsafe impl<T: ObjectImpl> IsSubclassable<T> for Object {
     fn override_vfuncs(class: &mut ::Class<Self>) {
diff --git a/glib/src/wrapper.rs b/glib/src/wrapper.rs
index 2871c29637a0..863e0fb798e6 100644
--- a/glib/src/wrapper.rs
+++ b/glib/src/wrapper.rs
@@ -329,33 +329,31 @@ macro_rules! glib_wrapper {
     // Object, no class struct, no parents or interfaces
     (
         $(#[$attr:meta])*
-        pub struct $name:ident(Object<$ffi_name:ty $(, $rust_class_name:ident)?>);
+        pub struct $name:ident(Object<$ffi_name:ty>);
 
         match fn {
             get_type => || $get_type_expr:expr,
         }
     ) => {
         $crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, ::std::os::raw::c_void, @get_type $get_type_expr, @extends [], @implements []);
-        $( pub type $rust_class_name = $crate::Class<$name>; )?
     };
 
     // Object, class struct, no parents or interfaces
     (
         $(#[$attr:meta])*
-        pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty $(, $rust_class_name:ident)?>);
+        pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty>);
 
         match fn {
             get_type => || $get_type_expr:expr,
         }
     ) => {
         $crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, $ffi_class_name, @get_type $get_type_expr, @extends [], @implements []);
-        $( pub type $rust_class_name = $crate::Class<$name>; )?
     };
 
     // Object, no class struct, parents, no interfaces
     (
         $(#[$attr:meta])*
-        pub struct $name:ident(Object<$ffi_name:ty $(, $rust_class_name:ident)?>) @extends $($extends:path),+;
+        pub struct $name:ident(Object<$ffi_name:ty>) @extends $($extends:path),+;
 
         match fn {
             get_type => || $get_type_expr:expr,
@@ -363,13 +361,12 @@ macro_rules! glib_wrapper {
     ) => {
         $crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, ::std::os::raw::c_void,
             @get_type $get_type_expr, @extends [$($extends),+], @implements []);
-        $( pub type $rust_class_name = $crate::Class<$name>; )?
     };
 
     // Object, class struct, parents, no interfaces
     (
         $(#[$attr:meta])*
-        pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty $(, $rust_class_name:ident)?>) @extends $($extends:path),+;
+        pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty>) @extends $($extends:path),+;
 
         match fn {
             get_type => || $get_type_expr:expr,
@@ -377,13 +374,12 @@ macro_rules! glib_wrapper {
     ) => {
         $crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, $ffi_class_name,
             @get_type $get_type_expr, @extends [$($extends),+], @implements []);
-        $( pub type $rust_class_name = $crate::Class<$name>; )?
     };
 
     // Object, no class struct, no parents, interfaces
     (
         $(#[$attr:meta])*
-        pub struct $name:ident(Object<$ffi_name:ty $(, $rust_class_name:ident)?>) @implements $($implements:path),+;
+        pub struct $name:ident(Object<$ffi_name:ty>) @implements $($implements:path),+;
 
         match fn {
             get_type => || $get_type_expr:expr,
@@ -391,13 +387,12 @@ macro_rules! glib_wrapper {
     ) => {
         $crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, ::std::os::raw::c_void,
             @get_type $get_type_expr, @extends [], @implements [$($implements),+]);
-        $( pub type $rust_class_name = $crate::Class<$name>; )?
     };
 
     // Object, class struct, no parents, interfaces
     (
         $(#[$attr:meta])*
-        pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty $(, $rust_class_name:ident)?>) @implements $($implements:path),+;
+        pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty>) @implements $($implements:path),+;
 
         match fn {
             get_type => || $get_type_expr:expr,
@@ -405,13 +400,12 @@ macro_rules! glib_wrapper {
     ) => {
         $crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, $ffi_class_name,
             @get_type $get_type_expr, @extends [], @implements [$($implements),+]);
-        $( pub type $rust_class_name = $crate::Class<$name>; )?
     };
 
     // Object, no class struct, parents and interfaces
     (
         $(#[$attr:meta])*
-        pub struct $name:ident(Object<$ffi_name:ty $(, $rust_class_name:ident)?>) @extends $($extends:path),+, @implements $($implements:path),+;
+        pub struct $name:ident(Object<$ffi_name:ty>) @extends $($extends:path),+, @implements $($implements:path),+;
 
         match fn {
             get_type => || $get_type_expr:expr,
@@ -419,13 +413,12 @@ macro_rules! glib_wrapper {
     ) => {
         $crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, ::std::os::raw::c_void,
             @get_type $get_type_expr, @extends [$($extends),+], @implements [$($implements),+]);
-        $( pub type $rust_class_name = $crate::Class<$name>; )?
     };
 
     // Object, class struct, parents and interfaces
     (
         $(#[$attr:meta])*
-        pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty $(, $rust_class_name:ident)?>) @extends $($extends:path),+, @implements $($implements:path),+;
+        pub struct $name:ident(Object<$ffi_name:ty, $ffi_class_name:ty>) @extends $($extends:path),+, @implements $($implements:path),+;
 
         match fn {
             get_type => || $get_type_expr:expr,
@@ -433,52 +426,47 @@ macro_rules! glib_wrapper {
     ) => {
         $crate::glib_object_wrapper!(@object [$($attr)*] $name, $ffi_name, $ffi_class_name,
             @get_type $get_type_expr, @extends [$($extends),+], @implements [$($implements),+]);
-        $( pub type $rust_class_name = $crate::Class<$name>; )?
     };
 
     // ObjectSubclass, no parents or interfaces
     (
         $(#[$attr:meta])*
-        pub struct $name:ident(ObjectSubclass<$subclass:ty $(, $rust_class_name:ident)?>);
+        pub struct $name:ident(ObjectSubclass<$subclass:ty>);
     ) => {
         use glib::translate::ToGlib;
         $crate::glib_object_wrapper!(@object [$($attr)*] $name, <$subclass as $crate::subclass::types::ObjectSubclass>::Instance, <$subclass as $crate::subclass::types::ObjectSubclass>::Class,
             @get_type $crate::translate::ToGlib::to_glib(&<$subclass as $crate::subclass::types::ObjectSubclass>::get_type()),
             @extends [], @implements []);
-        $( pub type $rust_class_name = $crate::Class<$name>; )?
     };
 
     // ObjectSubclass, no parents, interfaces
     (
         $(#[$attr:meta])*
-        pub struct $name:ident(ObjectSubclass<$subclass:ty $(, $rust_class_name:ident)?>) @implements $($implements:path),+;
+        pub struct $name:ident(ObjectSubclass<$subclass:ty>) @implements $($implements:path),+;
     ) => {
         $crate::glib_object_wrapper!(@object [$($attr)*] $name, <$subclass as $crate::subclass::types::ObjectSubclass>::Instance, <$subclass as $crate::subclass::types::ObjectSubclass>::Class,
             @get_type $crate::translate::ToGlib::to_glib(&<$subclass as $crate::subclass::types::ObjectSubclass>::get_type()),
             @extends [], @implements [$($implements),+]);
-        $( pub type $rust_class_name = $crate::Class<$name>; )?
     };
 
     // ObjectSubclass, parents, no interfaces
     (
         $(#[$attr:meta])*
-        pub struct $name:ident(ObjectSubclass<$subclass:ty $(, $rust_class_name:ident)?>) @extends $($extends:path),+;
+        pub struct $name:ident(ObjectSubclass<$subclass:ty>) @extends $($extends:path),+;
     ) => {
         $crate::glib_object_wrapper!(@object [$($attr)*] $name, <$subclass as $crate::subclass::types::ObjectSubclass>::Instance, <$subclass as $crate::subclass::types::ObjectSubclass>::Class,
             @get_type $crate::translate::ToGlib::to_glib(&<$subclass as $crate::subclass::types::ObjectSubclass>::get_type()),
             @extends [$($extends),+], @implements []);
-        $( pub type $rust_class_name = $crate::Class<$name>; )?
     };
 
     // ObjectSubclass, parents and interfaces
     (
         $(#[$attr:meta])*
-        pub struct $name:ident(ObjectSubclass<$subclass:ty $(, $rust_class_name:ident)?>) @extends $($extends:path),+, @implements $($implements:path),+;
+        pub struct $name:ident(ObjectSubclass<$subclass:ty>) @extends $($extends:path),+, @implements $($implements:path),+;
     ) => {
         $crate::glib_object_wrapper!(@object [$($attr)*] $name, <$subclass as $crate::subclass::types::ObjectSubclass>::Instance, <$subclass as $crate::subclass::types::ObjectSubclass>::Class,
             @get_type $crate::translate::ToGlib::to_glib(&<$subclass as $crate::subclass::types::ObjectSubclass>::get_type()),
             @extends [$($extends),+], @implements [$($implements),+]);
-        $( pub type $rust_class_name = $crate::Class<$name>; )?
     };
 
     // Interface, no prerequisites
diff --git a/glib/sys/versions.txt b/glib/sys/versions.txt
index 8f042be52d08..62b9885a87fa 100644
--- a/glib/sys/versions.txt
+++ b/glib/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/graphene/src/auto/versions.txt b/graphene/src/auto/versions.txt
index 8f042be52d08..62b9885a87fa 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 @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/graphene/sys/versions.txt b/graphene/sys/versions.txt
index 8f042be52d08..62b9885a87fa 100644
--- a/graphene/sys/versions.txt
+++ b/graphene/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/gtk/src/auto/about_dialog.rs b/gtk/src/auto/about_dialog.rs
index 34c7b8adfcac..32eeca4239bc 100644
--- a/gtk/src/auto/about_dialog.rs
+++ b/gtk/src/auto/about_dialog.rs
@@ -32,7 +32,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct AboutDialog(Object<gtk_sys::GtkAboutDialog, gtk_sys::GtkAboutDialogClass, AboutDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable;
+    pub struct AboutDialog(Object<gtk_sys::GtkAboutDialog, gtk_sys::GtkAboutDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_about_dialog_get_type(),
diff --git a/gtk/src/auto/accel_group.rs b/gtk/src/auto/accel_group.rs
index 9d97f36d21b6..b7733eae484d 100644
--- a/gtk/src/auto/accel_group.rs
+++ b/gtk/src/auto/accel_group.rs
@@ -19,7 +19,7 @@ use std::fmt;
 use std::mem::transmute;
 
 glib_wrapper! {
-    pub struct AccelGroup(Object<gtk_sys::GtkAccelGroup, gtk_sys::GtkAccelGroupClass, AccelGroupClass>);
+    pub struct AccelGroup(Object<gtk_sys::GtkAccelGroup, gtk_sys::GtkAccelGroupClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_accel_group_get_type(),
diff --git a/gtk/src/auto/accel_label.rs b/gtk/src/auto/accel_label.rs
index 3196f640ba7c..b24591867317 100644
--- a/gtk/src/auto/accel_label.rs
+++ b/gtk/src/auto/accel_label.rs
@@ -29,7 +29,7 @@ use Misc;
 use Widget;
 
 glib_wrapper! {
-    pub struct AccelLabel(Object<gtk_sys::GtkAccelLabel, gtk_sys::GtkAccelLabelClass, AccelLabelClass>) @extends Label, Misc, Widget, @implements Buildable;
+    pub struct AccelLabel(Object<gtk_sys::GtkAccelLabel, gtk_sys::GtkAccelLabelClass>) @extends Label, Misc, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_accel_label_get_type(),
diff --git a/gtk/src/auto/action_bar.rs b/gtk/src/auto/action_bar.rs
index d0d9f8abbfd9..110f88772e2e 100644
--- a/gtk/src/auto/action_bar.rs
+++ b/gtk/src/auto/action_bar.rs
@@ -20,7 +20,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct ActionBar(Object<gtk_sys::GtkActionBar, gtk_sys::GtkActionBarClass, ActionBarClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct ActionBar(Object<gtk_sys::GtkActionBar, gtk_sys::GtkActionBarClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_action_bar_get_type(),
diff --git a/gtk/src/auto/adjustment.rs b/gtk/src/auto/adjustment.rs
index 852e62c77c6f..59f74829d562 100644
--- a/gtk/src/auto/adjustment.rs
+++ b/gtk/src/auto/adjustment.rs
@@ -16,7 +16,7 @@ use std::fmt;
 use std::mem::transmute;
 
 glib_wrapper! {
-    pub struct Adjustment(Object<gtk_sys::GtkAdjustment, gtk_sys::GtkAdjustmentClass, AdjustmentClass>);
+    pub struct Adjustment(Object<gtk_sys::GtkAdjustment, gtk_sys::GtkAdjustmentClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_adjustment_get_type(),
diff --git a/gtk/src/auto/app_chooser_button.rs b/gtk/src/auto/app_chooser_button.rs
index 5f6c0d1eb5d4..bc8023ed7e40 100644
--- a/gtk/src/auto/app_chooser_button.rs
+++ b/gtk/src/auto/app_chooser_button.rs
@@ -33,7 +33,7 @@ use TreeModel;
 use Widget;
 
 glib_wrapper! {
-    pub struct AppChooserButton(Object<gtk_sys::GtkAppChooserButton, gtk_sys::GtkAppChooserButtonClass, AppChooserButtonClass>) @extends ComboBox, Bin, Container, Widget, @implements Buildable, CellEditable, CellLayout, AppChooser;
+    pub struct AppChooserButton(Object<gtk_sys::GtkAppChooserButton, gtk_sys::GtkAppChooserButtonClass>) @extends ComboBox, Bin, Container, Widget, @implements Buildable, CellEditable, CellLayout, AppChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_app_chooser_button_get_type(),
diff --git a/gtk/src/auto/app_chooser_dialog.rs b/gtk/src/auto/app_chooser_dialog.rs
index 963e933328b8..af52aafe58e3 100644
--- a/gtk/src/auto/app_chooser_dialog.rs
+++ b/gtk/src/auto/app_chooser_dialog.rs
@@ -35,7 +35,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct AppChooserDialog(Object<gtk_sys::GtkAppChooserDialog, gtk_sys::GtkAppChooserDialogClass, AppChooserDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable, AppChooser;
+    pub struct AppChooserDialog(Object<gtk_sys::GtkAppChooserDialog, gtk_sys::GtkAppChooserDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable, AppChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_app_chooser_dialog_get_type(),
diff --git a/gtk/src/auto/app_chooser_widget.rs b/gtk/src/auto/app_chooser_widget.rs
index 564352de8226..b1de5d80c37c 100644
--- a/gtk/src/auto/app_chooser_widget.rs
+++ b/gtk/src/auto/app_chooser_widget.rs
@@ -31,7 +31,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct AppChooserWidget(Object<gtk_sys::GtkAppChooserWidget, gtk_sys::GtkAppChooserWidgetClass, AppChooserWidgetClass>) @extends Box, Container, Widget, @implements Buildable, Orientable, AppChooser;
+    pub struct AppChooserWidget(Object<gtk_sys::GtkAppChooserWidget, gtk_sys::GtkAppChooserWidgetClass>) @extends Box, Container, Widget, @implements Buildable, Orientable, AppChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_app_chooser_widget_get_type(),
diff --git a/gtk/src/auto/application.rs b/gtk/src/auto/application.rs
index 89205e3e3aad..d27fa3752cd8 100644
--- a/gtk/src/auto/application.rs
+++ b/gtk/src/auto/application.rs
@@ -22,7 +22,7 @@ use ApplicationInhibitFlags;
 use Window;
 
 glib_wrapper! {
-    pub struct Application(Object<gtk_sys::GtkApplication, gtk_sys::GtkApplicationClass, ApplicationClass>) @extends gio::Application, @implements gio::ActionGroup, gio::ActionMap;
+    pub struct Application(Object<gtk_sys::GtkApplication, gtk_sys::GtkApplicationClass>) @extends gio::Application, @implements gio::ActionGroup, gio::ActionMap;
 
     match fn {
         get_type => || gtk_sys::gtk_application_get_type(),
diff --git a/gtk/src/auto/application_window.rs b/gtk/src/auto/application_window.rs
index a958272e872a..6764c101af29 100644
--- a/gtk/src/auto/application_window.rs
+++ b/gtk/src/auto/application_window.rs
@@ -31,7 +31,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct ApplicationWindow(Object<gtk_sys::GtkApplicationWindow, gtk_sys::GtkApplicationWindowClass, ApplicationWindowClass>) @extends Window, Bin, Container, Widget, @implements Buildable, gio::ActionGroup, gio::ActionMap;
+    pub struct ApplicationWindow(Object<gtk_sys::GtkApplicationWindow, gtk_sys::GtkApplicationWindowClass>) @extends Window, Bin, Container, Widget, @implements Buildable, gio::ActionGroup, gio::ActionMap;
 
     match fn {
         get_type => || gtk_sys::gtk_application_window_get_type(),
diff --git a/gtk/src/auto/aspect_frame.rs b/gtk/src/auto/aspect_frame.rs
index eac45c4cb7b1..546777c0d1db 100644
--- a/gtk/src/auto/aspect_frame.rs
+++ b/gtk/src/auto/aspect_frame.rs
@@ -27,7 +27,7 @@ use ShadowType;
 use Widget;
 
 glib_wrapper! {
-    pub struct AspectFrame(Object<gtk_sys::GtkAspectFrame, gtk_sys::GtkAspectFrameClass, AspectFrameClass>) @extends Frame, Bin, Container, Widget, @implements Buildable;
+    pub struct AspectFrame(Object<gtk_sys::GtkAspectFrame, gtk_sys::GtkAspectFrameClass>) @extends Frame, Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_aspect_frame_get_type(),
diff --git a/gtk/src/auto/assistant.rs b/gtk/src/auto/assistant.rs
index 0b7671947bfb..24c8c414b222 100644
--- a/gtk/src/auto/assistant.rs
+++ b/gtk/src/auto/assistant.rs
@@ -34,7 +34,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct Assistant(Object<gtk_sys::GtkAssistant, gtk_sys::GtkAssistantClass, AssistantClass>) @extends Window, Bin, Container, Widget, @implements Buildable;
+    pub struct Assistant(Object<gtk_sys::GtkAssistant, gtk_sys::GtkAssistantClass>) @extends Window, Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_assistant_get_type(),
diff --git a/gtk/src/auto/bin.rs b/gtk/src/auto/bin.rs
index 45c1e38eec82..6d32a32694e0 100644
--- a/gtk/src/auto/bin.rs
+++ b/gtk/src/auto/bin.rs
@@ -11,7 +11,7 @@ use Container;
 use Widget;
 
 glib_wrapper! {
-    pub struct Bin(Object<gtk_sys::GtkBin, gtk_sys::GtkBinClass, BinClass>) @extends Container, Widget, @implements Buildable;
+    pub struct Bin(Object<gtk_sys::GtkBin, gtk_sys::GtkBinClass>) @extends Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_bin_get_type(),
diff --git a/gtk/src/auto/box_.rs b/gtk/src/auto/box_.rs
index 601f459849e2..f3ac8125c616 100644
--- a/gtk/src/auto/box_.rs
+++ b/gtk/src/auto/box_.rs
@@ -28,7 +28,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct Box(Object<gtk_sys::GtkBox, gtk_sys::GtkBoxClass, BoxClass>) @extends Container, Widget, @implements Buildable, Orientable;
+    pub struct Box(Object<gtk_sys::GtkBox, gtk_sys::GtkBoxClass>) @extends Container, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_box_get_type(),
diff --git a/gtk/src/auto/builder.rs b/gtk/src/auto/builder.rs
index fb1504ba2962..6e1a69697b59 100644
--- a/gtk/src/auto/builder.rs
+++ b/gtk/src/auto/builder.rs
@@ -19,7 +19,7 @@ use Application;
 use Widget;
 
 glib_wrapper! {
-    pub struct Builder(Object<gtk_sys::GtkBuilder, gtk_sys::GtkBuilderClass, BuilderClass>);
+    pub struct Builder(Object<gtk_sys::GtkBuilder, gtk_sys::GtkBuilderClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_builder_get_type(),
diff --git a/gtk/src/auto/button.rs b/gtk/src/auto/button.rs
index 6f2303aaaaab..9da442341677 100644
--- a/gtk/src/auto/button.rs
+++ b/gtk/src/auto/button.rs
@@ -31,7 +31,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct Button(Object<gtk_sys::GtkButton, gtk_sys::GtkButtonClass, ButtonClass>) @extends Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct Button(Object<gtk_sys::GtkButton, gtk_sys::GtkButtonClass>) @extends Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_button_get_type(),
diff --git a/gtk/src/auto/button_box.rs b/gtk/src/auto/button_box.rs
index 3eb519e8c1ac..8895fcf200c1 100644
--- a/gtk/src/auto/button_box.rs
+++ b/gtk/src/auto/button_box.rs
@@ -29,7 +29,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct ButtonBox(Object<gtk_sys::GtkButtonBox, gtk_sys::GtkButtonBoxClass, ButtonBoxClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
+    pub struct ButtonBox(Object<gtk_sys::GtkButtonBox, gtk_sys::GtkButtonBoxClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_button_box_get_type(),
diff --git a/gtk/src/auto/calendar.rs b/gtk/src/auto/calendar.rs
index b43b854ffed7..6a1f7aee8958 100644
--- a/gtk/src/auto/calendar.rs
+++ b/gtk/src/auto/calendar.rs
@@ -25,7 +25,7 @@ use Container;
 use Widget;
 
 glib_wrapper! {
-    pub struct Calendar(Object<gtk_sys::GtkCalendar, gtk_sys::GtkCalendarClass, CalendarClass>) @extends Widget, @implements Buildable;
+    pub struct Calendar(Object<gtk_sys::GtkCalendar, gtk_sys::GtkCalendarClass>) @extends Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_calendar_get_type(),
diff --git a/gtk/src/auto/cell_area.rs b/gtk/src/auto/cell_area.rs
index e8fd05b02627..79165bc2f2cc 100644
--- a/gtk/src/auto/cell_area.rs
+++ b/gtk/src/auto/cell_area.rs
@@ -34,7 +34,7 @@ use TreePath;
 use Widget;
 
 glib_wrapper! {
-    pub struct CellArea(Object<gtk_sys::GtkCellArea, gtk_sys::GtkCellAreaClass, CellAreaClass>) @implements Buildable, CellLayout;
+    pub struct CellArea(Object<gtk_sys::GtkCellArea, gtk_sys::GtkCellAreaClass>) @implements Buildable, CellLayout;
 
     match fn {
         get_type => || gtk_sys::gtk_cell_area_get_type(),
diff --git a/gtk/src/auto/cell_area_box.rs b/gtk/src/auto/cell_area_box.rs
index 1121c3731290..071a4b5edd2a 100644
--- a/gtk/src/auto/cell_area_box.rs
+++ b/gtk/src/auto/cell_area_box.rs
@@ -22,7 +22,7 @@ use Orientable;
 use Orientation;
 
 glib_wrapper! {
-    pub struct CellAreaBox(Object<gtk_sys::GtkCellAreaBox, gtk_sys::GtkCellAreaBoxClass, CellAreaBoxClass>) @extends CellArea, @implements Buildable, CellLayout, Orientable;
+    pub struct CellAreaBox(Object<gtk_sys::GtkCellAreaBox, gtk_sys::GtkCellAreaBoxClass>) @extends CellArea, @implements Buildable, CellLayout, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_cell_area_box_get_type(),
diff --git a/gtk/src/auto/cell_area_context.rs b/gtk/src/auto/cell_area_context.rs
index c7c655fbfb81..13778fec34b1 100644
--- a/gtk/src/auto/cell_area_context.rs
+++ b/gtk/src/auto/cell_area_context.rs
@@ -19,7 +19,7 @@ use std::mem::transmute;
 use CellArea;
 
 glib_wrapper! {
-    pub struct CellAreaContext(Object<gtk_sys::GtkCellAreaContext, gtk_sys::GtkCellAreaContextClass, CellAreaContextClass>);
+    pub struct CellAreaContext(Object<gtk_sys::GtkCellAreaContext, gtk_sys::GtkCellAreaContextClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_cell_area_context_get_type(),
diff --git a/gtk/src/auto/cell_renderer.rs b/gtk/src/auto/cell_renderer.rs
index 7924c3fdf94f..01e2aa6fca78 100644
--- a/gtk/src/auto/cell_renderer.rs
+++ b/gtk/src/auto/cell_renderer.rs
@@ -29,7 +29,7 @@ use TreePath;
 use Widget;
 
 glib_wrapper! {
-    pub struct CellRenderer(Object<gtk_sys::GtkCellRenderer, gtk_sys::GtkCellRendererClass, CellRendererClass>);
+    pub struct CellRenderer(Object<gtk_sys::GtkCellRenderer, gtk_sys::GtkCellRendererClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_cell_renderer_get_type(),
diff --git a/gtk/src/auto/cell_renderer_accel.rs b/gtk/src/auto/cell_renderer_accel.rs
index da6614251f7b..2cae55d260f5 100644
--- a/gtk/src/auto/cell_renderer_accel.rs
+++ b/gtk/src/auto/cell_renderer_accel.rs
@@ -27,7 +27,7 @@ use CellRendererText;
 use TreePath;
 
 glib_wrapper! {
-    pub struct CellRendererAccel(Object<gtk_sys::GtkCellRendererAccel, gtk_sys::GtkCellRendererAccelClass, CellRendererAccelClass>) @extends CellRendererText, CellRenderer;
+    pub struct CellRendererAccel(Object<gtk_sys::GtkCellRendererAccel, gtk_sys::GtkCellRendererAccelClass>) @extends CellRendererText, CellRenderer;
 
     match fn {
         get_type => || gtk_sys::gtk_cell_renderer_accel_get_type(),
diff --git a/gtk/src/auto/cell_renderer_combo.rs b/gtk/src/auto/cell_renderer_combo.rs
index a79eb9be8496..7d4d28ee01d0 100644
--- a/gtk/src/auto/cell_renderer_combo.rs
+++ b/gtk/src/auto/cell_renderer_combo.rs
@@ -28,7 +28,7 @@ use TreeModel;
 use TreePath;
 
 glib_wrapper! {
-    pub struct CellRendererCombo(Object<gtk_sys::GtkCellRendererCombo, gtk_sys::GtkCellRendererComboClass, CellRendererComboClass>) @extends CellRendererText, CellRenderer;
+    pub struct CellRendererCombo(Object<gtk_sys::GtkCellRendererCombo, gtk_sys::GtkCellRendererComboClass>) @extends CellRendererText, CellRenderer;
 
     match fn {
         get_type => || gtk_sys::gtk_cell_renderer_combo_get_type(),
diff --git a/gtk/src/auto/cell_renderer_pixbuf.rs b/gtk/src/auto/cell_renderer_pixbuf.rs
index f4c2013612d8..02ab29e27996 100644
--- a/gtk/src/auto/cell_renderer_pixbuf.rs
+++ b/gtk/src/auto/cell_renderer_pixbuf.rs
@@ -26,7 +26,7 @@ use CellRenderer;
 use CellRendererMode;
 
 glib_wrapper! {
-    pub struct CellRendererPixbuf(Object<gtk_sys::GtkCellRendererPixbuf, gtk_sys::GtkCellRendererPixbufClass, CellRendererPixbufClass>) @extends CellRenderer;
+    pub struct CellRendererPixbuf(Object<gtk_sys::GtkCellRendererPixbuf, gtk_sys::GtkCellRendererPixbufClass>) @extends CellRenderer;
 
     match fn {
         get_type => || gtk_sys::gtk_cell_renderer_pixbuf_get_type(),
diff --git a/gtk/src/auto/cell_renderer_progress.rs b/gtk/src/auto/cell_renderer_progress.rs
index b9a8a05282f4..49c6f7f59481 100644
--- a/gtk/src/auto/cell_renderer_progress.rs
+++ b/gtk/src/auto/cell_renderer_progress.rs
@@ -24,7 +24,7 @@ use Orientable;
 use Orientation;
 
 glib_wrapper! {
-    pub struct CellRendererProgress(Object<gtk_sys::GtkCellRendererProgress, gtk_sys::GtkCellRendererProgressClass, CellRendererProgressClass>) @extends CellRenderer, @implements Orientable;
+    pub struct CellRendererProgress(Object<gtk_sys::GtkCellRendererProgress, gtk_sys::GtkCellRendererProgressClass>) @extends CellRenderer, @implements Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_cell_renderer_progress_get_type(),
diff --git a/gtk/src/auto/cell_renderer_spin.rs b/gtk/src/auto/cell_renderer_spin.rs
index 13842e66d8c9..2d116999aad9 100644
--- a/gtk/src/auto/cell_renderer_spin.rs
+++ b/gtk/src/auto/cell_renderer_spin.rs
@@ -25,7 +25,7 @@ use CellRendererMode;
 use CellRendererText;
 
 glib_wrapper! {
-    pub struct CellRendererSpin(Object<gtk_sys::GtkCellRendererSpin, gtk_sys::GtkCellRendererSpinClass, CellRendererSpinClass>) @extends CellRendererText, CellRenderer;
+    pub struct CellRendererSpin(Object<gtk_sys::GtkCellRendererSpin, gtk_sys::GtkCellRendererSpinClass>) @extends CellRendererText, CellRenderer;
 
     match fn {
         get_type => || gtk_sys::gtk_cell_renderer_spin_get_type(),
diff --git a/gtk/src/auto/cell_renderer_spinner.rs b/gtk/src/auto/cell_renderer_spinner.rs
index 734bdcdeef41..73b4810e52e9 100644
--- a/gtk/src/auto/cell_renderer_spinner.rs
+++ b/gtk/src/auto/cell_renderer_spinner.rs
@@ -22,7 +22,7 @@ use CellRendererMode;
 use IconSize;
 
 glib_wrapper! {
-    pub struct CellRendererSpinner(Object<gtk_sys::GtkCellRendererSpinner, gtk_sys::GtkCellRendererSpinnerClass, CellRendererSpinnerClass>) @extends CellRenderer;
+    pub struct CellRendererSpinner(Object<gtk_sys::GtkCellRendererSpinner, gtk_sys::GtkCellRendererSpinnerClass>) @extends CellRenderer;
 
     match fn {
         get_type => || gtk_sys::gtk_cell_renderer_spinner_get_type(),
diff --git a/gtk/src/auto/cell_renderer_text.rs b/gtk/src/auto/cell_renderer_text.rs
index 732ff7283005..ae383fa0c2ac 100644
--- a/gtk/src/auto/cell_renderer_text.rs
+++ b/gtk/src/auto/cell_renderer_text.rs
@@ -25,7 +25,7 @@ use CellRendererMode;
 use TreePath;
 
 glib_wrapper! {
-    pub struct CellRendererText(Object<gtk_sys::GtkCellRendererText, gtk_sys::GtkCellRendererTextClass, CellRendererTextClass>) @extends CellRenderer;
+    pub struct CellRendererText(Object<gtk_sys::GtkCellRendererText, gtk_sys::GtkCellRendererTextClass>) @extends CellRenderer;
 
     match fn {
         get_type => || gtk_sys::gtk_cell_renderer_text_get_type(),
diff --git a/gtk/src/auto/cell_renderer_toggle.rs b/gtk/src/auto/cell_renderer_toggle.rs
index 54d22108ea1e..c888793113c7 100644
--- a/gtk/src/auto/cell_renderer_toggle.rs
+++ b/gtk/src/auto/cell_renderer_toggle.rs
@@ -23,7 +23,7 @@ use CellRendererMode;
 use TreePath;
 
 glib_wrapper! {
-    pub struct CellRendererToggle(Object<gtk_sys::GtkCellRendererToggle, gtk_sys::GtkCellRendererToggleClass, CellRendererToggleClass>) @extends CellRenderer;
+    pub struct CellRendererToggle(Object<gtk_sys::GtkCellRendererToggle, gtk_sys::GtkCellRendererToggleClass>) @extends CellRenderer;
 
     match fn {
         get_type => || gtk_sys::gtk_cell_renderer_toggle_get_type(),
diff --git a/gtk/src/auto/cell_view.rs b/gtk/src/auto/cell_view.rs
index 0f2498f082f5..f883d0c7a7d1 100644
--- a/gtk/src/auto/cell_view.rs
+++ b/gtk/src/auto/cell_view.rs
@@ -31,7 +31,7 @@ use TreePath;
 use Widget;
 
 glib_wrapper! {
-    pub struct CellView(Object<gtk_sys::GtkCellView, gtk_sys::GtkCellViewClass, CellViewClass>) @extends Widget, @implements Buildable, CellLayout, Orientable;
+    pub struct CellView(Object<gtk_sys::GtkCellView, gtk_sys::GtkCellViewClass>) @extends Widget, @implements Buildable, CellLayout, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_cell_view_get_type(),
diff --git a/gtk/src/auto/check_button.rs b/gtk/src/auto/check_button.rs
index 9bb8360f815b..f69abd38b793 100644
--- a/gtk/src/auto/check_button.rs
+++ b/gtk/src/auto/check_button.rs
@@ -24,7 +24,7 @@ use ToggleButton;
 use Widget;
 
 glib_wrapper! {
-    pub struct CheckButton(Object<gtk_sys::GtkCheckButton, gtk_sys::GtkCheckButtonClass, CheckButtonClass>) @extends ToggleButton, Button, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct CheckButton(Object<gtk_sys::GtkCheckButton, gtk_sys::GtkCheckButtonClass>) @extends ToggleButton, Button, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_check_button_get_type(),
diff --git a/gtk/src/auto/check_menu_item.rs b/gtk/src/auto/check_menu_item.rs
index 13d5f11dcbf4..f8fdfc2f7dce 100644
--- a/gtk/src/auto/check_menu_item.rs
+++ b/gtk/src/auto/check_menu_item.rs
@@ -27,7 +27,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct CheckMenuItem(Object<gtk_sys::GtkCheckMenuItem, gtk_sys::GtkCheckMenuItemClass, CheckMenuItemClass>) @extends MenuItem, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct CheckMenuItem(Object<gtk_sys::GtkCheckMenuItem, gtk_sys::GtkCheckMenuItemClass>) @extends MenuItem, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_check_menu_item_get_type(),
diff --git a/gtk/src/auto/clipboard.rs b/gtk/src/auto/clipboard.rs
index ae7cecb54409..99c32910e697 100644
--- a/gtk/src/auto/clipboard.rs
+++ b/gtk/src/auto/clipboard.rs
@@ -17,7 +17,7 @@ use SelectionData;
 use TextBuffer;
 
 glib_wrapper! {
-    pub struct Clipboard(Object<gtk_sys::GtkClipboard, ClipboardClass>);
+    pub struct Clipboard(Object<gtk_sys::GtkClipboard>);
 
     match fn {
         get_type => || gtk_sys::gtk_clipboard_get_type(),
diff --git a/gtk/src/auto/color_button.rs b/gtk/src/auto/color_button.rs
index 3c79408cccb1..50baabdd5fe2 100644
--- a/gtk/src/auto/color_button.rs
+++ b/gtk/src/auto/color_button.rs
@@ -32,7 +32,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct ColorButton(Object<gtk_sys::GtkColorButton, gtk_sys::GtkColorButtonClass, ColorButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable, ColorChooser;
+    pub struct ColorButton(Object<gtk_sys::GtkColorButton, gtk_sys::GtkColorButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable, ColorChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_color_button_get_type(),
diff --git a/gtk/src/auto/color_chooser_dialog.rs b/gtk/src/auto/color_chooser_dialog.rs
index 299f51ba638f..5a0af98c869b 100644
--- a/gtk/src/auto/color_chooser_dialog.rs
+++ b/gtk/src/auto/color_chooser_dialog.rs
@@ -32,7 +32,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct ColorChooserDialog(Object<gtk_sys::GtkColorChooserDialog, gtk_sys::GtkColorChooserDialogClass, ColorChooserDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable, ColorChooser;
+    pub struct ColorChooserDialog(Object<gtk_sys::GtkColorChooserDialog, gtk_sys::GtkColorChooserDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable, ColorChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_color_chooser_dialog_get_type(),
diff --git a/gtk/src/auto/color_chooser_widget.rs b/gtk/src/auto/color_chooser_widget.rs
index 5fbc7b6c15a0..d656c5891a62 100644
--- a/gtk/src/auto/color_chooser_widget.rs
+++ b/gtk/src/auto/color_chooser_widget.rs
@@ -29,7 +29,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct ColorChooserWidget(Object<gtk_sys::GtkColorChooserWidget, gtk_sys::GtkColorChooserWidgetClass, ColorChooserWidgetClass>) @extends Box, Container, Widget, @implements Buildable, Orientable, ColorChooser;
+    pub struct ColorChooserWidget(Object<gtk_sys::GtkColorChooserWidget, gtk_sys::GtkColorChooserWidgetClass>) @extends Box, Container, Widget, @implements Buildable, Orientable, ColorChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_color_chooser_widget_get_type(),
diff --git a/gtk/src/auto/combo_box.rs b/gtk/src/auto/combo_box.rs
index 8bc8ba9cf21a..f0b5498663c9 100644
--- a/gtk/src/auto/combo_box.rs
+++ b/gtk/src/auto/combo_box.rs
@@ -37,7 +37,7 @@ use TreeModel;
 use Widget;
 
 glib_wrapper! {
-    pub struct ComboBox(Object<gtk_sys::GtkComboBox, gtk_sys::GtkComboBoxClass, ComboBoxClass>) @extends Bin, Container, Widget, @implements Buildable, CellEditable, CellLayout;
+    pub struct ComboBox(Object<gtk_sys::GtkComboBox, gtk_sys::GtkComboBoxClass>) @extends Bin, Container, Widget, @implements Buildable, CellEditable, CellLayout;
 
     match fn {
         get_type => || gtk_sys::gtk_combo_box_get_type(),
diff --git a/gtk/src/auto/combo_box_text.rs b/gtk/src/auto/combo_box_text.rs
index 5c5b2c93b5e7..32b90dc39c51 100644
--- a/gtk/src/auto/combo_box_text.rs
+++ b/gtk/src/auto/combo_box_text.rs
@@ -25,7 +25,7 @@ use TreeModel;
 use Widget;
 
 glib_wrapper! {
-    pub struct ComboBoxText(Object<gtk_sys::GtkComboBoxText, gtk_sys::GtkComboBoxTextClass, ComboBoxTextClass>) @extends ComboBox, Bin, Container, Widget, @implements Buildable, CellEditable, CellLayout;
+    pub struct ComboBoxText(Object<gtk_sys::GtkComboBoxText, gtk_sys::GtkComboBoxTextClass>) @extends ComboBox, Bin, Container, Widget, @implements Buildable, CellEditable, CellLayout;
 
     match fn {
         get_type => || gtk_sys::gtk_combo_box_text_get_type(),
diff --git a/gtk/src/auto/container.rs b/gtk/src/auto/container.rs
index 96883aad6b6f..cb1b41afc9bd 100644
--- a/gtk/src/auto/container.rs
+++ b/gtk/src/auto/container.rs
@@ -25,7 +25,7 @@ use Widget;
 use WidgetPath;
 
 glib_wrapper! {
-    pub struct Container(Object<gtk_sys::GtkContainer, gtk_sys::GtkContainerClass, ContainerClass>) @extends Widget, @implements Buildable;
+    pub struct Container(Object<gtk_sys::GtkContainer, gtk_sys::GtkContainerClass>) @extends Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_container_get_type(),
diff --git a/gtk/src/auto/css_provider.rs b/gtk/src/auto/css_provider.rs
index 9b653631061a..469a3938ec21 100644
--- a/gtk/src/auto/css_provider.rs
+++ b/gtk/src/auto/css_provider.rs
@@ -20,7 +20,7 @@ use CssSection;
 use StyleProvider;
 
 glib_wrapper! {
-    pub struct CssProvider(Object<gtk_sys::GtkCssProvider, gtk_sys::GtkCssProviderClass, CssProviderClass>) @implements StyleProvider;
+    pub struct CssProvider(Object<gtk_sys::GtkCssProvider, gtk_sys::GtkCssProviderClass>) @implements StyleProvider;
 
     match fn {
         get_type => || gtk_sys::gtk_css_provider_get_type(),
diff --git a/gtk/src/auto/dialog.rs b/gtk/src/auto/dialog.rs
index 614ed4660a92..502ec5787472 100644
--- a/gtk/src/auto/dialog.rs
+++ b/gtk/src/auto/dialog.rs
@@ -35,7 +35,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct Dialog(Object<gtk_sys::GtkDialog, gtk_sys::GtkDialogClass, DialogClass>) @extends Window, Bin, Container, Widget, @implements Buildable;
+    pub struct Dialog(Object<gtk_sys::GtkDialog, gtk_sys::GtkDialogClass>) @extends Window, Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_dialog_get_type(),
diff --git a/gtk/src/auto/drawing_area.rs b/gtk/src/auto/drawing_area.rs
index 4780f9ee362a..42965b948970 100644
--- a/gtk/src/auto/drawing_area.rs
+++ b/gtk/src/auto/drawing_area.rs
@@ -16,7 +16,7 @@ use Container;
 use Widget;
 
 glib_wrapper! {
-    pub struct DrawingArea(Object<gtk_sys::GtkDrawingArea, gtk_sys::GtkDrawingAreaClass, DrawingAreaClass>) @extends Widget, @implements Buildable;
+    pub struct DrawingArea(Object<gtk_sys::GtkDrawingArea, gtk_sys::GtkDrawingAreaClass>) @extends Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_drawing_area_get_type(),
diff --git a/gtk/src/auto/entry.rs b/gtk/src/auto/entry.rs
index 025be4a26429..00553a921688 100644
--- a/gtk/src/auto/entry.rs
+++ b/gtk/src/auto/entry.rs
@@ -46,7 +46,7 @@ use TargetList;
 use Widget;
 
 glib_wrapper! {
-    pub struct Entry(Object<gtk_sys::GtkEntry, gtk_sys::GtkEntryClass, EntryClass>) @extends Widget, @implements Buildable, CellEditable, Editable;
+    pub struct Entry(Object<gtk_sys::GtkEntry, gtk_sys::GtkEntryClass>) @extends Widget, @implements Buildable, CellEditable, Editable;
 
     match fn {
         get_type => || gtk_sys::gtk_entry_get_type(),
diff --git a/gtk/src/auto/entry_completion.rs b/gtk/src/auto/entry_completion.rs
index 58cc8957c8aa..cd80cafe70c2 100644
--- a/gtk/src/auto/entry_completion.rs
+++ b/gtk/src/auto/entry_completion.rs
@@ -25,7 +25,7 @@ use TreeIter;
 use TreeModel;
 
 glib_wrapper! {
-    pub struct EntryCompletion(Object<gtk_sys::GtkEntryCompletion, gtk_sys::GtkEntryCompletionClass, EntryCompletionClass>) @implements Buildable, CellLayout;
+    pub struct EntryCompletion(Object<gtk_sys::GtkEntryCompletion, gtk_sys::GtkEntryCompletionClass>) @implements Buildable, CellLayout;
 
     match fn {
         get_type => || gtk_sys::gtk_entry_completion_get_type(),
diff --git a/gtk/src/auto/enums.rs b/gtk/src/auto/enums.rs
index 48d5ff40e35e..7340f1c4a76f 100644
--- a/gtk/src/auto/enums.rs
+++ b/gtk/src/auto/enums.rs
@@ -2007,7 +2007,6 @@ pub enum IMPreeditStyle {
     __Unknown(i32),
 }
 
-#[deprecated]
 impl fmt::Display for IMPreeditStyle {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(
@@ -2023,7 +2022,6 @@ impl fmt::Display for IMPreeditStyle {
     }
 }
 
-#[deprecated]
 #[doc(hidden)]
 impl ToGlib for IMPreeditStyle {
     type GlibType = gtk_sys::GtkIMPreeditStyle;
@@ -2038,7 +2036,6 @@ impl ToGlib for IMPreeditStyle {
     }
 }
 
-#[deprecated]
 #[doc(hidden)]
 impl FromGlib<gtk_sys::GtkIMPreeditStyle> for IMPreeditStyle {
     fn from_glib(value: gtk_sys::GtkIMPreeditStyle) -> Self {
@@ -2052,28 +2049,24 @@ impl FromGlib<gtk_sys::GtkIMPreeditStyle> for IMPreeditStyle {
     }
 }
 
-#[deprecated]
 impl StaticType for IMPreeditStyle {
     fn static_type() -> Type {
         unsafe { from_glib(gtk_sys::gtk_im_preedit_style_get_type()) }
     }
 }
 
-#[deprecated]
 impl<'a> FromValueOptional<'a> for IMPreeditStyle {
     unsafe fn from_value_optional(value: &Value) -> Option<Self> {
         Some(FromValue::from_value(value))
     }
 }
 
-#[deprecated]
 impl<'a> FromValue<'a> for IMPreeditStyle {
     unsafe fn from_value(value: &Value) -> Self {
         from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0))
     }
 }
 
-#[deprecated]
 impl SetValue for IMPreeditStyle {
     unsafe fn set_value(value: &mut Value, this: &Self) {
         gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib())
@@ -2091,7 +2084,6 @@ pub enum IMStatusStyle {
     __Unknown(i32),
 }
 
-#[deprecated]
 impl fmt::Display for IMStatusStyle {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(
@@ -2107,7 +2099,6 @@ impl fmt::Display for IMStatusStyle {
     }
 }
 
-#[deprecated]
 #[doc(hidden)]
 impl ToGlib for IMStatusStyle {
     type GlibType = gtk_sys::GtkIMStatusStyle;
@@ -2122,7 +2113,6 @@ impl ToGlib for IMStatusStyle {
     }
 }
 
-#[deprecated]
 #[doc(hidden)]
 impl FromGlib<gtk_sys::GtkIMStatusStyle> for IMStatusStyle {
     fn from_glib(value: gtk_sys::GtkIMStatusStyle) -> Self {
@@ -2136,28 +2126,24 @@ impl FromGlib<gtk_sys::GtkIMStatusStyle> for IMStatusStyle {
     }
 }
 
-#[deprecated]
 impl StaticType for IMStatusStyle {
     fn static_type() -> Type {
         unsafe { from_glib(gtk_sys::gtk_im_status_style_get_type()) }
     }
 }
 
-#[deprecated]
 impl<'a> FromValueOptional<'a> for IMStatusStyle {
     unsafe fn from_value_optional(value: &Value) -> Option<Self> {
         Some(FromValue::from_value(value))
     }
 }
 
-#[deprecated]
 impl<'a> FromValue<'a> for IMStatusStyle {
     unsafe fn from_value(value: &Value) -> Self {
         from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0))
     }
 }
 
-#[deprecated]
 impl SetValue for IMStatusStyle {
     unsafe fn set_value(value: &mut Value, this: &Self) {
         gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib())
@@ -6556,7 +6542,6 @@ pub enum StateType {
     __Unknown(i32),
 }
 
-#[deprecated]
 impl fmt::Display for StateType {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(
@@ -6576,7 +6561,6 @@ impl fmt::Display for StateType {
     }
 }
 
-#[deprecated]
 #[doc(hidden)]
 impl ToGlib for StateType {
     type GlibType = gtk_sys::GtkStateType;
@@ -6595,7 +6579,6 @@ impl ToGlib for StateType {
     }
 }
 
-#[deprecated]
 #[doc(hidden)]
 impl FromGlib<gtk_sys::GtkStateType> for StateType {
     fn from_glib(value: gtk_sys::GtkStateType) -> Self {
@@ -6613,28 +6596,24 @@ impl FromGlib<gtk_sys::GtkStateType> for StateType {
     }
 }
 
-#[deprecated]
 impl StaticType for StateType {
     fn static_type() -> Type {
         unsafe { from_glib(gtk_sys::gtk_state_type_get_type()) }
     }
 }
 
-#[deprecated]
 impl<'a> FromValueOptional<'a> for StateType {
     unsafe fn from_value_optional(value: &Value) -> Option<Self> {
         Some(FromValue::from_value(value))
     }
 }
 
-#[deprecated]
 impl<'a> FromValue<'a> for StateType {
     unsafe fn from_value(value: &Value) -> Self {
         from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0))
     }
 }
 
-#[deprecated]
 impl SetValue for StateType {
     unsafe fn set_value(value: &mut Value, this: &Self) {
         gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib())
diff --git a/gtk/src/auto/event_box.rs b/gtk/src/auto/event_box.rs
index 33486ae9d1b1..f4f129e36c65 100644
--- a/gtk/src/auto/event_box.rs
+++ b/gtk/src/auto/event_box.rs
@@ -23,7 +23,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct EventBox(Object<gtk_sys::GtkEventBox, gtk_sys::GtkEventBoxClass, EventBoxClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct EventBox(Object<gtk_sys::GtkEventBox, gtk_sys::GtkEventBoxClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_event_box_get_type(),
diff --git a/gtk/src/auto/event_controller.rs b/gtk/src/auto/event_controller.rs
index 829831d01489..3cd487da141a 100644
--- a/gtk/src/auto/event_controller.rs
+++ b/gtk/src/auto/event_controller.rs
@@ -17,7 +17,7 @@ use PropagationPhase;
 use Widget;
 
 glib_wrapper! {
-    pub struct EventController(Object<gtk_sys::GtkEventController, gtk_sys::GtkEventControllerClass, EventControllerClass>);
+    pub struct EventController(Object<gtk_sys::GtkEventController, gtk_sys::GtkEventControllerClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_event_controller_get_type(),
diff --git a/gtk/src/auto/event_controller_key.rs b/gtk/src/auto/event_controller_key.rs
index 2ba9bf6ecf25..0a2b750131c9 100644
--- a/gtk/src/auto/event_controller_key.rs
+++ b/gtk/src/auto/event_controller_key.rs
@@ -23,7 +23,7 @@ use IMContext;
 use Widget;
 
 glib_wrapper! {
-    pub struct EventControllerKey(Object<gtk_sys::GtkEventControllerKey, gtk_sys::GtkEventControllerKeyClass, EventControllerKeyClass>) @extends EventController;
+    pub struct EventControllerKey(Object<gtk_sys::GtkEventControllerKey, gtk_sys::GtkEventControllerKeyClass>) @extends EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_event_controller_key_get_type(),
diff --git a/gtk/src/auto/event_controller_motion.rs b/gtk/src/auto/event_controller_motion.rs
index 4f968c83a3f9..df3531314f23 100644
--- a/gtk/src/auto/event_controller_motion.rs
+++ b/gtk/src/auto/event_controller_motion.rs
@@ -21,7 +21,7 @@ use EventController;
 use Widget;
 
 glib_wrapper! {
-    pub struct EventControllerMotion(Object<gtk_sys::GtkEventControllerMotion, gtk_sys::GtkEventControllerMotionClass, EventControllerMotionClass>) @extends EventController;
+    pub struct EventControllerMotion(Object<gtk_sys::GtkEventControllerMotion, gtk_sys::GtkEventControllerMotionClass>) @extends EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_event_controller_motion_get_type(),
diff --git a/gtk/src/auto/event_controller_scroll.rs b/gtk/src/auto/event_controller_scroll.rs
index a344ab659b4c..04d763d90ca2 100644
--- a/gtk/src/auto/event_controller_scroll.rs
+++ b/gtk/src/auto/event_controller_scroll.rs
@@ -23,7 +23,7 @@ use EventControllerScrollFlags;
 use Widget;
 
 glib_wrapper! {
-    pub struct EventControllerScroll(Object<gtk_sys::GtkEventControllerScroll, gtk_sys::GtkEventControllerScrollClass, EventControllerScrollClass>) @extends EventController;
+    pub struct EventControllerScroll(Object<gtk_sys::GtkEventControllerScroll, gtk_sys::GtkEventControllerScrollClass>) @extends EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_event_controller_scroll_get_type(),
diff --git a/gtk/src/auto/expander.rs b/gtk/src/auto/expander.rs
index ca1b62f8ef18..a202deb6ff41 100644
--- a/gtk/src/auto/expander.rs
+++ b/gtk/src/auto/expander.rs
@@ -27,7 +27,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct Expander(Object<gtk_sys::GtkExpander, gtk_sys::GtkExpanderClass, ExpanderClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct Expander(Object<gtk_sys::GtkExpander, gtk_sys::GtkExpanderClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_expander_get_type(),
diff --git a/gtk/src/auto/file_chooser_button.rs b/gtk/src/auto/file_chooser_button.rs
index d8b6f7b062b5..22a3ededbf75 100644
--- a/gtk/src/auto/file_chooser_button.rs
+++ b/gtk/src/auto/file_chooser_button.rs
@@ -31,7 +31,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct FileChooserButton(Object<gtk_sys::GtkFileChooserButton, gtk_sys::GtkFileChooserButtonClass, FileChooserButtonClass>) @extends Box, Container, Widget, @implements Buildable, Orientable, FileChooser;
+    pub struct FileChooserButton(Object<gtk_sys::GtkFileChooserButton, gtk_sys::GtkFileChooserButtonClass>) @extends Box, Container, Widget, @implements Buildable, Orientable, FileChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_file_chooser_button_get_type(),
diff --git a/gtk/src/auto/file_chooser_dialog.rs b/gtk/src/auto/file_chooser_dialog.rs
index b713507b738a..b5e059d15f9d 100644
--- a/gtk/src/auto/file_chooser_dialog.rs
+++ b/gtk/src/auto/file_chooser_dialog.rs
@@ -27,7 +27,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct FileChooserDialog(Object<gtk_sys::GtkFileChooserDialog, gtk_sys::GtkFileChooserDialogClass, FileChooserDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable, FileChooser;
+    pub struct FileChooserDialog(Object<gtk_sys::GtkFileChooserDialog, gtk_sys::GtkFileChooserDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable, FileChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_file_chooser_dialog_get_type(),
diff --git a/gtk/src/auto/file_chooser_native.rs b/gtk/src/auto/file_chooser_native.rs
index fe8b216e2497..7dff0d803f9e 100644
--- a/gtk/src/auto/file_chooser_native.rs
+++ b/gtk/src/auto/file_chooser_native.rs
@@ -26,7 +26,7 @@ use Widget;
 use Window;
 
 glib_wrapper! {
-    pub struct FileChooserNative(Object<gtk_sys::GtkFileChooserNative, gtk_sys::GtkFileChooserNativeClass, FileChooserNativeClass>) @extends NativeDialog, @implements FileChooser;
+    pub struct FileChooserNative(Object<gtk_sys::GtkFileChooserNative, gtk_sys::GtkFileChooserNativeClass>) @extends NativeDialog, @implements FileChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_file_chooser_native_get_type(),
diff --git a/gtk/src/auto/file_chooser_widget.rs b/gtk/src/auto/file_chooser_widget.rs
index 0952bfe1846d..4bc599d04cb2 100644
--- a/gtk/src/auto/file_chooser_widget.rs
+++ b/gtk/src/auto/file_chooser_widget.rs
@@ -35,7 +35,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct FileChooserWidget(Object<gtk_sys::GtkFileChooserWidget, gtk_sys::GtkFileChooserWidgetClass, FileChooserWidgetClass>) @extends Box, Container, Widget, @implements Buildable, Orientable, FileChooser;
+    pub struct FileChooserWidget(Object<gtk_sys::GtkFileChooserWidget, gtk_sys::GtkFileChooserWidgetClass>) @extends Box, Container, Widget, @implements Buildable, Orientable, FileChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_file_chooser_widget_get_type(),
diff --git a/gtk/src/auto/file_filter.rs b/gtk/src/auto/file_filter.rs
index 50ec8c286d20..bd04b75d9bf0 100644
--- a/gtk/src/auto/file_filter.rs
+++ b/gtk/src/auto/file_filter.rs
@@ -12,7 +12,7 @@ use Buildable;
 use FileFilterFlags;
 
 glib_wrapper! {
-    pub struct FileFilter(Object<gtk_sys::GtkFileFilter, FileFilterClass>) @implements Buildable;
+    pub struct FileFilter(Object<gtk_sys::GtkFileFilter>) @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_file_filter_get_type(),
diff --git a/gtk/src/auto/fixed.rs b/gtk/src/auto/fixed.rs
index 677350543d8d..681b2964d75e 100644
--- a/gtk/src/auto/fixed.rs
+++ b/gtk/src/auto/fixed.rs
@@ -17,7 +17,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct Fixed(Object<gtk_sys::GtkFixed, gtk_sys::GtkFixedClass, FixedClass>) @extends Container, Widget, @implements Buildable;
+    pub struct Fixed(Object<gtk_sys::GtkFixed, gtk_sys::GtkFixedClass>) @extends Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_fixed_get_type(),
diff --git a/gtk/src/auto/flow_box.rs b/gtk/src/auto/flow_box.rs
index b668ca6fd531..befb93382e3e 100644
--- a/gtk/src/auto/flow_box.rs
+++ b/gtk/src/auto/flow_box.rs
@@ -34,7 +34,7 @@ use SelectionMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct FlowBox(Object<gtk_sys::GtkFlowBox, gtk_sys::GtkFlowBoxClass, FlowBoxClass>) @extends Container, Widget, @implements Buildable, Orientable;
+    pub struct FlowBox(Object<gtk_sys::GtkFlowBox, gtk_sys::GtkFlowBoxClass>) @extends Container, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_flow_box_get_type(),
diff --git a/gtk/src/auto/flow_box_child.rs b/gtk/src/auto/flow_box_child.rs
index c313a23df15e..b2e3da55c020 100644
--- a/gtk/src/auto/flow_box_child.rs
+++ b/gtk/src/auto/flow_box_child.rs
@@ -26,7 +26,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct FlowBoxChild(Object<gtk_sys::GtkFlowBoxChild, gtk_sys::GtkFlowBoxChildClass, FlowBoxChildClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct FlowBoxChild(Object<gtk_sys::GtkFlowBoxChild, gtk_sys::GtkFlowBoxChildClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_flow_box_child_get_type(),
diff --git a/gtk/src/auto/font_button.rs b/gtk/src/auto/font_button.rs
index 20cbbe429604..61e4e0771aed 100644
--- a/gtk/src/auto/font_button.rs
+++ b/gtk/src/auto/font_button.rs
@@ -33,7 +33,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct FontButton(Object<gtk_sys::GtkFontButton, gtk_sys::GtkFontButtonClass, FontButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable, FontChooser;
+    pub struct FontButton(Object<gtk_sys::GtkFontButton, gtk_sys::GtkFontButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable, FontChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_font_button_get_type(),
diff --git a/gtk/src/auto/font_chooser_dialog.rs b/gtk/src/auto/font_chooser_dialog.rs
index 6e603db35ba0..e59dbc6d49e7 100644
--- a/gtk/src/auto/font_chooser_dialog.rs
+++ b/gtk/src/auto/font_chooser_dialog.rs
@@ -28,7 +28,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct FontChooserDialog(Object<gtk_sys::GtkFontChooserDialog, gtk_sys::GtkFontChooserDialogClass, FontChooserDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable, FontChooser;
+    pub struct FontChooserDialog(Object<gtk_sys::GtkFontChooserDialog, gtk_sys::GtkFontChooserDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable, FontChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_font_chooser_dialog_get_type(),
diff --git a/gtk/src/auto/font_chooser_widget.rs b/gtk/src/auto/font_chooser_widget.rs
index 0cf5e1b50512..2d70d672fede 100644
--- a/gtk/src/auto/font_chooser_widget.rs
+++ b/gtk/src/auto/font_chooser_widget.rs
@@ -30,7 +30,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct FontChooserWidget(Object<gtk_sys::GtkFontChooserWidget, gtk_sys::GtkFontChooserWidgetClass, FontChooserWidgetClass>) @extends Box, Container, Widget, @implements Buildable, Orientable, FontChooser;
+    pub struct FontChooserWidget(Object<gtk_sys::GtkFontChooserWidget, gtk_sys::GtkFontChooserWidgetClass>) @extends Box, Container, Widget, @implements Buildable, Orientable, FontChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_font_chooser_widget_get_type(),
diff --git a/gtk/src/auto/frame.rs b/gtk/src/auto/frame.rs
index 20a66ebf0e3b..0d26bbd2e361 100644
--- a/gtk/src/auto/frame.rs
+++ b/gtk/src/auto/frame.rs
@@ -28,7 +28,7 @@ use ShadowType;
 use Widget;
 
 glib_wrapper! {
-    pub struct Frame(Object<gtk_sys::GtkFrame, gtk_sys::GtkFrameClass, FrameClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct Frame(Object<gtk_sys::GtkFrame, gtk_sys::GtkFrameClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_frame_get_type(),
diff --git a/gtk/src/auto/gesture.rs b/gtk/src/auto/gesture.rs
index ed33294edf17..6944bfef4c01 100644
--- a/gtk/src/auto/gesture.rs
+++ b/gtk/src/auto/gesture.rs
@@ -22,7 +22,7 @@ use EventController;
 use EventSequenceState;
 
 glib_wrapper! {
-    pub struct Gesture(Object<gtk_sys::GtkGesture, gtk_sys::GtkGestureClass, GestureClass>) @extends EventController;
+    pub struct Gesture(Object<gtk_sys::GtkGesture, gtk_sys::GtkGestureClass>) @extends EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_gesture_get_type(),
diff --git a/gtk/src/auto/gesture_drag.rs b/gtk/src/auto/gesture_drag.rs
index 904662cc245d..5f61b2fe65eb 100644
--- a/gtk/src/auto/gesture_drag.rs
+++ b/gtk/src/auto/gesture_drag.rs
@@ -24,7 +24,7 @@ use PropagationPhase;
 use Widget;
 
 glib_wrapper! {
-    pub struct GestureDrag(Object<gtk_sys::GtkGestureDrag, gtk_sys::GtkGestureDragClass, GestureDragClass>) @extends GestureSingle, Gesture, EventController;
+    pub struct GestureDrag(Object<gtk_sys::GtkGestureDrag, gtk_sys::GtkGestureDragClass>) @extends GestureSingle, Gesture, EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_gesture_drag_get_type(),
diff --git a/gtk/src/auto/gesture_long_press.rs b/gtk/src/auto/gesture_long_press.rs
index 8e428b9c29a7..7c9e379f1595 100644
--- a/gtk/src/auto/gesture_long_press.rs
+++ b/gtk/src/auto/gesture_long_press.rs
@@ -26,7 +26,7 @@ use PropagationPhase;
 use Widget;
 
 glib_wrapper! {
-    pub struct GestureLongPress(Object<gtk_sys::GtkGestureLongPress, gtk_sys::GtkGestureLongPressClass, GestureLongPressClass>) @extends GestureSingle, Gesture, EventController;
+    pub struct GestureLongPress(Object<gtk_sys::GtkGestureLongPress, gtk_sys::GtkGestureLongPressClass>) @extends GestureSingle, Gesture, EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_gesture_long_press_get_type(),
diff --git a/gtk/src/auto/gesture_multi_press.rs b/gtk/src/auto/gesture_multi_press.rs
index 51bfa0037b79..379c12a81cae 100644
--- a/gtk/src/auto/gesture_multi_press.rs
+++ b/gtk/src/auto/gesture_multi_press.rs
@@ -24,7 +24,7 @@ use PropagationPhase;
 use Widget;
 
 glib_wrapper! {
-    pub struct GestureMultiPress(Object<gtk_sys::GtkGestureMultiPress, gtk_sys::GtkGestureMultiPressClass, GestureMultiPressClass>) @extends GestureSingle, Gesture, EventController;
+    pub struct GestureMultiPress(Object<gtk_sys::GtkGestureMultiPress, gtk_sys::GtkGestureMultiPressClass>) @extends GestureSingle, Gesture, EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_gesture_multi_press_get_type(),
diff --git a/gtk/src/auto/gesture_pan.rs b/gtk/src/auto/gesture_pan.rs
index f705780dd3cc..d186555c729e 100644
--- a/gtk/src/auto/gesture_pan.rs
+++ b/gtk/src/auto/gesture_pan.rs
@@ -27,7 +27,7 @@ use PropagationPhase;
 use Widget;
 
 glib_wrapper! {
-    pub struct GesturePan(Object<gtk_sys::GtkGesturePan, gtk_sys::GtkGesturePanClass, GesturePanClass>) @extends GestureDrag, GestureSingle, Gesture, EventController;
+    pub struct GesturePan(Object<gtk_sys::GtkGesturePan, gtk_sys::GtkGesturePanClass>) @extends GestureDrag, GestureSingle, Gesture, EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_gesture_pan_get_type(),
diff --git a/gtk/src/auto/gesture_rotate.rs b/gtk/src/auto/gesture_rotate.rs
index 56679f4258b9..6f1786086f71 100644
--- a/gtk/src/auto/gesture_rotate.rs
+++ b/gtk/src/auto/gesture_rotate.rs
@@ -23,7 +23,7 @@ use PropagationPhase;
 use Widget;
 
 glib_wrapper! {
-    pub struct GestureRotate(Object<gtk_sys::GtkGestureRotate, gtk_sys::GtkGestureRotateClass, GestureRotateClass>) @extends Gesture, EventController;
+    pub struct GestureRotate(Object<gtk_sys::GtkGestureRotate, gtk_sys::GtkGestureRotateClass>) @extends Gesture, EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_gesture_rotate_get_type(),
diff --git a/gtk/src/auto/gesture_single.rs b/gtk/src/auto/gesture_single.rs
index bc97d50fd7f1..35a47783c863 100644
--- a/gtk/src/auto/gesture_single.rs
+++ b/gtk/src/auto/gesture_single.rs
@@ -17,7 +17,7 @@ use EventController;
 use Gesture;
 
 glib_wrapper! {
-    pub struct GestureSingle(Object<gtk_sys::GtkGestureSingle, gtk_sys::GtkGestureSingleClass, GestureSingleClass>) @extends Gesture, EventController;
+    pub struct GestureSingle(Object<gtk_sys::GtkGestureSingle, gtk_sys::GtkGestureSingleClass>) @extends Gesture, EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_gesture_single_get_type(),
diff --git a/gtk/src/auto/gesture_stylus.rs b/gtk/src/auto/gesture_stylus.rs
index 5aaaaabd3ad3..08421e2755a1 100644
--- a/gtk/src/auto/gesture_stylus.rs
+++ b/gtk/src/auto/gesture_stylus.rs
@@ -27,7 +27,7 @@ use GestureSingle;
 use Widget;
 
 glib_wrapper! {
-    pub struct GestureStylus(Object<gtk_sys::GtkGestureStylus, gtk_sys::GtkGestureStylusClass, GestureStylusClass>) @extends GestureSingle, Gesture, EventController;
+    pub struct GestureStylus(Object<gtk_sys::GtkGestureStylus, gtk_sys::GtkGestureStylusClass>) @extends GestureSingle, Gesture, EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_gesture_stylus_get_type(),
diff --git a/gtk/src/auto/gesture_swipe.rs b/gtk/src/auto/gesture_swipe.rs
index ff8c7f43c9a9..dfb223e5f4c3 100644
--- a/gtk/src/auto/gesture_swipe.rs
+++ b/gtk/src/auto/gesture_swipe.rs
@@ -25,7 +25,7 @@ use PropagationPhase;
 use Widget;
 
 glib_wrapper! {
-    pub struct GestureSwipe(Object<gtk_sys::GtkGestureSwipe, gtk_sys::GtkGestureSwipeClass, GestureSwipeClass>) @extends GestureSingle, Gesture, EventController;
+    pub struct GestureSwipe(Object<gtk_sys::GtkGestureSwipe, gtk_sys::GtkGestureSwipeClass>) @extends GestureSingle, Gesture, EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_gesture_swipe_get_type(),
diff --git a/gtk/src/auto/gesture_zoom.rs b/gtk/src/auto/gesture_zoom.rs
index 084da0bee749..93bfef996ecc 100644
--- a/gtk/src/auto/gesture_zoom.rs
+++ b/gtk/src/auto/gesture_zoom.rs
@@ -23,7 +23,7 @@ use PropagationPhase;
 use Widget;
 
 glib_wrapper! {
-    pub struct GestureZoom(Object<gtk_sys::GtkGestureZoom, gtk_sys::GtkGestureZoomClass, GestureZoomClass>) @extends Gesture, EventController;
+    pub struct GestureZoom(Object<gtk_sys::GtkGestureZoom, gtk_sys::GtkGestureZoomClass>) @extends Gesture, EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_gesture_zoom_get_type(),
diff --git a/gtk/src/auto/gl_area.rs b/gtk/src/auto/gl_area.rs
index 73cf4cd099a4..57b8a72e9f28 100644
--- a/gtk/src/auto/gl_area.rs
+++ b/gtk/src/auto/gl_area.rs
@@ -34,7 +34,7 @@ use Container;
 use Widget;
 
 glib_wrapper! {
-    pub struct GLArea(Object<gtk_sys::GtkGLArea, gtk_sys::GtkGLAreaClass, GLAreaClass>) @extends Widget, @implements Buildable;
+    pub struct GLArea(Object<gtk_sys::GtkGLArea, gtk_sys::GtkGLAreaClass>) @extends Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_gl_area_get_type(),
diff --git a/gtk/src/auto/grid.rs b/gtk/src/auto/grid.rs
index e8a68207106f..020c048b36ca 100644
--- a/gtk/src/auto/grid.rs
+++ b/gtk/src/auto/grid.rs
@@ -27,7 +27,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct Grid(Object<gtk_sys::GtkGrid, gtk_sys::GtkGridClass, GridClass>) @extends Container, Widget, @implements Buildable, Orientable;
+    pub struct Grid(Object<gtk_sys::GtkGrid, gtk_sys::GtkGridClass>) @extends Container, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_grid_get_type(),
diff --git a/gtk/src/auto/header_bar.rs b/gtk/src/auto/header_bar.rs
index 08e229d703a5..18a6393d2a90 100644
--- a/gtk/src/auto/header_bar.rs
+++ b/gtk/src/auto/header_bar.rs
@@ -26,7 +26,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct HeaderBar(Object<gtk_sys::GtkHeaderBar, gtk_sys::GtkHeaderBarClass, HeaderBarClass>) @extends Container, Widget, @implements Buildable;
+    pub struct HeaderBar(Object<gtk_sys::GtkHeaderBar, gtk_sys::GtkHeaderBarClass>) @extends Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_header_bar_get_type(),
diff --git a/gtk/src/auto/icon_info.rs b/gtk/src/auto/icon_info.rs
index a1e97e1c3cd6..9fc701ac0ab5 100644
--- a/gtk/src/auto/icon_info.rs
+++ b/gtk/src/auto/icon_info.rs
@@ -23,7 +23,7 @@ use IconTheme;
 use StyleContext;
 
 glib_wrapper! {
-    pub struct IconInfo(Object<gtk_sys::GtkIconInfo, gtk_sys::GtkIconInfoClass, IconInfoClass>);
+    pub struct IconInfo(Object<gtk_sys::GtkIconInfo, gtk_sys::GtkIconInfoClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_icon_info_get_type(),
diff --git a/gtk/src/auto/icon_theme.rs b/gtk/src/auto/icon_theme.rs
index 3caf7b549c3f..fdb9a087b471 100644
--- a/gtk/src/auto/icon_theme.rs
+++ b/gtk/src/auto/icon_theme.rs
@@ -24,7 +24,7 @@ use IconInfo;
 use IconLookupFlags;
 
 glib_wrapper! {
-    pub struct IconTheme(Object<gtk_sys::GtkIconTheme, gtk_sys::GtkIconThemeClass, IconThemeClass>);
+    pub struct IconTheme(Object<gtk_sys::GtkIconTheme, gtk_sys::GtkIconThemeClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_icon_theme_get_type(),
diff --git a/gtk/src/auto/icon_view.rs b/gtk/src/auto/icon_view.rs
index f70fd7f719f9..d8553ff87609 100644
--- a/gtk/src/auto/icon_view.rs
+++ b/gtk/src/auto/icon_view.rs
@@ -44,7 +44,7 @@ use TreePath;
 use Widget;
 
 glib_wrapper! {
-    pub struct IconView(Object<gtk_sys::GtkIconView, gtk_sys::GtkIconViewClass, IconViewClass>) @extends Container, Widget, @implements Buildable, CellLayout, Scrollable;
+    pub struct IconView(Object<gtk_sys::GtkIconView, gtk_sys::GtkIconViewClass>) @extends Container, Widget, @implements Buildable, CellLayout, Scrollable;
 
     match fn {
         get_type => || gtk_sys::gtk_icon_view_get_type(),
diff --git a/gtk/src/auto/im_context.rs b/gtk/src/auto/im_context.rs
index 2d007f37ae97..a652831f6ff4 100644
--- a/gtk/src/auto/im_context.rs
+++ b/gtk/src/auto/im_context.rs
@@ -25,7 +25,7 @@ use InputHints;
 use InputPurpose;
 
 glib_wrapper! {
-    pub struct IMContext(Object<gtk_sys::GtkIMContext, gtk_sys::GtkIMContextClass, IMContextClass>);
+    pub struct IMContext(Object<gtk_sys::GtkIMContext, gtk_sys::GtkIMContextClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_im_context_get_type(),
diff --git a/gtk/src/auto/im_context_simple.rs b/gtk/src/auto/im_context_simple.rs
index ca9d9ada6b08..6e6f134b1fb5 100644
--- a/gtk/src/auto/im_context_simple.rs
+++ b/gtk/src/auto/im_context_simple.rs
@@ -13,7 +13,7 @@ use InputHints;
 use InputPurpose;
 
 glib_wrapper! {
-    pub struct IMContextSimple(Object<gtk_sys::GtkIMContextSimple, gtk_sys::GtkIMContextSimpleClass, IMContextSimpleClass>) @extends IMContext;
+    pub struct IMContextSimple(Object<gtk_sys::GtkIMContextSimple, gtk_sys::GtkIMContextSimpleClass>) @extends IMContext;
 
     match fn {
         get_type => || gtk_sys::gtk_im_context_simple_get_type(),
diff --git a/gtk/src/auto/im_multicontext.rs b/gtk/src/auto/im_multicontext.rs
index 8927968f8d58..eb825fdff988 100644
--- a/gtk/src/auto/im_multicontext.rs
+++ b/gtk/src/auto/im_multicontext.rs
@@ -15,7 +15,7 @@ use InputHints;
 use InputPurpose;
 
 glib_wrapper! {
-    pub struct IMMulticontext(Object<gtk_sys::GtkIMMulticontext, gtk_sys::GtkIMMulticontextClass, IMMulticontextClass>) @extends IMContext;
+    pub struct IMMulticontext(Object<gtk_sys::GtkIMMulticontext, gtk_sys::GtkIMMulticontextClass>) @extends IMContext;
 
     match fn {
         get_type => || gtk_sys::gtk_im_multicontext_get_type(),
diff --git a/gtk/src/auto/image.rs b/gtk/src/auto/image.rs
index 8aaefffc7246..2e9dda92d65c 100644
--- a/gtk/src/auto/image.rs
+++ b/gtk/src/auto/image.rs
@@ -34,7 +34,7 @@ use Misc;
 use Widget;
 
 glib_wrapper! {
-    pub struct Image(Object<gtk_sys::GtkImage, gtk_sys::GtkImageClass, ImageClass>) @extends Misc, Widget, @implements Buildable;
+    pub struct Image(Object<gtk_sys::GtkImage, gtk_sys::GtkImageClass>) @extends Misc, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_image_get_type(),
diff --git a/gtk/src/auto/info_bar.rs b/gtk/src/auto/info_bar.rs
index 984833696a63..94928e17f1e5 100644
--- a/gtk/src/auto/info_bar.rs
+++ b/gtk/src/auto/info_bar.rs
@@ -32,7 +32,7 @@ use ResponseType;
 use Widget;
 
 glib_wrapper! {
-    pub struct InfoBar(Object<gtk_sys::GtkInfoBar, gtk_sys::GtkInfoBarClass, InfoBarClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
+    pub struct InfoBar(Object<gtk_sys::GtkInfoBar, gtk_sys::GtkInfoBarClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_info_bar_get_type(),
diff --git a/gtk/src/auto/invisible.rs b/gtk/src/auto/invisible.rs
index b2bfd1790d01..b5a6b581f9cd 100644
--- a/gtk/src/auto/invisible.rs
+++ b/gtk/src/auto/invisible.rs
@@ -21,7 +21,7 @@ use Container;
 use Widget;
 
 glib_wrapper! {
-    pub struct Invisible(Object<gtk_sys::GtkInvisible, gtk_sys::GtkInvisibleClass, InvisibleClass>) @extends Widget, @implements Buildable;
+    pub struct Invisible(Object<gtk_sys::GtkInvisible, gtk_sys::GtkInvisibleClass>) @extends Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_invisible_get_type(),
diff --git a/gtk/src/auto/label.rs b/gtk/src/auto/label.rs
index d9b3d6545775..db6a39003696 100644
--- a/gtk/src/auto/label.rs
+++ b/gtk/src/auto/label.rs
@@ -33,7 +33,7 @@ use MovementStep;
 use Widget;
 
 glib_wrapper! {
-    pub struct Label(Object<gtk_sys::GtkLabel, gtk_sys::GtkLabelClass, LabelClass>) @extends Misc, Widget, @implements Buildable;
+    pub struct Label(Object<gtk_sys::GtkLabel, gtk_sys::GtkLabelClass>) @extends Misc, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_label_get_type(),
diff --git a/gtk/src/auto/layout.rs b/gtk/src/auto/layout.rs
index 91777d3f304c..39c36973508b 100644
--- a/gtk/src/auto/layout.rs
+++ b/gtk/src/auto/layout.rs
@@ -28,7 +28,7 @@ use ScrollablePolicy;
 use Widget;
 
 glib_wrapper! {
-    pub struct Layout(Object<gtk_sys::GtkLayout, gtk_sys::GtkLayoutClass, LayoutClass>) @extends Container, Widget, @implements Buildable, Scrollable;
+    pub struct Layout(Object<gtk_sys::GtkLayout, gtk_sys::GtkLayoutClass>) @extends Container, Widget, @implements Buildable, Scrollable;
 
     match fn {
         get_type => || gtk_sys::gtk_layout_get_type(),
diff --git a/gtk/src/auto/level_bar.rs b/gtk/src/auto/level_bar.rs
index 86098aa51e21..45c0b48bef1e 100644
--- a/gtk/src/auto/level_bar.rs
+++ b/gtk/src/auto/level_bar.rs
@@ -27,7 +27,7 @@ use Orientation;
 use Widget;
 
 glib_wrapper! {
-    pub struct LevelBar(Object<gtk_sys::GtkLevelBar, gtk_sys::GtkLevelBarClass, LevelBarClass>) @extends Widget, @implements Buildable, Orientable;
+    pub struct LevelBar(Object<gtk_sys::GtkLevelBar, gtk_sys::GtkLevelBarClass>) @extends Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_level_bar_get_type(),
diff --git a/gtk/src/auto/link_button.rs b/gtk/src/auto/link_button.rs
index b7a0434e1dd4..6193e9dd5c55 100644
--- a/gtk/src/auto/link_button.rs
+++ b/gtk/src/auto/link_button.rs
@@ -29,7 +29,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct LinkButton(Object<gtk_sys::GtkLinkButton, gtk_sys::GtkLinkButtonClass, LinkButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct LinkButton(Object<gtk_sys::GtkLinkButton, gtk_sys::GtkLinkButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_link_button_get_type(),
diff --git a/gtk/src/auto/list_box.rs b/gtk/src/auto/list_box.rs
index 60f7fd02063d..e1027464bad2 100644
--- a/gtk/src/auto/list_box.rs
+++ b/gtk/src/auto/list_box.rs
@@ -32,7 +32,7 @@ use SelectionMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct ListBox(Object<gtk_sys::GtkListBox, gtk_sys::GtkListBoxClass, ListBoxClass>) @extends Container, Widget, @implements Buildable;
+    pub struct ListBox(Object<gtk_sys::GtkListBox, gtk_sys::GtkListBoxClass>) @extends Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_list_box_get_type(),
diff --git a/gtk/src/auto/list_box_row.rs b/gtk/src/auto/list_box_row.rs
index b2008d26ae84..188fa5b94038 100644
--- a/gtk/src/auto/list_box_row.rs
+++ b/gtk/src/auto/list_box_row.rs
@@ -27,7 +27,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct ListBoxRow(Object<gtk_sys::GtkListBoxRow, gtk_sys::GtkListBoxRowClass, ListBoxRowClass>) @extends Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct ListBoxRow(Object<gtk_sys::GtkListBoxRow, gtk_sys::GtkListBoxRowClass>) @extends Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_list_box_row_get_type(),
diff --git a/gtk/src/auto/list_store.rs b/gtk/src/auto/list_store.rs
index 4402c9511ffb..caaa61fdecc5 100644
--- a/gtk/src/auto/list_store.rs
+++ b/gtk/src/auto/list_store.rs
@@ -14,7 +14,7 @@ use TreeModel;
 use TreeSortable;
 
 glib_wrapper! {
-    pub struct ListStore(Object<gtk_sys::GtkListStore, gtk_sys::GtkListStoreClass, ListStoreClass>) @implements Buildable, TreeDragDest, TreeDragSource, TreeModel, TreeSortable;
+    pub struct ListStore(Object<gtk_sys::GtkListStore, gtk_sys::GtkListStoreClass>) @implements Buildable, TreeDragDest, TreeDragSource, TreeModel, TreeSortable;
 
     match fn {
         get_type => || gtk_sys::gtk_list_store_get_type(),
diff --git a/gtk/src/auto/lock_button.rs b/gtk/src/auto/lock_button.rs
index 521472c783d6..0569b83759b3 100644
--- a/gtk/src/auto/lock_button.rs
+++ b/gtk/src/auto/lock_button.rs
@@ -32,7 +32,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct LockButton(Object<gtk_sys::GtkLockButton, gtk_sys::GtkLockButtonClass, LockButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct LockButton(Object<gtk_sys::GtkLockButton, gtk_sys::GtkLockButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_lock_button_get_type(),
diff --git a/gtk/src/auto/menu.rs b/gtk/src/auto/menu.rs
index 099b1003b834..29306a661f42 100644
--- a/gtk/src/auto/menu.rs
+++ b/gtk/src/auto/menu.rs
@@ -33,7 +33,7 @@ use ScrollType;
 use Widget;
 
 glib_wrapper! {
-    pub struct Menu(Object<gtk_sys::GtkMenu, gtk_sys::GtkMenuClass, MenuClass>) @extends MenuShell, Container, Widget, @implements Buildable;
+    pub struct Menu(Object<gtk_sys::GtkMenu, gtk_sys::GtkMenuClass>) @extends MenuShell, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_menu_get_type(),
diff --git a/gtk/src/auto/menu_bar.rs b/gtk/src/auto/menu_bar.rs
index c7777c30b5b8..e66b1d387b68 100644
--- a/gtk/src/auto/menu_bar.rs
+++ b/gtk/src/auto/menu_bar.rs
@@ -25,7 +25,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct MenuBar(Object<gtk_sys::GtkMenuBar, gtk_sys::GtkMenuBarClass, MenuBarClass>) @extends MenuShell, Container, Widget, @implements Buildable;
+    pub struct MenuBar(Object<gtk_sys::GtkMenuBar, gtk_sys::GtkMenuBarClass>) @extends MenuShell, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_menu_bar_get_type(),
diff --git a/gtk/src/auto/menu_button.rs b/gtk/src/auto/menu_button.rs
index 7fef72e8a249..2e9c54fbee3d 100644
--- a/gtk/src/auto/menu_button.rs
+++ b/gtk/src/auto/menu_button.rs
@@ -33,7 +33,7 @@ use ToggleButton;
 use Widget;
 
 glib_wrapper! {
-    pub struct MenuButton(Object<gtk_sys::GtkMenuButton, gtk_sys::GtkMenuButtonClass, MenuButtonClass>) @extends ToggleButton, Button, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct MenuButton(Object<gtk_sys::GtkMenuButton, gtk_sys::GtkMenuButtonClass>) @extends ToggleButton, Button, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_menu_button_get_type(),
diff --git a/gtk/src/auto/menu_item.rs b/gtk/src/auto/menu_item.rs
index 901bf0782ff9..285ec1a24f1b 100644
--- a/gtk/src/auto/menu_item.rs
+++ b/gtk/src/auto/menu_item.rs
@@ -31,7 +31,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct MenuItem(Object<gtk_sys::GtkMenuItem, gtk_sys::GtkMenuItemClass, MenuItemClass>) @extends Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct MenuItem(Object<gtk_sys::GtkMenuItem, gtk_sys::GtkMenuItemClass>) @extends Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_menu_item_get_type(),
diff --git a/gtk/src/auto/menu_shell.rs b/gtk/src/auto/menu_shell.rs
index 800a9a98bc52..2038a91cde80 100644
--- a/gtk/src/auto/menu_shell.rs
+++ b/gtk/src/auto/menu_shell.rs
@@ -25,7 +25,7 @@ use MenuItem;
 use Widget;
 
 glib_wrapper! {
-    pub struct MenuShell(Object<gtk_sys::GtkMenuShell, gtk_sys::GtkMenuShellClass, MenuShellClass>) @extends Container, Widget, @implements Buildable;
+    pub struct MenuShell(Object<gtk_sys::GtkMenuShell, gtk_sys::GtkMenuShellClass>) @extends Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_menu_shell_get_type(),
diff --git a/gtk/src/auto/menu_tool_button.rs b/gtk/src/auto/menu_tool_button.rs
index 2da430947ba4..031b8783d14a 100644
--- a/gtk/src/auto/menu_tool_button.rs
+++ b/gtk/src/auto/menu_tool_button.rs
@@ -28,7 +28,7 @@ use ToolItem;
 use Widget;
 
 glib_wrapper! {
-    pub struct MenuToolButton(Object<gtk_sys::GtkMenuToolButton, gtk_sys::GtkMenuToolButtonClass, MenuToolButtonClass>) @extends ToolButton, ToolItem, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct MenuToolButton(Object<gtk_sys::GtkMenuToolButton, gtk_sys::GtkMenuToolButtonClass>) @extends ToolButton, ToolItem, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_menu_tool_button_get_type(),
diff --git a/gtk/src/auto/message_dialog.rs b/gtk/src/auto/message_dialog.rs
index b52411a5917b..e1fefb7b5645 100644
--- a/gtk/src/auto/message_dialog.rs
+++ b/gtk/src/auto/message_dialog.rs
@@ -34,7 +34,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct MessageDialog(Object<gtk_sys::GtkMessageDialog, gtk_sys::GtkMessageDialogClass, MessageDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable;
+    pub struct MessageDialog(Object<gtk_sys::GtkMessageDialog, gtk_sys::GtkMessageDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_message_dialog_get_type(),
diff --git a/gtk/src/auto/misc.rs b/gtk/src/auto/misc.rs
index 354e07b88c24..01732bf67e07 100644
--- a/gtk/src/auto/misc.rs
+++ b/gtk/src/auto/misc.rs
@@ -9,7 +9,7 @@ use Buildable;
 use Widget;
 
 glib_wrapper! {
-    pub struct Misc(Object<gtk_sys::GtkMisc, gtk_sys::GtkMiscClass, MiscClass>) @extends Widget, @implements Buildable;
+    pub struct Misc(Object<gtk_sys::GtkMisc, gtk_sys::GtkMiscClass>) @extends Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_misc_get_type(),
diff --git a/gtk/src/auto/mod.rs b/gtk/src/auto/mod.rs
index 957e60047fb4..b326b1b70cf2 100644
--- a/gtk/src/auto/mod.rs
+++ b/gtk/src/auto/mod.rs
@@ -5,21 +5,21 @@
 mod about_dialog;
 pub use self::about_dialog::AboutDialogBuilder;
 pub use self::about_dialog::AboutDialogExt;
-pub use self::about_dialog::{AboutDialog, AboutDialogClass, NONE_ABOUT_DIALOG};
+pub use self::about_dialog::{AboutDialog, NONE_ABOUT_DIALOG};
 
 mod accel_group;
 pub use self::accel_group::AccelGroupExt;
-pub use self::accel_group::{AccelGroup, AccelGroupClass, NONE_ACCEL_GROUP};
+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, AccelLabelClass, NONE_ACCEL_LABEL};
+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, ActionBarClass, NONE_ACTION_BAR};
+pub use self::action_bar::{ActionBar, NONE_ACTION_BAR};
 
 mod actionable;
 pub use self::actionable::ActionableExt;
@@ -28,59 +28,51 @@ pub use self::actionable::{Actionable, NONE_ACTIONABLE};
 mod adjustment;
 pub use self::adjustment::AdjustmentBuilder;
 pub use self::adjustment::AdjustmentExt;
-pub use self::adjustment::{Adjustment, AdjustmentClass, NONE_ADJUSTMENT};
+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, AppChooserButtonClass, NONE_APP_CHOOSER_BUTTON,
-};
+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, AppChooserDialogClass, NONE_APP_CHOOSER_DIALOG,
-};
+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, AppChooserWidgetClass, NONE_APP_CHOOSER_WIDGET,
-};
+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, ApplicationClass, NONE_APPLICATION};
+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, ApplicationWindowClass, NONE_APPLICATION_WINDOW,
-};
+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, AspectFrameClass, NONE_ASPECT_FRAME};
+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, AssistantClass, NONE_ASSISTANT};
+pub use self::assistant::{Assistant, NONE_ASSISTANT};
 
 mod bin;
 pub use self::bin::BinExt;
-pub use self::bin::{Bin, BinClass, NONE_BIN};
+pub use self::bin::{Bin, NONE_BIN};
 
 mod box_;
 pub use self::box_::BoxBuilder;
 pub use self::box_::BoxExt;
-pub use self::box_::{Box, BoxClass, NONE_BOX};
+pub use self::box_::{Box, NONE_BOX};
 
 mod buildable;
 pub use self::buildable::BuildableExt;
@@ -88,35 +80,35 @@ pub use self::buildable::{Buildable, NONE_BUILDABLE};
 
 mod builder;
 pub use self::builder::BuilderExt;
-pub use self::builder::{Builder, BuilderClass, NONE_BUILDER};
+pub use self::builder::{Builder, NONE_BUILDER};
 
 mod button;
 pub use self::button::ButtonBuilder;
 pub use self::button::ButtonExt;
-pub use self::button::{Button, ButtonClass, NONE_BUTTON};
+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, ButtonBoxClass, NONE_BUTTON_BOX};
+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, CalendarClass, NONE_CALENDAR};
+pub use self::calendar::{Calendar, NONE_CALENDAR};
 
 mod cell_area;
 pub use self::cell_area::CellAreaExt;
-pub use self::cell_area::{CellArea, CellAreaClass, NONE_CELL_AREA};
+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, CellAreaBoxClass, NONE_CELL_AREA_BOX};
+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, CellAreaContextClass, NONE_CELL_AREA_CONTEXT};
+pub use self::cell_area_context::{CellAreaContext, NONE_CELL_AREA_CONTEXT};
 
 mod cell_editable;
 pub use self::cell_editable::CellEditableExt;
@@ -128,85 +120,69 @@ pub use self::cell_layout::{CellLayout, NONE_CELL_LAYOUT};
 
 mod cell_renderer;
 pub use self::cell_renderer::CellRendererExt;
-pub use self::cell_renderer::{CellRenderer, CellRendererClass, NONE_CELL_RENDERER};
+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, CellRendererAccelClass, NONE_CELL_RENDERER_ACCEL,
-};
+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, CellRendererComboClass, NONE_CELL_RENDERER_COMBO,
-};
+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, CellRendererPixbufClass, NONE_CELL_RENDERER_PIXBUF,
-};
+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, CellRendererProgressClass, NONE_CELL_RENDERER_PROGRESS,
-};
+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, CellRendererSpinClass, NONE_CELL_RENDERER_SPIN,
-};
+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, CellRendererSpinnerClass, NONE_CELL_RENDERER_SPINNER,
-};
+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, CellRendererTextClass, NONE_CELL_RENDERER_TEXT,
-};
+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, CellRendererToggleClass, NONE_CELL_RENDERER_TOGGLE,
-};
+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, CellViewClass, NONE_CELL_VIEW};
+pub use self::cell_view::{CellView, NONE_CELL_VIEW};
 
 mod check_button;
 pub use self::check_button::CheckButtonBuilder;
-pub use self::check_button::{CheckButton, CheckButtonClass, NONE_CHECK_BUTTON};
+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, CheckMenuItemClass, NONE_CHECK_MENU_ITEM};
+pub use self::check_menu_item::{CheckMenuItem, NONE_CHECK_MENU_ITEM};
 
 mod clipboard;
-pub use self::clipboard::{Clipboard, ClipboardClass};
+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, ColorButtonClass, NONE_COLOR_BUTTON};
+pub use self::color_button::{ColorButton, NONE_COLOR_BUTTON};
 
 mod color_chooser;
 pub use self::color_chooser::ColorChooserExt;
@@ -215,43 +191,39 @@ 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, ColorChooserDialogClass, NONE_COLOR_CHOOSER_DIALOG,
-};
+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, ColorChooserWidgetClass, NONE_COLOR_CHOOSER_WIDGET,
-};
+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, ComboBoxClass, NONE_COMBO_BOX};
+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, ComboBoxTextClass, NONE_COMBO_BOX_TEXT};
+pub use self::combo_box_text::{ComboBoxText, NONE_COMBO_BOX_TEXT};
 
 mod container;
 pub use self::container::ContainerExt;
-pub use self::container::{Container, ContainerClass, NONE_CONTAINER};
+pub use self::container::{Container, NONE_CONTAINER};
 
 mod css_provider;
 pub use self::css_provider::CssProviderExt;
-pub use self::css_provider::{CssProvider, CssProviderClass, NONE_CSS_PROVIDER};
+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, DialogClass, NONE_DIALOG};
+pub use self::dialog::{Dialog, NONE_DIALOG};
 
 mod drawing_area;
 pub use self::drawing_area::DrawingAreaBuilder;
-pub use self::drawing_area::{DrawingArea, DrawingAreaClass, NONE_DRAWING_AREA};
+pub use self::drawing_area::{DrawingArea, NONE_DRAWING_AREA};
 
 mod editable;
 pub use self::editable::EditableExt;
@@ -260,41 +232,41 @@ pub use self::editable::{Editable, NONE_EDITABLE};
 mod entry;
 pub use self::entry::EntryBuilder;
 pub use self::entry::EntryExt;
-pub use self::entry::{Entry, EntryClass, NONE_ENTRY};
+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, EntryCompletionClass, NONE_ENTRY_COMPLETION};
+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, EventBoxClass, NONE_EVENT_BOX};
+pub use self::event_box::{EventBox, NONE_EVENT_BOX};
 
 mod event_controller;
 pub use self::event_controller::EventControllerExt;
-pub use self::event_controller::{EventController, EventControllerClass, NONE_EVENT_CONTROLLER};
+pub use self::event_controller::{EventController, NONE_EVENT_CONTROLLER};
 
 #[cfg(any(feature = "v3_24", feature = "dox"))]
 mod event_controller_key;
 #[cfg(any(feature = "v3_24", feature = "dox"))]
-pub use self::event_controller_key::{EventControllerKey, EventControllerKeyClass};
+pub use self::event_controller_key::EventControllerKey;
 
 #[cfg(any(feature = "v3_24", feature = "dox"))]
 mod event_controller_motion;
 #[cfg(any(feature = "v3_24", feature = "dox"))]
-pub use self::event_controller_motion::{EventControllerMotion, EventControllerMotionClass};
+pub use self::event_controller_motion::EventControllerMotion;
 
 #[cfg(any(feature = "v3_24", feature = "dox"))]
 mod event_controller_scroll;
 #[cfg(any(feature = "v3_24", feature = "dox"))]
-pub use self::event_controller_scroll::{EventControllerScroll, EventControllerScrollClass};
+pub use self::event_controller_scroll::EventControllerScroll;
 
 mod expander;
 pub use self::expander::ExpanderBuilder;
 pub use self::expander::ExpanderExt;
-pub use self::expander::{Expander, ExpanderClass, NONE_EXPANDER};
+pub use self::expander::{Expander, NONE_EXPANDER};
 
 mod file_chooser;
 pub use self::file_chooser::FileChooserExt;
@@ -303,15 +275,11 @@ 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, FileChooserButtonClass, NONE_FILE_CHOOSER_BUTTON,
-};
+pub use self::file_chooser_button::{FileChooserButton, NONE_FILE_CHOOSER_BUTTON};
 
 mod file_chooser_dialog;
 pub use self::file_chooser_dialog::FileChooserDialogBuilder;
-pub use self::file_chooser_dialog::{
-    FileChooserDialog, FileChooserDialogClass, NONE_FILE_CHOOSER_DIALOG,
-};
+pub use self::file_chooser_dialog::{FileChooserDialog, NONE_FILE_CHOOSER_DIALOG};
 
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 mod file_chooser_native;
@@ -320,39 +288,35 @@ pub use self::file_chooser_native::FileChooserNativeBuilder;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 pub use self::file_chooser_native::FileChooserNativeExt;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
-pub use self::file_chooser_native::{
-    FileChooserNative, FileChooserNativeClass, NONE_FILE_CHOOSER_NATIVE,
-};
+pub use self::file_chooser_native::{FileChooserNative, NONE_FILE_CHOOSER_NATIVE};
 
 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, FileChooserWidgetClass, NONE_FILE_CHOOSER_WIDGET,
-};
+pub use self::file_chooser_widget::{FileChooserWidget, NONE_FILE_CHOOSER_WIDGET};
 
 mod file_filter;
-pub use self::file_filter::{FileFilter, FileFilterClass};
+pub use self::file_filter::FileFilter;
 
 mod fixed;
 pub use self::fixed::FixedBuilder;
 pub use self::fixed::FixedExt;
-pub use self::fixed::{Fixed, FixedClass, NONE_FIXED};
+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, FlowBoxClass, NONE_FLOW_BOX};
+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, FlowBoxChildClass, NONE_FLOW_BOX_CHILD};
+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, FontButtonClass, NONE_FONT_BUTTON};
+pub use self::font_button::{FontButton, NONE_FONT_BUTTON};
 
 mod font_chooser;
 pub use self::font_chooser::FontChooserExt;
@@ -360,21 +324,17 @@ pub use self::font_chooser::{FontChooser, NONE_FONT_CHOOSER};
 
 mod font_chooser_dialog;
 pub use self::font_chooser_dialog::FontChooserDialogBuilder;
-pub use self::font_chooser_dialog::{
-    FontChooserDialog, FontChooserDialogClass, NONE_FONT_CHOOSER_DIALOG,
-};
+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, FontChooserWidgetClass, NONE_FONT_CHOOSER_WIDGET,
-};
+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, FrameClass, NONE_FRAME};
+pub use self::frame::{Frame, NONE_FRAME};
 
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 mod gl_area;
@@ -383,204 +343,204 @@ pub use self::gl_area::GLAreaBuilder;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 pub use self::gl_area::GLAreaExt;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
-pub use self::gl_area::{GLArea, GLAreaClass, NONE_GL_AREA};
+pub use self::gl_area::{GLArea, NONE_GL_AREA};
 
 mod gesture;
 pub use self::gesture::GestureExt;
-pub use self::gesture::{Gesture, GestureClass, NONE_GESTURE};
+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, GestureDragClass, NONE_GESTURE_DRAG};
+pub use self::gesture_drag::{GestureDrag, NONE_GESTURE_DRAG};
 
 mod gesture_long_press;
+pub use self::gesture_long_press::GestureLongPress;
 pub use self::gesture_long_press::GestureLongPressBuilder;
-pub use self::gesture_long_press::{GestureLongPress, GestureLongPressClass};
 
 mod gesture_multi_press;
+pub use self::gesture_multi_press::GestureMultiPress;
 pub use self::gesture_multi_press::GestureMultiPressBuilder;
-pub use self::gesture_multi_press::{GestureMultiPress, GestureMultiPressClass};
 
 mod gesture_pan;
+pub use self::gesture_pan::GesturePan;
 pub use self::gesture_pan::GesturePanBuilder;
-pub use self::gesture_pan::{GesturePan, GesturePanClass};
 
 mod gesture_rotate;
+pub use self::gesture_rotate::GestureRotate;
 pub use self::gesture_rotate::GestureRotateBuilder;
-pub use self::gesture_rotate::{GestureRotate, GestureRotateClass};
 
 mod gesture_single;
 pub use self::gesture_single::GestureSingleExt;
-pub use self::gesture_single::{GestureSingle, GestureSingleClass, NONE_GESTURE_SINGLE};
+pub use self::gesture_single::{GestureSingle, NONE_GESTURE_SINGLE};
 
 #[cfg(any(feature = "v3_24", feature = "dox"))]
 mod gesture_stylus;
 #[cfg(any(feature = "v3_24", feature = "dox"))]
-pub use self::gesture_stylus::{GestureStylus, GestureStylusClass};
+pub use self::gesture_stylus::GestureStylus;
 
 mod gesture_swipe;
+pub use self::gesture_swipe::GestureSwipe;
 pub use self::gesture_swipe::GestureSwipeBuilder;
-pub use self::gesture_swipe::{GestureSwipe, GestureSwipeClass};
 
 mod gesture_zoom;
+pub use self::gesture_zoom::GestureZoom;
 pub use self::gesture_zoom::GestureZoomBuilder;
-pub use self::gesture_zoom::{GestureZoom, GestureZoomClass};
 
 mod grid;
 pub use self::grid::GridBuilder;
 pub use self::grid::GridExt;
-pub use self::grid::{Grid, GridClass, NONE_GRID};
+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, HeaderBarClass, NONE_HEADER_BAR};
+pub use self::header_bar::{HeaderBar, NONE_HEADER_BAR};
 
 mod im_context;
 pub use self::im_context::IMContextExt;
-pub use self::im_context::{IMContext, IMContextClass, NONE_IM_CONTEXT};
+pub use self::im_context::{IMContext, NONE_IM_CONTEXT};
 
 mod im_context_simple;
 pub use self::im_context_simple::IMContextSimpleBuilder;
-pub use self::im_context_simple::{IMContextSimple, IMContextSimpleClass, NONE_IM_CONTEXT_SIMPLE};
+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, IMMulticontextClass, NONE_IM_MULTICONTEXT};
+pub use self::im_multicontext::{IMMulticontext, NONE_IM_MULTICONTEXT};
 
 mod icon_info;
-pub use self::icon_info::{IconInfo, IconInfoClass};
+pub use self::icon_info::IconInfo;
 
 mod icon_theme;
 pub use self::icon_theme::IconThemeExt;
-pub use self::icon_theme::{IconTheme, IconThemeClass, NONE_ICON_THEME};
+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, IconViewClass, NONE_ICON_VIEW};
+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, ImageClass, NONE_IMAGE};
+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, InfoBarClass, NONE_INFO_BAR};
+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, InvisibleClass, NONE_INVISIBLE};
+pub use self::invisible::{Invisible, NONE_INVISIBLE};
 
 mod label;
 pub use self::label::LabelBuilder;
 pub use self::label::LabelExt;
-pub use self::label::{Label, LabelClass, NONE_LABEL};
+pub use self::label::{Label, NONE_LABEL};
 
 mod layout;
 pub use self::layout::LayoutBuilder;
 pub use self::layout::LayoutExt;
-pub use self::layout::{Layout, LayoutClass, NONE_LAYOUT};
+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, LevelBarClass, NONE_LEVEL_BAR};
+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, LinkButtonClass, NONE_LINK_BUTTON};
+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, ListBoxClass, NONE_LIST_BOX};
+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, ListBoxRowClass, NONE_LIST_BOX_ROW};
+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, ListStoreClass, NONE_LIST_STORE};
+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, LockButtonClass, NONE_LOCK_BUTTON};
+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, MenuClass, NONE_MENU};
+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, MenuBarClass, NONE_MENU_BAR};
+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, MenuButtonClass, NONE_MENU_BUTTON};
+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, MenuItemClass, NONE_MENU_ITEM};
+pub use self::menu_item::{MenuItem, NONE_MENU_ITEM};
 
 mod menu_shell;
 pub use self::menu_shell::MenuShellExt;
-pub use self::menu_shell::{MenuShell, MenuShellClass, NONE_MENU_SHELL};
+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, MenuToolButtonClass, NONE_MENU_TOOL_BUTTON};
+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, MessageDialogClass, NONE_MESSAGE_DIALOG};
+pub use self::message_dialog::{MessageDialog, NONE_MESSAGE_DIALOG};
 
 mod misc;
-pub use self::misc::{Misc, MiscClass, NONE_MISC};
+pub use self::misc::{Misc, NONE_MISC};
 
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 mod model_button;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
-pub use self::model_button::ModelButtonBuilder;
+pub use self::model_button::ModelButton;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
-pub use self::model_button::{ModelButton, ModelButtonClass};
+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, MountOperationClass, NONE_MOUNT_OPERATION};
+pub use self::mount_operation::{MountOperation, NONE_MOUNT_OPERATION};
 
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 mod native_dialog;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 pub use self::native_dialog::NativeDialogExt;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
-pub use self::native_dialog::{NativeDialog, NativeDialogClass, NONE_NATIVE_DIALOG};
+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, NotebookClass, NONE_NOTEBOOK};
+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, OffscreenWindowClass, NONE_OFFSCREEN_WINDOW};
+pub use self::offscreen_window::{OffscreenWindow, NONE_OFFSCREEN_WINDOW};
 
 mod orientable;
 pub use self::orientable::OrientableExt;
@@ -589,26 +549,26 @@ pub use self::orientable::{Orientable, NONE_ORIENTABLE};
 mod overlay;
 pub use self::overlay::OverlayBuilder;
 pub use self::overlay::OverlayExt;
-pub use self::overlay::{Overlay, OverlayClass, NONE_OVERLAY};
+pub use self::overlay::{Overlay, NONE_OVERLAY};
 
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 mod pad_controller;
 #[cfg(any(feature = "v3_22", feature = "dox"))]
-pub use self::pad_controller::PadControllerBuilder;
+pub use self::pad_controller::PadController;
 #[cfg(any(feature = "v3_22", feature = "dox"))]
-pub use self::pad_controller::{PadController, PadControllerClass};
+pub use self::pad_controller::PadControllerBuilder;
 
 mod page_setup;
-pub use self::page_setup::{PageSetup, PageSetupClass};
+pub use self::page_setup::PageSetup;
 
 mod paned;
 pub use self::paned::PanedBuilder;
 pub use self::paned::PanedExt;
-pub use self::paned::{Paned, PanedClass, NONE_PANED};
+pub use self::paned::{Paned, NONE_PANED};
 
 mod places_sidebar;
+pub use self::places_sidebar::PlacesSidebar;
 pub use self::places_sidebar::PlacesSidebarBuilder;
-pub use self::places_sidebar::{PlacesSidebar, PlacesSidebarClass};
 
 #[cfg(any(gdk_backend = "x11", feature = "dox"))]
 mod plug;
@@ -617,12 +577,12 @@ pub use self::plug::PlugBuilder;
 #[cfg(any(gdk_backend = "x11", feature = "dox"))]
 pub use self::plug::PlugExt;
 #[cfg(any(gdk_backend = "x11", feature = "dox"))]
-pub use self::plug::{Plug, PlugClass, NONE_PLUG};
+pub use self::plug::{Plug, NONE_PLUG};
 
 mod popover;
 pub use self::popover::PopoverBuilder;
 pub use self::popover::PopoverExt;
-pub use self::popover::{Popover, PopoverClass, NONE_POPOVER};
+pub use self::popover::{Popover, NONE_POPOVER};
 
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 mod popover_menu;
@@ -631,46 +591,46 @@ pub use self::popover_menu::PopoverMenuBuilder;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 pub use self::popover_menu::PopoverMenuExt;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
-pub use self::popover_menu::{PopoverMenu, PopoverMenuClass, NONE_POPOVER_MENU};
+pub use self::popover_menu::{PopoverMenu, NONE_POPOVER_MENU};
 
 mod print_context;
-pub use self::print_context::{PrintContext, PrintContextClass};
+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, PrintOperationClass, NONE_PRINT_OPERATION};
+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;
-pub use self::print_settings::{PrintSettings, PrintSettingsClass};
+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, ProgressBarClass, NONE_PROGRESS_BAR};
+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, RadioButtonClass, NONE_RADIO_BUTTON};
+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, RadioMenuItemClass, NONE_RADIO_MENU_ITEM};
+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, RadioToolButtonClass, NONE_RADIO_TOOL_BUTTON};
+pub use self::radio_tool_button::{RadioToolButton, NONE_RADIO_TOOL_BUTTON};
 
 mod range;
 pub use self::range::RangeExt;
-pub use self::range::{Range, RangeClass, NONE_RANGE};
+pub use self::range::{Range, NONE_RANGE};
 
 mod recent_chooser;
 pub use self::recent_chooser::RecentChooserExt;
@@ -678,45 +638,39 @@ pub use self::recent_chooser::{RecentChooser, NONE_RECENT_CHOOSER};
 
 mod recent_chooser_dialog;
 pub use self::recent_chooser_dialog::RecentChooserDialogBuilder;
-pub use self::recent_chooser_dialog::{
-    RecentChooserDialog, RecentChooserDialogClass, NONE_RECENT_CHOOSER_DIALOG,
-};
+pub use self::recent_chooser_dialog::{RecentChooserDialog, NONE_RECENT_CHOOSER_DIALOG};
 
 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, RecentChooserMenuClass, NONE_RECENT_CHOOSER_MENU,
-};
+pub use self::recent_chooser_menu::{RecentChooserMenu, NONE_RECENT_CHOOSER_MENU};
 
 mod recent_chooser_widget;
 pub use self::recent_chooser_widget::RecentChooserWidgetBuilder;
-pub use self::recent_chooser_widget::{
-    RecentChooserWidget, RecentChooserWidgetClass, NONE_RECENT_CHOOSER_WIDGET,
-};
+pub use self::recent_chooser_widget::{RecentChooserWidget, NONE_RECENT_CHOOSER_WIDGET};
 
 mod recent_filter;
-pub use self::recent_filter::{RecentFilter, RecentFilterClass};
+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, RecentManagerClass, NONE_RECENT_MANAGER};
+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, RevealerClass, NONE_REVEALER};
+pub use self::revealer::{Revealer, NONE_REVEALER};
 
 mod scale;
 pub use self::scale::ScaleBuilder;
 pub use self::scale::ScaleExt;
-pub use self::scale::{Scale, ScaleClass, NONE_SCALE};
+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, ScaleButtonClass, NONE_SCALE_BUTTON};
+pub use self::scale_button::{ScaleButton, NONE_SCALE_BUTTON};
 
 mod scrollable;
 pub use self::scrollable::ScrollableExt;
@@ -724,71 +678,67 @@ pub use self::scrollable::{Scrollable, NONE_SCROLLABLE};
 
 mod scrollbar;
 pub use self::scrollbar::ScrollbarBuilder;
-pub use self::scrollbar::{Scrollbar, ScrollbarClass, NONE_SCROLLBAR};
+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, ScrolledWindowClass, NONE_SCROLLED_WINDOW};
+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, SearchBarClass, NONE_SEARCH_BAR};
+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, SearchEntryClass, NONE_SEARCH_ENTRY};
+pub use self::search_entry::{SearchEntry, NONE_SEARCH_ENTRY};
 
 mod separator;
 pub use self::separator::SeparatorBuilder;
-pub use self::separator::{Separator, SeparatorClass, NONE_SEPARATOR};
+pub use self::separator::{Separator, NONE_SEPARATOR};
 
 mod separator_menu_item;
 pub use self::separator_menu_item::SeparatorMenuItemBuilder;
-pub use self::separator_menu_item::{
-    SeparatorMenuItem, SeparatorMenuItemClass, NONE_SEPARATOR_MENU_ITEM,
-};
+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, SeparatorToolItemClass, NONE_SEPARATOR_TOOL_ITEM,
-};
+pub use self::separator_tool_item::{SeparatorToolItem, NONE_SEPARATOR_TOOL_ITEM};
 
 mod settings;
 pub use self::settings::SettingsExt;
-pub use self::settings::{Settings, SettingsClass, NONE_SETTINGS};
+pub use self::settings::{Settings, NONE_SETTINGS};
 
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 mod shortcut_label;
 #[cfg(any(feature = "v3_22", feature = "dox"))]
-pub use self::shortcut_label::ShortcutLabelBuilder;
+pub use self::shortcut_label::ShortcutLabel;
 #[cfg(any(feature = "v3_22", feature = "dox"))]
-pub use self::shortcut_label::{ShortcutLabel, ShortcutLabelClass};
+pub use self::shortcut_label::ShortcutLabelBuilder;
 
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 mod shortcuts_group;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
-pub use self::shortcuts_group::ShortcutsGroupBuilder;
+pub use self::shortcuts_group::ShortcutsGroup;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
-pub use self::shortcuts_group::{ShortcutsGroup, ShortcutsGroupClass};
+pub use self::shortcuts_group::ShortcutsGroupBuilder;
 
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 mod shortcuts_section;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
-pub use self::shortcuts_section::ShortcutsSectionBuilder;
+pub use self::shortcuts_section::ShortcutsSection;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
-pub use self::shortcuts_section::{ShortcutsSection, ShortcutsSectionClass};
+pub use self::shortcuts_section::ShortcutsSectionBuilder;
 
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 mod shortcuts_shortcut;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
-pub use self::shortcuts_shortcut::ShortcutsShortcutBuilder;
+pub use self::shortcuts_shortcut::ShortcutsShortcut;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
-pub use self::shortcuts_shortcut::{ShortcutsShortcut, ShortcutsShortcutClass};
+pub use self::shortcuts_shortcut::ShortcutsShortcutBuilder;
 
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 mod shortcuts_window;
@@ -797,12 +747,12 @@ pub use self::shortcuts_window::ShortcutsWindowBuilder;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 pub use self::shortcuts_window::ShortcutsWindowExt;
 #[cfg(any(feature = "v3_20", feature = "dox"))]
-pub use self::shortcuts_window::{ShortcutsWindow, ShortcutsWindowClass, NONE_SHORTCUTS_WINDOW};
+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, SizeGroupClass, NONE_SIZE_GROUP};
+pub use self::size_group::{SizeGroup, NONE_SIZE_GROUP};
 
 #[cfg(any(gdk_backend = "x11", feature = "dox"))]
 mod socket;
@@ -811,22 +761,22 @@ pub use self::socket::GtkSocketExt;
 #[cfg(any(gdk_backend = "x11", feature = "dox"))]
 pub use self::socket::SocketBuilder;
 #[cfg(any(gdk_backend = "x11", feature = "dox"))]
-pub use self::socket::{Socket, SocketClass, NONE_SOCKET};
+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, SpinButtonClass, NONE_SPIN_BUTTON};
+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, SpinnerClass, NONE_SPINNER};
+pub use self::spinner::{Spinner, NONE_SPINNER};
 
 mod stack;
 pub use self::stack::StackBuilder;
 pub use self::stack::StackExt;
-pub use self::stack::{Stack, StackClass, NONE_STACK};
+pub use self::stack::{Stack, NONE_STACK};
 
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 mod stack_sidebar;
@@ -835,26 +785,26 @@ pub use self::stack_sidebar::StackSidebarBuilder;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 pub use self::stack_sidebar::StackSidebarExt;
 #[cfg(any(feature = "v3_16", feature = "dox"))]
-pub use self::stack_sidebar::{StackSidebar, StackSidebarClass, NONE_STACK_SIDEBAR};
+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, StackSwitcherClass, NONE_STACK_SWITCHER};
+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, StatusbarClass, NONE_STATUSBAR};
+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, StyleContextClass, NONE_STYLE_CONTEXT};
+pub use self::style_context::{StyleContext, NONE_STYLE_CONTEXT};
 
 mod style_properties;
 pub use self::style_properties::StylePropertiesExt;
-pub use self::style_properties::{StyleProperties, StylePropertiesClass, NONE_STYLE_PROPERTIES};
+pub use self::style_properties::{StyleProperties, NONE_STYLE_PROPERTIES};
 
 mod style_provider;
 pub use self::style_provider::StyleProviderExt;
@@ -863,67 +813,65 @@ 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, SwitchClass, NONE_SWITCH};
+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, TextBufferClass, NONE_TEXT_BUFFER};
+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, TextChildAnchorClass, NONE_TEXT_CHILD_ANCHOR};
+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, TextMarkClass, NONE_TEXT_MARK};
+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, TextTagClass, NONE_TEXT_TAG};
+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, TextTagTableClass, NONE_TEXT_TAG_TABLE};
+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, TextViewClass, NONE_TEXT_VIEW};
+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, ToggleButtonClass, NONE_TOGGLE_BUTTON};
+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, ToggleToolButtonClass, NONE_TOGGLE_TOOL_BUTTON,
-};
+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, ToolButtonClass, NONE_TOOL_BUTTON};
+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, ToolItemClass, NONE_TOOL_ITEM};
+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, ToolItemGroupClass, NONE_TOOL_ITEM_GROUP};
+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, ToolPaletteClass, NONE_TOOL_PALETTE};
+pub use self::tool_palette::{ToolPalette, NONE_TOOL_PALETTE};
 
 mod tool_shell;
 pub use self::tool_shell::ToolShellExt;
@@ -932,10 +880,10 @@ 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, ToolbarClass, NONE_TOOLBAR};
+pub use self::toolbar::{Toolbar, NONE_TOOLBAR};
 
 mod tooltip;
-pub use self::tooltip::{Tooltip, TooltipClass};
+pub use self::tooltip::Tooltip;
 
 mod tree_drag_dest;
 pub use self::tree_drag_dest::TreeDragDestExt;
@@ -951,15 +899,15 @@ 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, TreeModelFilterClass, NONE_TREE_MODEL_FILTER};
+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, TreeModelSortClass, NONE_TREE_MODEL_SORT};
+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, TreeSelectionClass, NONE_TREE_SELECTION};
+pub use self::tree_selection::{TreeSelection, NONE_TREE_SELECTION};
 
 mod tree_sortable;
 pub use self::tree_sortable::TreeSortableExt;
@@ -967,40 +915,40 @@ pub use self::tree_sortable::{TreeSortable, NONE_TREE_SORTABLE};
 
 mod tree_store;
 pub use self::tree_store::TreeStoreExt;
-pub use self::tree_store::{TreeStore, TreeStoreClass, NONE_TREE_STORE};
+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, TreeViewClass, NONE_TREE_VIEW};
+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, TreeViewColumnClass, NONE_TREE_VIEW_COLUMN};
+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, ViewportClass, NONE_VIEWPORT};
+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, VolumeButtonClass, NONE_VOLUME_BUTTON};
+pub use self::volume_button::{VolumeButton, NONE_VOLUME_BUTTON};
 
 mod widget;
 pub use self::widget::WidgetExt;
-pub use self::widget::{Widget, WidgetClass, NONE_WIDGET};
+pub use self::widget::{Widget, NONE_WIDGET};
 
 mod window;
 pub use self::window::GtkWindowExt;
 pub use self::window::WindowBuilder;
-pub use self::window::{Window, WindowClass, NONE_WINDOW};
+pub use self::window::{Window, NONE_WINDOW};
 
 mod window_group;
 pub use self::window_group::WindowGroupExt;
-pub use self::window_group::{WindowGroup, WindowGroupClass, NONE_WINDOW_GROUP};
+pub use self::window_group::{WindowGroup, NONE_WINDOW_GROUP};
 
 mod css_section;
 pub use self::css_section::CssSection;
diff --git a/gtk/src/auto/model_button.rs b/gtk/src/auto/model_button.rs
index 54098936c9bc..b708dc89c086 100644
--- a/gtk/src/auto/model_button.rs
+++ b/gtk/src/auto/model_button.rs
@@ -47,7 +47,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct ModelButton(Object<gtk_sys::GtkModelButton, ModelButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct ModelButton(Object<gtk_sys::GtkModelButton>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_model_button_get_type(),
diff --git a/gtk/src/auto/mount_operation.rs b/gtk/src/auto/mount_operation.rs
index fe486c87076e..4fbf0a529fc7 100644
--- a/gtk/src/auto/mount_operation.rs
+++ b/gtk/src/auto/mount_operation.rs
@@ -21,7 +21,7 @@ use std::mem::transmute;
 use Window;
 
 glib_wrapper! {
-    pub struct MountOperation(Object<gtk_sys::GtkMountOperation, gtk_sys::GtkMountOperationClass, MountOperationClass>) @extends gio::MountOperation;
+    pub struct MountOperation(Object<gtk_sys::GtkMountOperation, gtk_sys::GtkMountOperationClass>) @extends gio::MountOperation;
 
     match fn {
         get_type => || gtk_sys::gtk_mount_operation_get_type(),
diff --git a/gtk/src/auto/native_dialog.rs b/gtk/src/auto/native_dialog.rs
index 4becf1860651..8c36230cc7b2 100644
--- a/gtk/src/auto/native_dialog.rs
+++ b/gtk/src/auto/native_dialog.rs
@@ -30,7 +30,7 @@ use ResponseType;
 use Window;
 
 glib_wrapper! {
-    pub struct NativeDialog(Object<gtk_sys::GtkNativeDialog, gtk_sys::GtkNativeDialogClass, NativeDialogClass>);
+    pub struct NativeDialog(Object<gtk_sys::GtkNativeDialog, gtk_sys::GtkNativeDialogClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_native_dialog_get_type(),
diff --git a/gtk/src/auto/notebook.rs b/gtk/src/auto/notebook.rs
index 344cd3af448b..aa9293b21a07 100644
--- a/gtk/src/auto/notebook.rs
+++ b/gtk/src/auto/notebook.rs
@@ -32,7 +32,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct Notebook(Object<gtk_sys::GtkNotebook, gtk_sys::GtkNotebookClass, NotebookClass>) @extends Container, Widget, @implements Buildable;
+    pub struct Notebook(Object<gtk_sys::GtkNotebook, gtk_sys::GtkNotebookClass>) @extends Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_notebook_get_type(),
diff --git a/gtk/src/auto/offscreen_window.rs b/gtk/src/auto/offscreen_window.rs
index 5d0e5d4244cb..c161fa1d4ea3 100644
--- a/gtk/src/auto/offscreen_window.rs
+++ b/gtk/src/auto/offscreen_window.rs
@@ -24,7 +24,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct OffscreenWindow(Object<gtk_sys::GtkOffscreenWindow, gtk_sys::GtkOffscreenWindowClass, OffscreenWindowClass>) @extends Window, Bin, Container, Widget, @implements Buildable;
+    pub struct OffscreenWindow(Object<gtk_sys::GtkOffscreenWindow, gtk_sys::GtkOffscreenWindowClass>) @extends Window, Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_offscreen_window_get_type(),
diff --git a/gtk/src/auto/overlay.rs b/gtk/src/auto/overlay.rs
index 8c70ad742352..08e822fd84ba 100644
--- a/gtk/src/auto/overlay.rs
+++ b/gtk/src/auto/overlay.rs
@@ -19,7 +19,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct Overlay(Object<gtk_sys::GtkOverlay, gtk_sys::GtkOverlayClass, OverlayClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct Overlay(Object<gtk_sys::GtkOverlay, gtk_sys::GtkOverlayClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_overlay_get_type(),
diff --git a/gtk/src/auto/pad_controller.rs b/gtk/src/auto/pad_controller.rs
index 8429aa14c30b..83f313852c91 100644
--- a/gtk/src/auto/pad_controller.rs
+++ b/gtk/src/auto/pad_controller.rs
@@ -23,7 +23,7 @@ use Widget;
 use Window;
 
 glib_wrapper! {
-    pub struct PadController(Object<gtk_sys::GtkPadController, gtk_sys::GtkPadControllerClass, PadControllerClass>) @extends EventController;
+    pub struct PadController(Object<gtk_sys::GtkPadController, gtk_sys::GtkPadControllerClass>) @extends EventController;
 
     match fn {
         get_type => || gtk_sys::gtk_pad_controller_get_type(),
diff --git a/gtk/src/auto/page_setup.rs b/gtk/src/auto/page_setup.rs
index 9c12184e5636..d749e5841e4c 100644
--- a/gtk/src/auto/page_setup.rs
+++ b/gtk/src/auto/page_setup.rs
@@ -13,7 +13,7 @@ use PaperSize;
 use Unit;
 
 glib_wrapper! {
-    pub struct PageSetup(Object<gtk_sys::GtkPageSetup, PageSetupClass>);
+    pub struct PageSetup(Object<gtk_sys::GtkPageSetup>);
 
     match fn {
         get_type => || gtk_sys::gtk_page_setup_get_type(),
diff --git a/gtk/src/auto/paned.rs b/gtk/src/auto/paned.rs
index e817401029e0..ed6607b44136 100644
--- a/gtk/src/auto/paned.rs
+++ b/gtk/src/auto/paned.rs
@@ -29,7 +29,7 @@ use ScrollType;
 use Widget;
 
 glib_wrapper! {
-    pub struct Paned(Object<gtk_sys::GtkPaned, gtk_sys::GtkPanedClass, PanedClass>) @extends Container, Widget, @implements Buildable, Orientable;
+    pub struct Paned(Object<gtk_sys::GtkPaned, gtk_sys::GtkPanedClass>) @extends Container, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_paned_get_type(),
diff --git a/gtk/src/auto/places_sidebar.rs b/gtk/src/auto/places_sidebar.rs
index e1dfef432b23..ce94c8c3c907 100644
--- a/gtk/src/auto/places_sidebar.rs
+++ b/gtk/src/auto/places_sidebar.rs
@@ -36,7 +36,7 @@ use ShadowType;
 use Widget;
 
 glib_wrapper! {
-    pub struct PlacesSidebar(Object<gtk_sys::GtkPlacesSidebar, gtk_sys::GtkPlacesSidebarClass, PlacesSidebarClass>) @extends ScrolledWindow, Bin, Container, Widget, @implements Buildable;
+    pub struct PlacesSidebar(Object<gtk_sys::GtkPlacesSidebar, gtk_sys::GtkPlacesSidebarClass>) @extends ScrolledWindow, Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_places_sidebar_get_type(),
diff --git a/gtk/src/auto/plug.rs b/gtk/src/auto/plug.rs
index a8e9f49fd7b7..bc6e28894033 100644
--- a/gtk/src/auto/plug.rs
+++ b/gtk/src/auto/plug.rs
@@ -29,7 +29,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct Plug(Object<gtk_sys::GtkPlug, gtk_sys::GtkPlugClass, PlugClass>) @extends Window, Bin, Container, Widget, @implements Buildable;
+    pub struct Plug(Object<gtk_sys::GtkPlug, gtk_sys::GtkPlugClass>) @extends Window, Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_plug_get_type(),
diff --git a/gtk/src/auto/popover.rs b/gtk/src/auto/popover.rs
index 8f778464f086..c4b76d307d7f 100644
--- a/gtk/src/auto/popover.rs
+++ b/gtk/src/auto/popover.rs
@@ -27,7 +27,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct Popover(Object<gtk_sys::GtkPopover, gtk_sys::GtkPopoverClass, PopoverClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct Popover(Object<gtk_sys::GtkPopover, gtk_sys::GtkPopoverClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_popover_get_type(),
diff --git a/gtk/src/auto/popover_menu.rs b/gtk/src/auto/popover_menu.rs
index 4c721821e86d..0bb3b980bb7d 100644
--- a/gtk/src/auto/popover_menu.rs
+++ b/gtk/src/auto/popover_menu.rs
@@ -30,7 +30,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct PopoverMenu(Object<gtk_sys::GtkPopoverMenu, gtk_sys::GtkPopoverMenuClass, PopoverMenuClass>) @extends Popover, Bin, Container, Widget, @implements Buildable;
+    pub struct PopoverMenu(Object<gtk_sys::GtkPopoverMenu, gtk_sys::GtkPopoverMenuClass>) @extends Popover, Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_popover_menu_get_type(),
diff --git a/gtk/src/auto/print_context.rs b/gtk/src/auto/print_context.rs
index e402ebf550d5..7a7bae5057ec 100644
--- a/gtk/src/auto/print_context.rs
+++ b/gtk/src/auto/print_context.rs
@@ -11,7 +11,7 @@ use std::mem;
 use PageSetup;
 
 glib_wrapper! {
-    pub struct PrintContext(Object<gtk_sys::GtkPrintContext, PrintContextClass>);
+    pub struct PrintContext(Object<gtk_sys::GtkPrintContext>);
 
     match fn {
         get_type => || gtk_sys::gtk_print_context_get_type(),
diff --git a/gtk/src/auto/print_operation.rs b/gtk/src/auto/print_operation.rs
index 293b3e4ceeb6..61c7682bf6d8 100644
--- a/gtk/src/auto/print_operation.rs
+++ b/gtk/src/auto/print_operation.rs
@@ -33,7 +33,7 @@ use Widget;
 use Window;
 
 glib_wrapper! {
-    pub struct PrintOperation(Object<gtk_sys::GtkPrintOperation, gtk_sys::GtkPrintOperationClass, PrintOperationClass>) @implements PrintOperationPreview;
+    pub struct PrintOperation(Object<gtk_sys::GtkPrintOperation, gtk_sys::GtkPrintOperationClass>) @implements PrintOperationPreview;
 
     match fn {
         get_type => || gtk_sys::gtk_print_operation_get_type(),
diff --git a/gtk/src/auto/print_settings.rs b/gtk/src/auto/print_settings.rs
index eef4869acdf4..f8e2c414b392 100644
--- a/gtk/src/auto/print_settings.rs
+++ b/gtk/src/auto/print_settings.rs
@@ -21,7 +21,7 @@ use PrintQuality;
 use Unit;
 
 glib_wrapper! {
-    pub struct PrintSettings(Object<gtk_sys::GtkPrintSettings, PrintSettingsClass>);
+    pub struct PrintSettings(Object<gtk_sys::GtkPrintSettings>);
 
     match fn {
         get_type => || gtk_sys::gtk_print_settings_get_type(),
diff --git a/gtk/src/auto/progress_bar.rs b/gtk/src/auto/progress_bar.rs
index 1ee5f17d45a9..a31f99c98d82 100644
--- a/gtk/src/auto/progress_bar.rs
+++ b/gtk/src/auto/progress_bar.rs
@@ -25,7 +25,7 @@ use Orientation;
 use Widget;
 
 glib_wrapper! {
-    pub struct ProgressBar(Object<gtk_sys::GtkProgressBar, gtk_sys::GtkProgressBarClass, ProgressBarClass>) @extends Widget, @implements Buildable, Orientable;
+    pub struct ProgressBar(Object<gtk_sys::GtkProgressBar, gtk_sys::GtkProgressBarClass>) @extends Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_progress_bar_get_type(),
diff --git a/gtk/src/auto/radio_button.rs b/gtk/src/auto/radio_button.rs
index 518c8cb636c0..5494733ef912 100644
--- a/gtk/src/auto/radio_button.rs
+++ b/gtk/src/auto/radio_button.rs
@@ -30,7 +30,7 @@ use ToggleButton;
 use Widget;
 
 glib_wrapper! {
-    pub struct RadioButton(Object<gtk_sys::GtkRadioButton, gtk_sys::GtkRadioButtonClass, RadioButtonClass>) @extends CheckButton, ToggleButton, Button, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct RadioButton(Object<gtk_sys::GtkRadioButton, gtk_sys::GtkRadioButtonClass>) @extends CheckButton, ToggleButton, Button, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_radio_button_get_type(),
diff --git a/gtk/src/auto/radio_menu_item.rs b/gtk/src/auto/radio_menu_item.rs
index 87c8d33a8e1f..43768fd39055 100644
--- a/gtk/src/auto/radio_menu_item.rs
+++ b/gtk/src/auto/radio_menu_item.rs
@@ -28,7 +28,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct RadioMenuItem(Object<gtk_sys::GtkRadioMenuItem, gtk_sys::GtkRadioMenuItemClass, RadioMenuItemClass>) @extends CheckMenuItem, MenuItem, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct RadioMenuItem(Object<gtk_sys::GtkRadioMenuItem, gtk_sys::GtkRadioMenuItemClass>) @extends CheckMenuItem, MenuItem, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_radio_menu_item_get_type(),
diff --git a/gtk/src/auto/radio_tool_button.rs b/gtk/src/auto/radio_tool_button.rs
index c48eb4ef7e4e..6b3fb3fc4620 100644
--- a/gtk/src/auto/radio_tool_button.rs
+++ b/gtk/src/auto/radio_tool_button.rs
@@ -24,7 +24,7 @@ use ToolItem;
 use Widget;
 
 glib_wrapper! {
-    pub struct RadioToolButton(Object<gtk_sys::GtkRadioToolButton, gtk_sys::GtkRadioToolButtonClass, RadioToolButtonClass>) @extends ToggleToolButton, ToolButton, ToolItem, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct RadioToolButton(Object<gtk_sys::GtkRadioToolButton, gtk_sys::GtkRadioToolButtonClass>) @extends ToggleToolButton, ToolButton, ToolItem, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_radio_tool_button_get_type(),
diff --git a/gtk/src/auto/range.rs b/gtk/src/auto/range.rs
index 8d21647549ad..9afde3c2b5a8 100644
--- a/gtk/src/auto/range.rs
+++ b/gtk/src/auto/range.rs
@@ -26,7 +26,7 @@ use SensitivityType;
 use Widget;
 
 glib_wrapper! {
-    pub struct Range(Object<gtk_sys::GtkRange, gtk_sys::GtkRangeClass, RangeClass>) @extends Widget, @implements Buildable, Orientable;
+    pub struct Range(Object<gtk_sys::GtkRange, gtk_sys::GtkRangeClass>) @extends Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_range_get_type(),
diff --git a/gtk/src/auto/recent_chooser_dialog.rs b/gtk/src/auto/recent_chooser_dialog.rs
index 017f69cc2126..8e45406e2e8d 100644
--- a/gtk/src/auto/recent_chooser_dialog.rs
+++ b/gtk/src/auto/recent_chooser_dialog.rs
@@ -28,7 +28,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct RecentChooserDialog(Object<gtk_sys::GtkRecentChooserDialog, gtk_sys::GtkRecentChooserDialogClass, RecentChooserDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable, RecentChooser;
+    pub struct RecentChooserDialog(Object<gtk_sys::GtkRecentChooserDialog, gtk_sys::GtkRecentChooserDialogClass>) @extends Dialog, Window, Bin, Container, Widget, @implements Buildable, RecentChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_recent_chooser_dialog_get_type(),
diff --git a/gtk/src/auto/recent_chooser_menu.rs b/gtk/src/auto/recent_chooser_menu.rs
index c29fb9adf832..93220e387da5 100644
--- a/gtk/src/auto/recent_chooser_menu.rs
+++ b/gtk/src/auto/recent_chooser_menu.rs
@@ -29,7 +29,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct RecentChooserMenu(Object<gtk_sys::GtkRecentChooserMenu, gtk_sys::GtkRecentChooserMenuClass, RecentChooserMenuClass>) @extends Menu, MenuShell, Container, Widget, @implements Buildable, RecentChooser;
+    pub struct RecentChooserMenu(Object<gtk_sys::GtkRecentChooserMenu, gtk_sys::GtkRecentChooserMenuClass>) @extends Menu, MenuShell, Container, Widget, @implements Buildable, RecentChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_recent_chooser_menu_get_type(),
diff --git a/gtk/src/auto/recent_chooser_widget.rs b/gtk/src/auto/recent_chooser_widget.rs
index 0b289711bcc1..581a9e427aeb 100644
--- a/gtk/src/auto/recent_chooser_widget.rs
+++ b/gtk/src/auto/recent_chooser_widget.rs
@@ -25,7 +25,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct RecentChooserWidget(Object<gtk_sys::GtkRecentChooserWidget, gtk_sys::GtkRecentChooserWidgetClass, RecentChooserWidgetClass>) @extends Box, Container, Widget, @implements Buildable, Orientable, RecentChooser;
+    pub struct RecentChooserWidget(Object<gtk_sys::GtkRecentChooserWidget, gtk_sys::GtkRecentChooserWidgetClass>) @extends Box, Container, Widget, @implements Buildable, Orientable, RecentChooser;
 
     match fn {
         get_type => || gtk_sys::gtk_recent_chooser_widget_get_type(),
diff --git a/gtk/src/auto/recent_filter.rs b/gtk/src/auto/recent_filter.rs
index c6b7bbac7942..92104aedc569 100644
--- a/gtk/src/auto/recent_filter.rs
+++ b/gtk/src/auto/recent_filter.rs
@@ -10,7 +10,7 @@ use Buildable;
 use RecentFilterFlags;
 
 glib_wrapper! {
-    pub struct RecentFilter(Object<gtk_sys::GtkRecentFilter, RecentFilterClass>) @implements Buildable;
+    pub struct RecentFilter(Object<gtk_sys::GtkRecentFilter>) @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_recent_filter_get_type(),
diff --git a/gtk/src/auto/recent_manager.rs b/gtk/src/auto/recent_manager.rs
index 5d5c0da04687..19f85a0f1582 100644
--- a/gtk/src/auto/recent_manager.rs
+++ b/gtk/src/auto/recent_manager.rs
@@ -23,7 +23,7 @@ use RecentData;
 use RecentInfo;
 
 glib_wrapper! {
-    pub struct RecentManager(Object<gtk_sys::GtkRecentManager, gtk_sys::GtkRecentManagerClass, RecentManagerClass>);
+    pub struct RecentManager(Object<gtk_sys::GtkRecentManager, gtk_sys::GtkRecentManagerClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_recent_manager_get_type(),
diff --git a/gtk/src/auto/revealer.rs b/gtk/src/auto/revealer.rs
index 2ae2d0cd46a8..6c9283b063c7 100644
--- a/gtk/src/auto/revealer.rs
+++ b/gtk/src/auto/revealer.rs
@@ -24,7 +24,7 @@ use RevealerTransitionType;
 use Widget;
 
 glib_wrapper! {
-    pub struct Revealer(Object<gtk_sys::GtkRevealer, gtk_sys::GtkRevealerClass, RevealerClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct Revealer(Object<gtk_sys::GtkRevealer, gtk_sys::GtkRevealerClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_revealer_get_type(),
diff --git a/gtk/src/auto/scale.rs b/gtk/src/auto/scale.rs
index 8e67ed182055..b0c742bbf6e4 100644
--- a/gtk/src/auto/scale.rs
+++ b/gtk/src/auto/scale.rs
@@ -30,7 +30,7 @@ use SensitivityType;
 use Widget;
 
 glib_wrapper! {
-    pub struct Scale(Object<gtk_sys::GtkScale, gtk_sys::GtkScaleClass, ScaleClass>) @extends Range, Widget, @implements Buildable, Orientable;
+    pub struct Scale(Object<gtk_sys::GtkScale, gtk_sys::GtkScaleClass>) @extends Range, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_scale_get_type(),
diff --git a/gtk/src/auto/scale_button.rs b/gtk/src/auto/scale_button.rs
index 8a73a3e00ac0..b98bb901fec0 100644
--- a/gtk/src/auto/scale_button.rs
+++ b/gtk/src/auto/scale_button.rs
@@ -37,7 +37,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct ScaleButton(Object<gtk_sys::GtkScaleButton, gtk_sys::GtkScaleButtonClass, ScaleButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable, Orientable;
+    pub struct ScaleButton(Object<gtk_sys::GtkScaleButton, gtk_sys::GtkScaleButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_scale_button_get_type(),
diff --git a/gtk/src/auto/scrollbar.rs b/gtk/src/auto/scrollbar.rs
index 5d9ec50892cc..3991adaa28c7 100644
--- a/gtk/src/auto/scrollbar.rs
+++ b/gtk/src/auto/scrollbar.rs
@@ -21,7 +21,7 @@ use SensitivityType;
 use Widget;
 
 glib_wrapper! {
-    pub struct Scrollbar(Object<gtk_sys::GtkScrollbar, gtk_sys::GtkScrollbarClass, ScrollbarClass>) @extends Range, Widget, @implements Buildable, Orientable;
+    pub struct Scrollbar(Object<gtk_sys::GtkScrollbar, gtk_sys::GtkScrollbarClass>) @extends Range, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_scrollbar_get_type(),
diff --git a/gtk/src/auto/scrolled_window.rs b/gtk/src/auto/scrolled_window.rs
index 6edbd909f46d..fc3aafcb3243 100644
--- a/gtk/src/auto/scrolled_window.rs
+++ b/gtk/src/auto/scrolled_window.rs
@@ -36,7 +36,7 @@ use ShadowType;
 use Widget;
 
 glib_wrapper! {
-    pub struct ScrolledWindow(Object<gtk_sys::GtkScrolledWindow, gtk_sys::GtkScrolledWindowClass, ScrolledWindowClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct ScrolledWindow(Object<gtk_sys::GtkScrolledWindow, gtk_sys::GtkScrolledWindowClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_scrolled_window_get_type(),
diff --git a/gtk/src/auto/search_bar.rs b/gtk/src/auto/search_bar.rs
index 0f1aa8366eb4..57a857eee2d4 100644
--- a/gtk/src/auto/search_bar.rs
+++ b/gtk/src/auto/search_bar.rs
@@ -26,7 +26,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct SearchBar(Object<gtk_sys::GtkSearchBar, gtk_sys::GtkSearchBarClass, SearchBarClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct SearchBar(Object<gtk_sys::GtkSearchBar, gtk_sys::GtkSearchBarClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_search_bar_get_type(),
diff --git a/gtk/src/auto/search_entry.rs b/gtk/src/auto/search_entry.rs
index d9f0b8842fa3..8d1335e13a00 100644
--- a/gtk/src/auto/search_entry.rs
+++ b/gtk/src/auto/search_entry.rs
@@ -38,7 +38,7 @@ use ShadowType;
 use Widget;
 
 glib_wrapper! {
-    pub struct SearchEntry(Object<gtk_sys::GtkSearchEntry, gtk_sys::GtkSearchEntryClass, SearchEntryClass>) @extends Entry, Widget, @implements Buildable, CellEditable, Editable;
+    pub struct SearchEntry(Object<gtk_sys::GtkSearchEntry, gtk_sys::GtkSearchEntryClass>) @extends Entry, Widget, @implements Buildable, CellEditable, Editable;
 
     match fn {
         get_type => || gtk_sys::gtk_search_entry_get_type(),
diff --git a/gtk/src/auto/separator.rs b/gtk/src/auto/separator.rs
index 215a556bada2..6aee5d3d901b 100644
--- a/gtk/src/auto/separator.rs
+++ b/gtk/src/auto/separator.rs
@@ -18,7 +18,7 @@ use Orientation;
 use Widget;
 
 glib_wrapper! {
-    pub struct Separator(Object<gtk_sys::GtkSeparator, gtk_sys::GtkSeparatorClass, SeparatorClass>) @extends Widget, @implements Buildable, Orientable;
+    pub struct Separator(Object<gtk_sys::GtkSeparator, gtk_sys::GtkSeparatorClass>) @extends Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_separator_get_type(),
diff --git a/gtk/src/auto/separator_menu_item.rs b/gtk/src/auto/separator_menu_item.rs
index f55be065e2af..11ce38ffc1cc 100644
--- a/gtk/src/auto/separator_menu_item.rs
+++ b/gtk/src/auto/separator_menu_item.rs
@@ -22,7 +22,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct SeparatorMenuItem(Object<gtk_sys::GtkSeparatorMenuItem, gtk_sys::GtkSeparatorMenuItemClass, SeparatorMenuItemClass>) @extends MenuItem, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct SeparatorMenuItem(Object<gtk_sys::GtkSeparatorMenuItem, gtk_sys::GtkSeparatorMenuItemClass>) @extends MenuItem, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_separator_menu_item_get_type(),
diff --git a/gtk/src/auto/separator_tool_item.rs b/gtk/src/auto/separator_tool_item.rs
index de8318a680b0..a5d320b13fd4 100644
--- a/gtk/src/auto/separator_tool_item.rs
+++ b/gtk/src/auto/separator_tool_item.rs
@@ -24,7 +24,7 @@ use ToolItem;
 use Widget;
 
 glib_wrapper! {
-    pub struct SeparatorToolItem(Object<gtk_sys::GtkSeparatorToolItem, gtk_sys::GtkSeparatorToolItemClass, SeparatorToolItemClass>) @extends ToolItem, Bin, Container, Widget, @implements Buildable;
+    pub struct SeparatorToolItem(Object<gtk_sys::GtkSeparatorToolItem, gtk_sys::GtkSeparatorToolItemClass>) @extends ToolItem, Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_separator_tool_item_get_type(),
diff --git a/gtk/src/auto/settings.rs b/gtk/src/auto/settings.rs
index 5e02e6f102e9..722d7a0388c5 100644
--- a/gtk/src/auto/settings.rs
+++ b/gtk/src/auto/settings.rs
@@ -21,7 +21,7 @@ use std::mem::transmute;
 use StyleProvider;
 
 glib_wrapper! {
-    pub struct Settings(Object<gtk_sys::GtkSettings, gtk_sys::GtkSettingsClass, SettingsClass>) @implements StyleProvider;
+    pub struct Settings(Object<gtk_sys::GtkSettings, gtk_sys::GtkSettingsClass>) @implements StyleProvider;
 
     match fn {
         get_type => || gtk_sys::gtk_settings_get_type(),
diff --git a/gtk/src/auto/shortcut_label.rs b/gtk/src/auto/shortcut_label.rs
index e2afb3e72e80..115657c36a86 100644
--- a/gtk/src/auto/shortcut_label.rs
+++ b/gtk/src/auto/shortcut_label.rs
@@ -35,7 +35,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct ShortcutLabel(Object<gtk_sys::GtkShortcutLabel, gtk_sys::GtkShortcutLabelClass, ShortcutLabelClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
+    pub struct ShortcutLabel(Object<gtk_sys::GtkShortcutLabel, gtk_sys::GtkShortcutLabelClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_shortcut_label_get_type(),
diff --git a/gtk/src/auto/shortcuts_group.rs b/gtk/src/auto/shortcuts_group.rs
index f289b53d2367..4758032e7795 100644
--- a/gtk/src/auto/shortcuts_group.rs
+++ b/gtk/src/auto/shortcuts_group.rs
@@ -32,7 +32,7 @@ use SizeGroup;
 use Widget;
 
 glib_wrapper! {
-    pub struct ShortcutsGroup(Object<gtk_sys::GtkShortcutsGroup, gtk_sys::GtkShortcutsGroupClass, ShortcutsGroupClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
+    pub struct ShortcutsGroup(Object<gtk_sys::GtkShortcutsGroup, gtk_sys::GtkShortcutsGroupClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_shortcuts_group_get_type(),
diff --git a/gtk/src/auto/shortcuts_section.rs b/gtk/src/auto/shortcuts_section.rs
index f2a8b394046f..602bdfddcb8e 100644
--- a/gtk/src/auto/shortcuts_section.rs
+++ b/gtk/src/auto/shortcuts_section.rs
@@ -33,7 +33,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct ShortcutsSection(Object<gtk_sys::GtkShortcutsSection, gtk_sys::GtkShortcutsSectionClass, ShortcutsSectionClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
+    pub struct ShortcutsSection(Object<gtk_sys::GtkShortcutsSection, gtk_sys::GtkShortcutsSectionClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_shortcuts_section_get_type(),
diff --git a/gtk/src/auto/shortcuts_shortcut.rs b/gtk/src/auto/shortcuts_shortcut.rs
index 8919df9bb1b7..8149d8bf0a19 100644
--- a/gtk/src/auto/shortcuts_shortcut.rs
+++ b/gtk/src/auto/shortcuts_shortcut.rs
@@ -35,7 +35,7 @@ use TextDirection;
 use Widget;
 
 glib_wrapper! {
-    pub struct ShortcutsShortcut(Object<gtk_sys::GtkShortcutsShortcut, gtk_sys::GtkShortcutsShortcutClass, ShortcutsShortcutClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
+    pub struct ShortcutsShortcut(Object<gtk_sys::GtkShortcutsShortcut, gtk_sys::GtkShortcutsShortcutClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_shortcuts_shortcut_get_type(),
diff --git a/gtk/src/auto/shortcuts_window.rs b/gtk/src/auto/shortcuts_window.rs
index 4333eb0e0819..25da2ff4c50f 100644
--- a/gtk/src/auto/shortcuts_window.rs
+++ b/gtk/src/auto/shortcuts_window.rs
@@ -33,7 +33,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct ShortcutsWindow(Object<gtk_sys::GtkShortcutsWindow, gtk_sys::GtkShortcutsWindowClass, ShortcutsWindowClass>) @extends Window, Bin, Container, Widget, @implements Buildable;
+    pub struct ShortcutsWindow(Object<gtk_sys::GtkShortcutsWindow, gtk_sys::GtkShortcutsWindowClass>) @extends Window, Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_shortcuts_window_get_type(),
diff --git a/gtk/src/auto/size_group.rs b/gtk/src/auto/size_group.rs
index 722e309e9b61..1374fdf9120a 100644
--- a/gtk/src/auto/size_group.rs
+++ b/gtk/src/auto/size_group.rs
@@ -19,7 +19,7 @@ use SizeGroupMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct SizeGroup(Object<gtk_sys::GtkSizeGroup, gtk_sys::GtkSizeGroupClass, SizeGroupClass>) @implements Buildable;
+    pub struct SizeGroup(Object<gtk_sys::GtkSizeGroup, gtk_sys::GtkSizeGroupClass>) @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_size_group_get_type(),
diff --git a/gtk/src/auto/socket.rs b/gtk/src/auto/socket.rs
index 1418539bd635..1650668d07c4 100644
--- a/gtk/src/auto/socket.rs
+++ b/gtk/src/auto/socket.rs
@@ -23,7 +23,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct Socket(Object<gtk_sys::GtkSocket, gtk_sys::GtkSocketClass, SocketClass>) @extends Container, Widget, @implements Buildable;
+    pub struct Socket(Object<gtk_sys::GtkSocket, gtk_sys::GtkSocketClass>) @extends Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_socket_get_type(),
diff --git a/gtk/src/auto/spin_button.rs b/gtk/src/auto/spin_button.rs
index 8a9c5698bca6..05b0f8518147 100644
--- a/gtk/src/auto/spin_button.rs
+++ b/gtk/src/auto/spin_button.rs
@@ -40,7 +40,7 @@ use SpinType;
 use Widget;
 
 glib_wrapper! {
-    pub struct SpinButton(Object<gtk_sys::GtkSpinButton, gtk_sys::GtkSpinButtonClass, SpinButtonClass>) @extends Entry, Widget, @implements Buildable, CellEditable, Editable, Orientable;
+    pub struct SpinButton(Object<gtk_sys::GtkSpinButton, gtk_sys::GtkSpinButtonClass>) @extends Entry, Widget, @implements Buildable, CellEditable, Editable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_spin_button_get_type(),
diff --git a/gtk/src/auto/spinner.rs b/gtk/src/auto/spinner.rs
index 0f98991fce8b..ad5f9ad38f26 100644
--- a/gtk/src/auto/spinner.rs
+++ b/gtk/src/auto/spinner.rs
@@ -23,7 +23,7 @@ use Container;
 use Widget;
 
 glib_wrapper! {
-    pub struct Spinner(Object<gtk_sys::GtkSpinner, gtk_sys::GtkSpinnerClass, SpinnerClass>) @extends Widget, @implements Buildable;
+    pub struct Spinner(Object<gtk_sys::GtkSpinner, gtk_sys::GtkSpinnerClass>) @extends Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_spinner_get_type(),
diff --git a/gtk/src/auto/stack.rs b/gtk/src/auto/stack.rs
index dea4afcd1e47..c797d024af1b 100644
--- a/gtk/src/auto/stack.rs
+++ b/gtk/src/auto/stack.rs
@@ -26,7 +26,7 @@ use StackTransitionType;
 use Widget;
 
 glib_wrapper! {
-    pub struct Stack(Object<gtk_sys::GtkStack, gtk_sys::GtkStackClass, StackClass>) @extends Container, Widget, @implements Buildable;
+    pub struct Stack(Object<gtk_sys::GtkStack, gtk_sys::GtkStackClass>) @extends Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_stack_get_type(),
diff --git a/gtk/src/auto/stack_sidebar.rs b/gtk/src/auto/stack_sidebar.rs
index 2998d67455cf..631017c3df09 100644
--- a/gtk/src/auto/stack_sidebar.rs
+++ b/gtk/src/auto/stack_sidebar.rs
@@ -27,7 +27,7 @@ use Stack;
 use Widget;
 
 glib_wrapper! {
-    pub struct StackSidebar(Object<gtk_sys::GtkStackSidebar, gtk_sys::GtkStackSidebarClass, StackSidebarClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct StackSidebar(Object<gtk_sys::GtkStackSidebar, gtk_sys::GtkStackSidebarClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_stack_sidebar_get_type(),
diff --git a/gtk/src/auto/stack_switcher.rs b/gtk/src/auto/stack_switcher.rs
index 5c1fcc2360e1..6e4670e686d4 100644
--- a/gtk/src/auto/stack_switcher.rs
+++ b/gtk/src/auto/stack_switcher.rs
@@ -31,7 +31,7 @@ use Stack;
 use Widget;
 
 glib_wrapper! {
-    pub struct StackSwitcher(Object<gtk_sys::GtkStackSwitcher, gtk_sys::GtkStackSwitcherClass, StackSwitcherClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
+    pub struct StackSwitcher(Object<gtk_sys::GtkStackSwitcher, gtk_sys::GtkStackSwitcherClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_stack_switcher_get_type(),
diff --git a/gtk/src/auto/statusbar.rs b/gtk/src/auto/statusbar.rs
index 60a9555515dd..f443eacb4c44 100644
--- a/gtk/src/auto/statusbar.rs
+++ b/gtk/src/auto/statusbar.rs
@@ -28,7 +28,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct Statusbar(Object<gtk_sys::GtkStatusbar, gtk_sys::GtkStatusbarClass, StatusbarClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
+    pub struct Statusbar(Object<gtk_sys::GtkStatusbar, gtk_sys::GtkStatusbarClass>) @extends Box, Container, Widget, @implements Buildable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_statusbar_get_type(),
diff --git a/gtk/src/auto/style_context.rs b/gtk/src/auto/style_context.rs
index 3f703913de21..0d8d63c3813e 100644
--- a/gtk/src/auto/style_context.rs
+++ b/gtk/src/auto/style_context.rs
@@ -30,7 +30,7 @@ use TextDirection;
 use WidgetPath;
 
 glib_wrapper! {
-    pub struct StyleContext(Object<gtk_sys::GtkStyleContext, gtk_sys::GtkStyleContextClass, StyleContextClass>);
+    pub struct StyleContext(Object<gtk_sys::GtkStyleContext, gtk_sys::GtkStyleContextClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_style_context_get_type(),
diff --git a/gtk/src/auto/style_properties.rs b/gtk/src/auto/style_properties.rs
index 27696b7aa432..4616465a1117 100644
--- a/gtk/src/auto/style_properties.rs
+++ b/gtk/src/auto/style_properties.rs
@@ -11,7 +11,7 @@ use StateFlags;
 use StyleProvider;
 
 glib_wrapper! {
-    pub struct StyleProperties(Object<gtk_sys::GtkStyleProperties, gtk_sys::GtkStylePropertiesClass, StylePropertiesClass>) @implements StyleProvider;
+    pub struct StyleProperties(Object<gtk_sys::GtkStyleProperties, gtk_sys::GtkStylePropertiesClass>) @implements StyleProvider;
 
     match fn {
         get_type => || gtk_sys::gtk_style_properties_get_type(),
@@ -26,7 +26,6 @@ impl StyleProperties {
     }
 }
 
-#[cfg_attr(feature = "v3_16", deprecated)]
 impl Default for StyleProperties {
     fn default() -> Self {
         Self::new()
diff --git a/gtk/src/auto/switch.rs b/gtk/src/auto/switch.rs
index c5ffa1a8b16a..5b1b42f30ee6 100644
--- a/gtk/src/auto/switch.rs
+++ b/gtk/src/auto/switch.rs
@@ -25,7 +25,7 @@ use Container;
 use Widget;
 
 glib_wrapper! {
-    pub struct Switch(Object<gtk_sys::GtkSwitch, gtk_sys::GtkSwitchClass, SwitchClass>) @extends Widget, @implements Buildable, Actionable;
+    pub struct Switch(Object<gtk_sys::GtkSwitch, gtk_sys::GtkSwitchClass>) @extends Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_switch_get_type(),
diff --git a/gtk/src/auto/text_buffer.rs b/gtk/src/auto/text_buffer.rs
index c754e9e60b85..6d995710564e 100644
--- a/gtk/src/auto/text_buffer.rs
+++ b/gtk/src/auto/text_buffer.rs
@@ -31,7 +31,7 @@ use TextTag;
 use TextTagTable;
 
 glib_wrapper! {
-    pub struct TextBuffer(Object<gtk_sys::GtkTextBuffer, gtk_sys::GtkTextBufferClass, TextBufferClass>);
+    pub struct TextBuffer(Object<gtk_sys::GtkTextBuffer, gtk_sys::GtkTextBufferClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_text_buffer_get_type(),
diff --git a/gtk/src/auto/text_child_anchor.rs b/gtk/src/auto/text_child_anchor.rs
index c886a4844b1b..930e0ea93602 100644
--- a/gtk/src/auto/text_child_anchor.rs
+++ b/gtk/src/auto/text_child_anchor.rs
@@ -9,7 +9,7 @@ use std::fmt;
 use Widget;
 
 glib_wrapper! {
-    pub struct TextChildAnchor(Object<gtk_sys::GtkTextChildAnchor, gtk_sys::GtkTextChildAnchorClass, TextChildAnchorClass>);
+    pub struct TextChildAnchor(Object<gtk_sys::GtkTextChildAnchor, gtk_sys::GtkTextChildAnchorClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_text_child_anchor_get_type(),
diff --git a/gtk/src/auto/text_mark.rs b/gtk/src/auto/text_mark.rs
index 0fb65d86a425..f54c3778a559 100644
--- a/gtk/src/auto/text_mark.rs
+++ b/gtk/src/auto/text_mark.rs
@@ -13,7 +13,7 @@ use std::fmt;
 use TextBuffer;
 
 glib_wrapper! {
-    pub struct TextMark(Object<gtk_sys::GtkTextMark, gtk_sys::GtkTextMarkClass, TextMarkClass>);
+    pub struct TextMark(Object<gtk_sys::GtkTextMark, gtk_sys::GtkTextMarkClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_text_mark_get_type(),
diff --git a/gtk/src/auto/text_tag.rs b/gtk/src/auto/text_tag.rs
index 6ea7709ac328..354d348279d7 100644
--- a/gtk/src/auto/text_tag.rs
+++ b/gtk/src/auto/text_tag.rs
@@ -27,7 +27,7 @@ use TextIter;
 use WrapMode;
 
 glib_wrapper! {
-    pub struct TextTag(Object<gtk_sys::GtkTextTag, gtk_sys::GtkTextTagClass, TextTagClass>);
+    pub struct TextTag(Object<gtk_sys::GtkTextTag, gtk_sys::GtkTextTagClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_text_tag_get_type(),
diff --git a/gtk/src/auto/text_tag_table.rs b/gtk/src/auto/text_tag_table.rs
index 38fa39ded43e..b0fb51b7014d 100644
--- a/gtk/src/auto/text_tag_table.rs
+++ b/gtk/src/auto/text_tag_table.rs
@@ -16,7 +16,7 @@ use Buildable;
 use TextTag;
 
 glib_wrapper! {
-    pub struct TextTagTable(Object<gtk_sys::GtkTextTagTable, gtk_sys::GtkTextTagTableClass, TextTagTableClass>) @implements Buildable;
+    pub struct TextTagTable(Object<gtk_sys::GtkTextTagTable, gtk_sys::GtkTextTagTableClass>) @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_text_tag_table_get_type(),
diff --git a/gtk/src/auto/text_view.rs b/gtk/src/auto/text_view.rs
index 555b7ac831a5..5b14b7b47069 100644
--- a/gtk/src/auto/text_view.rs
+++ b/gtk/src/auto/text_view.rs
@@ -48,7 +48,7 @@ use Widget;
 use WrapMode;
 
 glib_wrapper! {
-    pub struct TextView(Object<gtk_sys::GtkTextView, gtk_sys::GtkTextViewClass, TextViewClass>) @extends Container, Widget, @implements Buildable, Scrollable;
+    pub struct TextView(Object<gtk_sys::GtkTextView, gtk_sys::GtkTextViewClass>) @extends Container, Widget, @implements Buildable, Scrollable;
 
     match fn {
         get_type => || gtk_sys::gtk_text_view_get_type(),
diff --git a/gtk/src/auto/toggle_button.rs b/gtk/src/auto/toggle_button.rs
index 7235a4ff2845..3208383394c1 100644
--- a/gtk/src/auto/toggle_button.rs
+++ b/gtk/src/auto/toggle_button.rs
@@ -30,7 +30,7 @@ use ResizeMode;
 use Widget;
 
 glib_wrapper! {
-    pub struct ToggleButton(Object<gtk_sys::GtkToggleButton, gtk_sys::GtkToggleButtonClass, ToggleButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct ToggleButton(Object<gtk_sys::GtkToggleButton, gtk_sys::GtkToggleButtonClass>) @extends Button, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_toggle_button_get_type(),
diff --git a/gtk/src/auto/toggle_tool_button.rs b/gtk/src/auto/toggle_tool_button.rs
index 875443a3d269..366f9b447226 100644
--- a/gtk/src/auto/toggle_tool_button.rs
+++ b/gtk/src/auto/toggle_tool_button.rs
@@ -27,7 +27,7 @@ use ToolItem;
 use Widget;
 
 glib_wrapper! {
-    pub struct ToggleToolButton(Object<gtk_sys::GtkToggleToolButton, gtk_sys::GtkToggleToolButtonClass, ToggleToolButtonClass>) @extends ToolButton, ToolItem, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct ToggleToolButton(Object<gtk_sys::GtkToggleToolButton, gtk_sys::GtkToggleToolButtonClass>) @extends ToolButton, ToolItem, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_toggle_tool_button_get_type(),
diff --git a/gtk/src/auto/tool_button.rs b/gtk/src/auto/tool_button.rs
index 533f6f63e692..f83f323157a7 100644
--- a/gtk/src/auto/tool_button.rs
+++ b/gtk/src/auto/tool_button.rs
@@ -29,7 +29,7 @@ use ToolItem;
 use Widget;
 
 glib_wrapper! {
-    pub struct ToolButton(Object<gtk_sys::GtkToolButton, gtk_sys::GtkToolButtonClass, ToolButtonClass>) @extends ToolItem, Bin, Container, Widget, @implements Buildable, Actionable;
+    pub struct ToolButton(Object<gtk_sys::GtkToolButton, gtk_sys::GtkToolButtonClass>) @extends ToolItem, Bin, Container, Widget, @implements Buildable, Actionable;
 
     match fn {
         get_type => || gtk_sys::gtk_tool_button_get_type(),
diff --git a/gtk/src/auto/tool_item.rs b/gtk/src/auto/tool_item.rs
index d84f5630d63b..df11fd012784 100644
--- a/gtk/src/auto/tool_item.rs
+++ b/gtk/src/auto/tool_item.rs
@@ -29,7 +29,7 @@ use ToolbarStyle;
 use Widget;
 
 glib_wrapper! {
-    pub struct ToolItem(Object<gtk_sys::GtkToolItem, gtk_sys::GtkToolItemClass, ToolItemClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct ToolItem(Object<gtk_sys::GtkToolItem, gtk_sys::GtkToolItemClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_tool_item_get_type(),
diff --git a/gtk/src/auto/tool_item_group.rs b/gtk/src/auto/tool_item_group.rs
index cfbc6591715c..f8391d23819d 100644
--- a/gtk/src/auto/tool_item_group.rs
+++ b/gtk/src/auto/tool_item_group.rs
@@ -28,7 +28,7 @@ use ToolShell;
 use Widget;
 
 glib_wrapper! {
-    pub struct ToolItemGroup(Object<gtk_sys::GtkToolItemGroup, gtk_sys::GtkToolItemGroupClass, ToolItemGroupClass>) @extends Container, Widget, @implements Buildable, ToolShell;
+    pub struct ToolItemGroup(Object<gtk_sys::GtkToolItemGroup, gtk_sys::GtkToolItemGroupClass>) @extends Container, Widget, @implements Buildable, ToolShell;
 
     match fn {
         get_type => || gtk_sys::gtk_tool_item_group_get_type(),
diff --git a/gtk/src/auto/tool_palette.rs b/gtk/src/auto/tool_palette.rs
index 645d5495cf21..deee13d673aa 100644
--- a/gtk/src/auto/tool_palette.rs
+++ b/gtk/src/auto/tool_palette.rs
@@ -37,7 +37,7 @@ use ToolbarStyle;
 use Widget;
 
 glib_wrapper! {
-    pub struct ToolPalette(Object<gtk_sys::GtkToolPalette, gtk_sys::GtkToolPaletteClass, ToolPaletteClass>) @extends Container, Widget, @implements Buildable, Orientable, Scrollable;
+    pub struct ToolPalette(Object<gtk_sys::GtkToolPalette, gtk_sys::GtkToolPaletteClass>) @extends Container, Widget, @implements Buildable, Orientable, Scrollable;
 
     match fn {
         get_type => || gtk_sys::gtk_tool_palette_get_type(),
diff --git a/gtk/src/auto/toolbar.rs b/gtk/src/auto/toolbar.rs
index 192af2e46065..587222c82239 100644
--- a/gtk/src/auto/toolbar.rs
+++ b/gtk/src/auto/toolbar.rs
@@ -33,7 +33,7 @@ use ToolbarStyle;
 use Widget;
 
 glib_wrapper! {
-    pub struct Toolbar(Object<gtk_sys::GtkToolbar, gtk_sys::GtkToolbarClass, ToolbarClass>) @extends Container, Widget, @implements Buildable, Orientable, ToolShell;
+    pub struct Toolbar(Object<gtk_sys::GtkToolbar, gtk_sys::GtkToolbarClass>) @extends Container, Widget, @implements Buildable, Orientable, ToolShell;
 
     match fn {
         get_type => || gtk_sys::gtk_toolbar_get_type(),
diff --git a/gtk/src/auto/tooltip.rs b/gtk/src/auto/tooltip.rs
index 940688985295..7c4b564a42e7 100644
--- a/gtk/src/auto/tooltip.rs
+++ b/gtk/src/auto/tooltip.rs
@@ -13,7 +13,7 @@ use IconSize;
 use Widget;
 
 glib_wrapper! {
-    pub struct Tooltip(Object<gtk_sys::GtkTooltip, TooltipClass>);
+    pub struct Tooltip(Object<gtk_sys::GtkTooltip>);
 
     match fn {
         get_type => || gtk_sys::gtk_tooltip_get_type(),
diff --git a/gtk/src/auto/tree_model_filter.rs b/gtk/src/auto/tree_model_filter.rs
index 1ac0dae5ee26..8574826305b2 100644
--- a/gtk/src/auto/tree_model_filter.rs
+++ b/gtk/src/auto/tree_model_filter.rs
@@ -16,7 +16,7 @@ use TreeModel;
 use TreePath;
 
 glib_wrapper! {
-    pub struct TreeModelFilter(Object<gtk_sys::GtkTreeModelFilter, gtk_sys::GtkTreeModelFilterClass, TreeModelFilterClass>) @implements TreeDragSource, TreeModel;
+    pub struct TreeModelFilter(Object<gtk_sys::GtkTreeModelFilter, gtk_sys::GtkTreeModelFilterClass>) @implements TreeDragSource, TreeModel;
 
     match fn {
         get_type => || gtk_sys::gtk_tree_model_filter_get_type(),
diff --git a/gtk/src/auto/tree_model_sort.rs b/gtk/src/auto/tree_model_sort.rs
index defd2baf0058..1669ec4636d0 100644
--- a/gtk/src/auto/tree_model_sort.rs
+++ b/gtk/src/auto/tree_model_sort.rs
@@ -13,7 +13,7 @@ use TreePath;
 use TreeSortable;
 
 glib_wrapper! {
-    pub struct TreeModelSort(Object<gtk_sys::GtkTreeModelSort, gtk_sys::GtkTreeModelSortClass, TreeModelSortClass>) @implements TreeDragSource, TreeModel, TreeSortable;
+    pub struct TreeModelSort(Object<gtk_sys::GtkTreeModelSort, gtk_sys::GtkTreeModelSortClass>) @implements TreeDragSource, TreeModel, TreeSortable;
 
     match fn {
         get_type => || gtk_sys::gtk_tree_model_sort_get_type(),
diff --git a/gtk/src/auto/tree_selection.rs b/gtk/src/auto/tree_selection.rs
index 4c70509ced40..2eaecb15d1c3 100644
--- a/gtk/src/auto/tree_selection.rs
+++ b/gtk/src/auto/tree_selection.rs
@@ -20,7 +20,7 @@ use TreePath;
 use TreeView;
 
 glib_wrapper! {
-    pub struct TreeSelection(Object<gtk_sys::GtkTreeSelection, gtk_sys::GtkTreeSelectionClass, TreeSelectionClass>);
+    pub struct TreeSelection(Object<gtk_sys::GtkTreeSelection, gtk_sys::GtkTreeSelectionClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_tree_selection_get_type(),
diff --git a/gtk/src/auto/tree_store.rs b/gtk/src/auto/tree_store.rs
index 2cc8a91e981b..d69fafcd1d10 100644
--- a/gtk/src/auto/tree_store.rs
+++ b/gtk/src/auto/tree_store.rs
@@ -14,7 +14,7 @@ use TreeModel;
 use TreeSortable;
 
 glib_wrapper! {
-    pub struct TreeStore(Object<gtk_sys::GtkTreeStore, gtk_sys::GtkTreeStoreClass, TreeStoreClass>) @implements Buildable, TreeDragDest, TreeDragSource, TreeModel, TreeSortable;
+    pub struct TreeStore(Object<gtk_sys::GtkTreeStore, gtk_sys::GtkTreeStoreClass>) @implements Buildable, TreeDragDest, TreeDragSource, TreeModel, TreeSortable;
 
     match fn {
         get_type => || gtk_sys::gtk_tree_store_get_type(),
diff --git a/gtk/src/auto/tree_view.rs b/gtk/src/auto/tree_view.rs
index d54665db74e3..94ff3353fd82 100644
--- a/gtk/src/auto/tree_view.rs
+++ b/gtk/src/auto/tree_view.rs
@@ -45,7 +45,7 @@ use TreeViewGridLines;
 use Widget;
 
 glib_wrapper! {
-    pub struct TreeView(Object<gtk_sys::GtkTreeView, gtk_sys::GtkTreeViewClass, TreeViewClass>) @extends Container, Widget, @implements Buildable, Scrollable;
+    pub struct TreeView(Object<gtk_sys::GtkTreeView, gtk_sys::GtkTreeViewClass>) @extends Container, Widget, @implements Buildable, Scrollable;
 
     match fn {
         get_type => || gtk_sys::gtk_tree_view_get_type(),
diff --git a/gtk/src/auto/tree_view_column.rs b/gtk/src/auto/tree_view_column.rs
index c05b8554668e..d1cfcb9976b1 100644
--- a/gtk/src/auto/tree_view_column.rs
+++ b/gtk/src/auto/tree_view_column.rs
@@ -30,7 +30,7 @@ use TreeViewColumnSizing;
 use Widget;
 
 glib_wrapper! {
-    pub struct TreeViewColumn(Object<gtk_sys::GtkTreeViewColumn, gtk_sys::GtkTreeViewColumnClass, TreeViewColumnClass>) @implements Buildable, CellLayout;
+    pub struct TreeViewColumn(Object<gtk_sys::GtkTreeViewColumn, gtk_sys::GtkTreeViewColumnClass>) @implements Buildable, CellLayout;
 
     match fn {
         get_type => || gtk_sys::gtk_tree_view_column_get_type(),
diff --git a/gtk/src/auto/versions.txt b/gtk/src/auto/versions.txt
index 8f042be52d08..62b9885a87fa 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 @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/gtk/src/auto/viewport.rs b/gtk/src/auto/viewport.rs
index e29fae8a2dbc..0477134066ce 100644
--- a/gtk/src/auto/viewport.rs
+++ b/gtk/src/auto/viewport.rs
@@ -27,7 +27,7 @@ use ShadowType;
 use Widget;
 
 glib_wrapper! {
-    pub struct Viewport(Object<gtk_sys::GtkViewport, gtk_sys::GtkViewportClass, ViewportClass>) @extends Bin, Container, Widget, @implements Buildable, Scrollable;
+    pub struct Viewport(Object<gtk_sys::GtkViewport, gtk_sys::GtkViewportClass>) @extends Bin, Container, Widget, @implements Buildable, Scrollable;
 
     match fn {
         get_type => || gtk_sys::gtk_viewport_get_type(),
diff --git a/gtk/src/auto/volume_button.rs b/gtk/src/auto/volume_button.rs
index 5d10bb9eaac1..3cc2da479498 100644
--- a/gtk/src/auto/volume_button.rs
+++ b/gtk/src/auto/volume_button.rs
@@ -35,7 +35,7 @@ use ScaleButton;
 use Widget;
 
 glib_wrapper! {
-    pub struct VolumeButton(Object<gtk_sys::GtkVolumeButton, gtk_sys::GtkVolumeButtonClass, VolumeButtonClass>) @extends ScaleButton, Button, Bin, Container, Widget, @implements Buildable, Actionable, Orientable;
+    pub struct VolumeButton(Object<gtk_sys::GtkVolumeButton, gtk_sys::GtkVolumeButtonClass>) @extends ScaleButton, Button, Bin, Container, Widget, @implements Buildable, Actionable, Orientable;
 
     match fn {
         get_type => || gtk_sys::gtk_volume_button_get_type(),
diff --git a/gtk/src/auto/widget.rs b/gtk/src/auto/widget.rs
index c236d73c7e12..37bc147f6a79 100644
--- a/gtk/src/auto/widget.rs
+++ b/gtk/src/auto/widget.rs
@@ -51,7 +51,7 @@ use WidgetPath;
 use Window;
 
 glib_wrapper! {
-    pub struct Widget(Object<gtk_sys::GtkWidget, gtk_sys::GtkWidgetClass, WidgetClass>) @implements Buildable;
+    pub struct Widget(Object<gtk_sys::GtkWidget, gtk_sys::GtkWidgetClass>) @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_widget_get_type(),
diff --git a/gtk/src/auto/window.rs b/gtk/src/auto/window.rs
index da76b0637e53..99cb16895dc7 100644
--- a/gtk/src/auto/window.rs
+++ b/gtk/src/auto/window.rs
@@ -37,7 +37,7 @@ use WindowPosition;
 use WindowType;
 
 glib_wrapper! {
-    pub struct Window(Object<gtk_sys::GtkWindow, gtk_sys::GtkWindowClass, WindowClass>) @extends Bin, Container, Widget, @implements Buildable;
+    pub struct Window(Object<gtk_sys::GtkWindow, gtk_sys::GtkWindowClass>) @extends Bin, Container, Widget, @implements Buildable;
 
     match fn {
         get_type => || gtk_sys::gtk_window_get_type(),
diff --git a/gtk/src/auto/window_group.rs b/gtk/src/auto/window_group.rs
index 9113959a98c7..dae5187f3e85 100644
--- a/gtk/src/auto/window_group.rs
+++ b/gtk/src/auto/window_group.rs
@@ -11,7 +11,7 @@ use Widget;
 use Window;
 
 glib_wrapper! {
-    pub struct WindowGroup(Object<gtk_sys::GtkWindowGroup, gtk_sys::GtkWindowGroupClass, WindowGroupClass>);
+    pub struct WindowGroup(Object<gtk_sys::GtkWindowGroup, gtk_sys::GtkWindowGroupClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_window_group_get_type(),
diff --git a/gtk/src/entry_buffer.rs b/gtk/src/entry_buffer.rs
index 00f7544af152..4ba7b8ef75e2 100644
--- a/gtk/src/entry_buffer.rs
+++ b/gtk/src/entry_buffer.rs
@@ -7,7 +7,7 @@ use gtk_sys;
 use libc::{c_int, c_uint};
 
 glib_wrapper! {
-    pub struct EntryBuffer(Object<gtk_sys::GtkEntryBuffer, gtk_sys::GtkEntryBufferClass, EntryBufferClass>);
+    pub struct EntryBuffer(Object<gtk_sys::GtkEntryBuffer, gtk_sys::GtkEntryBufferClass>);
 
     match fn {
         get_type => || gtk_sys::gtk_entry_buffer_get_type(),
diff --git a/gtk/sys/versions.txt b/gtk/sys/versions.txt
index 8f042be52d08..62b9885a87fa 100644
--- a/gtk/sys/versions.txt
+++ b/gtk/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/pango/src/auto/context.rs b/pango/src/auto/context.rs
index 7672126260bc..7a87fc34d1c7 100644
--- a/pango/src/auto/context.rs
+++ b/pango/src/auto/context.rs
@@ -21,7 +21,7 @@ use Language;
 use Matrix;
 
 glib_wrapper! {
-    pub struct Context(Object<pango_sys::PangoContext, pango_sys::PangoContextClass, ContextClass>);
+    pub struct Context(Object<pango_sys::PangoContext, pango_sys::PangoContextClass>);
 
     match fn {
         get_type => || pango_sys::pango_context_get_type(),
diff --git a/pango/src/auto/engine_lang.rs b/pango/src/auto/engine_lang.rs
index b4d49a1dfded..9767718cd9b8 100644
--- a/pango/src/auto/engine_lang.rs
+++ b/pango/src/auto/engine_lang.rs
@@ -7,7 +7,7 @@ use pango_sys;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct EngineLang(Object<pango_sys::PangoEngineLang, pango_sys::PangoEngineLangClass, EngineLangClass>);
+    pub struct EngineLang(Object<pango_sys::PangoEngineLang, pango_sys::PangoEngineLangClass>);
 
     match fn {
         get_type => || pango_sys::pango_engine_lang_get_type(),
diff --git a/pango/src/auto/engine_shape.rs b/pango/src/auto/engine_shape.rs
index 4b328b49de3e..11df8b0d1159 100644
--- a/pango/src/auto/engine_shape.rs
+++ b/pango/src/auto/engine_shape.rs
@@ -7,7 +7,7 @@ use pango_sys;
 use std::fmt;
 
 glib_wrapper! {
-    pub struct EngineShape(Object<pango_sys::PangoEngineShape, pango_sys::PangoEngineShapeClass, EngineShapeClass>);
+    pub struct EngineShape(Object<pango_sys::PangoEngineShape, pango_sys::PangoEngineShapeClass>);
 
     match fn {
         get_type => || pango_sys::pango_engine_shape_get_type(),
diff --git a/pango/src/auto/enums.rs b/pango/src/auto/enums.rs
index 4c1472dd68e1..50187ef7dafe 100644
--- a/pango/src/auto/enums.rs
+++ b/pango/src/auto/enums.rs
@@ -302,7 +302,6 @@ pub enum BidiType {
     __Unknown(i32),
 }
 
-#[cfg_attr(feature = "v1_44", deprecated)]
 impl fmt::Display for BidiType {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(
@@ -334,7 +333,6 @@ impl fmt::Display for BidiType {
     }
 }
 
-#[cfg_attr(feature = "v1_44", deprecated)]
 #[doc(hidden)]
 impl ToGlib for BidiType {
     type GlibType = pango_sys::PangoBidiType;
@@ -365,7 +363,6 @@ impl ToGlib for BidiType {
     }
 }
 
-#[cfg_attr(feature = "v1_44", deprecated)]
 #[doc(hidden)]
 impl FromGlib<pango_sys::PangoBidiType> for BidiType {
     fn from_glib(value: pango_sys::PangoBidiType) -> Self {
@@ -394,28 +391,24 @@ impl FromGlib<pango_sys::PangoBidiType> for BidiType {
     }
 }
 
-#[cfg_attr(feature = "v1_44", deprecated)]
 impl StaticType for BidiType {
     fn static_type() -> Type {
         unsafe { from_glib(pango_sys::pango_bidi_type_get_type()) }
     }
 }
 
-#[cfg_attr(feature = "v1_44", deprecated)]
 impl<'a> FromValueOptional<'a> for BidiType {
     unsafe fn from_value_optional(value: &Value) -> Option<Self> {
         Some(FromValue::from_value(value))
     }
 }
 
-#[cfg_attr(feature = "v1_44", deprecated)]
 impl<'a> FromValue<'a> for BidiType {
     unsafe fn from_value(value: &Value) -> Self {
         from_glib(gobject_sys::g_value_get_enum(value.to_glib_none().0))
     }
 }
 
-#[cfg_attr(feature = "v1_44", deprecated)]
 impl SetValue for BidiType {
     unsafe fn set_value(value: &mut Value, this: &Self) {
         gobject_sys::g_value_set_enum(value.to_glib_none_mut().0, this.to_glib())
diff --git a/pango/src/auto/font.rs b/pango/src/auto/font.rs
index d2ced8bff038..c3975cc3415e 100644
--- a/pango/src/auto/font.rs
+++ b/pango/src/auto/font.rs
@@ -18,7 +18,7 @@ use Language;
 use Rectangle;
 
 glib_wrapper! {
-    pub struct Font(Object<pango_sys::PangoFont, pango_sys::PangoFontClass, FontClass>);
+    pub struct Font(Object<pango_sys::PangoFont, pango_sys::PangoFontClass>);
 
     match fn {
         get_type => || pango_sys::pango_font_get_type(),
diff --git a/pango/src/auto/font_face.rs b/pango/src/auto/font_face.rs
index 2e82d8e27742..52beae6e834b 100644
--- a/pango/src/auto/font_face.rs
+++ b/pango/src/auto/font_face.rs
@@ -14,7 +14,7 @@ use FontDescription;
 use FontFamily;
 
 glib_wrapper! {
-    pub struct FontFace(Object<pango_sys::PangoFontFace, pango_sys::PangoFontFaceClass, FontFaceClass>);
+    pub struct FontFace(Object<pango_sys::PangoFontFace, pango_sys::PangoFontFaceClass>);
 
     match fn {
         get_type => || pango_sys::pango_font_face_get_type(),
diff --git a/pango/src/auto/font_family.rs b/pango/src/auto/font_family.rs
index 389009f8b9a4..f5cd035056b2 100644
--- a/pango/src/auto/font_family.rs
+++ b/pango/src/auto/font_family.rs
@@ -12,7 +12,7 @@ use std::ptr;
 use FontFace;
 
 glib_wrapper! {
-    pub struct FontFamily(Object<pango_sys::PangoFontFamily, pango_sys::PangoFontFamilyClass, FontFamilyClass>);
+    pub struct FontFamily(Object<pango_sys::PangoFontFamily, pango_sys::PangoFontFamilyClass>);
 
     match fn {
         get_type => || pango_sys::pango_font_family_get_type(),
diff --git a/pango/src/auto/font_map.rs b/pango/src/auto/font_map.rs
index 85305e3b6f14..722b45ae007a 100644
--- a/pango/src/auto/font_map.rs
+++ b/pango/src/auto/font_map.rs
@@ -16,7 +16,7 @@ use Fontset;
 use Language;
 
 glib_wrapper! {
-    pub struct FontMap(Object<pango_sys::PangoFontMap, pango_sys::PangoFontMapClass, FontMapClass>);
+    pub struct FontMap(Object<pango_sys::PangoFontMap, pango_sys::PangoFontMapClass>);
 
     match fn {
         get_type => || pango_sys::pango_font_map_get_type(),
diff --git a/pango/src/auto/fontset.rs b/pango/src/auto/fontset.rs
index 96b297b82618..d662641e1c2a 100644
--- a/pango/src/auto/fontset.rs
+++ b/pango/src/auto/fontset.rs
@@ -10,7 +10,7 @@ use Font;
 use FontMetrics;
 
 glib_wrapper! {
-    pub struct Fontset(Object<pango_sys::PangoFontset, pango_sys::PangoFontsetClass, FontsetClass>);
+    pub struct Fontset(Object<pango_sys::PangoFontset, pango_sys::PangoFontsetClass>);
 
     match fn {
         get_type => || pango_sys::pango_fontset_get_type(),
diff --git a/pango/src/auto/fontset_simple.rs b/pango/src/auto/fontset_simple.rs
index 871ce6f39079..2ab4689ab69d 100644
--- a/pango/src/auto/fontset_simple.rs
+++ b/pango/src/auto/fontset_simple.rs
@@ -11,7 +11,7 @@ use Fontset;
 use Language;
 
 glib_wrapper! {
-    pub struct FontsetSimple(Object<pango_sys::PangoFontsetSimple, pango_sys::PangoFontsetSimpleClass, FontsetSimpleClass>) @extends Fontset;
+    pub struct FontsetSimple(Object<pango_sys::PangoFontsetSimple, pango_sys::PangoFontsetSimpleClass>) @extends Fontset;
 
     match fn {
         get_type => || pango_sys::pango_fontset_simple_get_type(),
diff --git a/pango/src/auto/layout.rs b/pango/src/auto/layout.rs
index 9c609b5ab88b..a8b7d631a29c 100644
--- a/pango/src/auto/layout.rs
+++ b/pango/src/auto/layout.rs
@@ -21,7 +21,7 @@ use TabArray;
 use WrapMode;
 
 glib_wrapper! {
-    pub struct Layout(Object<pango_sys::PangoLayout, pango_sys::PangoLayoutClass, LayoutClass>);
+    pub struct Layout(Object<pango_sys::PangoLayout, pango_sys::PangoLayoutClass>);
 
     match fn {
         get_type => || pango_sys::pango_layout_get_type(),
diff --git a/pango/src/auto/mod.rs b/pango/src/auto/mod.rs
index ed102d851a48..fac828bffc95 100644
--- a/pango/src/auto/mod.rs
+++ b/pango/src/auto/mod.rs
@@ -3,43 +3,43 @@
 // DO NOT EDIT
 
 mod context;
-pub use self::context::{Context, ContextClass};
+pub use self::context::Context;
 
 mod engine_lang;
-pub use self::engine_lang::{EngineLang, EngineLangClass, NONE_ENGINE_LANG};
+pub use self::engine_lang::{EngineLang, NONE_ENGINE_LANG};
 
 mod engine_shape;
-pub use self::engine_shape::{EngineShape, EngineShapeClass, NONE_ENGINE_SHAPE};
+pub use self::engine_shape::{EngineShape, NONE_ENGINE_SHAPE};
 
 mod font;
 pub use self::font::FontExt;
-pub use self::font::{Font, FontClass, NONE_FONT};
+pub use self::font::{Font, NONE_FONT};
 
 mod font_face;
 pub use self::font_face::FontFaceExt;
-pub use self::font_face::{FontFace, FontFaceClass, NONE_FONT_FACE};
+pub use self::font_face::{FontFace, NONE_FONT_FACE};
 
 mod font_family;
 pub use self::font_family::FontFamilyExt;
-pub use self::font_family::{FontFamily, FontFamilyClass, NONE_FONT_FAMILY};
+pub use self::font_family::{FontFamily, NONE_FONT_FAMILY};
 
 mod font_map;
 pub use self::font_map::FontMapExt;
-pub use self::font_map::{FontMap, FontMapClass, NONE_FONT_MAP};
+pub use self::font_map::{FontMap, NONE_FONT_MAP};
 
 mod fontset;
 pub use self::fontset::FontsetExt;
-pub use self::fontset::{Fontset, FontsetClass, NONE_FONTSET};
+pub use self::fontset::{Fontset, NONE_FONTSET};
 
 mod fontset_simple;
-pub use self::fontset_simple::{FontsetSimple, FontsetSimpleClass};
+pub use self::fontset_simple::FontsetSimple;
 
 mod layout;
-pub use self::layout::{Layout, LayoutClass};
+pub use self::layout::Layout;
 
 mod renderer;
 pub use self::renderer::RendererExt;
-pub use self::renderer::{Renderer, RendererClass, NONE_RENDERER};
+pub use self::renderer::{Renderer, NONE_RENDERER};
 
 mod attr_iterator;
 pub use self::attr_iterator::AttrIterator;
diff --git a/pango/src/auto/renderer.rs b/pango/src/auto/renderer.rs
index 0eb5ec907add..2f1e653911f4 100644
--- a/pango/src/auto/renderer.rs
+++ b/pango/src/auto/renderer.rs
@@ -17,7 +17,7 @@ use Matrix;
 use RenderPart;
 
 glib_wrapper! {
-    pub struct Renderer(Object<pango_sys::PangoRenderer, pango_sys::PangoRendererClass, RendererClass>);
+    pub struct Renderer(Object<pango_sys::PangoRenderer, pango_sys::PangoRendererClass>);
 
     match fn {
         get_type => || pango_sys::pango_renderer_get_type(),
diff --git a/pango/src/auto/versions.txt b/pango/src/auto/versions.txt
index 8f042be52d08..62b9885a87fa 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 @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/pango/src/coverage.rs b/pango/src/coverage.rs
index b3478fb9b027..c1dbf79802a5 100644
--- a/pango/src/coverage.rs
+++ b/pango/src/coverage.rs
@@ -11,7 +11,7 @@ use CoverageLevel;
 
 #[cfg(any(feature = "v1_44", feature = "dox"))]
 glib_wrapper! {
-    pub struct Coverage(Object<pango_sys::PangoCoverage, CoverageClass>);
+    pub struct Coverage(Object<pango_sys::PangoCoverage>);
 
     match fn {
         get_type => || pango_sys::pango_coverage_get_type(),
diff --git a/pango/sys/versions.txt b/pango/sys/versions.txt
index 8f042be52d08..62b9885a87fa 100644
--- a/pango/sys/versions.txt
+++ b/pango/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/pangocairo/src/auto/versions.txt b/pangocairo/src/auto/versions.txt
index 8f042be52d08..62b9885a87fa 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 @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)
diff --git a/pangocairo/sys/versions.txt b/pangocairo/sys/versions.txt
index 8f042be52d08..62b9885a87fa 100644
--- a/pangocairo/sys/versions.txt
+++ b/pangocairo/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ cea2f7c)
+Generated by gir (https://github.com/gtk-rs/gir @ db37199)
 from gir-files (https://github.com/gtk-rs/gir-files @ 8de1aa1)