diff --git a/gir b/gir
index 5ec9961..9eab494 160000
--- a/gir
+++ b/gir
@@ -1 +1 @@
-Subproject commit 5ec99615df5814343d47e1286c404783584dbe26
+Subproject commit 9eab494254d574bbcb72c6987562cfef40f88717
diff --git a/gir-files b/gir-files
index 3fde76b..47c69e6 160000
--- a/gir-files
+++ b/gir-files
@@ -1 +1 @@
-Subproject commit 3fde76b3ebf6d26db74dfbabd7d1bca17842b374
+Subproject commit 47c69e69d993acdeaa286ea690cd06044e46380c
diff --git a/src/auto/app_launch_context.rs b/src/auto/app_launch_context.rs
index 0ae9910..60afb55 100644
--- a/src/auto/app_launch_context.rs
+++ b/src/auto/app_launch_context.rs
@@ -125,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 ba087fe..a552868 100644
--- a/src/auto/cursor.rs
+++ b/src/auto/cursor.rs
@@ -131,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 a5bf2c3..e7ee309 100644
--- a/src/auto/device.rs
+++ b/src/auto/device.rs
@@ -616,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())
 }
@@ -624,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())
 }
@@ -639,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())
 }
@@ -696,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())
 }
@@ -704,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())
 }
@@ -712,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())
 }
@@ -720,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())
 }
@@ -735,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 a9174f9..c931604 100644
--- a/src/auto/device_manager.rs
+++ b/src/auto/device_manager.rs
@@ -99,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 bc191da..3a0f399 100644
--- a/src/auto/device_tool.rs
+++ b/src/auto/device_tool.rs
@@ -144,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 64e5f42..820c5c7 100644
--- a/src/auto/display.rs
+++ b/src/auto/display.rs
@@ -531,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))
 }
@@ -539,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))
 }
@@ -547,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())
 }
@@ -562,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))
 }
@@ -570,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 1e473e8..bfcb32b 100644
--- a/src/auto/display_manager.rs
+++ b/src/auto/display_manager.rs
@@ -92,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 b957ad7..0ec9a5c 100644
--- a/src/auto/drag_context.rs
+++ b/src/auto/drag_context.rs
@@ -195,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))
 }
@@ -203,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))
 }
@@ -211,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())
 }
@@ -219,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 0086628..b072944 100644
--- a/src/auto/drawing_context.rs
+++ b/src/auto/drawing_context.rs
@@ -104,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())
 }
@@ -112,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/flags.rs b/src/auto/flags.rs
index 7e11cdc..9e75749 100644
--- a/src/auto/flags.rs
+++ b/src/auto/flags.rs
@@ -215,7 +215,7 @@ bitflags! {
         const SMOOTH_SCROLL_MASK = 8388608;
         const TOUCHPAD_GESTURE_MASK = 16777216;
         const TABLET_PAD_MASK = 33554432;
-        const ALL_EVENTS_MASK = 16777214;
+        const ALL_EVENTS_MASK = 67108862;
     }
 }
 
diff --git a/src/auto/frame_clock.rs b/src/auto/frame_clock.rs
index 60fc74b..6dca432 100644
--- a/src/auto/frame_clock.rs
+++ b/src/auto/frame_clock.rs
@@ -184,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/gl_context.rs b/src/auto/gl_context.rs
index 538a23a..c2f365b 100644
--- a/src/auto/gl_context.rs
+++ b/src/auto/gl_context.rs
@@ -254,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())
 }
@@ -262,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())
 }
@@ -270,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/monitor.rs b/src/auto/monitor.rs
index b9eb866..1e09222 100644
--- a/src/auto/monitor.rs
+++ b/src/auto/monitor.rs
@@ -336,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())
 }
@@ -365,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())
 }
@@ -373,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())
 }
@@ -395,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 cd470b7..74daa4d 100644
--- a/src/auto/screen.rs
+++ b/src/auto/screen.rs
@@ -391,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 3997348..447ae41 100644
--- a/src/auto/seat.rs
+++ b/src/auto/seat.rs
@@ -172,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))
 }
@@ -180,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))
 }
@@ -188,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))
 }
@@ -196,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))
 }
@@ -204,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/versions.txt b/src/auto/versions.txt
index 1ab682a..4725cf3 100644
--- a/src/auto/versions.txt
+++ b/src/auto/versions.txt
@@ -1,4 +1,2 @@
-All files in this directory
-were generated by gir (https://github.com/gtk-rs/gir @ 5ec9961)
-from gir-files (https://github.com/gtk-rs/gir-files @ 3fde76b)
-DO NOT EDIT THEM
+Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
+from gir-files (https://github.com/gtk-rs/gir-files @ 47c69e6)
diff --git a/src/auto/window.rs b/src/auto/window.rs
index b9d915f..186a2d8 100644
--- a/src/auto/window.rs
+++ b/src/auto/window.rs
@@ -1489,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 {