diff --git a/Gir.toml b/Gir.toml
index d2f2d28..d84b914 100644
--- a/Gir.toml
+++ b/Gir.toml
@@ -56,7 +56,6 @@ generate = [
 
 manual = [
     "Gdk.Atom",
-    "Gdk.Atom_",
     "Gdk.EventButton",
     "Gdk.EventConfigure",
     "Gdk.EventCrossing",
diff --git a/gir b/gir
index 0f1d1c1..8b9d0bb 160000
--- a/gir
+++ b/gir
@@ -1 +1 @@
-Subproject commit 0f1d1c178407c918d5cd2fbd5cf67126324cd4ff
+Subproject commit 8b9d0bb32ed3b76ff9931ee283c07d32af955b60
diff --git a/src/auto/app_launch_context.rs b/src/auto/app_launch_context.rs
index 5e45a24..23bb6d9 100644
--- a/src/auto/app_launch_context.rs
+++ b/src/auto/app_launch_context.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Display;
@@ -124,7 +125,6 @@ impl<O: IsA<AppLaunchContext> + IsA<glib::object::Object>> AppLaunchContextExt f
 
 unsafe extern "C" fn notify_display_trampoline<P>(this: *mut ffi::GdkAppLaunchContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AppLaunchContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AppLaunchContext::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cursor.rs b/src/auto/cursor.rs
index eb48e83..dc3d650 100644
--- a/src/auto/cursor.rs
+++ b/src/auto/cursor.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CursorType;
@@ -130,14 +131,12 @@ impl<O: IsA<Cursor> + IsA<glib::object::Object>> CursorExt for O {
 
 unsafe extern "C" fn notify_cursor_type_trampoline<P>(this: *mut ffi::GdkCursor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Cursor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Cursor::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_display_trampoline<P>(this: *mut ffi::GdkCursor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Cursor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Cursor::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/device.rs b/src/auto/device.rs
index 7a8d336..3491af6 100644
--- a/src/auto/device.rs
+++ b/src/auto/device.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Atom;
@@ -615,7 +616,6 @@ impl<O: IsA<Device> + IsA<glib::object::Object>> DeviceExt for O {
 
 unsafe extern "C" fn changed_trampoline<P>(this: *mut ffi::GdkDevice, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
@@ -623,14 +623,12 @@ where P: IsA<Device> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn tool_changed_trampoline<P>(this: *mut ffi::GdkDevice, tool: *mut ffi::GdkDeviceTool, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P, &DeviceTool) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(tool))
 }
 
 unsafe extern "C" fn notify_associated_device_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
@@ -638,56 +636,48 @@ where P: IsA<Device> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_axes_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_device_manager_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_display_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_cursor_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_input_mode_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_input_source_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_n_axes_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_name_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
@@ -695,7 +685,6 @@ where P: IsA<Device> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn notify_num_touches_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
@@ -703,7 +692,6 @@ where P: IsA<Device> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_product_id_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
@@ -711,7 +699,6 @@ where P: IsA<Device> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn notify_seat_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
@@ -719,14 +706,12 @@ where P: IsA<Device> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_tool_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_type_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
@@ -734,7 +719,6 @@ where P: IsA<Device> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_vendor_id_trampoline<P>(this: *mut ffi::GdkDevice, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Device> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Device::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/device_manager.rs b/src/auto/device_manager.rs
index c147567..971b535 100644
--- a/src/auto/device_manager.rs
+++ b/src/auto/device_manager.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Device;
@@ -98,28 +99,24 @@ impl<O: IsA<DeviceManager> + IsA<glib::object::Object>> DeviceManagerExt for O {
 
 unsafe extern "C" fn device_added_trampoline<P>(this: *mut ffi::GdkDeviceManager, device: *mut ffi::GdkDevice, f: glib_ffi::gpointer)
 where P: IsA<DeviceManager> {
-    callback_guard!();
     let f: &&(Fn(&P, &Device) + 'static) = transmute(f);
     f(&DeviceManager::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(device))
 }
 
 unsafe extern "C" fn device_changed_trampoline<P>(this: *mut ffi::GdkDeviceManager, device: *mut ffi::GdkDevice, f: glib_ffi::gpointer)
 where P: IsA<DeviceManager> {
-    callback_guard!();
     let f: &&(Fn(&P, &Device) + 'static) = transmute(f);
     f(&DeviceManager::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(device))
 }
 
 unsafe extern "C" fn device_removed_trampoline<P>(this: *mut ffi::GdkDeviceManager, device: *mut ffi::GdkDevice, f: glib_ffi::gpointer)
 where P: IsA<DeviceManager> {
-    callback_guard!();
     let f: &&(Fn(&P, &Device) + 'static) = transmute(f);
     f(&DeviceManager::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(device))
 }
 
 unsafe extern "C" fn notify_display_trampoline<P>(this: *mut ffi::GdkDeviceManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<DeviceManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&DeviceManager::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/device_tool.rs b/src/auto/device_tool.rs
index a562e85..2156d4c 100644
--- a/src/auto/device_tool.rs
+++ b/src/auto/device_tool.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use AxisFlags;
@@ -143,28 +144,24 @@ impl<O: IsA<DeviceTool> + IsA<glib::object::Object>> DeviceToolExt for O {
 
 unsafe extern "C" fn notify_axes_trampoline<P>(this: *mut ffi::GdkDeviceTool, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<DeviceTool> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&DeviceTool::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_hardware_id_trampoline<P>(this: *mut ffi::GdkDeviceTool, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<DeviceTool> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&DeviceTool::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_serial_trampoline<P>(this: *mut ffi::GdkDeviceTool, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<DeviceTool> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&DeviceTool::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tool_type_trampoline<P>(this: *mut ffi::GdkDeviceTool, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<DeviceTool> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&DeviceTool::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/display.rs b/src/auto/display.rs
index 365f488..bb3e61a 100644
--- a/src/auto/display.rs
+++ b/src/auto/display.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use AppLaunchContext;
@@ -530,7 +531,6 @@ impl<O: IsA<Display> + IsA<glib::object::Object>> DisplayExt for O {
 
 unsafe extern "C" fn closed_trampoline<P>(this: *mut ffi::GdkDisplay, is_error: glib_ffi::gboolean, f: glib_ffi::gpointer)
 where P: IsA<Display> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) + 'static) = transmute(f);
     f(&Display::from_glib_borrow(this).downcast_unchecked(), from_glib(is_error))
 }
@@ -538,7 +538,6 @@ where P: IsA<Display> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn monitor_added_trampoline<P>(this: *mut ffi::GdkDisplay, monitor: *mut ffi::GdkMonitor, f: glib_ffi::gpointer)
 where P: IsA<Display> {
-    callback_guard!();
     let f: &&(Fn(&P, &Monitor) + 'static) = transmute(f);
     f(&Display::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(monitor))
 }
@@ -546,14 +545,12 @@ where P: IsA<Display> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn monitor_removed_trampoline<P>(this: *mut ffi::GdkDisplay, monitor: *mut ffi::GdkMonitor, f: glib_ffi::gpointer)
 where P: IsA<Display> {
-    callback_guard!();
     let f: &&(Fn(&P, &Monitor) + 'static) = transmute(f);
     f(&Display::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(monitor))
 }
 
 unsafe extern "C" fn opened_trampoline<P>(this: *mut ffi::GdkDisplay, f: glib_ffi::gpointer)
 where P: IsA<Display> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Display::from_glib_borrow(this).downcast_unchecked())
 }
@@ -561,7 +558,6 @@ where P: IsA<Display> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn seat_added_trampoline<P>(this: *mut ffi::GdkDisplay, seat: *mut ffi::GdkSeat, f: glib_ffi::gpointer)
 where P: IsA<Display> {
-    callback_guard!();
     let f: &&(Fn(&P, &Seat) + 'static) = transmute(f);
     f(&Display::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(seat))
 }
@@ -569,7 +565,6 @@ where P: IsA<Display> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn seat_removed_trampoline<P>(this: *mut ffi::GdkDisplay, seat: *mut ffi::GdkSeat, f: glib_ffi::gpointer)
 where P: IsA<Display> {
-    callback_guard!();
     let f: &&(Fn(&P, &Seat) + 'static) = transmute(f);
     f(&Display::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(seat))
 }
diff --git a/src/auto/display_manager.rs b/src/auto/display_manager.rs
index 790b391..29f005b 100644
--- a/src/auto/display_manager.rs
+++ b/src/auto/display_manager.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Display;
@@ -91,14 +92,12 @@ impl<O: IsA<DisplayManager> + IsA<glib::object::Object>> DisplayManagerExt for O
 
 unsafe extern "C" fn display_opened_trampoline<P>(this: *mut ffi::GdkDisplayManager, display: *mut ffi::GdkDisplay, f: glib_ffi::gpointer)
 where P: IsA<DisplayManager> {
-    callback_guard!();
     let f: &&(Fn(&P, &Display) + 'static) = transmute(f);
     f(&DisplayManager::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(display))
 }
 
 unsafe extern "C" fn notify_default_display_trampoline<P>(this: *mut ffi::GdkDisplayManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<DisplayManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&DisplayManager::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/drag_context.rs b/src/auto/drag_context.rs
index 3af983e..029a4ec 100644
--- a/src/auto/drag_context.rs
+++ b/src/auto/drag_context.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Atom;
@@ -194,7 +195,6 @@ impl<O: IsA<DragContext> + IsA<glib::object::Object>> DragContextExt for O {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn action_changed_trampoline<P>(this: *mut ffi::GdkDragContext, action: ffi::GdkDragAction, f: glib_ffi::gpointer)
 where P: IsA<DragContext> {
-    callback_guard!();
     let f: &&(Fn(&P, DragAction) + 'static) = transmute(f);
     f(&DragContext::from_glib_borrow(this).downcast_unchecked(), from_glib(action))
 }
@@ -202,7 +202,6 @@ where P: IsA<DragContext> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn cancel_trampoline<P>(this: *mut ffi::GdkDragContext, reason: ffi::GdkDragCancelReason, f: glib_ffi::gpointer)
 where P: IsA<DragContext> {
-    callback_guard!();
     let f: &&(Fn(&P, DragCancelReason) + 'static) = transmute(f);
     f(&DragContext::from_glib_borrow(this).downcast_unchecked(), from_glib(reason))
 }
@@ -210,7 +209,6 @@ where P: IsA<DragContext> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn dnd_finished_trampoline<P>(this: *mut ffi::GdkDragContext, f: glib_ffi::gpointer)
 where P: IsA<DragContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&DragContext::from_glib_borrow(this).downcast_unchecked())
 }
@@ -218,7 +216,6 @@ where P: IsA<DragContext> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn drop_performed_trampoline<P>(this: *mut ffi::GdkDragContext, time: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<DragContext> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) + 'static) = transmute(f);
     f(&DragContext::from_glib_borrow(this).downcast_unchecked(), time)
 }
diff --git a/src/auto/drawing_context.rs b/src/auto/drawing_context.rs
index e63f5e1..5cef274 100644
--- a/src/auto/drawing_context.rs
+++ b/src/auto/drawing_context.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_22", feature = "dox"))]
@@ -103,7 +104,6 @@ impl<O: IsA<DrawingContext> + IsA<glib::object::Object>> DrawingContextExt for O
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_clip_trampoline<P>(this: *mut ffi::GdkDrawingContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<DrawingContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&DrawingContext::from_glib_borrow(this).downcast_unchecked())
 }
@@ -111,7 +111,6 @@ where P: IsA<DrawingContext> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_window_trampoline<P>(this: *mut ffi::GdkDrawingContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<DrawingContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&DrawingContext::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/enums.rs b/src/auto/enums.rs
index 93a701c..8be12c2 100644
--- a/src/auto/enums.rs
+++ b/src/auto/enums.rs
@@ -1,14 +1,18 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
-use glib_ffi;
-use glib::error::ErrorDomain;
-use glib::Type;
 use glib::StaticType;
-use glib::value::{Value, SetValue, FromValue, FromValueOptional};
-use gobject_ffi;
+use glib::Type;
+use glib::error::ErrorDomain;
 use glib::translate::*;
+use glib::value::FromValue;
+use glib::value::FromValueOptional;
+use glib::value::SetValue;
+use glib::value::Value;
+use glib_ffi;
+use gobject_ffi;
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
 pub enum AxisUse {
diff --git a/src/auto/flags.rs b/src/auto/flags.rs
index fd2fe17..99067ed 100644
--- a/src/auto/flags.rs
+++ b/src/auto/flags.rs
@@ -1,12 +1,16 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
-use glib::Type;
 use glib::StaticType;
-use glib::value::{Value, SetValue, FromValue, FromValueOptional};
-use gobject_ffi;
+use glib::Type;
 use glib::translate::*;
+use glib::value::FromValue;
+use glib::value::FromValueOptional;
+use glib::value::SetValue;
+use glib::value::Value;
+use gobject_ffi;
 
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 bitflags! {
diff --git a/src/auto/frame_clock.rs b/src/auto/frame_clock.rs
index a517306..ac3ab3f 100644
--- a/src/auto/frame_clock.rs
+++ b/src/auto/frame_clock.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_8", feature = "dox"))]
@@ -183,49 +184,42 @@ impl<O: IsA<FrameClock> + IsA<glib::object::Object>> FrameClockExt for O {
 
 unsafe extern "C" fn after_paint_trampoline<P>(this: *mut ffi::GdkFrameClock, f: glib_ffi::gpointer)
 where P: IsA<FrameClock> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FrameClock::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn before_paint_trampoline<P>(this: *mut ffi::GdkFrameClock, f: glib_ffi::gpointer)
 where P: IsA<FrameClock> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FrameClock::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn flush_events_trampoline<P>(this: *mut ffi::GdkFrameClock, f: glib_ffi::gpointer)
 where P: IsA<FrameClock> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FrameClock::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn layout_trampoline<P>(this: *mut ffi::GdkFrameClock, f: glib_ffi::gpointer)
 where P: IsA<FrameClock> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FrameClock::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn paint_trampoline<P>(this: *mut ffi::GdkFrameClock, f: glib_ffi::gpointer)
 where P: IsA<FrameClock> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FrameClock::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn resume_events_trampoline<P>(this: *mut ffi::GdkFrameClock, f: glib_ffi::gpointer)
 where P: IsA<FrameClock> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FrameClock::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn update_trampoline<P>(this: *mut ffi::GdkFrameClock, f: glib_ffi::gpointer)
 where P: IsA<FrameClock> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FrameClock::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/frame_timings.rs b/src/auto/frame_timings.rs
index 4e3eb1d..61bccda 100644
--- a/src/auto/frame_timings.rs
+++ b/src/auto/frame_timings.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
diff --git a/src/auto/functions.rs b/src/auto/functions.rs
index de57cd3..e68ad7f 100644
--- a/src/auto/functions.rs
+++ b/src/auto/functions.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Atom;
@@ -326,7 +327,7 @@ pub fn query_depths() -> Vec<i32> {
 }
 
 //#[cfg_attr(feature = "v3_22", deprecated)]
-//pub fn query_visual_types(visual_types: /*Unimplemented*/CArray TypeId { ns_id: 1, id: 100 }) -> i32 {
+//pub fn query_visual_types(visual_types: /*Unimplemented*/CArray TypeId { ns_id: 1, id: 99 }) -> i32 {
 //    unsafe { TODO: call ffi::gdk_query_visual_types() }
 //}
 
diff --git a/src/auto/g_l_context.rs b/src/auto/g_l_context.rs
index 6332cf0..debe43c 100644
--- a/src/auto/g_l_context.rs
+++ b/src/auto/g_l_context.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_16", feature = "dox"))]
@@ -253,7 +254,6 @@ impl<O: IsA<GLContext> + IsA<glib::object::Object>> GLContextExt for O {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_display_trampoline<P>(this: *mut ffi::GdkGLContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GLContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GLContext::from_glib_borrow(this).downcast_unchecked())
 }
@@ -261,7 +261,6 @@ where P: IsA<GLContext> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_shared_context_trampoline<P>(this: *mut ffi::GdkGLContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GLContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GLContext::from_glib_borrow(this).downcast_unchecked())
 }
@@ -269,7 +268,6 @@ where P: IsA<GLContext> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_window_trampoline<P>(this: *mut ffi::GdkGLContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GLContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GLContext::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/mod.rs b/src/auto/mod.rs
index 43fb6fd..be536c7 100644
--- a/src/auto/mod.rs
+++ b/src/auto/mod.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 mod app_launch_context;
diff --git a/src/auto/monitor.rs b/src/auto/monitor.rs
index dd0653d..986f557 100644
--- a/src/auto/monitor.rs
+++ b/src/auto/monitor.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Display;
@@ -335,28 +336,24 @@ impl<O: IsA<Monitor> + IsA<glib::object::Object>> MonitorExt for O {
 
 unsafe extern "C" fn invalidate_trampoline<P>(this: *mut ffi::GdkMonitor, f: glib_ffi::gpointer)
 where P: IsA<Monitor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Monitor::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_display_trampoline<P>(this: *mut ffi::GdkMonitor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Monitor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Monitor::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_geometry_trampoline<P>(this: *mut ffi::GdkMonitor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Monitor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Monitor::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_height_mm_trampoline<P>(this: *mut ffi::GdkMonitor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Monitor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Monitor::from_glib_borrow(this).downcast_unchecked())
 }
@@ -364,7 +361,6 @@ where P: IsA<Monitor> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_manufacturer_trampoline<P>(this: *mut ffi::GdkMonitor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Monitor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Monitor::from_glib_borrow(this).downcast_unchecked())
 }
@@ -372,21 +368,18 @@ where P: IsA<Monitor> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_model_trampoline<P>(this: *mut ffi::GdkMonitor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Monitor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Monitor::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_refresh_rate_trampoline<P>(this: *mut ffi::GdkMonitor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Monitor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Monitor::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_scale_factor_trampoline<P>(this: *mut ffi::GdkMonitor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Monitor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Monitor::from_glib_borrow(this).downcast_unchecked())
 }
@@ -394,21 +387,18 @@ where P: IsA<Monitor> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_subpixel_layout_trampoline<P>(this: *mut ffi::GdkMonitor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Monitor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Monitor::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_width_mm_trampoline<P>(this: *mut ffi::GdkMonitor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Monitor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Monitor::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_workarea_trampoline<P>(this: *mut ffi::GdkMonitor, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Monitor> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Monitor::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/screen.rs b/src/auto/screen.rs
index dc97970..3d1b9aa 100644
--- a/src/auto/screen.rs
+++ b/src/auto/screen.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Display;
@@ -390,35 +391,30 @@ impl<O: IsA<Screen> + IsA<glib::object::Object>> ScreenExt for O {
 
 unsafe extern "C" fn composited_changed_trampoline<P>(this: *mut ffi::GdkScreen, f: glib_ffi::gpointer)
 where P: IsA<Screen> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Screen::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn monitors_changed_trampoline<P>(this: *mut ffi::GdkScreen, f: glib_ffi::gpointer)
 where P: IsA<Screen> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Screen::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn size_changed_trampoline<P>(this: *mut ffi::GdkScreen, f: glib_ffi::gpointer)
 where P: IsA<Screen> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Screen::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_font_options_trampoline<P>(this: *mut ffi::GdkScreen, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Screen> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Screen::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_resolution_trampoline<P>(this: *mut ffi::GdkScreen, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Screen> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Screen::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/seat.rs b/src/auto/seat.rs
index 2eec2b7..5b4ec34 100644
--- a/src/auto/seat.rs
+++ b/src/auto/seat.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_20", feature = "dox"))]
@@ -171,7 +172,6 @@ impl<O: IsA<Seat> + IsA<glib::object::Object>> SeatExt for O {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn device_added_trampoline<P>(this: *mut ffi::GdkSeat, device: *mut ffi::GdkDevice, f: glib_ffi::gpointer)
 where P: IsA<Seat> {
-    callback_guard!();
     let f: &&(Fn(&P, &Device) + 'static) = transmute(f);
     f(&Seat::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(device))
 }
@@ -179,7 +179,6 @@ where P: IsA<Seat> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn device_removed_trampoline<P>(this: *mut ffi::GdkSeat, device: *mut ffi::GdkDevice, f: glib_ffi::gpointer)
 where P: IsA<Seat> {
-    callback_guard!();
     let f: &&(Fn(&P, &Device) + 'static) = transmute(f);
     f(&Seat::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(device))
 }
@@ -187,7 +186,6 @@ where P: IsA<Seat> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn tool_added_trampoline<P>(this: *mut ffi::GdkSeat, tool: *mut ffi::GdkDeviceTool, f: glib_ffi::gpointer)
 where P: IsA<Seat> {
-    callback_guard!();
     let f: &&(Fn(&P, &DeviceTool) + 'static) = transmute(f);
     f(&Seat::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(tool))
 }
@@ -195,7 +193,6 @@ where P: IsA<Seat> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn tool_removed_trampoline<P>(this: *mut ffi::GdkSeat, tool: *mut ffi::GdkDeviceTool, f: glib_ffi::gpointer)
 where P: IsA<Seat> {
-    callback_guard!();
     let f: &&(Fn(&P, &DeviceTool) + 'static) = transmute(f);
     f(&Seat::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(tool))
 }
@@ -203,7 +200,6 @@ where P: IsA<Seat> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn notify_display_trampoline<P>(this: *mut ffi::GdkSeat, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Seat> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Seat::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/visual.rs b/src/auto/visual.rs
index 765d4bd..26c4681 100644
--- a/src/auto/visual.rs
+++ b/src/auto/visual.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ByteOrder;
diff --git a/src/auto/window.rs b/src/auto/window.rs
index 3477a35..488bb60 100644
--- a/src/auto/window.rs
+++ b/src/auto/window.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Cursor;
@@ -1488,21 +1489,18 @@ impl<O: IsA<Window> + IsA<glib::object::Object>> WindowExt for O {
 
 unsafe extern "C" fn create_surface_trampoline<P>(this: *mut ffi::GdkWindow, width: libc::c_int, height: libc::c_int, f: glib_ffi::gpointer) -> *mut cairo_ffi::cairo_surface_t
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P, i32, i32) -> cairo::Surface + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked(), width, height).to_glib_full()
 }
 
 unsafe extern "C" fn pick_embedded_child_trampoline<P>(this: *mut ffi::GdkWindow, x: libc::c_double, y: libc::c_double, f: glib_ffi::gpointer) -> *mut ffi::GdkWindow
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P, f64, f64) -> Option<Window> + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked(), x, y)/*Not checked*/.to_glib_none().0
 }
 
 unsafe extern "C" fn notify_cursor_trampoline<P>(this: *mut ffi::GdkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/rt.rs b/src/rt.rs
index 6b67d93..0e6f48a 100644
--- a/src/rt.rs
+++ b/src/rt.rs
@@ -44,15 +44,6 @@ macro_rules! assert_not_initialized {
     )
 }
 
-macro_rules! callback_guard {
-    () => (
-        let _guard = ::glib::CallbackGuard::new();
-        if cfg!(debug_assertions) {
-            assert_initialized_main_thread!();
-        }
-    )
-}
-
 /// Returns `true` if GDK has been initialized.
 #[inline]
 pub fn is_initialized() -> bool {