diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+### 4.0.4
+
++ Update to haskell-gi(-base)-0.25
+
 ### 4.0.3
 
 + Fix some introspection data involving GtkTreeIters.
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Documentation
 Autogenerated documentation for this package can be found at
 
-[https://hackage.haskell.org/package/gi-gtk-4.0.3/docs/GI-Gtk.html](https://hackage.haskell.org/package/gi-gtk-4.0.3/docs/GI-Gtk.html)
+[https://hackage.haskell.org/package/gi-gtk-4.0.4/docs/GI-Gtk.html](https://hackage.haskell.org/package/gi-gtk-4.0.4/docs/GI-Gtk.html)
 
 For general documentation on using [haskell-gi](https://github.com/haskell-gi/haskell-gi) based bindings, see [the project page](https://github.com/haskell-gi/haskell-gi) or [the Wiki](https://github.com/haskell-gi/haskell-gi/wiki).
diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -2,7 +2,6 @@
 
 import Data.GI.CodeGen.CabalHooks (setupBinding, TaggedOverride(..))
 
-import qualified GI.Atk.Config as Atk
 import qualified GI.GLib.Config as GLib
 import qualified GI.GObject.Config as GObject
 import qualified GI.Gdk.Config as Gdk
@@ -15,10 +14,12 @@
 
 
 main :: IO ()
-main = setupBinding name version verbose overridesFile inheritedOverrides outputDir
+main = setupBinding name version pkgName pkgVersion verbose overridesFile inheritedOverrides outputDir
   where name = "Gtk"
         version = "4.0"
+        pkgName = "gi-gtk"
+        pkgVersion = "4.0.4"
         overridesFile = Just "Gtk.overrides"
         verbose = False
         outputDir = Nothing
-        inheritedOverrides = [TaggedOverride "inherited:Atk" Atk.overrides, TaggedOverride "inherited:GLib" GLib.overrides, TaggedOverride "inherited:GObject" GObject.overrides, TaggedOverride "inherited:Gdk" Gdk.overrides, TaggedOverride "inherited:GdkPixbuf" GdkPixbuf.overrides, TaggedOverride "inherited:Gio" Gio.overrides, TaggedOverride "inherited:Graphene" Graphene.overrides, TaggedOverride "inherited:Gsk" Gsk.overrides, TaggedOverride "inherited:Pango" Pango.overrides, TaggedOverride "inherited:Cairo" Cairo.overrides]
+        inheritedOverrides = [TaggedOverride "inherited:GLib" GLib.overrides, TaggedOverride "inherited:GObject" GObject.overrides, TaggedOverride "inherited:Gdk" Gdk.overrides, TaggedOverride "inherited:GdkPixbuf" GdkPixbuf.overrides, TaggedOverride "inherited:Gio" Gio.overrides, TaggedOverride "inherited:Graphene" Graphene.overrides, TaggedOverride "inherited:Gsk" Gsk.overrides, TaggedOverride "inherited:Pango" Pango.overrides, TaggedOverride "inherited:Cairo" Cairo.overrides]
diff --git a/gi-gtk.cabal b/gi-gtk.cabal
--- a/gi-gtk.cabal
+++ b/gi-gtk.cabal
@@ -1,5 +1,5 @@
 name:                 gi-gtk
-version:              4.0.3
+version:              4.0.4
 synopsis:             Gtk bindings
 description:          Bindings for Gtk, autogenerated by haskell-gi.
 homepage:             https://github.com/haskell-gi/haskell-gi
@@ -9,14 +9,14 @@
 maintainer:           Iñaki García Etxebarria
 category:             Bindings
 build-type:           Custom
-cabal-version:        1.24
+cabal-version:        2.0
 
 extra-source-files: README.md ChangeLog.md stack.yaml Gtk.overrides
 
 custom-setup
       setup-depends: base >= 4.9 && < 5,
                      Cabal >= 1.24,
-                     haskell-gi >= 0.24.1 && < 0.25,
+                     haskell-gi >= 0.25 && < 0.26,
                      gi-cairo == 1.0.*,
                      gi-pango == 1.0.*,
                      gi-gio == 2.0.*,
@@ -36,8 +36,8 @@
 
       pkgconfig-depends: gtk4
       build-depends: base >= 4.9 && <5,
-                     haskell-gi-base >= 0.24 && < 0.25,
-                     haskell-gi >= 0.24.1 && < 0.25,
+                     haskell-gi-base >= 0.25 && < 0.26,
+                     haskell-gi >= 0.25 && < 0.26,
                      haskell-gi-overloading < 1.1,
                      gi-cairo == 1.0.*,
                      gi-pango == 1.0.*,
@@ -73,11 +73,11 @@
                        GI.Gtk.Flags,
                        GI.Gtk.Functions,
                        GI.Gtk.Interfaces,
+                       GI.Gtk.Interfaces.Accessible,
                        GI.Gtk.Interfaces.Actionable,
                        GI.Gtk.Interfaces.AppChooser,
                        GI.Gtk.Interfaces.Buildable,
                        GI.Gtk.Interfaces.BuilderScope,
-                       GI.Gtk.Interfaces.CellAccessibleParent,
                        GI.Gtk.Interfaces.CellEditable,
                        GI.Gtk.Interfaces.CellLayout,
                        GI.Gtk.Interfaces.ColorChooser,
@@ -98,13 +98,13 @@
                        GI.Gtk.Interfaces.TreeModel,
                        GI.Gtk.Interfaces.TreeSortable,
                        GI.Gtk.Objects,
+                       GI.Gtk.Objects.ATContext,
                        GI.Gtk.Objects.AboutDialog,
-                       GI.Gtk.Objects.AccelLabel,
-                       GI.Gtk.Objects.Accessible,
                        GI.Gtk.Objects.ActionBar,
                        GI.Gtk.Objects.ActivateAction,
                        GI.Gtk.Objects.Adjustment,
                        GI.Gtk.Objects.AlternativeTrigger,
+                       GI.Gtk.Objects.AnyFilter,
                        GI.Gtk.Objects.AppChooserButton,
                        GI.Gtk.Objects.AppChooserDialog,
                        GI.Gtk.Objects.AppChooserWidget,
@@ -114,16 +114,17 @@
                        GI.Gtk.Objects.Assistant,
                        GI.Gtk.Objects.AssistantPage,
                        GI.Gtk.Objects.BinLayout,
-                       GI.Gtk.Objects.BooleanCellAccessible,
+                       GI.Gtk.Objects.BookmarkList,
+                       GI.Gtk.Objects.BoolFilter,
                        GI.Gtk.Objects.Box,
                        GI.Gtk.Objects.BoxLayout,
                        GI.Gtk.Objects.Builder,
                        GI.Gtk.Objects.BuilderCScope,
+                       GI.Gtk.Objects.BuilderListItemFactory,
                        GI.Gtk.Objects.Button,
-                       GI.Gtk.Objects.ButtonAccessible,
+                       GI.Gtk.Objects.CClosureExpression,
                        GI.Gtk.Objects.Calendar,
                        GI.Gtk.Objects.CallbackAction,
-                       GI.Gtk.Objects.CellAccessible,
                        GI.Gtk.Objects.CellArea,
                        GI.Gtk.Objects.CellAreaBox,
                        GI.Gtk.Objects.CellAreaContext,
@@ -140,60 +141,62 @@
                        GI.Gtk.Objects.CenterBox,
                        GI.Gtk.Objects.CenterLayout,
                        GI.Gtk.Objects.CheckButton,
+                       GI.Gtk.Objects.ClosureExpression,
                        GI.Gtk.Objects.ColorButton,
                        GI.Gtk.Objects.ColorChooserDialog,
                        GI.Gtk.Objects.ColorChooserWidget,
+                       GI.Gtk.Objects.ColumnView,
+                       GI.Gtk.Objects.ColumnViewColumn,
                        GI.Gtk.Objects.ComboBox,
-                       GI.Gtk.Objects.ComboBoxAccessible,
                        GI.Gtk.Objects.ComboBoxText,
-                       GI.Gtk.Objects.CompositeAccessible,
+                       GI.Gtk.Objects.ConstantExpression,
                        GI.Gtk.Objects.Constraint,
                        GI.Gtk.Objects.ConstraintGuide,
                        GI.Gtk.Objects.ConstraintLayout,
                        GI.Gtk.Objects.ConstraintLayoutChild,
-                       GI.Gtk.Objects.ContainerCellAccessible,
                        GI.Gtk.Objects.CssProvider,
+                       GI.Gtk.Objects.CustomFilter,
                        GI.Gtk.Objects.CustomLayout,
+                       GI.Gtk.Objects.CustomSorter,
                        GI.Gtk.Objects.Dialog,
+                       GI.Gtk.Objects.DirectoryList,
                        GI.Gtk.Objects.DragIcon,
                        GI.Gtk.Objects.DragSource,
                        GI.Gtk.Objects.DrawingArea,
                        GI.Gtk.Objects.DropControllerMotion,
+                       GI.Gtk.Objects.DropDown,
                        GI.Gtk.Objects.DropTarget,
                        GI.Gtk.Objects.DropTargetAsync,
+                       GI.Gtk.Objects.EditableLabel,
                        GI.Gtk.Objects.EmojiChooser,
                        GI.Gtk.Objects.Entry,
-                       GI.Gtk.Objects.EntryAccessible,
                        GI.Gtk.Objects.EntryBuffer,
                        GI.Gtk.Objects.EntryCompletion,
-                       GI.Gtk.Objects.EntryIconAccessible,
                        GI.Gtk.Objects.EventController,
                        GI.Gtk.Objects.EventControllerFocus,
                        GI.Gtk.Objects.EventControllerKey,
                        GI.Gtk.Objects.EventControllerLegacy,
                        GI.Gtk.Objects.EventControllerMotion,
                        GI.Gtk.Objects.EventControllerScroll,
+                       GI.Gtk.Objects.EveryFilter,
                        GI.Gtk.Objects.Expander,
-                       GI.Gtk.Objects.ExpanderAccessible,
-                       GI.Gtk.Objects.FileChooserButton,
+                       GI.Gtk.Objects.Expression,
                        GI.Gtk.Objects.FileChooserDialog,
                        GI.Gtk.Objects.FileChooserNative,
                        GI.Gtk.Objects.FileChooserWidget,
                        GI.Gtk.Objects.FileFilter,
+                       GI.Gtk.Objects.Filter,
                        GI.Gtk.Objects.FilterListModel,
                        GI.Gtk.Objects.Fixed,
                        GI.Gtk.Objects.FixedLayout,
                        GI.Gtk.Objects.FixedLayoutChild,
                        GI.Gtk.Objects.FlattenListModel,
                        GI.Gtk.Objects.FlowBox,
-                       GI.Gtk.Objects.FlowBoxAccessible,
                        GI.Gtk.Objects.FlowBoxChild,
-                       GI.Gtk.Objects.FlowBoxChildAccessible,
                        GI.Gtk.Objects.FontButton,
                        GI.Gtk.Objects.FontChooserDialog,
                        GI.Gtk.Objects.FontChooserWidget,
                        GI.Gtk.Objects.Frame,
-                       GI.Gtk.Objects.FrameAccessible,
                        GI.Gtk.Objects.GLArea,
                        GI.Gtk.Objects.Gesture,
                        GI.Gtk.Objects.GestureClick,
@@ -208,6 +211,7 @@
                        GI.Gtk.Objects.Grid,
                        GI.Gtk.Objects.GridLayout,
                        GI.Gtk.Objects.GridLayoutChild,
+                       GI.Gtk.Objects.GridView,
                        GI.Gtk.Objects.HeaderBar,
                        GI.Gtk.Objects.IMContext,
                        GI.Gtk.Objects.IMContextSimple,
@@ -215,79 +219,70 @@
                        GI.Gtk.Objects.IconPaintable,
                        GI.Gtk.Objects.IconTheme,
                        GI.Gtk.Objects.IconView,
-                       GI.Gtk.Objects.IconViewAccessible,
                        GI.Gtk.Objects.Image,
-                       GI.Gtk.Objects.ImageAccessible,
-                       GI.Gtk.Objects.ImageCellAccessible,
                        GI.Gtk.Objects.InfoBar,
                        GI.Gtk.Objects.KeyvalTrigger,
                        GI.Gtk.Objects.Label,
-                       GI.Gtk.Objects.LabelAccessible,
                        GI.Gtk.Objects.LayoutChild,
                        GI.Gtk.Objects.LayoutManager,
                        GI.Gtk.Objects.LevelBar,
-                       GI.Gtk.Objects.LevelBarAccessible,
                        GI.Gtk.Objects.LinkButton,
-                       GI.Gtk.Objects.LinkButtonAccessible,
+                       GI.Gtk.Objects.ListBase,
                        GI.Gtk.Objects.ListBox,
-                       GI.Gtk.Objects.ListBoxAccessible,
                        GI.Gtk.Objects.ListBoxRow,
-                       GI.Gtk.Objects.ListBoxRowAccessible,
+                       GI.Gtk.Objects.ListItem,
+                       GI.Gtk.Objects.ListItemFactory,
                        GI.Gtk.Objects.ListStore,
+                       GI.Gtk.Objects.ListView,
                        GI.Gtk.Objects.LockButton,
-                       GI.Gtk.Objects.LockButtonAccessible,
                        GI.Gtk.Objects.MapListModel,
                        GI.Gtk.Objects.MediaControls,
                        GI.Gtk.Objects.MediaFile,
                        GI.Gtk.Objects.MediaStream,
                        GI.Gtk.Objects.MenuButton,
-                       GI.Gtk.Objects.MenuButtonAccessible,
                        GI.Gtk.Objects.MessageDialog,
                        GI.Gtk.Objects.MnemonicAction,
                        GI.Gtk.Objects.MnemonicTrigger,
                        GI.Gtk.Objects.MountOperation,
+                       GI.Gtk.Objects.MultiFilter,
+                       GI.Gtk.Objects.MultiSelection,
+                       GI.Gtk.Objects.MultiSorter,
                        GI.Gtk.Objects.NamedAction,
                        GI.Gtk.Objects.NativeDialog,
                        GI.Gtk.Objects.NeverTrigger,
                        GI.Gtk.Objects.NoSelection,
                        GI.Gtk.Objects.Notebook,
-                       GI.Gtk.Objects.NotebookAccessible,
                        GI.Gtk.Objects.NotebookPage,
-                       GI.Gtk.Objects.NotebookPageAccessible,
                        GI.Gtk.Objects.NothingAction,
+                       GI.Gtk.Objects.NumericSorter,
+                       GI.Gtk.Objects.ObjectExpression,
                        GI.Gtk.Objects.Overlay,
+                       GI.Gtk.Objects.OverlayLayout,
+                       GI.Gtk.Objects.OverlayLayoutChild,
                        GI.Gtk.Objects.PadController,
                        GI.Gtk.Objects.PageSetup,
                        GI.Gtk.Objects.Paned,
-                       GI.Gtk.Objects.PanedAccessible,
+                       GI.Gtk.Objects.ParamSpecExpression,
                        GI.Gtk.Objects.PasswordEntry,
                        GI.Gtk.Objects.Picture,
                        GI.Gtk.Objects.Popover,
-                       GI.Gtk.Objects.PopoverAccessible,
                        GI.Gtk.Objects.PopoverMenu,
                        GI.Gtk.Objects.PopoverMenuBar,
                        GI.Gtk.Objects.PrintContext,
                        GI.Gtk.Objects.PrintOperation,
                        GI.Gtk.Objects.PrintSettings,
                        GI.Gtk.Objects.ProgressBar,
-                       GI.Gtk.Objects.ProgressBarAccessible,
-                       GI.Gtk.Objects.RadioButton,
-                       GI.Gtk.Objects.RadioButtonAccessible,
+                       GI.Gtk.Objects.PropertyExpression,
                        GI.Gtk.Objects.Range,
-                       GI.Gtk.Objects.RangeAccessible,
                        GI.Gtk.Objects.RecentManager,
-                       GI.Gtk.Objects.RendererCellAccessible,
                        GI.Gtk.Objects.Revealer,
                        GI.Gtk.Objects.Scale,
-                       GI.Gtk.Objects.ScaleAccessible,
                        GI.Gtk.Objects.ScaleButton,
-                       GI.Gtk.Objects.ScaleButtonAccessible,
                        GI.Gtk.Objects.Scrollbar,
-                       GI.Gtk.Objects.ScrollbarAccessible,
                        GI.Gtk.Objects.ScrolledWindow,
-                       GI.Gtk.Objects.ScrolledWindowAccessible,
                        GI.Gtk.Objects.SearchBar,
                        GI.Gtk.Objects.SearchEntry,
+                       GI.Gtk.Objects.SelectionFilterModel,
                        GI.Gtk.Objects.Separator,
                        GI.Gtk.Objects.Settings,
                        GI.Gtk.Objects.Shortcut,
@@ -300,68 +295,64 @@
                        GI.Gtk.Objects.ShortcutsShortcut,
                        GI.Gtk.Objects.ShortcutsWindow,
                        GI.Gtk.Objects.SignalAction,
+                       GI.Gtk.Objects.SignalListItemFactory,
                        GI.Gtk.Objects.SingleSelection,
                        GI.Gtk.Objects.SizeGroup,
                        GI.Gtk.Objects.SliceListModel,
                        GI.Gtk.Objects.Snapshot,
                        GI.Gtk.Objects.SortListModel,
+                       GI.Gtk.Objects.Sorter,
                        GI.Gtk.Objects.SpinButton,
-                       GI.Gtk.Objects.SpinButtonAccessible,
                        GI.Gtk.Objects.Spinner,
-                       GI.Gtk.Objects.SpinnerAccessible,
                        GI.Gtk.Objects.Stack,
-                       GI.Gtk.Objects.StackAccessible,
                        GI.Gtk.Objects.StackPage,
                        GI.Gtk.Objects.StackSidebar,
                        GI.Gtk.Objects.StackSwitcher,
                        GI.Gtk.Objects.Statusbar,
-                       GI.Gtk.Objects.StatusbarAccessible,
+                       GI.Gtk.Objects.StringFilter,
+                       GI.Gtk.Objects.StringList,
+                       GI.Gtk.Objects.StringObject,
+                       GI.Gtk.Objects.StringSorter,
                        GI.Gtk.Objects.StyleContext,
                        GI.Gtk.Objects.Switch,
-                       GI.Gtk.Objects.SwitchAccessible,
                        GI.Gtk.Objects.Text,
-                       GI.Gtk.Objects.TextAccessible,
                        GI.Gtk.Objects.TextBuffer,
-                       GI.Gtk.Objects.TextCellAccessible,
                        GI.Gtk.Objects.TextChildAnchor,
                        GI.Gtk.Objects.TextMark,
                        GI.Gtk.Objects.TextTag,
                        GI.Gtk.Objects.TextTagTable,
                        GI.Gtk.Objects.TextView,
-                       GI.Gtk.Objects.TextViewAccessible,
                        GI.Gtk.Objects.ToggleButton,
-                       GI.Gtk.Objects.ToggleButtonAccessible,
                        GI.Gtk.Objects.Tooltip,
-                       GI.Gtk.Objects.ToplevelAccessible,
+                       GI.Gtk.Objects.TreeExpander,
                        GI.Gtk.Objects.TreeListModel,
                        GI.Gtk.Objects.TreeListRow,
+                       GI.Gtk.Objects.TreeListRowSorter,
                        GI.Gtk.Objects.TreeModelFilter,
                        GI.Gtk.Objects.TreeModelSort,
                        GI.Gtk.Objects.TreeSelection,
                        GI.Gtk.Objects.TreeStore,
                        GI.Gtk.Objects.TreeView,
-                       GI.Gtk.Objects.TreeViewAccessible,
                        GI.Gtk.Objects.TreeViewColumn,
                        GI.Gtk.Objects.Video,
                        GI.Gtk.Objects.Viewport,
                        GI.Gtk.Objects.VolumeButton,
                        GI.Gtk.Objects.Widget,
-                       GI.Gtk.Objects.WidgetAccessible,
                        GI.Gtk.Objects.WidgetPaintable,
                        GI.Gtk.Objects.Window,
-                       GI.Gtk.Objects.WindowAccessible,
                        GI.Gtk.Objects.WindowControls,
                        GI.Gtk.Objects.WindowGroup,
                        GI.Gtk.Objects.WindowHandle,
                        GI.Gtk.Structs,
+                       GI.Gtk.Structs.Bitset,
+                       GI.Gtk.Structs.BitsetIter,
                        GI.Gtk.Structs.Border,
                        GI.Gtk.Structs.BuildableParseContext,
                        GI.Gtk.Structs.BuildableParser,
-                       GI.Gtk.Structs.Clipboard,
                        GI.Gtk.Structs.CssLocation,
                        GI.Gtk.Structs.CssSection,
                        GI.Gtk.Structs.CssStyleChange,
-                       GI.Gtk.Structs.FileFilterInfo,
+                       GI.Gtk.Structs.ExpressionWatch,
                        GI.Gtk.Structs.PadActionEntry,
                        GI.Gtk.Structs.PageRange,
                        GI.Gtk.Structs.PaperSize,
@@ -375,8 +366,7 @@
                        GI.Gtk.Structs.TreeIter,
                        GI.Gtk.Structs.TreePath,
                        GI.Gtk.Structs.TreeRowReference,
-                       GI.Gtk.Structs.WidgetClass,
-                       GI.Gtk.Structs.WindowGeometryInfo
+                       GI.Gtk.Structs.WidgetClass
 
       autogen-modules: GI.Gtk.Config,
                        GI.Gtk,
@@ -386,11 +376,11 @@
                        GI.Gtk.Flags,
                        GI.Gtk.Functions,
                        GI.Gtk.Interfaces,
+                       GI.Gtk.Interfaces.Accessible,
                        GI.Gtk.Interfaces.Actionable,
                        GI.Gtk.Interfaces.AppChooser,
                        GI.Gtk.Interfaces.Buildable,
                        GI.Gtk.Interfaces.BuilderScope,
-                       GI.Gtk.Interfaces.CellAccessibleParent,
                        GI.Gtk.Interfaces.CellEditable,
                        GI.Gtk.Interfaces.CellLayout,
                        GI.Gtk.Interfaces.ColorChooser,
@@ -411,13 +401,13 @@
                        GI.Gtk.Interfaces.TreeModel,
                        GI.Gtk.Interfaces.TreeSortable,
                        GI.Gtk.Objects,
+                       GI.Gtk.Objects.ATContext,
                        GI.Gtk.Objects.AboutDialog,
-                       GI.Gtk.Objects.AccelLabel,
-                       GI.Gtk.Objects.Accessible,
                        GI.Gtk.Objects.ActionBar,
                        GI.Gtk.Objects.ActivateAction,
                        GI.Gtk.Objects.Adjustment,
                        GI.Gtk.Objects.AlternativeTrigger,
+                       GI.Gtk.Objects.AnyFilter,
                        GI.Gtk.Objects.AppChooserButton,
                        GI.Gtk.Objects.AppChooserDialog,
                        GI.Gtk.Objects.AppChooserWidget,
@@ -427,16 +417,17 @@
                        GI.Gtk.Objects.Assistant,
                        GI.Gtk.Objects.AssistantPage,
                        GI.Gtk.Objects.BinLayout,
-                       GI.Gtk.Objects.BooleanCellAccessible,
+                       GI.Gtk.Objects.BookmarkList,
+                       GI.Gtk.Objects.BoolFilter,
                        GI.Gtk.Objects.Box,
                        GI.Gtk.Objects.BoxLayout,
                        GI.Gtk.Objects.Builder,
                        GI.Gtk.Objects.BuilderCScope,
+                       GI.Gtk.Objects.BuilderListItemFactory,
                        GI.Gtk.Objects.Button,
-                       GI.Gtk.Objects.ButtonAccessible,
+                       GI.Gtk.Objects.CClosureExpression,
                        GI.Gtk.Objects.Calendar,
                        GI.Gtk.Objects.CallbackAction,
-                       GI.Gtk.Objects.CellAccessible,
                        GI.Gtk.Objects.CellArea,
                        GI.Gtk.Objects.CellAreaBox,
                        GI.Gtk.Objects.CellAreaContext,
@@ -453,60 +444,62 @@
                        GI.Gtk.Objects.CenterBox,
                        GI.Gtk.Objects.CenterLayout,
                        GI.Gtk.Objects.CheckButton,
+                       GI.Gtk.Objects.ClosureExpression,
                        GI.Gtk.Objects.ColorButton,
                        GI.Gtk.Objects.ColorChooserDialog,
                        GI.Gtk.Objects.ColorChooserWidget,
+                       GI.Gtk.Objects.ColumnView,
+                       GI.Gtk.Objects.ColumnViewColumn,
                        GI.Gtk.Objects.ComboBox,
-                       GI.Gtk.Objects.ComboBoxAccessible,
                        GI.Gtk.Objects.ComboBoxText,
-                       GI.Gtk.Objects.CompositeAccessible,
+                       GI.Gtk.Objects.ConstantExpression,
                        GI.Gtk.Objects.Constraint,
                        GI.Gtk.Objects.ConstraintGuide,
                        GI.Gtk.Objects.ConstraintLayout,
                        GI.Gtk.Objects.ConstraintLayoutChild,
-                       GI.Gtk.Objects.ContainerCellAccessible,
                        GI.Gtk.Objects.CssProvider,
+                       GI.Gtk.Objects.CustomFilter,
                        GI.Gtk.Objects.CustomLayout,
+                       GI.Gtk.Objects.CustomSorter,
                        GI.Gtk.Objects.Dialog,
+                       GI.Gtk.Objects.DirectoryList,
                        GI.Gtk.Objects.DragIcon,
                        GI.Gtk.Objects.DragSource,
                        GI.Gtk.Objects.DrawingArea,
                        GI.Gtk.Objects.DropControllerMotion,
+                       GI.Gtk.Objects.DropDown,
                        GI.Gtk.Objects.DropTarget,
                        GI.Gtk.Objects.DropTargetAsync,
+                       GI.Gtk.Objects.EditableLabel,
                        GI.Gtk.Objects.EmojiChooser,
                        GI.Gtk.Objects.Entry,
-                       GI.Gtk.Objects.EntryAccessible,
                        GI.Gtk.Objects.EntryBuffer,
                        GI.Gtk.Objects.EntryCompletion,
-                       GI.Gtk.Objects.EntryIconAccessible,
                        GI.Gtk.Objects.EventController,
                        GI.Gtk.Objects.EventControllerFocus,
                        GI.Gtk.Objects.EventControllerKey,
                        GI.Gtk.Objects.EventControllerLegacy,
                        GI.Gtk.Objects.EventControllerMotion,
                        GI.Gtk.Objects.EventControllerScroll,
+                       GI.Gtk.Objects.EveryFilter,
                        GI.Gtk.Objects.Expander,
-                       GI.Gtk.Objects.ExpanderAccessible,
-                       GI.Gtk.Objects.FileChooserButton,
+                       GI.Gtk.Objects.Expression,
                        GI.Gtk.Objects.FileChooserDialog,
                        GI.Gtk.Objects.FileChooserNative,
                        GI.Gtk.Objects.FileChooserWidget,
                        GI.Gtk.Objects.FileFilter,
+                       GI.Gtk.Objects.Filter,
                        GI.Gtk.Objects.FilterListModel,
                        GI.Gtk.Objects.Fixed,
                        GI.Gtk.Objects.FixedLayout,
                        GI.Gtk.Objects.FixedLayoutChild,
                        GI.Gtk.Objects.FlattenListModel,
                        GI.Gtk.Objects.FlowBox,
-                       GI.Gtk.Objects.FlowBoxAccessible,
                        GI.Gtk.Objects.FlowBoxChild,
-                       GI.Gtk.Objects.FlowBoxChildAccessible,
                        GI.Gtk.Objects.FontButton,
                        GI.Gtk.Objects.FontChooserDialog,
                        GI.Gtk.Objects.FontChooserWidget,
                        GI.Gtk.Objects.Frame,
-                       GI.Gtk.Objects.FrameAccessible,
                        GI.Gtk.Objects.GLArea,
                        GI.Gtk.Objects.Gesture,
                        GI.Gtk.Objects.GestureClick,
@@ -521,6 +514,7 @@
                        GI.Gtk.Objects.Grid,
                        GI.Gtk.Objects.GridLayout,
                        GI.Gtk.Objects.GridLayoutChild,
+                       GI.Gtk.Objects.GridView,
                        GI.Gtk.Objects.HeaderBar,
                        GI.Gtk.Objects.IMContext,
                        GI.Gtk.Objects.IMContextSimple,
@@ -528,79 +522,70 @@
                        GI.Gtk.Objects.IconPaintable,
                        GI.Gtk.Objects.IconTheme,
                        GI.Gtk.Objects.IconView,
-                       GI.Gtk.Objects.IconViewAccessible,
                        GI.Gtk.Objects.Image,
-                       GI.Gtk.Objects.ImageAccessible,
-                       GI.Gtk.Objects.ImageCellAccessible,
                        GI.Gtk.Objects.InfoBar,
                        GI.Gtk.Objects.KeyvalTrigger,
                        GI.Gtk.Objects.Label,
-                       GI.Gtk.Objects.LabelAccessible,
                        GI.Gtk.Objects.LayoutChild,
                        GI.Gtk.Objects.LayoutManager,
                        GI.Gtk.Objects.LevelBar,
-                       GI.Gtk.Objects.LevelBarAccessible,
                        GI.Gtk.Objects.LinkButton,
-                       GI.Gtk.Objects.LinkButtonAccessible,
+                       GI.Gtk.Objects.ListBase,
                        GI.Gtk.Objects.ListBox,
-                       GI.Gtk.Objects.ListBoxAccessible,
                        GI.Gtk.Objects.ListBoxRow,
-                       GI.Gtk.Objects.ListBoxRowAccessible,
+                       GI.Gtk.Objects.ListItem,
+                       GI.Gtk.Objects.ListItemFactory,
                        GI.Gtk.Objects.ListStore,
+                       GI.Gtk.Objects.ListView,
                        GI.Gtk.Objects.LockButton,
-                       GI.Gtk.Objects.LockButtonAccessible,
                        GI.Gtk.Objects.MapListModel,
                        GI.Gtk.Objects.MediaControls,
                        GI.Gtk.Objects.MediaFile,
                        GI.Gtk.Objects.MediaStream,
                        GI.Gtk.Objects.MenuButton,
-                       GI.Gtk.Objects.MenuButtonAccessible,
                        GI.Gtk.Objects.MessageDialog,
                        GI.Gtk.Objects.MnemonicAction,
                        GI.Gtk.Objects.MnemonicTrigger,
                        GI.Gtk.Objects.MountOperation,
+                       GI.Gtk.Objects.MultiFilter,
+                       GI.Gtk.Objects.MultiSelection,
+                       GI.Gtk.Objects.MultiSorter,
                        GI.Gtk.Objects.NamedAction,
                        GI.Gtk.Objects.NativeDialog,
                        GI.Gtk.Objects.NeverTrigger,
                        GI.Gtk.Objects.NoSelection,
                        GI.Gtk.Objects.Notebook,
-                       GI.Gtk.Objects.NotebookAccessible,
                        GI.Gtk.Objects.NotebookPage,
-                       GI.Gtk.Objects.NotebookPageAccessible,
                        GI.Gtk.Objects.NothingAction,
+                       GI.Gtk.Objects.NumericSorter,
+                       GI.Gtk.Objects.ObjectExpression,
                        GI.Gtk.Objects.Overlay,
+                       GI.Gtk.Objects.OverlayLayout,
+                       GI.Gtk.Objects.OverlayLayoutChild,
                        GI.Gtk.Objects.PadController,
                        GI.Gtk.Objects.PageSetup,
                        GI.Gtk.Objects.Paned,
-                       GI.Gtk.Objects.PanedAccessible,
+                       GI.Gtk.Objects.ParamSpecExpression,
                        GI.Gtk.Objects.PasswordEntry,
                        GI.Gtk.Objects.Picture,
                        GI.Gtk.Objects.Popover,
-                       GI.Gtk.Objects.PopoverAccessible,
                        GI.Gtk.Objects.PopoverMenu,
                        GI.Gtk.Objects.PopoverMenuBar,
                        GI.Gtk.Objects.PrintContext,
                        GI.Gtk.Objects.PrintOperation,
                        GI.Gtk.Objects.PrintSettings,
                        GI.Gtk.Objects.ProgressBar,
-                       GI.Gtk.Objects.ProgressBarAccessible,
-                       GI.Gtk.Objects.RadioButton,
-                       GI.Gtk.Objects.RadioButtonAccessible,
+                       GI.Gtk.Objects.PropertyExpression,
                        GI.Gtk.Objects.Range,
-                       GI.Gtk.Objects.RangeAccessible,
                        GI.Gtk.Objects.RecentManager,
-                       GI.Gtk.Objects.RendererCellAccessible,
                        GI.Gtk.Objects.Revealer,
                        GI.Gtk.Objects.Scale,
-                       GI.Gtk.Objects.ScaleAccessible,
                        GI.Gtk.Objects.ScaleButton,
-                       GI.Gtk.Objects.ScaleButtonAccessible,
                        GI.Gtk.Objects.Scrollbar,
-                       GI.Gtk.Objects.ScrollbarAccessible,
                        GI.Gtk.Objects.ScrolledWindow,
-                       GI.Gtk.Objects.ScrolledWindowAccessible,
                        GI.Gtk.Objects.SearchBar,
                        GI.Gtk.Objects.SearchEntry,
+                       GI.Gtk.Objects.SelectionFilterModel,
                        GI.Gtk.Objects.Separator,
                        GI.Gtk.Objects.Settings,
                        GI.Gtk.Objects.Shortcut,
@@ -613,68 +598,64 @@
                        GI.Gtk.Objects.ShortcutsShortcut,
                        GI.Gtk.Objects.ShortcutsWindow,
                        GI.Gtk.Objects.SignalAction,
+                       GI.Gtk.Objects.SignalListItemFactory,
                        GI.Gtk.Objects.SingleSelection,
                        GI.Gtk.Objects.SizeGroup,
                        GI.Gtk.Objects.SliceListModel,
                        GI.Gtk.Objects.Snapshot,
                        GI.Gtk.Objects.SortListModel,
+                       GI.Gtk.Objects.Sorter,
                        GI.Gtk.Objects.SpinButton,
-                       GI.Gtk.Objects.SpinButtonAccessible,
                        GI.Gtk.Objects.Spinner,
-                       GI.Gtk.Objects.SpinnerAccessible,
                        GI.Gtk.Objects.Stack,
-                       GI.Gtk.Objects.StackAccessible,
                        GI.Gtk.Objects.StackPage,
                        GI.Gtk.Objects.StackSidebar,
                        GI.Gtk.Objects.StackSwitcher,
                        GI.Gtk.Objects.Statusbar,
-                       GI.Gtk.Objects.StatusbarAccessible,
+                       GI.Gtk.Objects.StringFilter,
+                       GI.Gtk.Objects.StringList,
+                       GI.Gtk.Objects.StringObject,
+                       GI.Gtk.Objects.StringSorter,
                        GI.Gtk.Objects.StyleContext,
                        GI.Gtk.Objects.Switch,
-                       GI.Gtk.Objects.SwitchAccessible,
                        GI.Gtk.Objects.Text,
-                       GI.Gtk.Objects.TextAccessible,
                        GI.Gtk.Objects.TextBuffer,
-                       GI.Gtk.Objects.TextCellAccessible,
                        GI.Gtk.Objects.TextChildAnchor,
                        GI.Gtk.Objects.TextMark,
                        GI.Gtk.Objects.TextTag,
                        GI.Gtk.Objects.TextTagTable,
                        GI.Gtk.Objects.TextView,
-                       GI.Gtk.Objects.TextViewAccessible,
                        GI.Gtk.Objects.ToggleButton,
-                       GI.Gtk.Objects.ToggleButtonAccessible,
                        GI.Gtk.Objects.Tooltip,
-                       GI.Gtk.Objects.ToplevelAccessible,
+                       GI.Gtk.Objects.TreeExpander,
                        GI.Gtk.Objects.TreeListModel,
                        GI.Gtk.Objects.TreeListRow,
+                       GI.Gtk.Objects.TreeListRowSorter,
                        GI.Gtk.Objects.TreeModelFilter,
                        GI.Gtk.Objects.TreeModelSort,
                        GI.Gtk.Objects.TreeSelection,
                        GI.Gtk.Objects.TreeStore,
                        GI.Gtk.Objects.TreeView,
-                       GI.Gtk.Objects.TreeViewAccessible,
                        GI.Gtk.Objects.TreeViewColumn,
                        GI.Gtk.Objects.Video,
                        GI.Gtk.Objects.Viewport,
                        GI.Gtk.Objects.VolumeButton,
                        GI.Gtk.Objects.Widget,
-                       GI.Gtk.Objects.WidgetAccessible,
                        GI.Gtk.Objects.WidgetPaintable,
                        GI.Gtk.Objects.Window,
-                       GI.Gtk.Objects.WindowAccessible,
                        GI.Gtk.Objects.WindowControls,
                        GI.Gtk.Objects.WindowGroup,
                        GI.Gtk.Objects.WindowHandle,
                        GI.Gtk.Structs,
+                       GI.Gtk.Structs.Bitset,
+                       GI.Gtk.Structs.BitsetIter,
                        GI.Gtk.Structs.Border,
                        GI.Gtk.Structs.BuildableParseContext,
                        GI.Gtk.Structs.BuildableParser,
-                       GI.Gtk.Structs.Clipboard,
                        GI.Gtk.Structs.CssLocation,
                        GI.Gtk.Structs.CssSection,
                        GI.Gtk.Structs.CssStyleChange,
-                       GI.Gtk.Structs.FileFilterInfo,
+                       GI.Gtk.Structs.ExpressionWatch,
                        GI.Gtk.Structs.PadActionEntry,
                        GI.Gtk.Structs.PageRange,
                        GI.Gtk.Structs.PaperSize,
@@ -688,5 +669,4 @@
                        GI.Gtk.Structs.TreeIter,
                        GI.Gtk.Structs.TreePath,
                        GI.Gtk.Structs.TreeRowReference,
-                       GI.Gtk.Structs.WidgetClass,
-                       GI.Gtk.Structs.WindowGeometryInfo
+                       GI.Gtk.Structs.WidgetClass