diff --git a/gir/girgen/gen_init.go b/gir/girgen/gen_init.go
index 25c6ec8a6..3b7bb909d 100644
--- a/gir/girgen/gen_init.go
+++ b/gir/girgen/gen_init.go
@@ -4,12 +4,12 @@ import "github.com/diamondburned/gotk4/gir"
 
 var initTmpl = newGoTemplate(`
 	func init() {
-		glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+		externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 			{{ if .Enums -}}
 			// Enums
 			{{- range .Enums }}
 			{{- if .GLibGetType }}
-			{T: glib.Type(C.{{.GLibGetType}}()), F: marshal{{.Name}}},
+			{T: externglib.Type(C.{{.GLibGetType}}()), F: marshal{{.Name}}},
 			{{- else }}
 			// Skipped {{.Name}}.
 			{{- end -}}
@@ -27,6 +27,7 @@ type initGenerator struct {
 }
 
 func (ng *NamespaceGenerator) generateInit() {
+	ng.addImportAlias("github.com/gotk3/gotk3/glib", "externglib")
 	ng.pen.BlockTmpl(initTmpl, initGenerator{
 		Namespace: *ng.current.Namespace,
 		Ng:        ng,
diff --git a/gir/girgen/girgen.go b/gir/girgen/girgen.go
index b6d6fdb53..e40ce3ab5 100644
--- a/gir/girgen/girgen.go
+++ b/gir/girgen/girgen.go
@@ -130,6 +130,7 @@ func (g *Generator) UseNamespace(namespace string) *NamespaceGenerator {
 		body: &buf,
 
 		imports: map[string]string{},
+		pkgPath: g.ImportPath(gir.GoNamespace(res.Namespace)),
 		gen:     g,
 		current: res,
 	}
@@ -140,6 +141,7 @@ type NamespaceGenerator struct {
 	pen  *pen.Pen
 	body *bytes.Buffer
 
+	pkgPath string            // package name
 	imports map[string]string // optional alias value
 
 	gen     *Generator
@@ -181,10 +183,10 @@ func (ng *NamespaceGenerator) Generate(w io.Writer) error {
 			// Only use the import alias if it's provided and does not match the
 			// base name of the import path for idiomaticity.
 			if alias != "" && alias != path.Base(imp) {
-				pen.Words(alias, "")
+				pen.Words(alias, "", strconv.Quote(imp))
+			} else {
+				pen.Words(strconv.Quote(imp))
 			}
-
-			pen.Words(strconv.Quote(imp))
 		}
 		pen.Block(")")
 		pen.Line()
diff --git a/gir/girgen/type.go b/gir/girgen/type.go
index d944e36fe..447cd4391 100644
--- a/gir/girgen/type.go
+++ b/gir/girgen/type.go
@@ -36,7 +36,6 @@ var (
 	typeFlight singleflight.Group
 )
 
-// countPtrs counts the number of nested pointers from the given gir.Type.
 func countPtrs(typ gir.Type, result *gir.TypeFindResult) uint8 {
 	ptr := uint8(strings.Count(typ.CType, "*"))
 
@@ -55,8 +54,10 @@ func countPtrs(typ gir.Type, result *gir.TypeFindResult) uint8 {
 
 // builtinType is a convenient function to make a new resolvedType.
 func builtinType(imp, typ string, girType gir.Type) *ResolvedType {
-	// Create the actual type.
-	typ = path.Base(imp) + "." + typ
+	if imp != "" {
+		// Create the actual type if there's an import path.
+		typ = path.Base(imp) + "." + typ
+	}
 
 	return &ResolvedType{
 		Builtin: &typ,
@@ -69,14 +70,15 @@ func builtinType(imp, typ string, girType gir.Type) *ResolvedType {
 
 // externGLibType returns an external GLib type from gotk3.
 func externGLibType(glibType string, typ gir.Type) *ResolvedType {
-	glibType = "externglib." + glibType
+	ptrs := strings.Count(glibType, "*")
+	glibType = strings.Repeat("*", ptrs) + "externglib." + strings.TrimPrefix(glibType, "*")
 
 	return &ResolvedType{
 		Builtin: &glibType,
 		Import:  "github.com/gotk3/gotk3/glib",
 		Package: "externglib",
 		CType:   typ.CType,
-		Ptr:     countPtrs(typ, nil),
+		Ptr:     uint8(ptrs),
 	}
 }
 
@@ -233,7 +235,7 @@ func (ng *NamespaceGenerator) ResolveType(typ gir.Type) *ResolvedType {
 
 			// Add the import in the same singleflight callback, but only if the
 			// namespace is not the current one.
-			if resolved.Extern != nil && !resolved.Extern.Result.Eq(ng.current) {
+			if resolved.Import != "" && resolved.Import != ng.pkgPath {
 				ng.addImportAlias(resolved.Import, resolved.Package)
 			}
 		}
@@ -293,25 +295,23 @@ func (ng *NamespaceGenerator) resolveTypeUncached(typ gir.Type) *ResolvedType {
 	case "gpointer":
 		return builtinType("unsafe", "Pointer", typ)
 	case "GLib.DestroyNotify", "DestroyNotify": // This should be handled externally.
-		return builtinType("unsafe.Pointer", typ)
+		return builtinType("unsafe", "Pointer", typ)
 	case "GType":
-		return builtinType("glib.Type", typ)
+		return externGLibType("Type", typ)
 	case "GObject.GValue", "GObject.Value": // inconsistency???
-		return builtinType("*glib.Value", typ)
+		return externGLibType("*Value", typ)
 	case "GObject.Object":
-		return builtinType("*glib.Object", typ)
+		return externGLibType("*Object", typ)
 	case "GObject.Closure":
-		return builtinType("*glib.Closure", typ)
+		return externGLibType("*Closure", typ)
 	case "GObject.Callback":
 		// Callback is a special func(Any) Any type, so we treat it as
 		// interface{} similarly to object.Connect(). We can use glib's Closure
 		// APIs to parse this interface{}.
-		return builtinType("interface{}", typ)
+		return builtinType("", "interface{}", typ)
 
 	case "GObject.InitiallyUnowned":
-		resolved := builtinType("glib.InitiallyUnowned", typ)
-		// resolved.Parent = "GObject.Object"
-		return resolved
+		return externGLibType("InitiallyUnowned", typ)
 
 	case "va_list":
 		// CGo cannot handle variadic argument lists.
@@ -345,7 +345,7 @@ func (ng *NamespaceGenerator) resolveTypeUncached(typ gir.Type) *ResolvedType {
 		return nil
 	}
 
-	return typeFromResult(typ, result)
+	return typeFromResult(ng.gen, typ, result)
 }
 
 // TODO: GoTypeConverter converts Go types to C with GIR type.
@@ -498,7 +498,7 @@ func (ng *NamespaceGenerator) _typeConverter(value, target string, typ gir.Type,
 		return ""
 	}
 
-	resolved := typeFromResult(typ, result)
+	resolved := typeFromResult(ng.gen, typ, result)
 	goType := resolved.GoType(false)
 
 	// Resolve alias.
diff --git a/pkg/cairo/cairo.go b/pkg/cairo/cairo.go
index d5a57670e..f7f8e4d48 100644
--- a/pkg/cairo/cairo.go
+++ b/pkg/cairo/cairo.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"unsafe"
 
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: cairo-gobject
@@ -15,30 +15,30 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 		// Enums
-		{T: glib.Type(C.cairo_gobject_status_get_type()), F: marshalStatus},
-		{T: glib.Type(C.cairo_gobject_content_get_type()), F: marshalContent},
-		{T: glib.Type(C.cairo_gobject_operator_get_type()), F: marshalOperator},
-		{T: glib.Type(C.cairo_gobject_antialias_get_type()), F: marshalAntialias},
-		{T: glib.Type(C.cairo_gobject_fill_rule_get_type()), F: marshalFillRule},
-		{T: glib.Type(C.cairo_gobject_line_cap_get_type()), F: marshalLineCap},
-		{T: glib.Type(C.cairo_gobject_line_join_get_type()), F: marshalLineJoin},
-		{T: glib.Type(C.cairo_gobject_text_cluster_flags_get_type()), F: marshalTextClusterFlags},
-		{T: glib.Type(C.cairo_gobject_font_slant_get_type()), F: marshalFontSlant},
-		{T: glib.Type(C.cairo_gobject_font_weight_get_type()), F: marshalFontWeight},
-		{T: glib.Type(C.cairo_gobject_subpixel_order_get_type()), F: marshalSubpixelOrder},
-		{T: glib.Type(C.cairo_gobject_hint_style_get_type()), F: marshalHintStyle},
-		{T: glib.Type(C.cairo_gobject_hint_metrics_get_type()), F: marshalHintMetrics},
-		{T: glib.Type(C.cairo_gobject_font_type_get_type()), F: marshalFontType},
-		{T: glib.Type(C.cairo_gobject_path_data_type_get_type()), F: marshalPathDataType},
-		{T: glib.Type(C.cairo_gobject_device_type_get_type()), F: marshalDeviceType},
-		{T: glib.Type(C.cairo_gobject_surface_type_get_type()), F: marshalSurfaceType},
-		{T: glib.Type(C.cairo_gobject_format_get_type()), F: marshalFormat},
-		{T: glib.Type(C.cairo_gobject_pattern_type_get_type()), F: marshalPatternType},
-		{T: glib.Type(C.cairo_gobject_extend_get_type()), F: marshalExtend},
-		{T: glib.Type(C.cairo_gobject_filter_get_type()), F: marshalFilter},
-		{T: glib.Type(C.cairo_gobject_region_overlap_get_type()), F: marshalRegionOverlap},
+		{T: externglib.Type(C.cairo_gobject_status_get_type()), F: marshalStatus},
+		{T: externglib.Type(C.cairo_gobject_content_get_type()), F: marshalContent},
+		{T: externglib.Type(C.cairo_gobject_operator_get_type()), F: marshalOperator},
+		{T: externglib.Type(C.cairo_gobject_antialias_get_type()), F: marshalAntialias},
+		{T: externglib.Type(C.cairo_gobject_fill_rule_get_type()), F: marshalFillRule},
+		{T: externglib.Type(C.cairo_gobject_line_cap_get_type()), F: marshalLineCap},
+		{T: externglib.Type(C.cairo_gobject_line_join_get_type()), F: marshalLineJoin},
+		{T: externglib.Type(C.cairo_gobject_text_cluster_flags_get_type()), F: marshalTextClusterFlags},
+		{T: externglib.Type(C.cairo_gobject_font_slant_get_type()), F: marshalFontSlant},
+		{T: externglib.Type(C.cairo_gobject_font_weight_get_type()), F: marshalFontWeight},
+		{T: externglib.Type(C.cairo_gobject_subpixel_order_get_type()), F: marshalSubpixelOrder},
+		{T: externglib.Type(C.cairo_gobject_hint_style_get_type()), F: marshalHintStyle},
+		{T: externglib.Type(C.cairo_gobject_hint_metrics_get_type()), F: marshalHintMetrics},
+		{T: externglib.Type(C.cairo_gobject_font_type_get_type()), F: marshalFontType},
+		{T: externglib.Type(C.cairo_gobject_path_data_type_get_type()), F: marshalPathDataType},
+		{T: externglib.Type(C.cairo_gobject_device_type_get_type()), F: marshalDeviceType},
+		{T: externglib.Type(C.cairo_gobject_surface_type_get_type()), F: marshalSurfaceType},
+		{T: externglib.Type(C.cairo_gobject_format_get_type()), F: marshalFormat},
+		{T: externglib.Type(C.cairo_gobject_pattern_type_get_type()), F: marshalPatternType},
+		{T: externglib.Type(C.cairo_gobject_extend_get_type()), F: marshalExtend},
+		{T: externglib.Type(C.cairo_gobject_filter_get_type()), F: marshalFilter},
+		{T: externglib.Type(C.cairo_gobject_region_overlap_get_type()), F: marshalRegionOverlap},
 
 		// Objects/Classes
 	})
diff --git a/pkg/freetype2/freetype2.go b/pkg/freetype2/freetype2.go
index 72313b452..b94a3631c 100644
--- a/pkg/freetype2/freetype2.go
+++ b/pkg/freetype2/freetype2.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"unsafe"
 
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config:
@@ -14,7 +14,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 
 		// Objects/Classes
 	})
diff --git a/pkg/gdk/gdk.go b/pkg/gdk/gdk.go
index 60d30c3c3..d6537ef0d 100644
--- a/pkg/gdk/gdk.go
+++ b/pkg/gdk/gdk.go
@@ -12,6 +12,7 @@ import (
 	"github.com/diamondburned/gotk4/pkg/gio"
 	"github.com/diamondburned/gotk4/pkg/pango"
 	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: gtk4
@@ -20,26 +21,26 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 		// Enums
-		{T: glib.Type(C.gdk_axis_use_get_type()), F: marshalAxisUse},
-		{T: glib.Type(C.gdk_crossing_mode_get_type()), F: marshalCrossingMode},
-		{T: glib.Type(C.gdk_device_pad_feature_get_type()), F: marshalDevicePadFeature},
-		{T: glib.Type(C.gdk_device_tool_type_get_type()), F: marshalDeviceToolType},
-		{T: glib.Type(C.gdk_drag_cancel_reason_get_type()), F: marshalDragCancelReason},
-		{T: glib.Type(C.gdk_event_type_get_type()), F: marshalEventType},
-		{T: glib.Type(C.gdk_fullscreen_mode_get_type()), F: marshalFullscreenMode},
-		{T: glib.Type(C.gdk_gl_error_get_type()), F: marshalGLError},
-		{T: glib.Type(C.gdk_gravity_get_type()), F: marshalGravity},
-		{T: glib.Type(C.gdk_input_source_get_type()), F: marshalInputSource},
-		{T: glib.Type(C.gdk_key_match_get_type()), F: marshalKeyMatch},
-		{T: glib.Type(C.gdk_memory_format_get_type()), F: marshalMemoryFormat},
-		{T: glib.Type(C.gdk_notify_type_get_type()), F: marshalNotifyType},
-		{T: glib.Type(C.gdk_scroll_direction_get_type()), F: marshalScrollDirection},
-		{T: glib.Type(C.gdk_subpixel_layout_get_type()), F: marshalSubpixelLayout},
-		{T: glib.Type(C.gdk_surface_edge_get_type()), F: marshalSurfaceEdge},
-		{T: glib.Type(C.gdk_touchpad_gesture_phase_get_type()), F: marshalTouchpadGesturePhase},
-		{T: glib.Type(C.gdk_vulkan_error_get_type()), F: marshalVulkanError},
+		{T: externglib.Type(C.gdk_axis_use_get_type()), F: marshalAxisUse},
+		{T: externglib.Type(C.gdk_crossing_mode_get_type()), F: marshalCrossingMode},
+		{T: externglib.Type(C.gdk_device_pad_feature_get_type()), F: marshalDevicePadFeature},
+		{T: externglib.Type(C.gdk_device_tool_type_get_type()), F: marshalDeviceToolType},
+		{T: externglib.Type(C.gdk_drag_cancel_reason_get_type()), F: marshalDragCancelReason},
+		{T: externglib.Type(C.gdk_event_type_get_type()), F: marshalEventType},
+		{T: externglib.Type(C.gdk_fullscreen_mode_get_type()), F: marshalFullscreenMode},
+		{T: externglib.Type(C.gdk_gl_error_get_type()), F: marshalGLError},
+		{T: externglib.Type(C.gdk_gravity_get_type()), F: marshalGravity},
+		{T: externglib.Type(C.gdk_input_source_get_type()), F: marshalInputSource},
+		{T: externglib.Type(C.gdk_key_match_get_type()), F: marshalKeyMatch},
+		{T: externglib.Type(C.gdk_memory_format_get_type()), F: marshalMemoryFormat},
+		{T: externglib.Type(C.gdk_notify_type_get_type()), F: marshalNotifyType},
+		{T: externglib.Type(C.gdk_scroll_direction_get_type()), F: marshalScrollDirection},
+		{T: externglib.Type(C.gdk_subpixel_layout_get_type()), F: marshalSubpixelLayout},
+		{T: externglib.Type(C.gdk_surface_edge_get_type()), F: marshalSurfaceEdge},
+		{T: externglib.Type(C.gdk_touchpad_gesture_phase_get_type()), F: marshalTouchpadGesturePhase},
+		{T: externglib.Type(C.gdk_vulkan_error_get_type()), F: marshalVulkanError},
 
 		// Objects/Classes
 	})
@@ -874,24 +875,24 @@ func CairoSetSourceRgba(cr *cairo.Context, rgba *RGBA)
 // deserialize it, asynchronously. When the operation is finished, @callback
 // will be called. You can then call gdk_content_deserialize_finish() to get the
 // result of the operation.
-func ContentDeserializeAsync(stream *gio.InputStream, mimeType string, _type glib.Type, ioPriority int, cancellable *gio.Cancellable, callback gio.AsyncReadyCallback, userData unsafe.Pointer)
+func ContentDeserializeAsync(stream *gio.InputStream, mimeType string, _type externglib.Type, ioPriority int, cancellable *gio.Cancellable, callback gio.AsyncReadyCallback, userData unsafe.Pointer)
 
 // ContentDeserializeFinish: finishes a content deserialization operation.
-func ContentDeserializeFinish(result gio.AsyncResult, value *glib.Value) bool
+func ContentDeserializeFinish(result gio.AsyncResult, value *externglib.Value) bool
 
 // ContentRegisterDeserializer: registers a function to create objects of a
 // given @type from a serialized representation with the given mime type.
-func ContentRegisterDeserializer(mimeType string, _type glib.Type, deserialize ContentDeserializeFunc, data unsafe.Pointer, notify unsafe.Pointer)
+func ContentRegisterDeserializer(mimeType string, _type externglib.Type, deserialize ContentDeserializeFunc, data unsafe.Pointer, notify unsafe.Pointer)
 
 // ContentRegisterSerializer: registers a function to convert objects of the
 // given @type to a serialized representation with the given mime type.
-func ContentRegisterSerializer(_type glib.Type, mimeType string, serialize ContentSerializeFunc, data unsafe.Pointer, notify unsafe.Pointer)
+func ContentRegisterSerializer(_type externglib.Type, mimeType string, serialize ContentSerializeFunc, data unsafe.Pointer, notify unsafe.Pointer)
 
 // ContentSerializeAsync: serialize content and write it to the given output
 // stream, asynchronously. When the operation is finished, @callback will be
 // called. You can then call gdk_content_serialize_finish() to get the result of
 // the operation.
-func ContentSerializeAsync(stream *gio.OutputStream, mimeType string, value *glib.Value, ioPriority int, cancellable *gio.Cancellable, callback gio.AsyncReadyCallback, userData unsafe.Pointer)
+func ContentSerializeAsync(stream *gio.OutputStream, mimeType string, value *externglib.Value, ioPriority int, cancellable *gio.Cancellable, callback gio.AsyncReadyCallback, userData unsafe.Pointer)
 
 // ContentSerializeFinish: finishes a content serialization operation.
 func ContentSerializeFinish(result gio.AsyncResult) bool
@@ -1027,7 +1028,7 @@ func PixbufGetFromTexture(texture *Texture) *gdkpixbuf.Pixbuf
 // gtk_init_check() in order to take effect.
 func SetAllowedBackends(backends string)
 
-func ToplevelSizeGetType() glib.Type
+func ToplevelSizeGetType() externglib.Type
 
 // UnicodeToKeyval: convert from a ISO10646 character to a key symbol.
 func UnicodeToKeyval(wc uint32) uint
@@ -1090,7 +1091,7 @@ func (c *ContentFormats) Native() unsafe.Pointer {
 
 func NewContentFormats(mimeTypes []string, nMimeTypes uint) *ContentFormats
 
-func NewContentFormats(_type glib.Type) *ContentFormats
+func NewContentFormats(_type externglib.Type) *ContentFormats
 
 // ContentFormatsBuilder: a ContentFormatsBuilder struct is an opaque struct. It
 // is meant to not be kept around and only be used to create new ContentFormats
@@ -1468,7 +1469,7 @@ type AppLaunchContext struct {
 }
 
 func wrapAppLaunchContext(obj *glib.Object) *AppLaunchContext {
-	return &AppLaunchContext{AppLaunchContext{*glib.Object{obj}}}
+	return &AppLaunchContext{AppLaunchContext{*externglib.Object{obj}}}
 }
 
 func marshalAppLaunchContext(p uintptr) (interface{}, error) {
@@ -1503,7 +1504,7 @@ type CairoContext struct {
 }
 
 func wrapCairoContext(obj *glib.Object) *CairoContext {
-	return &CairoContext{DrawContext{*glib.Object{obj}}}
+	return &CairoContext{DrawContext{*externglib.Object{obj}}}
 }
 
 func marshalCairoContext(p uintptr) (interface{}, error) {
@@ -1527,11 +1528,11 @@ func marshalCairoContext(p uintptr) (interface{}, error) {
 // gdk_clipboard_read_text_async() or gdk_clipboard_read_texture_async(). For
 // other data, use gdk_clipboard_read_async(), which provides a Stream object.
 type Clipboard struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapClipboard(obj *glib.Object) *Clipboard {
-	return &Clipboard{*glib.Object{obj}}
+	return &Clipboard{*externglib.Object{obj}}
 }
 
 func marshalClipboard(p uintptr) (interface{}, error) {
@@ -1543,11 +1544,11 @@ func marshalClipboard(p uintptr) (interface{}, error) {
 // ContentDeserializer: a GdkContentDeserializer is used to deserialize content
 // received via inter-application data transfers.
 type ContentDeserializer struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapContentDeserializer(obj *glib.Object) *ContentDeserializer {
-	return &ContentDeserializer{*glib.Object{obj}}
+	return &ContentDeserializer{*externglib.Object{obj}}
 }
 
 func marshalContentDeserializer(p uintptr) (interface{}, error) {
@@ -1566,11 +1567,11 @@ func marshalContentDeserializer(p uintptr) (interface{}, error) {
 // ContentSerializer and ContentDeserializer if you want to add support for
 // application-specific data formats.
 type ContentProvider struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapContentProvider(obj *glib.Object) *ContentProvider {
-	return &ContentProvider{*glib.Object{obj}}
+	return &ContentProvider{*externglib.Object{obj}}
 }
 
 func marshalContentProvider(p uintptr) (interface{}, error) {
@@ -1582,11 +1583,11 @@ func marshalContentProvider(p uintptr) (interface{}, error) {
 // ContentSerializer: a GdkContentSerializer is used to serialize content for
 // inter-application data transfers.
 type ContentSerializer struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapContentSerializer(obj *glib.Object) *ContentSerializer {
-	return &ContentSerializer{*glib.Object{obj}}
+	return &ContentSerializer{*externglib.Object{obj}}
 }
 
 func marshalContentSerializer(p uintptr) (interface{}, error) {
@@ -1615,11 +1616,11 @@ func marshalCrossingEvent(p uintptr) (interface{}, error) {
 // Cursors are immutable objects, so they can not change after they have been
 // constructed.
 type Cursor struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapCursor(obj *glib.Object) *Cursor {
-	return &Cursor{*glib.Object{obj}}
+	return &Cursor{*externglib.Object{obj}}
 }
 
 func marshalCursor(p uintptr) (interface{}, error) {
@@ -1664,11 +1665,11 @@ func marshalDeleteEvent(p uintptr) (interface{}, error) {
 // See the Seat documentation for more information about the various kinds of
 // devices, and their relationships.
 type Device struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDevice(obj *glib.Object) *Device {
-	return &Device{*glib.Object{obj}}
+	return &Device{*externglib.Object{obj}}
 }
 
 func marshalDevice(p uintptr) (interface{}, error) {
@@ -1679,11 +1680,11 @@ func marshalDevice(p uintptr) (interface{}, error) {
 
 // DeviceTool: a physical tool associated to a Device.
 type DeviceTool struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDeviceTool(obj *glib.Object) *DeviceTool {
-	return &DeviceTool{*glib.Object{obj}}
+	return &DeviceTool{*externglib.Object{obj}}
 }
 
 func marshalDeviceTool(p uintptr) (interface{}, error) {
@@ -1705,11 +1706,11 @@ func marshalDeviceTool(p uintptr) (interface{}, error) {
 // Output devices are represented by Monitor objects, which can be accessed with
 // gdk_display_get_monitor_at_surface() and similar APIs.
 type Display struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDisplay(obj *glib.Object) *Display {
-	return &Display{*glib.Object{obj}}
+	return &Display{*externglib.Object{obj}}
 }
 
 func marshalDisplay(p uintptr) (interface{}, error) {
@@ -1754,11 +1755,11 @@ func marshalDisplay(p uintptr) (interface{}, error) {
 //    #endif
 //      g_error ("Unsupported GDK backend");
 type DisplayManager struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDisplayManager(obj *glib.Object) *DisplayManager {
-	return &DisplayManager{*glib.Object{obj}}
+	return &DisplayManager{*externglib.Object{obj}}
 }
 
 func marshalDisplayManager(p uintptr) (interface{}, error) {
@@ -1770,11 +1771,11 @@ func marshalDisplayManager(p uintptr) (interface{}, error) {
 // Drag: the GdkDrag struct contains only private fields and should not be
 // accessed directly.
 type Drag struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDrag(obj *glib.Object) *Drag {
-	return &Drag{*glib.Object{obj}}
+	return &Drag{*externglib.Object{obj}}
 }
 
 func marshalDrag(p uintptr) (interface{}, error) {
@@ -1791,11 +1792,11 @@ func marshalDrag(p uintptr) (interface{}, error) {
 //
 // A GdkDrawContext is always associated with a single toplevel surface.
 type DrawContext struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDrawContext(obj *glib.Object) *DrawContext {
-	return &DrawContext{*glib.Object{obj}}
+	return &DrawContext{*externglib.Object{obj}}
 }
 
 func marshalDrawContext(p uintptr) (interface{}, error) {
@@ -1807,11 +1808,11 @@ func marshalDrawContext(p uintptr) (interface{}, error) {
 // Drop: the GdkDrop struct contains only private fields and should not be
 // accessed directly.
 type Drop struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDrop(obj *glib.Object) *Drop {
-	return &Drop{*glib.Object{obj}}
+	return &Drop{*externglib.Object{obj}}
 }
 
 func marshalDrop(p uintptr) (interface{}, error) {
@@ -1865,11 +1866,11 @@ func marshalFocusEvent(p uintptr) (interface{}, error) {
 // gdk_frame_clock_get_frame_time() and the value inside the FrameClock::update
 // signal of the clock, they will stay exactly synchronized.
 type FrameClock struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFrameClock(obj *glib.Object) *FrameClock {
-	return &FrameClock{*glib.Object{obj}}
+	return &FrameClock{*externglib.Object{obj}}
 }
 
 func marshalFrameClock(p uintptr) (interface{}, error) {
@@ -1929,7 +1930,7 @@ type GLContext struct {
 }
 
 func wrapGLContext(obj *glib.Object) *GLContext {
-	return &GLContext{DrawContext{*glib.Object{obj}}}
+	return &GLContext{DrawContext{*externglib.Object{obj}}}
 }
 
 func marshalGLContext(p uintptr) (interface{}, error) {
@@ -1944,7 +1945,7 @@ type GLTexture struct {
 }
 
 func wrapGLTexture(obj *glib.Object) *GLTexture {
-	return &GLTexture{Texture{*glib.Object{obj}}}
+	return &GLTexture{Texture{*externglib.Object{obj}}}
 }
 
 func marshalGLTexture(p uintptr) (interface{}, error) {
@@ -1989,7 +1990,7 @@ type MemoryTexture struct {
 }
 
 func wrapMemoryTexture(obj *glib.Object) *MemoryTexture {
-	return &MemoryTexture{Texture{*glib.Object{obj}}}
+	return &MemoryTexture{Texture{*externglib.Object{obj}}}
 }
 
 func marshalMemoryTexture(p uintptr) (interface{}, error) {
@@ -2003,11 +2004,11 @@ func marshalMemoryTexture(p uintptr) (interface{}, error) {
 // monitors with gdk_display_get_monitors(). You can use
 // gdk_display_get_monitor_at_surface() to find a particular monitor.
 type Monitor struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapMonitor(obj *glib.Object) *Monitor {
-	return &Monitor{*glib.Object{obj}}
+	return &Monitor{*externglib.Object{obj}}
 }
 
 func marshalMonitor(p uintptr) (interface{}, error) {
@@ -2079,11 +2080,11 @@ func marshalScrollEvent(p uintptr) (interface{}, error) {
 // Seat: the Seat object represents a collection of input devices that belong to
 // a user.
 type Seat struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSeat(obj *glib.Object) *Seat {
-	return &Seat{*glib.Object{obj}}
+	return &Seat{*externglib.Object{obj}}
 }
 
 func marshalSeat(p uintptr) (interface{}, error) {
@@ -2094,11 +2095,11 @@ func marshalSeat(p uintptr) (interface{}, error) {
 
 // Snapshot: base type for snapshot operations.
 type Snapshot struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSnapshot(obj *glib.Object) *Snapshot {
-	return &Snapshot{*glib.Object{obj}}
+	return &Snapshot{*externglib.Object{obj}}
 }
 
 func marshalSnapshot(p uintptr) (interface{}, error) {
@@ -2116,11 +2117,11 @@ func marshalSnapshot(p uintptr) (interface{}, error) {
 // Other, more specialized surface types exist, but you will rarely interact
 // with them directly.
 type Surface struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSurface(obj *glib.Object) *Surface {
-	return &Surface{*glib.Object{obj}}
+	return &Surface{*externglib.Object{obj}}
 }
 
 func marshalSurface(p uintptr) (interface{}, error) {
@@ -2131,11 +2132,11 @@ func marshalSurface(p uintptr) (interface{}, error) {
 
 // Texture: the `GdkTexture` structure contains only private data.
 type Texture struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTexture(obj *glib.Object) *Texture {
-	return &Texture{*glib.Object{obj}}
+	return &Texture{*externglib.Object{obj}}
 }
 
 func marshalTexture(p uintptr) (interface{}, error) {
@@ -2188,7 +2189,7 @@ type VulkanContext struct {
 }
 
 func wrapVulkanContext(obj *glib.Object) *VulkanContext {
-	return &VulkanContext{DrawContext{*glib.Object{obj}}}
+	return &VulkanContext{DrawContext{*externglib.Object{obj}}}
 }
 
 func marshalVulkanContext(p uintptr) (interface{}, error) {
diff --git a/pkg/gdkpixbuf/gdkpixbuf.go b/pkg/gdkpixbuf/gdkpixbuf.go
index c7cd7b368..a6080f463 100644
--- a/pkg/gdkpixbuf/gdkpixbuf.go
+++ b/pkg/gdkpixbuf/gdkpixbuf.go
@@ -7,7 +7,7 @@ import (
 	"unsafe"
 
 	"github.com/diamondburned/gotk4/pkg/glib"
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: gdk-pixbuf-2.0
@@ -16,13 +16,13 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 		// Enums
-		{T: glib.Type(C.gdk_colorspace_get_type()), F: marshalColorspace},
-		{T: glib.Type(C.gdk_interp_type_get_type()), F: marshalInterpType},
-		{T: glib.Type(C.gdk_pixbuf_alpha_mode_get_type()), F: marshalPixbufAlphaMode},
-		{T: glib.Type(C.gdk_pixbuf_error_get_type()), F: marshalPixbufError},
-		{T: glib.Type(C.gdk_pixbuf_rotation_get_type()), F: marshalPixbufRotation},
+		{T: externglib.Type(C.gdk_colorspace_get_type()), F: marshalColorspace},
+		{T: externglib.Type(C.gdk_interp_type_get_type()), F: marshalInterpType},
+		{T: externglib.Type(C.gdk_pixbuf_alpha_mode_get_type()), F: marshalPixbufAlphaMode},
+		{T: externglib.Type(C.gdk_pixbuf_error_get_type()), F: marshalPixbufError},
+		{T: externglib.Type(C.gdk_pixbuf_rotation_get_type()), F: marshalPixbufRotation},
 
 		// Objects/Classes
 	})
@@ -187,11 +187,11 @@ func (p *PixbufFormat) Native() unsafe.Pointer {
 // color space, bits per sample, width and height, and the rowstride (the number
 // of bytes between the start of one row and the start of the next).
 type Pixbuf struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapPixbuf(obj *glib.Object) *Pixbuf {
-	return &Pixbuf{*glib.Object{obj}}
+	return &Pixbuf{*externglib.Object{obj}}
 }
 
 func marshalPixbuf(p uintptr) (interface{}, error) {
@@ -202,11 +202,11 @@ func marshalPixbuf(p uintptr) (interface{}, error) {
 
 // PixbufAnimation: an opaque struct representing an animation.
 type PixbufAnimation struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapPixbufAnimation(obj *glib.Object) *PixbufAnimation {
-	return &PixbufAnimation{*glib.Object{obj}}
+	return &PixbufAnimation{*externglib.Object{obj}}
 }
 
 func marshalPixbufAnimation(p uintptr) (interface{}, error) {
@@ -218,11 +218,11 @@ func marshalPixbufAnimation(p uintptr) (interface{}, error) {
 // PixbufAnimationIter: an opaque struct representing an iterator which points
 // to a certain position in an animation.
 type PixbufAnimationIter struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapPixbufAnimationIter(obj *glib.Object) *PixbufAnimationIter {
-	return &PixbufAnimationIter{*glib.Object{obj}}
+	return &PixbufAnimationIter{*externglib.Object{obj}}
 }
 
 func marshalPixbufAnimationIter(p uintptr) (interface{}, error) {
@@ -233,11 +233,11 @@ func marshalPixbufAnimationIter(p uintptr) (interface{}, error) {
 
 // PixbufLoader: the GdkPixbufLoader struct contains only private fields.
 type PixbufLoader struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapPixbufLoader(obj *glib.Object) *PixbufLoader {
-	return &PixbufLoader{*glib.Object{obj}}
+	return &PixbufLoader{*externglib.Object{obj}}
 }
 
 func marshalPixbufLoader(p uintptr) (interface{}, error) {
@@ -252,7 +252,7 @@ type PixbufSimpleAnim struct {
 }
 
 func wrapPixbufSimpleAnim(obj *glib.Object) *PixbufSimpleAnim {
-	return &PixbufSimpleAnim{PixbufAnimation{*glib.Object{obj}}}
+	return &PixbufSimpleAnim{PixbufAnimation{*externglib.Object{obj}}}
 }
 
 func marshalPixbufSimpleAnim(p uintptr) (interface{}, error) {
@@ -266,7 +266,7 @@ type PixbufSimpleAnimIter struct {
 }
 
 func wrapPixbufSimpleAnimIter(obj *glib.Object) *PixbufSimpleAnimIter {
-	return &PixbufSimpleAnimIter{PixbufAnimationIter{*glib.Object{obj}}}
+	return &PixbufSimpleAnimIter{PixbufAnimationIter{*externglib.Object{obj}}}
 }
 
 func marshalPixbufSimpleAnimIter(p uintptr) (interface{}, error) {
diff --git a/pkg/gdkpixdata/gdkpixdata.go b/pkg/gdkpixdata/gdkpixdata.go
index ac26eac80..54cc1ba89 100644
--- a/pkg/gdkpixdata/gdkpixdata.go
+++ b/pkg/gdkpixdata/gdkpixdata.go
@@ -6,7 +6,7 @@ import (
 	"unsafe"
 
 	"github.com/diamondburned/gotk4/pkg/gdkpixbuf"
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: gdk-pixbuf-2.0
@@ -15,7 +15,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 
 		// Objects/Classes
 	})
diff --git a/pkg/gdkwayland/gdkwayland.go b/pkg/gdkwayland/gdkwayland.go
index f3db5837d..28831c11b 100644
--- a/pkg/gdkwayland/gdkwayland.go
+++ b/pkg/gdkwayland/gdkwayland.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/diamondburned/gotk4/pkg/gdk"
 	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: gtk4-wayland
@@ -15,7 +16,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 
 		// Objects/Classes
 	})
@@ -26,7 +27,7 @@ type WaylandDevice struct {
 }
 
 func wrapWaylandDevice(obj *glib.Object) *WaylandDevice {
-	return &WaylandDevice{Device{*glib.Object{obj}}}
+	return &WaylandDevice{Device{*externglib.Object{obj}}}
 }
 
 func marshalWaylandDevice(p uintptr) (interface{}, error) {
@@ -40,7 +41,7 @@ type WaylandDisplay struct {
 }
 
 func wrapWaylandDisplay(obj *glib.Object) *WaylandDisplay {
-	return &WaylandDisplay{Display{*glib.Object{obj}}}
+	return &WaylandDisplay{Display{*externglib.Object{obj}}}
 }
 
 func marshalWaylandDisplay(p uintptr) (interface{}, error) {
@@ -54,7 +55,7 @@ type WaylandMonitor struct {
 }
 
 func wrapWaylandMonitor(obj *glib.Object) *WaylandMonitor {
-	return &WaylandMonitor{Monitor{*glib.Object{obj}}}
+	return &WaylandMonitor{Monitor{*externglib.Object{obj}}}
 }
 
 func marshalWaylandMonitor(p uintptr) (interface{}, error) {
@@ -68,7 +69,7 @@ type WaylandPopup struct {
 }
 
 func wrapWaylandPopup(obj *glib.Object) *WaylandPopup {
-	return &WaylandPopup{WaylandSurface{Surface{*glib.Object{obj}}}}
+	return &WaylandPopup{WaylandSurface{Surface{*externglib.Object{obj}}}}
 }
 
 func marshalWaylandPopup(p uintptr) (interface{}, error) {
@@ -82,7 +83,7 @@ type WaylandSeat struct {
 }
 
 func wrapWaylandSeat(obj *glib.Object) *WaylandSeat {
-	return &WaylandSeat{Seat{*glib.Object{obj}}}
+	return &WaylandSeat{Seat{*externglib.Object{obj}}}
 }
 
 func marshalWaylandSeat(p uintptr) (interface{}, error) {
@@ -96,7 +97,7 @@ type WaylandSurface struct {
 }
 
 func wrapWaylandSurface(obj *glib.Object) *WaylandSurface {
-	return &WaylandSurface{Surface{*glib.Object{obj}}}
+	return &WaylandSurface{Surface{*externglib.Object{obj}}}
 }
 
 func marshalWaylandSurface(p uintptr) (interface{}, error) {
@@ -110,7 +111,7 @@ type WaylandToplevel struct {
 }
 
 func wrapWaylandToplevel(obj *glib.Object) *WaylandToplevel {
-	return &WaylandToplevel{WaylandSurface{Surface{*glib.Object{obj}}}}
+	return &WaylandToplevel{WaylandSurface{Surface{*externglib.Object{obj}}}}
 }
 
 func marshalWaylandToplevel(p uintptr) (interface{}, error) {
diff --git a/pkg/gdkx11/gdkx11.go b/pkg/gdkx11/gdkx11.go
index b595e924f..67e3da5cd 100644
--- a/pkg/gdkx11/gdkx11.go
+++ b/pkg/gdkx11/gdkx11.go
@@ -8,6 +8,7 @@ import (
 	"github.com/diamondburned/gotk4/pkg/gdk"
 	"github.com/diamondburned/gotk4/pkg/xlib"
 	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: gtk4-x11
@@ -16,7 +17,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 		// Enums
 		// Skipped X11DeviceType.
 
@@ -79,7 +80,7 @@ type X11AppLaunchContext struct {
 }
 
 func wrapX11AppLaunchContext(obj *glib.Object) *X11AppLaunchContext {
-	return &X11AppLaunchContext{AppLaunchContext{AppLaunchContext{*glib.Object{obj}}}}
+	return &X11AppLaunchContext{AppLaunchContext{AppLaunchContext{*externglib.Object{obj}}}}
 }
 
 func marshalX11AppLaunchContext(p uintptr) (interface{}, error) {
@@ -89,11 +90,11 @@ func marshalX11AppLaunchContext(p uintptr) (interface{}, error) {
 }
 
 type X11DeviceManagerXI2 struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapX11DeviceManagerXI2(obj *glib.Object) *X11DeviceManagerXI2 {
-	return &X11DeviceManagerXI2{*glib.Object{obj}}
+	return &X11DeviceManagerXI2{*externglib.Object{obj}}
 }
 
 func marshalX11DeviceManagerXI2(p uintptr) (interface{}, error) {
@@ -107,7 +108,7 @@ type X11DeviceXI2 struct {
 }
 
 func wrapX11DeviceXI2(obj *glib.Object) *X11DeviceXI2 {
-	return &X11DeviceXI2{Device{*glib.Object{obj}}}
+	return &X11DeviceXI2{Device{*externglib.Object{obj}}}
 }
 
 func marshalX11DeviceXI2(p uintptr) (interface{}, error) {
@@ -121,7 +122,7 @@ type X11Display struct {
 }
 
 func wrapX11Display(obj *glib.Object) *X11Display {
-	return &X11Display{Display{*glib.Object{obj}}}
+	return &X11Display{Display{*externglib.Object{obj}}}
 }
 
 func marshalX11Display(p uintptr) (interface{}, error) {
@@ -135,7 +136,7 @@ type X11Drag struct {
 }
 
 func wrapX11Drag(obj *glib.Object) *X11Drag {
-	return &X11Drag{Drag{*glib.Object{obj}}}
+	return &X11Drag{Drag{*externglib.Object{obj}}}
 }
 
 func marshalX11Drag(p uintptr) (interface{}, error) {
@@ -149,7 +150,7 @@ type X11Monitor struct {
 }
 
 func wrapX11Monitor(obj *glib.Object) *X11Monitor {
-	return &X11Monitor{Monitor{*glib.Object{obj}}}
+	return &X11Monitor{Monitor{*externglib.Object{obj}}}
 }
 
 func marshalX11Monitor(p uintptr) (interface{}, error) {
@@ -159,11 +160,11 @@ func marshalX11Monitor(p uintptr) (interface{}, error) {
 }
 
 type X11Screen struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapX11Screen(obj *glib.Object) *X11Screen {
-	return &X11Screen{*glib.Object{obj}}
+	return &X11Screen{*externglib.Object{obj}}
 }
 
 func marshalX11Screen(p uintptr) (interface{}, error) {
@@ -177,7 +178,7 @@ type X11Surface struct {
 }
 
 func wrapX11Surface(obj *glib.Object) *X11Surface {
-	return &X11Surface{Surface{*glib.Object{obj}}}
+	return &X11Surface{Surface{*externglib.Object{obj}}}
 }
 
 func marshalX11Surface(p uintptr) (interface{}, error) {
diff --git a/pkg/gio/gio.go b/pkg/gio/gio.go
index 7c6682cb7..cb328b641 100644
--- a/pkg/gio/gio.go
+++ b/pkg/gio/gio.go
@@ -7,7 +7,7 @@ import (
 	"unsafe"
 
 	"github.com/diamondburned/gotk4/pkg/glib"
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: gio-2.0 gio-unix-2.0
@@ -26,50 +26,50 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 		// Enums
-		{T: glib.Type(C.g_bus_type_get_type()), F: marshalBusType},
-		{T: glib.Type(C.g_converter_result_get_type()), F: marshalConverterResult},
-		{T: glib.Type(C.g_credentials_type_get_type()), F: marshalCredentialsType},
-		{T: glib.Type(C.g_dbus_error_get_type()), F: marshalDBusError},
-		{T: glib.Type(C.g_dbus_message_byte_order_get_type()), F: marshalDBusMessageByteOrder},
-		{T: glib.Type(C.g_dbus_message_header_field_get_type()), F: marshalDBusMessageHeaderField},
-		{T: glib.Type(C.g_dbus_message_type_get_type()), F: marshalDBusMessageType},
-		{T: glib.Type(C.g_data_stream_byte_order_get_type()), F: marshalDataStreamByteOrder},
-		{T: glib.Type(C.g_data_stream_newline_type_get_type()), F: marshalDataStreamNewlineType},
-		{T: glib.Type(C.g_drive_start_stop_type_get_type()), F: marshalDriveStartStopType},
-		{T: glib.Type(C.g_emblem_origin_get_type()), F: marshalEmblemOrigin},
-		{T: glib.Type(C.g_file_attribute_status_get_type()), F: marshalFileAttributeStatus},
-		{T: glib.Type(C.g_file_attribute_type_get_type()), F: marshalFileAttributeType},
-		{T: glib.Type(C.g_file_monitor_event_get_type()), F: marshalFileMonitorEvent},
-		{T: glib.Type(C.g_file_type_get_type()), F: marshalFileType},
-		{T: glib.Type(C.g_filesystem_preview_type_get_type()), F: marshalFilesystemPreviewType},
-		{T: glib.Type(C.g_io_error_enum_get_type()), F: marshalIOErrorEnum},
-		{T: glib.Type(C.g_io_module_scope_flags_get_type()), F: marshalIOModuleScopeFlags},
-		{T: glib.Type(C.g_memory_monitor_warning_level_get_type()), F: marshalMemoryMonitorWarningLevel},
-		{T: glib.Type(C.g_mount_operation_result_get_type()), F: marshalMountOperationResult},
-		{T: glib.Type(C.g_network_connectivity_get_type()), F: marshalNetworkConnectivity},
-		{T: glib.Type(C.g_notification_priority_get_type()), F: marshalNotificationPriority},
-		{T: glib.Type(C.g_password_save_get_type()), F: marshalPasswordSave},
-		{T: glib.Type(C.g_pollable_return_get_type()), F: marshalPollableReturn},
-		{T: glib.Type(C.g_resolver_error_get_type()), F: marshalResolverError},
-		{T: glib.Type(C.g_resolver_record_type_get_type()), F: marshalResolverRecordType},
-		{T: glib.Type(C.g_resource_error_get_type()), F: marshalResourceError},
-		{T: glib.Type(C.g_socket_client_event_get_type()), F: marshalSocketClientEvent},
-		{T: glib.Type(C.g_socket_family_get_type()), F: marshalSocketFamily},
-		{T: glib.Type(C.g_socket_listener_event_get_type()), F: marshalSocketListenerEvent},
-		{T: glib.Type(C.g_socket_protocol_get_type()), F: marshalSocketProtocol},
-		{T: glib.Type(C.g_socket_type_get_type()), F: marshalSocketType},
-		{T: glib.Type(C.g_tls_authentication_mode_get_type()), F: marshalTlsAuthenticationMode},
-		{T: glib.Type(C.g_tls_certificate_request_flags_get_type()), F: marshalTlsCertificateRequestFlags},
-		{T: glib.Type(C.g_tls_channel_binding_error_get_type()), F: marshalTlsChannelBindingError},
-		{T: glib.Type(C.g_tls_channel_binding_type_get_type()), F: marshalTlsChannelBindingType},
-		{T: glib.Type(C.g_tls_database_lookup_flags_get_type()), F: marshalTlsDatabaseLookupFlags},
-		{T: glib.Type(C.g_tls_error_get_type()), F: marshalTlsError},
-		{T: glib.Type(C.g_tls_interaction_result_get_type()), F: marshalTlsInteractionResult},
-		{T: glib.Type(C.g_tls_rehandshake_mode_get_type()), F: marshalTlsRehandshakeMode},
-		{T: glib.Type(C.g_unix_socket_address_type_get_type()), F: marshalUnixSocketAddressType},
-		{T: glib.Type(C.g_zlib_compressor_format_get_type()), F: marshalZlibCompressorFormat},
+		{T: externglib.Type(C.g_bus_type_get_type()), F: marshalBusType},
+		{T: externglib.Type(C.g_converter_result_get_type()), F: marshalConverterResult},
+		{T: externglib.Type(C.g_credentials_type_get_type()), F: marshalCredentialsType},
+		{T: externglib.Type(C.g_dbus_error_get_type()), F: marshalDBusError},
+		{T: externglib.Type(C.g_dbus_message_byte_order_get_type()), F: marshalDBusMessageByteOrder},
+		{T: externglib.Type(C.g_dbus_message_header_field_get_type()), F: marshalDBusMessageHeaderField},
+		{T: externglib.Type(C.g_dbus_message_type_get_type()), F: marshalDBusMessageType},
+		{T: externglib.Type(C.g_data_stream_byte_order_get_type()), F: marshalDataStreamByteOrder},
+		{T: externglib.Type(C.g_data_stream_newline_type_get_type()), F: marshalDataStreamNewlineType},
+		{T: externglib.Type(C.g_drive_start_stop_type_get_type()), F: marshalDriveStartStopType},
+		{T: externglib.Type(C.g_emblem_origin_get_type()), F: marshalEmblemOrigin},
+		{T: externglib.Type(C.g_file_attribute_status_get_type()), F: marshalFileAttributeStatus},
+		{T: externglib.Type(C.g_file_attribute_type_get_type()), F: marshalFileAttributeType},
+		{T: externglib.Type(C.g_file_monitor_event_get_type()), F: marshalFileMonitorEvent},
+		{T: externglib.Type(C.g_file_type_get_type()), F: marshalFileType},
+		{T: externglib.Type(C.g_filesystem_preview_type_get_type()), F: marshalFilesystemPreviewType},
+		{T: externglib.Type(C.g_io_error_enum_get_type()), F: marshalIOErrorEnum},
+		{T: externglib.Type(C.g_io_module_scope_flags_get_type()), F: marshalIOModuleScopeFlags},
+		{T: externglib.Type(C.g_memory_monitor_warning_level_get_type()), F: marshalMemoryMonitorWarningLevel},
+		{T: externglib.Type(C.g_mount_operation_result_get_type()), F: marshalMountOperationResult},
+		{T: externglib.Type(C.g_network_connectivity_get_type()), F: marshalNetworkConnectivity},
+		{T: externglib.Type(C.g_notification_priority_get_type()), F: marshalNotificationPriority},
+		{T: externglib.Type(C.g_password_save_get_type()), F: marshalPasswordSave},
+		{T: externglib.Type(C.g_pollable_return_get_type()), F: marshalPollableReturn},
+		{T: externglib.Type(C.g_resolver_error_get_type()), F: marshalResolverError},
+		{T: externglib.Type(C.g_resolver_record_type_get_type()), F: marshalResolverRecordType},
+		{T: externglib.Type(C.g_resource_error_get_type()), F: marshalResourceError},
+		{T: externglib.Type(C.g_socket_client_event_get_type()), F: marshalSocketClientEvent},
+		{T: externglib.Type(C.g_socket_family_get_type()), F: marshalSocketFamily},
+		{T: externglib.Type(C.g_socket_listener_event_get_type()), F: marshalSocketListenerEvent},
+		{T: externglib.Type(C.g_socket_protocol_get_type()), F: marshalSocketProtocol},
+		{T: externglib.Type(C.g_socket_type_get_type()), F: marshalSocketType},
+		{T: externglib.Type(C.g_tls_authentication_mode_get_type()), F: marshalTlsAuthenticationMode},
+		{T: externglib.Type(C.g_tls_certificate_request_flags_get_type()), F: marshalTlsCertificateRequestFlags},
+		{T: externglib.Type(C.g_tls_channel_binding_error_get_type()), F: marshalTlsChannelBindingError},
+		{T: externglib.Type(C.g_tls_channel_binding_type_get_type()), F: marshalTlsChannelBindingType},
+		{T: externglib.Type(C.g_tls_database_lookup_flags_get_type()), F: marshalTlsDatabaseLookupFlags},
+		{T: externglib.Type(C.g_tls_error_get_type()), F: marshalTlsError},
+		{T: externglib.Type(C.g_tls_interaction_result_get_type()), F: marshalTlsInteractionResult},
+		{T: externglib.Type(C.g_tls_rehandshake_mode_get_type()), F: marshalTlsRehandshakeMode},
+		{T: externglib.Type(C.g_unix_socket_address_type_get_type()), F: marshalUnixSocketAddressType},
+		{T: externglib.Type(C.g_zlib_compressor_format_get_type()), F: marshalZlibCompressorFormat},
 
 		// Objects/Classes
 	})
@@ -2352,11 +2352,11 @@ func BusOwnNameOnConnection(connection *DBusConnection, name string, flags BusNa
 
 // BusOwnNameOnConnectionWithClosures: version of g_bus_own_name_on_connection()
 // using closures instead of callbacks for easier binding in other languages.
-func BusOwnNameOnConnectionWithClosures(connection *DBusConnection, name string, flags BusNameOwnerFlags, nameAcquiredClosure *glib.Closure, nameLostClosure *glib.Closure) uint
+func BusOwnNameOnConnectionWithClosures(connection *DBusConnection, name string, flags BusNameOwnerFlags, nameAcquiredClosure *externglib.Closure, nameLostClosure *externglib.Closure) uint
 
 // BusOwnNameWithClosures: version of g_bus_own_name() using closures instead of
 // callbacks for easier binding in other languages.
-func BusOwnNameWithClosures(busType BusType, name string, flags BusNameOwnerFlags, busAcquiredClosure *glib.Closure, nameAcquiredClosure *glib.Closure, nameLostClosure *glib.Closure) uint
+func BusOwnNameWithClosures(busType BusType, name string, flags BusNameOwnerFlags, busAcquiredClosure *externglib.Closure, nameAcquiredClosure *externglib.Closure, nameLostClosure *externglib.Closure) uint
 
 // BusUnownName: stops owning a name.
 //
@@ -2412,11 +2412,11 @@ func BusWatchNameOnConnection(connection *DBusConnection, name string, flags Bus
 // BusWatchNameOnConnectionWithClosures: version of
 // g_bus_watch_name_on_connection() using closures instead of callbacks for
 // easier binding in other languages.
-func BusWatchNameOnConnectionWithClosures(connection *DBusConnection, name string, flags BusNameWatcherFlags, nameAppearedClosure *glib.Closure, nameVanishedClosure *glib.Closure) uint
+func BusWatchNameOnConnectionWithClosures(connection *DBusConnection, name string, flags BusNameWatcherFlags, nameAppearedClosure *externglib.Closure, nameVanishedClosure *externglib.Closure) uint
 
 // BusWatchNameWithClosures: version of g_bus_watch_name() using closures
 // instead of callbacks for easier binding in other languages.
-func BusWatchNameWithClosures(busType BusType, name string, flags BusNameWatcherFlags, nameAppearedClosure *glib.Closure, nameVanishedClosure *glib.Closure) uint
+func BusWatchNameWithClosures(busType BusType, name string, flags BusNameWatcherFlags, nameAppearedClosure *externglib.Closure, nameVanishedClosure *externglib.Closure) uint
 
 // ContentTypeCanBeExecutable: checks if a content type can be executable. Note
 // that for instance things like text files can be executables (i.e. scripts and
@@ -2669,7 +2669,7 @@ func DbusGenerateGuid() string
 //
 // See the g_dbus_gvariant_to_gvalue() function for how to convert a #GVariant
 // to a #GValue.
-func DbusGvalueToGvariant(gvalue *glib.Value, _type *glib.VariantType) *glib.Variant
+func DbusGvalueToGvariant(gvalue *externglib.Value, _type *glib.VariantType) *glib.Variant
 
 // DbusGvariantToGvalue: converts a #GVariant to a #GValue. If @value is
 // floating, it is consumed.
@@ -2682,7 +2682,7 @@ func DbusGvalueToGvariant(gvalue *glib.Value, _type *glib.VariantType) *glib.Var
 //
 // The conversion never fails - a valid #GValue is always returned in
 // @out_gvalue.
-func DbusGvariantToGvalue(value *glib.Variant) glib.Value
+func DbusGvariantToGvalue(value *glib.Variant) externglib.Value
 
 // DbusIsAddress: checks if @string is a [D-Bus
 // address](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses).
@@ -2814,7 +2814,7 @@ func IOErrorQuark() glib.Quark
 //
 // If @type has already been registered as an extension for this extension
 // point, the existing OExtension object is returned.
-func IOExtensionPointImplement(extensionPointName string, _type glib.Type, extensionName string, priority int) *IOExtension
+func IOExtensionPointImplement(extensionPointName string, _type externglib.Type, extensionName string, priority int) *IOExtension
 
 // IOExtensionPointLookup: looks up an existing extension point.
 func IOExtensionPointLookup(name string) *IOExtensionPoint
@@ -2956,7 +2956,7 @@ func NewNullSettingsBackend() *SettingsBackend
 // SourceFunc. The new source does not actually do anything on its own; use
 // g_source_add_child_source() to add other sources to it to cause it to
 // trigger.
-func NewPollableSource(pollableStream *glib.Object) *glib.Source
+func NewPollableSource(pollableStream *externglib.Object) *glib.Source
 
 // PollableSourceNewFull: utility method for InputStream and OutputStream
 // implementations. Creates a new #GSource, as with g_pollable_source_new(), but
@@ -3091,13 +3091,13 @@ func SettingsSchemaSourceGetDefault() *SettingsSchemaSource
 // SimpleAsyncReportGerrorInIdle: reports an error in an idle function. Similar
 // to g_simple_async_report_error_in_idle(), but takes a #GError rather than
 // building a new one.
-func SimpleAsyncReportGerrorInIdle(object *glib.Object, callback AsyncReadyCallback, userData unsafe.Pointer, error *glib.Error)
+func SimpleAsyncReportGerrorInIdle(object *externglib.Object, callback AsyncReadyCallback, userData unsafe.Pointer, error *glib.Error)
 
 // SimpleAsyncReportTakeGerrorInIdle: reports an error in an idle function.
 // Similar to g_simple_async_report_gerror_in_idle(), but takes over the
 // caller's ownership of @error, so the caller does not have to free it any
 // more.
-func SimpleAsyncReportTakeGerrorInIdle(object *glib.Object, callback AsyncReadyCallback, userData unsafe.Pointer, error *glib.Error)
+func SimpleAsyncReportTakeGerrorInIdle(object *externglib.Object, callback AsyncReadyCallback, userData unsafe.Pointer, error *glib.Error)
 
 // SrvTargetListSort: sorts @targets in place according to the algorithm in RFC
 // 2782.
@@ -4532,11 +4532,11 @@ func (u *UnixMountPoint) Native() unsafe.Pointer {
 // installed applications often come in groups (like during system updates) and
 // rescanning the list on every change is pointless and expensive.
 type AppInfoMonitor struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapAppInfoMonitor(obj *glib.Object) *AppInfoMonitor {
-	return &AppInfoMonitor{*glib.Object{obj}}
+	return &AppInfoMonitor{*externglib.Object{obj}}
 }
 
 func marshalAppInfoMonitor(p uintptr) (interface{}, error) {
@@ -4549,11 +4549,11 @@ func marshalAppInfoMonitor(p uintptr) (interface{}, error) {
 // is used to handle for instance startup notification and launching the new
 // application on the same screen as the launching window.
 type AppLaunchContext struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapAppLaunchContext(obj *glib.Object) *AppLaunchContext {
-	return &AppLaunchContext{*glib.Object{obj}}
+	return &AppLaunchContext{*externglib.Object{obj}}
 }
 
 func marshalAppLaunchContext(p uintptr) (interface{}, error) {
@@ -4669,11 +4669,11 @@ func marshalAppLaunchContext(p uintptr) (interface{}, error) {
 // For an example of using extra D-Bus hooks with GApplication, see
 // [gapplication-example-dbushooks.c](https://git.gnome.org/browse/glib/tree/gio/tests/gapplication-example-dbushooks.c).
 type Application struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapApplication(obj *glib.Object) *Application {
-	return &Application{*glib.Object{obj}}
+	return &Application{*externglib.Object{obj}}
 }
 
 func marshalApplication(p uintptr) (interface{}, error) {
@@ -4784,11 +4784,11 @@ func marshalApplication(p uintptr) (interface{}, error) {
 // The complete example can be found here:
 // [gapplication-example-cmdline3.c](https://git.gnome.org/browse/glib/tree/gio/tests/gapplication-example-cmdline3.c)
 type ApplicationCommandLine struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapApplicationCommandLine(obj *glib.Object) *ApplicationCommandLine {
-	return &ApplicationCommandLine{*glib.Object{obj}}
+	return &ApplicationCommandLine{*externglib.Object{obj}}
 }
 
 func marshalApplicationCommandLine(p uintptr) (interface{}, error) {
@@ -4816,7 +4816,7 @@ type BufferedInputStream struct {
 }
 
 func wrapBufferedInputStream(obj *glib.Object) *BufferedInputStream {
-	return &BufferedInputStream{FilterInputStream{InputStream{*glib.Object{obj}}}}
+	return &BufferedInputStream{FilterInputStream{InputStream{*externglib.Object{obj}}}}
 }
 
 func marshalBufferedInputStream(p uintptr) (interface{}, error) {
@@ -4844,7 +4844,7 @@ type BufferedOutputStream struct {
 }
 
 func wrapBufferedOutputStream(obj *glib.Object) *BufferedOutputStream {
-	return &BufferedOutputStream{FilterOutputStream{OutputStream{*glib.Object{obj}}}}
+	return &BufferedOutputStream{FilterOutputStream{OutputStream{*externglib.Object{obj}}}}
 }
 
 func marshalBufferedOutputStream(p uintptr) (interface{}, error) {
@@ -4856,11 +4856,11 @@ func marshalBufferedOutputStream(p uintptr) (interface{}, error) {
 // BytesIcon: GBytesIcon specifies an image held in memory in a common format
 // (usually png) to be used as icon.
 type BytesIcon struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapBytesIcon(obj *glib.Object) *BytesIcon {
-	return &BytesIcon{*glib.Object{obj}}
+	return &BytesIcon{*externglib.Object{obj}}
 }
 
 func marshalBytesIcon(p uintptr) (interface{}, error) {
@@ -4873,11 +4873,11 @@ func marshalBytesIcon(p uintptr) (interface{}, error) {
 // throughout GIO to allow for cancellation of synchronous and asynchronous
 // operations.
 type Cancellable struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapCancellable(obj *glib.Object) *Cancellable {
-	return &Cancellable{*glib.Object{obj}}
+	return &Cancellable{*externglib.Object{obj}}
 }
 
 func marshalCancellable(p uintptr) (interface{}, error) {
@@ -4889,11 +4889,11 @@ func marshalCancellable(p uintptr) (interface{}, error) {
 // CharsetConverter: GCharsetConverter is an implementation of #GConverter based
 // on GIConv.
 type CharsetConverter struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapCharsetConverter(obj *glib.Object) *CharsetConverter {
-	return &CharsetConverter{*glib.Object{obj}}
+	return &CharsetConverter{*externglib.Object{obj}}
 }
 
 func marshalCharsetConverter(p uintptr) (interface{}, error) {
@@ -4911,7 +4911,7 @@ type ConverterInputStream struct {
 }
 
 func wrapConverterInputStream(obj *glib.Object) *ConverterInputStream {
-	return &ConverterInputStream{FilterInputStream{InputStream{*glib.Object{obj}}}}
+	return &ConverterInputStream{FilterInputStream{InputStream{*externglib.Object{obj}}}}
 }
 
 func marshalConverterInputStream(p uintptr) (interface{}, error) {
@@ -4929,7 +4929,7 @@ type ConverterOutputStream struct {
 }
 
 func wrapConverterOutputStream(obj *glib.Object) *ConverterOutputStream {
-	return &ConverterOutputStream{FilterOutputStream{OutputStream{*glib.Object{obj}}}}
+	return &ConverterOutputStream{FilterOutputStream{OutputStream{*externglib.Object{obj}}}}
 }
 
 func marshalConverterOutputStream(p uintptr) (interface{}, error) {
@@ -4969,11 +4969,11 @@ func marshalConverterOutputStream(p uintptr) (interface{}, error) {
 // On Solaris (including OpenSolaris and its derivatives), the native credential
 // type is a `ucred_t`. This corresponds to G_CREDENTIALS_TYPE_SOLARIS_UCRED.
 type Credentials struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapCredentials(obj *glib.Object) *Credentials {
-	return &Credentials{*glib.Object{obj}}
+	return &Credentials{*externglib.Object{obj}}
 }
 
 func marshalCredentials(p uintptr) (interface{}, error) {
@@ -4986,11 +4986,11 @@ func marshalCredentials(p uintptr) (interface{}, error) {
 // that can be used as a proxy for an action group that is exported over D-Bus
 // with g_dbus_connection_export_action_group().
 type DBusActionGroup struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDBusActionGroup(obj *glib.Object) *DBusActionGroup {
-	return &DBusActionGroup{*glib.Object{obj}}
+	return &DBusActionGroup{*externglib.Object{obj}}
 }
 
 func marshalDBusActionGroup(p uintptr) (interface{}, error) {
@@ -5057,11 +5057,11 @@ func marshalDBusActionGroup(p uintptr) (interface{}, error) {
 //    }
 //
 type DBusAuthObserver struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDBusAuthObserver(obj *glib.Object) *DBusAuthObserver {
-	return &DBusAuthObserver{*glib.Object{obj}}
+	return &DBusAuthObserver{*externglib.Object{obj}}
 }
 
 func marshalDBusAuthObserver(p uintptr) (interface{}, error) {
@@ -5118,11 +5118,11 @@ func marshalDBusAuthObserver(p uintptr) (interface{}, error) {
 // Here is an example for exporting a #GObject:
 // [gdbus-example-export.c](https://git.gnome.org/browse/glib/tree/gio/tests/gdbus-example-export.c)
 type DBusConnection struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDBusConnection(obj *glib.Object) *DBusConnection {
-	return &DBusConnection{*glib.Object{obj}}
+	return &DBusConnection{*externglib.Object{obj}}
 }
 
 func marshalDBusConnection(p uintptr) (interface{}, error) {
@@ -5134,11 +5134,11 @@ func marshalDBusConnection(p uintptr) (interface{}, error) {
 // DBusInterfaceSkeleton: abstract base class for D-Bus interfaces on the
 // service side.
 type DBusInterfaceSkeleton struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDBusInterfaceSkeleton(obj *glib.Object) *DBusInterfaceSkeleton {
-	return &DBusInterfaceSkeleton{*glib.Object{obj}}
+	return &DBusInterfaceSkeleton{*externglib.Object{obj}}
 }
 
 func marshalDBusInterfaceSkeleton(p uintptr) (interface{}, error) {
@@ -5155,7 +5155,7 @@ type DBusMenuModel struct {
 }
 
 func wrapDBusMenuModel(obj *glib.Object) *DBusMenuModel {
-	return &DBusMenuModel{MenuModel{*glib.Object{obj}}}
+	return &DBusMenuModel{MenuModel{*externglib.Object{obj}}}
 }
 
 func marshalDBusMenuModel(p uintptr) (interface{}, error) {
@@ -5167,11 +5167,11 @@ func marshalDBusMenuModel(p uintptr) (interface{}, error) {
 // DBusMessage: a type for representing D-Bus messages that can be sent or
 // received on a BusConnection.
 type DBusMessage struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDBusMessage(obj *glib.Object) *DBusMessage {
-	return &DBusMessage{*glib.Object{obj}}
+	return &DBusMessage{*externglib.Object{obj}}
 }
 
 func marshalDBusMessage(p uintptr) (interface{}, error) {
@@ -5188,11 +5188,11 @@ func marshalDBusMessage(p uintptr) (interface{}, error) {
 // argument to the handle_method_call() function in a BusInterfaceVTable that
 // was passed to g_dbus_connection_register_object().
 type DBusMethodInvocation struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDBusMethodInvocation(obj *glib.Object) *DBusMethodInvocation {
-	return &DBusMethodInvocation{*glib.Object{obj}}
+	return &DBusMethodInvocation{*externglib.Object{obj}}
 }
 
 func marshalDBusMethodInvocation(p uintptr) (interface{}, error) {
@@ -5265,11 +5265,11 @@ func marshalDBusMethodInvocation(p uintptr) (interface{}, error) {
 // the same context and, consequently, will deliver signals in the same main
 // loop.
 type DBusObjectManagerClient struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDBusObjectManagerClient(obj *glib.Object) *DBusObjectManagerClient {
-	return &DBusObjectManagerClient{*glib.Object{obj}}
+	return &DBusObjectManagerClient{*externglib.Object{obj}}
 }
 
 func marshalDBusObjectManagerClient(p uintptr) (interface{}, error) {
@@ -5299,11 +5299,11 @@ func marshalDBusObjectManagerClient(p uintptr) (interface{}, error) {
 // used with BusObjectManagerServer or any D-Bus object implementing the
 // org.freedesktop.DBus.ObjectManager interface.
 type DBusObjectManagerServer struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDBusObjectManagerServer(obj *glib.Object) *DBusObjectManagerServer {
-	return &DBusObjectManagerServer{*glib.Object{obj}}
+	return &DBusObjectManagerServer{*externglib.Object{obj}}
 }
 
 func marshalDBusObjectManagerServer(p uintptr) (interface{}, error) {
@@ -5317,11 +5317,11 @@ func marshalDBusObjectManagerServer(p uintptr) (interface{}, error) {
 // BusObjectProxy yourself - typically BusObjectManagerClient is used to obtain
 // it.
 type DBusObjectProxy struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDBusObjectProxy(obj *glib.Object) *DBusObjectProxy {
-	return &DBusObjectProxy{*glib.Object{obj}}
+	return &DBusObjectProxy{*externglib.Object{obj}}
 }
 
 func marshalDBusObjectProxy(p uintptr) (interface{}, error) {
@@ -5336,11 +5336,11 @@ func marshalDBusObjectProxy(p uintptr) (interface{}, error) {
 //
 // This type is intended to be used with BusObjectManager.
 type DBusObjectSkeleton struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDBusObjectSkeleton(obj *glib.Object) *DBusObjectSkeleton {
-	return &DBusObjectSkeleton{*glib.Object{obj}}
+	return &DBusObjectSkeleton{*externglib.Object{obj}}
 }
 
 func marshalDBusObjectSkeleton(p uintptr) (interface{}, error) {
@@ -5385,11 +5385,11 @@ func marshalDBusObjectSkeleton(p uintptr) (interface{}, error) {
 // An example using a proxy for a well-known name can be found in
 // [gdbus-example-watch-proxy.c](https://git.gnome.org/browse/glib/tree/gio/tests/gdbus-example-watch-proxy.c)
 type DBusProxy struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDBusProxy(obj *glib.Object) *DBusProxy {
-	return &DBusProxy{*glib.Object{obj}}
+	return &DBusProxy{*externglib.Object{obj}}
 }
 
 func marshalDBusProxy(p uintptr) (interface{}, error) {
@@ -5415,11 +5415,11 @@ func marshalDBusProxy(p uintptr) (interface{}, error) {
 // connections that have successfully authenticated as the same user that is
 // running the BusServer.
 type DBusServer struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDBusServer(obj *glib.Object) *DBusServer {
-	return &DBusServer{*glib.Object{obj}}
+	return &DBusServer{*externglib.Object{obj}}
 }
 
 func marshalDBusServer(p uintptr) (interface{}, error) {
@@ -5435,7 +5435,7 @@ type DataInputStream struct {
 }
 
 func wrapDataInputStream(obj *glib.Object) *DataInputStream {
-	return &DataInputStream{BufferedInputStream{FilterInputStream{InputStream{*glib.Object{obj}}}}}
+	return &DataInputStream{BufferedInputStream{FilterInputStream{InputStream{*externglib.Object{obj}}}}}
 }
 
 func marshalDataInputStream(p uintptr) (interface{}, error) {
@@ -5451,7 +5451,7 @@ type DataOutputStream struct {
 }
 
 func wrapDataOutputStream(obj *glib.Object) *DataOutputStream {
-	return &DataOutputStream{FilterOutputStream{OutputStream{*glib.Object{obj}}}}
+	return &DataOutputStream{FilterOutputStream{OutputStream{*externglib.Object{obj}}}}
 }
 
 func marshalDataOutputStream(p uintptr) (interface{}, error) {
@@ -5467,11 +5467,11 @@ func marshalDataOutputStream(p uintptr) (interface{}, error) {
 // interfaces, thus you have to use the `gio-unix-2.0.pc` pkg-config file when
 // using it.
 type DesktopAppInfo struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDesktopAppInfo(obj *glib.Object) *DesktopAppInfo {
-	return &DesktopAppInfo{*glib.Object{obj}}
+	return &DesktopAppInfo{*externglib.Object{obj}}
 }
 
 func marshalDesktopAppInfo(p uintptr) (interface{}, error) {
@@ -5487,11 +5487,11 @@ func marshalDesktopAppInfo(p uintptr) (interface{}, error) {
 // Currently, only metainformation about the emblem's origin is supported. More
 // may be added in the future.
 type Emblem struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapEmblem(obj *glib.Object) *Emblem {
-	return &Emblem{*glib.Object{obj}}
+	return &Emblem{*externglib.Object{obj}}
 }
 
 func marshalEmblem(p uintptr) (interface{}, error) {
@@ -5507,11 +5507,11 @@ func marshalEmblem(p uintptr) (interface{}, error) {
 // Note that Icon allows no control over the position of the emblems. See also
 // #GEmblem for more information.
 type EmblemedIcon struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapEmblemedIcon(obj *glib.Object) *EmblemedIcon {
-	return &EmblemedIcon{*glib.Object{obj}}
+	return &EmblemedIcon{*externglib.Object{obj}}
 }
 
 func marshalEmblemedIcon(p uintptr) (interface{}, error) {
@@ -5545,11 +5545,11 @@ func marshalEmblemedIcon(p uintptr) (interface{}, error) {
 // further actions may be performed on it, and it should be freed with
 // g_object_unref().
 type FileEnumerator struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFileEnumerator(obj *glib.Object) *FileEnumerator {
-	return &FileEnumerator{*glib.Object{obj}}
+	return &FileEnumerator{*externglib.Object{obj}}
 }
 
 func marshalFileEnumerator(p uintptr) (interface{}, error) {
@@ -5580,7 +5580,7 @@ type FileIOStream struct {
 }
 
 func wrapFileIOStream(obj *glib.Object) *FileIOStream {
-	return &FileIOStream{IOStream{*glib.Object{obj}}}
+	return &FileIOStream{IOStream{*externglib.Object{obj}}}
 }
 
 func marshalFileIOStream(p uintptr) (interface{}, error) {
@@ -5592,11 +5592,11 @@ func marshalFileIOStream(p uintptr) (interface{}, error) {
 // FileIcon: GFileIcon specifies an icon by pointing to an image file to be used
 // as icon.
 type FileIcon struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFileIcon(obj *glib.Object) *FileIcon {
-	return &FileIcon{*glib.Object{obj}}
+	return &FileIcon{*externglib.Object{obj}}
 }
 
 func marshalFileIcon(p uintptr) (interface{}, error) {
@@ -5629,11 +5629,11 @@ func marshalFileIcon(p uintptr) (interface{}, error) {
 //
 // AttributeMatcher allows for searching through a Info for attributes.
 type FileInfo struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFileInfo(obj *glib.Object) *FileInfo {
-	return &FileInfo{*glib.Object{obj}}
+	return &FileInfo{*externglib.Object{obj}}
 }
 
 func marshalFileInfo(p uintptr) (interface{}, error) {
@@ -5656,7 +5656,7 @@ type FileInputStream struct {
 }
 
 func wrapFileInputStream(obj *glib.Object) *FileInputStream {
-	return &FileInputStream{InputStream{*glib.Object{obj}}}
+	return &FileInputStream{InputStream{*externglib.Object{obj}}}
 }
 
 func marshalFileInputStream(p uintptr) (interface{}, error) {
@@ -5677,11 +5677,11 @@ func marshalFileInputStream(p uintptr) (interface{}, error) {
 // context is blocked, this may cause notifications to be blocked even if the
 // thread-default context is still running).
 type FileMonitor struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFileMonitor(obj *glib.Object) *FileMonitor {
-	return &FileMonitor{*glib.Object{obj}}
+	return &FileMonitor{*externglib.Object{obj}}
 }
 
 func marshalFileMonitor(p uintptr) (interface{}, error) {
@@ -5707,7 +5707,7 @@ type FileOutputStream struct {
 }
 
 func wrapFileOutputStream(obj *glib.Object) *FileOutputStream {
-	return &FileOutputStream{OutputStream{*glib.Object{obj}}}
+	return &FileOutputStream{OutputStream{*externglib.Object{obj}}}
 }
 
 func marshalFileOutputStream(p uintptr) (interface{}, error) {
@@ -5720,11 +5720,11 @@ func marshalFileOutputStream(p uintptr) (interface{}, error) {
 // string by looking in the file system for clues. Can return a list of possible
 // completion strings for widget implementations.
 type FilenameCompleter struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFilenameCompleter(obj *glib.Object) *FilenameCompleter {
-	return &FilenameCompleter{*glib.Object{obj}}
+	return &FilenameCompleter{*externglib.Object{obj}}
 }
 
 func marshalFilenameCompleter(p uintptr) (interface{}, error) {
@@ -5742,7 +5742,7 @@ type FilterInputStream struct {
 }
 
 func wrapFilterInputStream(obj *glib.Object) *FilterInputStream {
-	return &FilterInputStream{InputStream{*glib.Object{obj}}}
+	return &FilterInputStream{InputStream{*externglib.Object{obj}}}
 }
 
 func marshalFilterInputStream(p uintptr) (interface{}, error) {
@@ -5760,7 +5760,7 @@ type FilterOutputStream struct {
 }
 
 func wrapFilterOutputStream(obj *glib.Object) *FilterOutputStream {
-	return &FilterOutputStream{OutputStream{*glib.Object{obj}}}
+	return &FilterOutputStream{OutputStream{*externglib.Object{obj}}}
 }
 
 func marshalFilterOutputStream(p uintptr) (interface{}, error) {
@@ -5814,11 +5814,11 @@ func marshalFilterOutputStream(p uintptr) (interface{}, error) {
 // state the wrapper stream leaves the base stream in (though they are
 // guaranteed not to crash).
 type IOStream struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapIOStream(obj *glib.Object) *IOStream {
-	return &IOStream{*glib.Object{obj}}
+	return &IOStream{*externglib.Object{obj}}
 }
 
 func marshalIOStream(p uintptr) (interface{}, error) {
@@ -5835,11 +5835,11 @@ func marshalIOStream(p uintptr) (interface{}, error) {
 // To actually connect to a remote host, you will need a SocketAddress (which
 // includes a Address as well as a port number).
 type InetAddress struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapInetAddress(obj *glib.Object) *InetAddress {
-	return &InetAddress{*glib.Object{obj}}
+	return &InetAddress{*externglib.Object{obj}}
 }
 
 func marshalInetAddress(p uintptr) (interface{}, error) {
@@ -5853,11 +5853,11 @@ func marshalInetAddress(p uintptr) (interface{}, error) {
 // of the base address are relevant for matching purposes. These are often given
 // in string form. Eg, "10.0.0.0/8", or "fe80::/10".
 type InetAddressMask struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapInetAddressMask(obj *glib.Object) *InetAddressMask {
-	return &InetAddressMask{*glib.Object{obj}}
+	return &InetAddressMask{*externglib.Object{obj}}
 }
 
 func marshalInetAddressMask(p uintptr) (interface{}, error) {
@@ -5873,7 +5873,7 @@ type InetSocketAddress struct {
 }
 
 func wrapInetSocketAddress(obj *glib.Object) *InetSocketAddress {
-	return &InetSocketAddress{SocketAddress{*glib.Object{obj}}}
+	return &InetSocketAddress{SocketAddress{*externglib.Object{obj}}}
 }
 
 func marshalInetSocketAddress(p uintptr) (interface{}, error) {
@@ -5894,11 +5894,11 @@ func marshalInetSocketAddress(p uintptr) (interface{}, error) {
 //
 // All of these functions have async variants too.
 type InputStream struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapInputStream(obj *glib.Object) *InputStream {
-	return &InputStream{*glib.Object{obj}}
+	return &InputStream{*externglib.Object{obj}}
 }
 
 func marshalInputStream(p uintptr) (interface{}, error) {
@@ -5913,11 +5913,11 @@ func marshalInputStream(p uintptr) (interface{}, error) {
 // It provides insertions, deletions, and lookups in logarithmic time with a
 // fast path for the common case of iterating the list linearly.
 type ListStore struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapListStore(obj *glib.Object) *ListStore {
-	return &ListStore{*glib.Object{obj}}
+	return &ListStore{*externglib.Object{obj}}
 }
 
 func marshalListStore(p uintptr) (interface{}, error) {
@@ -5935,7 +5935,7 @@ type MemoryInputStream struct {
 }
 
 func wrapMemoryInputStream(obj *glib.Object) *MemoryInputStream {
-	return &MemoryInputStream{InputStream{*glib.Object{obj}}}
+	return &MemoryInputStream{InputStream{*externglib.Object{obj}}}
 }
 
 func marshalMemoryInputStream(p uintptr) (interface{}, error) {
@@ -5954,7 +5954,7 @@ type MemoryOutputStream struct {
 }
 
 func wrapMemoryOutputStream(obj *glib.Object) *MemoryOutputStream {
-	return &MemoryOutputStream{OutputStream{*glib.Object{obj}}}
+	return &MemoryOutputStream{OutputStream{*externglib.Object{obj}}}
 }
 
 func marshalMemoryOutputStream(p uintptr) (interface{}, error) {
@@ -5975,7 +5975,7 @@ type Menu struct {
 }
 
 func wrapMenu(obj *glib.Object) *Menu {
-	return &Menu{MenuModel{*glib.Object{obj}}}
+	return &Menu{MenuModel{*externglib.Object{obj}}}
 }
 
 func marshalMenu(p uintptr) (interface{}, error) {
@@ -5987,11 +5987,11 @@ func marshalMenu(p uintptr) (interface{}, error) {
 // MenuAttributeIter: GMenuAttributeIter is an opaque structure type. You must
 // access it using the functions below.
 type MenuAttributeIter struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapMenuAttributeIter(obj *glib.Object) *MenuAttributeIter {
-	return &MenuAttributeIter{*glib.Object{obj}}
+	return &MenuAttributeIter{*externglib.Object{obj}}
 }
 
 func marshalMenuAttributeIter(p uintptr) (interface{}, error) {
@@ -6003,11 +6003,11 @@ func marshalMenuAttributeIter(p uintptr) (interface{}, error) {
 // MenuItem: GMenuItem is an opaque structure type. You must access it using the
 // functions below.
 type MenuItem struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapMenuItem(obj *glib.Object) *MenuItem {
-	return &MenuItem{*glib.Object{obj}}
+	return &MenuItem{*externglib.Object{obj}}
 }
 
 func marshalMenuItem(p uintptr) (interface{}, error) {
@@ -6019,11 +6019,11 @@ func marshalMenuItem(p uintptr) (interface{}, error) {
 // MenuLinkIter: GMenuLinkIter is an opaque structure type. You must access it
 // using the functions below.
 type MenuLinkIter struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapMenuLinkIter(obj *glib.Object) *MenuLinkIter {
-	return &MenuLinkIter{*glib.Object{obj}}
+	return &MenuLinkIter{*externglib.Object{obj}}
 }
 
 func marshalMenuLinkIter(p uintptr) (interface{}, error) {
@@ -6142,11 +6142,11 @@ func marshalMenuLinkIter(p uintptr) (interface{}, error) {
 // rendered as "selected" when the state of the action is equal to the target
 // value of the menu item.
 type MenuModel struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapMenuModel(obj *glib.Object) *MenuModel {
-	return &MenuModel{*glib.Object{obj}}
+	return &MenuModel{*externglib.Object{obj}}
 }
 
 func marshalMenuModel(p uintptr) (interface{}, error) {
@@ -6176,11 +6176,11 @@ func marshalMenuModel(p uintptr) (interface{}, error) {
 // with Windows. [VeraCrypt](https://www.veracrypt.fr/) is a maintained fork of
 // TrueCrypt with various improvements and auditing fixes.
 type MountOperation struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapMountOperation(obj *glib.Object) *MountOperation {
-	return &MountOperation{*glib.Object{obj}}
+	return &MountOperation{*externglib.Object{obj}}
 }
 
 func marshalMountOperation(p uintptr) (interface{}, error) {
@@ -6195,7 +6195,7 @@ type NativeSocketAddress struct {
 }
 
 func wrapNativeSocketAddress(obj *glib.Object) *NativeSocketAddress {
-	return &NativeSocketAddress{SocketAddress{*glib.Object{obj}}}
+	return &NativeSocketAddress{SocketAddress{*externglib.Object{obj}}}
 }
 
 func marshalNativeSocketAddress(p uintptr) (interface{}, error) {
@@ -6209,7 +6209,7 @@ type NativeVolumeMonitor struct {
 }
 
 func wrapNativeVolumeMonitor(obj *glib.Object) *NativeVolumeMonitor {
-	return &NativeVolumeMonitor{VolumeMonitor{*glib.Object{obj}}}
+	return &NativeVolumeMonitor{VolumeMonitor{*externglib.Object{obj}}}
 }
 
 func marshalNativeVolumeMonitor(p uintptr) (interface{}, error) {
@@ -6227,11 +6227,11 @@ func marshalNativeVolumeMonitor(p uintptr) (interface{}, error) {
 //
 // See Connectable for an example of using the connectable interface.
 type NetworkAddress struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapNetworkAddress(obj *glib.Object) *NetworkAddress {
-	return &NetworkAddress{*glib.Object{obj}}
+	return &NetworkAddress{*externglib.Object{obj}}
 }
 
 func marshalNetworkAddress(p uintptr) (interface{}, error) {
@@ -6248,11 +6248,11 @@ func marshalNetworkAddress(p uintptr) (interface{}, error) {
 // See Target for more information about SRV records, and see Connectable for an
 // example of using the connectable interface.
 type NetworkService struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapNetworkService(obj *glib.Object) *NetworkService {
-	return &NetworkService{*glib.Object{obj}}
+	return &NetworkService{*externglib.Object{obj}}
 }
 
 func marshalNetworkService(p uintptr) (interface{}, error) {
@@ -6282,11 +6282,11 @@ func marshalNetworkService(p uintptr) (interface{}, error) {
 //
 // A notification can be sent with g_application_send_notification().
 type Notification struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapNotification(obj *glib.Object) *Notification {
-	return &Notification{*glib.Object{obj}}
+	return &Notification{*externglib.Object{obj}}
 }
 
 func marshalNotification(p uintptr) (interface{}, error) {
@@ -6307,11 +6307,11 @@ func marshalNotification(p uintptr) (interface{}, error) {
 //
 // All of these functions have async variants too.
 type OutputStream struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapOutputStream(obj *glib.Object) *OutputStream {
-	return &OutputStream{*glib.Object{obj}}
+	return &OutputStream{*externglib.Object{obj}}
 }
 
 func marshalOutputStream(p uintptr) (interface{}, error) {
@@ -6334,11 +6334,11 @@ func marshalOutputStream(p uintptr) (interface{}, error) {
 // decide if it is appropriate to show a "Click here to unlock" button in a
 // dialog and to provide the mechanism to invoke when that button is clicked.
 type Permission struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapPermission(obj *glib.Object) *Permission {
-	return &Permission{*glib.Object{obj}}
+	return &Permission{*externglib.Object{obj}}
 }
 
 func marshalPermission(p uintptr) (interface{}, error) {
@@ -6396,11 +6396,11 @@ func marshalPermission(p uintptr) (interface{}, error) {
 // setting stored in #GSettings, see g_settings_create_action() instead, and
 // possibly combine its use with g_settings_bind().
 type PropertyAction struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapPropertyAction(obj *glib.Object) *PropertyAction {
-	return &PropertyAction{*glib.Object{obj}}
+	return &PropertyAction{*externglib.Object{obj}}
 }
 
 func marshalPropertyAction(p uintptr) (interface{}, error) {
@@ -6415,7 +6415,7 @@ type ProxyAddress struct {
 }
 
 func wrapProxyAddress(obj *glib.Object) *ProxyAddress {
-	return &ProxyAddress{InetSocketAddress{SocketAddress{*glib.Object{obj}}}}
+	return &ProxyAddress{InetSocketAddress{SocketAddress{*externglib.Object{obj}}}}
 }
 
 func marshalProxyAddress(p uintptr) (interface{}, error) {
@@ -6438,7 +6438,7 @@ type ProxyAddressEnumerator struct {
 }
 
 func wrapProxyAddressEnumerator(obj *glib.Object) *ProxyAddressEnumerator {
-	return &ProxyAddressEnumerator{SocketAddressEnumerator{*glib.Object{obj}}}
+	return &ProxyAddressEnumerator{SocketAddressEnumerator{*externglib.Object{obj}}}
 }
 
 func marshalProxyAddressEnumerator(p uintptr) (interface{}, error) {
@@ -6456,11 +6456,11 @@ func marshalProxyAddressEnumerator(p uintptr) (interface{}, error) {
 // also implement Connectable, making it easy to connect to a remote
 // host/service.
 type Resolver struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapResolver(obj *glib.Object) *Resolver {
-	return &Resolver{*glib.Object{obj}}
+	return &Resolver{*externglib.Object{obj}}
 }
 
 func marshalResolver(p uintptr) (interface{}, error) {
@@ -6703,11 +6703,11 @@ func marshalResolver(p uintptr) (interface{}, error) {
 // rules. It should not be committed to version control or included in
 // `EXTRA_DIST`.
 type Settings struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSettings(obj *glib.Object) *Settings {
-	return &Settings{*glib.Object{obj}}
+	return &Settings{*externglib.Object{obj}}
 }
 
 func marshalSettings(p uintptr) (interface{}, error) {
@@ -6740,11 +6740,11 @@ func marshalSettings(p uintptr) (interface{}, error) {
 // reason, you have to define the C preprocessor symbol
 // G_SETTINGS_ENABLE_BACKEND before including `gio/gsettingsbackend.h`.
 type SettingsBackend struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSettingsBackend(obj *glib.Object) *SettingsBackend {
-	return &SettingsBackend{*glib.Object{obj}}
+	return &SettingsBackend{*externglib.Object{obj}}
 }
 
 func marshalSettingsBackend(p uintptr) (interface{}, error) {
@@ -6759,11 +6759,11 @@ func marshalSettingsBackend(p uintptr) (interface{}, error) {
 //
 // See also Action.
 type SimpleAction struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSimpleAction(obj *glib.Object) *SimpleAction {
-	return &SimpleAction{*glib.Object{obj}}
+	return &SimpleAction{*externglib.Object{obj}}
 }
 
 func marshalSimpleAction(p uintptr) (interface{}, error) {
@@ -6775,11 +6775,11 @@ func marshalSimpleAction(p uintptr) (interface{}, error) {
 // SimpleActionGroup: GSimpleActionGroup is a hash table filled with #GAction
 // objects, implementing the Group and Map interfaces.
 type SimpleActionGroup struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSimpleActionGroup(obj *glib.Object) *SimpleActionGroup {
-	return &SimpleActionGroup{*glib.Object{obj}}
+	return &SimpleActionGroup{*externglib.Object{obj}}
 }
 
 func marshalSimpleActionGroup(p uintptr) (interface{}, error) {
@@ -6947,11 +6947,11 @@ func marshalSimpleActionGroup(p uintptr) (interface{}, error) {
 //    }
 //
 type SimpleAsyncResult struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSimpleAsyncResult(obj *glib.Object) *SimpleAsyncResult {
-	return &SimpleAsyncResult{*glib.Object{obj}}
+	return &SimpleAsyncResult{*externglib.Object{obj}}
 }
 
 func marshalSimpleAsyncResult(p uintptr) (interface{}, error) {
@@ -6973,7 +6973,7 @@ type SimpleIOStream struct {
 }
 
 func wrapSimpleIOStream(obj *glib.Object) *SimpleIOStream {
-	return &SimpleIOStream{IOStream{*glib.Object{obj}}}
+	return &SimpleIOStream{IOStream{*externglib.Object{obj}}}
 }
 
 func marshalSimpleIOStream(p uintptr) (interface{}, error) {
@@ -6992,7 +6992,7 @@ type SimplePermission struct {
 }
 
 func wrapSimplePermission(obj *glib.Object) *SimplePermission {
-	return &SimplePermission{Permission{*glib.Object{obj}}}
+	return &SimplePermission{Permission{*externglib.Object{obj}}}
 }
 
 func marshalSimplePermission(p uintptr) (interface{}, error) {
@@ -7009,11 +7009,11 @@ func marshalSimplePermission(p uintptr) (interface{}, error) {
 // base class for another proxy resolver implementation, or it can be created
 // and used manually, such as with g_socket_client_set_proxy_resolver().
 type SimpleProxyResolver struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSimpleProxyResolver(obj *glib.Object) *SimpleProxyResolver {
-	return &SimpleProxyResolver{*glib.Object{obj}}
+	return &SimpleProxyResolver{*externglib.Object{obj}}
 }
 
 func marshalSimpleProxyResolver(p uintptr) (interface{}, error) {
@@ -7071,11 +7071,11 @@ func marshalSimpleProxyResolver(p uintptr) (interface{}, error) {
 // a #GSocket concurrently from multiple threads, you must implement your own
 // locking.
 type Socket struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSocket(obj *glib.Object) *Socket {
-	return &Socket{*glib.Object{obj}}
+	return &Socket{*externglib.Object{obj}}
 }
 
 func marshalSocket(p uintptr) (interface{}, error) {
@@ -7088,11 +7088,11 @@ func marshalSocket(p uintptr) (interface{}, error) {
 // sockets API. This is an abstract class; use SocketAddress for internet
 // sockets, or SocketAddress for UNIX domain sockets.
 type SocketAddress struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSocketAddress(obj *glib.Object) *SocketAddress {
-	return &SocketAddress{*glib.Object{obj}}
+	return &SocketAddress{*externglib.Object{obj}}
 }
 
 func marshalSocketAddress(p uintptr) (interface{}, error) {
@@ -7114,11 +7114,11 @@ func marshalSocketAddress(p uintptr) (interface{}, error) {
 // g_socket_address_enumerator_next() has returned nil, further enumeration with
 // that AddressEnumerator is not possible, and it can be unreffed.
 type SocketAddressEnumerator struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSocketAddressEnumerator(obj *glib.Object) *SocketAddressEnumerator {
-	return &SocketAddressEnumerator{*glib.Object{obj}}
+	return &SocketAddressEnumerator{*externglib.Object{obj}}
 }
 
 func marshalSocketAddressEnumerator(p uintptr) (interface{}, error) {
@@ -7140,11 +7140,11 @@ func marshalSocketAddressEnumerator(p uintptr) (interface{}, error) {
 // As Client is a lightweight object, you don't need to cache it. You can just
 // create a new one any time you need one.
 type SocketClient struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSocketClient(obj *glib.Object) *SocketClient {
-	return &SocketClient{*glib.Object{obj}}
+	return &SocketClient{*externglib.Object{obj}}
 }
 
 func marshalSocketClient(p uintptr) (interface{}, error) {
@@ -7173,7 +7173,7 @@ type SocketConnection struct {
 }
 
 func wrapSocketConnection(obj *glib.Object) *SocketConnection {
-	return &SocketConnection{IOStream{*glib.Object{obj}}}
+	return &SocketConnection{IOStream{*externglib.Object{obj}}}
 }
 
 func marshalSocketConnection(p uintptr) (interface{}, error) {
@@ -7201,11 +7201,11 @@ func marshalSocketConnection(p uintptr) (interface{}, error) {
 // registered with the GType typesystem before calling
 // g_socket_receive_message() to read such a message.
 type SocketControlMessage struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSocketControlMessage(obj *glib.Object) *SocketControlMessage {
-	return &SocketControlMessage{*glib.Object{obj}}
+	return &SocketControlMessage{*externglib.Object{obj}}
 }
 
 func marshalSocketControlMessage(p uintptr) (interface{}, error) {
@@ -7227,11 +7227,11 @@ func marshalSocketControlMessage(p uintptr) (interface{}, error) {
 // If you want to implement a network server, also look at Service and
 // SocketService which are subclasses of Listener that make this even easier.
 type SocketListener struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSocketListener(obj *glib.Object) *SocketListener {
-	return &SocketListener{*glib.Object{obj}}
+	return &SocketListener{*externglib.Object{obj}}
 }
 
 func marshalSocketListener(p uintptr) (interface{}, error) {
@@ -7267,7 +7267,7 @@ type SocketService struct {
 }
 
 func wrapSocketService(obj *glib.Object) *SocketService {
-	return &SocketService{SocketListener{*glib.Object{obj}}}
+	return &SocketService{SocketListener{*externglib.Object{obj}}}
 }
 
 func marshalSocketService(p uintptr) (interface{}, error) {
@@ -7326,11 +7326,11 @@ func marshalSocketService(p uintptr) (interface{}, error) {
 // g_subprocess_get_if_exited() (which are similar to the familiar
 // WIFEXITED-style POSIX macros).
 type Subprocess struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSubprocess(obj *glib.Object) *Subprocess {
-	return &Subprocess{*glib.Object{obj}}
+	return &Subprocess{*externglib.Object{obj}}
 }
 
 func marshalSubprocess(p uintptr) (interface{}, error) {
@@ -7347,11 +7347,11 @@ func marshalSubprocess(p uintptr) (interface{}, error) {
 // use of this class allows access to more advanced options. It can also be used
 // to launch multiple subprocesses with a similar configuration.
 type SubprocessLauncher struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSubprocessLauncher(obj *glib.Object) *SubprocessLauncher {
-	return &SubprocessLauncher{*glib.Object{obj}}
+	return &SubprocessLauncher{*externglib.Object{obj}}
 }
 
 func marshalSubprocessLauncher(p uintptr) (interface{}, error) {
@@ -7776,11 +7776,11 @@ func marshalSubprocessLauncher(p uintptr) (interface{}, error) {
 //    function (for "short-circuit" results, such as when passing
 //    0 to g_input_stream_read_async())
 type Task struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTask(obj *glib.Object) *Task {
-	return &Task{*glib.Object{obj}}
+	return &Task{*externglib.Object{obj}}
 }
 
 func marshalTask(p uintptr) (interface{}, error) {
@@ -7796,7 +7796,7 @@ type TcpConnection struct {
 }
 
 func wrapTcpConnection(obj *glib.Object) *TcpConnection {
-	return &TcpConnection{SocketConnection{IOStream{*glib.Object{obj}}}}
+	return &TcpConnection{SocketConnection{IOStream{*externglib.Object{obj}}}}
 }
 
 func marshalTcpConnection(p uintptr) (interface{}, error) {
@@ -7814,7 +7814,7 @@ type TcpWrapperConnection struct {
 }
 
 func wrapTcpWrapperConnection(obj *glib.Object) *TcpWrapperConnection {
-	return &TcpWrapperConnection{TcpConnection{SocketConnection{IOStream{*glib.Object{obj}}}}}
+	return &TcpWrapperConnection{TcpConnection{SocketConnection{IOStream{*externglib.Object{obj}}}}}
 }
 
 func marshalTcpWrapperConnection(p uintptr) (interface{}, error) {
@@ -7886,11 +7886,11 @@ func marshalTcpWrapperConnection(p uintptr) (interface{}, error) {
 //        CLEANFILES += gschemas.compiled
 //
 type TestDBus struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTestDBus(obj *glib.Object) *TestDBus {
-	return &TestDBus{*glib.Object{obj}}
+	return &TestDBus{*externglib.Object{obj}}
 }
 
 func marshalTestDBus(p uintptr) (interface{}, error) {
@@ -7906,11 +7906,11 @@ func marshalTestDBus(p uintptr) (interface{}, error) {
 // gtk_icon_theme_choose_icon() should be used to resolve the list of names so
 // that fallback icons work nicely with themes that inherit other themes.
 type ThemedIcon struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapThemedIcon(obj *glib.Object) *ThemedIcon {
-	return &ThemedIcon{*glib.Object{obj}}
+	return &ThemedIcon{*externglib.Object{obj}}
 }
 
 func marshalThemedIcon(p uintptr) (interface{}, error) {
@@ -7937,7 +7937,7 @@ type ThreadedSocketService struct {
 }
 
 func wrapThreadedSocketService(obj *glib.Object) *ThreadedSocketService {
-	return &ThreadedSocketService{SocketService{SocketListener{*glib.Object{obj}}}}
+	return &ThreadedSocketService{SocketService{SocketListener{*externglib.Object{obj}}}}
 }
 
 func marshalThreadedSocketService(p uintptr) (interface{}, error) {
@@ -7951,11 +7951,11 @@ func marshalThreadedSocketService(p uintptr) (interface{}, error) {
 // a client from a server), or the combination of a certificate and a private
 // key (which is needed when acting as a ServerConnection).
 type TlsCertificate struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTlsCertificate(obj *glib.Object) *TlsCertificate {
-	return &TlsCertificate{*glib.Object{obj}}
+	return &TlsCertificate{*externglib.Object{obj}}
 }
 
 func marshalTlsCertificate(p uintptr) (interface{}, error) {
@@ -7975,7 +7975,7 @@ type TlsConnection struct {
 }
 
 func wrapTlsConnection(obj *glib.Object) *TlsConnection {
-	return &TlsConnection{IOStream{*glib.Object{obj}}}
+	return &TlsConnection{IOStream{*externglib.Object{obj}}}
 }
 
 func marshalTlsConnection(p uintptr) (interface{}, error) {
@@ -7994,11 +7994,11 @@ func marshalTlsConnection(p uintptr) (interface{}, error) {
 // Most common client applications will not directly interact with Database. It
 // is used internally by Connection.
 type TlsDatabase struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTlsDatabase(obj *glib.Object) *TlsDatabase {
-	return &TlsDatabase{*glib.Object{obj}}
+	return &TlsDatabase{*externglib.Object{obj}}
 }
 
 func marshalTlsDatabase(p uintptr) (interface{}, error) {
@@ -8028,11 +8028,11 @@ func marshalTlsDatabase(p uintptr) (interface{}, error) {
 // G_TLS_INTERACTION_UNHANDLED. If a derived class implements an async method,
 // it must also implement the corresponding finish method.
 type TlsInteraction struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTlsInteraction(obj *glib.Object) *TlsInteraction {
-	return &TlsInteraction{*glib.Object{obj}}
+	return &TlsInteraction{*externglib.Object{obj}}
 }
 
 func marshalTlsInteraction(p uintptr) (interface{}, error) {
@@ -8043,11 +8043,11 @@ func marshalTlsInteraction(p uintptr) (interface{}, error) {
 
 // TlsPassword: holds a password used in TLS.
 type TlsPassword struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTlsPassword(obj *glib.Object) *TlsPassword {
-	return &TlsPassword{*glib.Object{obj}}
+	return &TlsPassword{*externglib.Object{obj}}
 }
 
 func marshalTlsPassword(p uintptr) (interface{}, error) {
@@ -8070,7 +8070,7 @@ type UnixConnection struct {
 }
 
 func wrapUnixConnection(obj *glib.Object) *UnixConnection {
-	return &UnixConnection{SocketConnection{IOStream{*glib.Object{obj}}}}
+	return &UnixConnection{SocketConnection{IOStream{*externglib.Object{obj}}}}
 }
 
 func marshalUnixConnection(p uintptr) (interface{}, error) {
@@ -8093,7 +8093,7 @@ type UnixCredentialsMessage struct {
 }
 
 func wrapUnixCredentialsMessage(obj *glib.Object) *UnixCredentialsMessage {
-	return &UnixCredentialsMessage{SocketControlMessage{*glib.Object{obj}}}
+	return &UnixCredentialsMessage{SocketControlMessage{*externglib.Object{obj}}}
 }
 
 func marshalUnixCredentialsMessage(p uintptr) (interface{}, error) {
@@ -8112,11 +8112,11 @@ func marshalUnixCredentialsMessage(p uintptr) (interface{}, error) {
 // Note that `<gio/gunixfdlist.h>` belongs to the UNIX-specific GIO interfaces,
 // thus you have to use the `gio-unix-2.0.pc` pkg-config file when using it.
 type UnixFDList struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapUnixFDList(obj *glib.Object) *UnixFDList {
-	return &UnixFDList{*glib.Object{obj}}
+	return &UnixFDList{*externglib.Object{obj}}
 }
 
 func marshalUnixFDList(p uintptr) (interface{}, error) {
@@ -8142,7 +8142,7 @@ type UnixFDMessage struct {
 }
 
 func wrapUnixFDMessage(obj *glib.Object) *UnixFDMessage {
-	return &UnixFDMessage{SocketControlMessage{*glib.Object{obj}}}
+	return &UnixFDMessage{SocketControlMessage{*externglib.Object{obj}}}
 }
 
 func marshalUnixFDMessage(p uintptr) (interface{}, error) {
@@ -8165,7 +8165,7 @@ type UnixInputStream struct {
 }
 
 func wrapUnixInputStream(obj *glib.Object) *UnixInputStream {
-	return &UnixInputStream{InputStream{*glib.Object{obj}}}
+	return &UnixInputStream{InputStream{*externglib.Object{obj}}}
 }
 
 func marshalUnixInputStream(p uintptr) (interface{}, error) {
@@ -8176,11 +8176,11 @@ func marshalUnixInputStream(p uintptr) (interface{}, error) {
 
 // UnixMountMonitor: watches Mounts for changes.
 type UnixMountMonitor struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapUnixMountMonitor(obj *glib.Object) *UnixMountMonitor {
-	return &UnixMountMonitor{*glib.Object{obj}}
+	return &UnixMountMonitor{*externglib.Object{obj}}
 }
 
 func marshalUnixMountMonitor(p uintptr) (interface{}, error) {
@@ -8203,7 +8203,7 @@ type UnixOutputStream struct {
 }
 
 func wrapUnixOutputStream(obj *glib.Object) *UnixOutputStream {
-	return &UnixOutputStream{OutputStream{*glib.Object{obj}}}
+	return &UnixOutputStream{OutputStream{*externglib.Object{obj}}}
 }
 
 func marshalUnixOutputStream(p uintptr) (interface{}, error) {
@@ -8230,7 +8230,7 @@ type UnixSocketAddress struct {
 }
 
 func wrapUnixSocketAddress(obj *glib.Object) *UnixSocketAddress {
-	return &UnixSocketAddress{SocketAddress{*glib.Object{obj}}}
+	return &UnixSocketAddress{SocketAddress{*externglib.Object{obj}}}
 }
 
 func marshalUnixSocketAddress(p uintptr) (interface{}, error) {
@@ -8241,11 +8241,11 @@ func marshalUnixSocketAddress(p uintptr) (interface{}, error) {
 
 // Vfs: entry point for using GIO functionality.
 type Vfs struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapVfs(obj *glib.Object) *Vfs {
-	return &Vfs{*glib.Object{obj}}
+	return &Vfs{*externglib.Object{obj}}
 }
 
 func marshalVfs(p uintptr) (interface{}, error) {
@@ -8265,11 +8265,11 @@ func marshalVfs(p uintptr) (interface{}, error) {
 // In order to receive updates about volumes and mounts monitored through GVFS,
 // a main loop must be running.
 type VolumeMonitor struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapVolumeMonitor(obj *glib.Object) *VolumeMonitor {
-	return &VolumeMonitor{*glib.Object{obj}}
+	return &VolumeMonitor{*externglib.Object{obj}}
 }
 
 func marshalVolumeMonitor(p uintptr) (interface{}, error) {
@@ -8280,11 +8280,11 @@ func marshalVolumeMonitor(p uintptr) (interface{}, error) {
 
 // ZlibCompressor: zlib decompression
 type ZlibCompressor struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapZlibCompressor(obj *glib.Object) *ZlibCompressor {
-	return &ZlibCompressor{*glib.Object{obj}}
+	return &ZlibCompressor{*externglib.Object{obj}}
 }
 
 func marshalZlibCompressor(p uintptr) (interface{}, error) {
@@ -8295,11 +8295,11 @@ func marshalZlibCompressor(p uintptr) (interface{}, error) {
 
 // ZlibDecompressor: zlib decompression
 type ZlibDecompressor struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapZlibDecompressor(obj *glib.Object) *ZlibDecompressor {
-	return &ZlibDecompressor{*glib.Object{obj}}
+	return &ZlibDecompressor{*externglib.Object{obj}}
 }
 
 func marshalZlibDecompressor(p uintptr) (interface{}, error) {
diff --git a/pkg/glib/glib.go b/pkg/glib/glib.go
index b6339b8da..f45643471 100644
--- a/pkg/glib/glib.go
+++ b/pkg/glib/glib.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"unsafe"
 
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: glib-2.0
@@ -15,7 +15,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 		// Enums
 		// Skipped BookmarkFileError.
 		// Skipped ChecksumType.
@@ -6362,7 +6362,7 @@ func StrvContains(strv string, str string) bool
 // Two empty arrays are considered equal. Neither @strv1 not @strv2 may be nil.
 func StrvEqual(strv1 string, strv2 string) bool
 
-func StrvGetType() glib.Type
+func StrvGetType() externglib.Type
 
 // StrvLength: returns the length of the given nil-terminated string array
 // @str_array. @str_array must not be nil.
@@ -7878,7 +7878,7 @@ func UuidStringIsValid(str string) bool
 // pads.
 func UuidStringRandom() string
 
-func VariantGetGtype() glib.Type
+func VariantGetGtype() externglib.Type
 
 // VariantIsObjectPath: determines if a given string is a valid D-Bus object
 // path. You should ensure that a string is a valid D-Bus object path before
diff --git a/pkg/graphene/graphene.go b/pkg/graphene/graphene.go
index e65b23b37..89d933270 100644
--- a/pkg/graphene/graphene.go
+++ b/pkg/graphene/graphene.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"unsafe"
 
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: graphene-gobject-1.0
@@ -15,7 +15,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 		// Enums
 		// Skipped EulerOrder.
 		// Skipped RayIntersectionKind.
diff --git a/pkg/gsk/gsk.go b/pkg/gsk/gsk.go
index a4e2afe03..cec43958b 100644
--- a/pkg/gsk/gsk.go
+++ b/pkg/gsk/gsk.go
@@ -9,7 +9,7 @@ import (
 	"github.com/diamondburned/gotk4/pkg/gdk"
 	"github.com/diamondburned/gotk4/pkg/glib"
 	"github.com/diamondburned/gotk4/pkg/graphene"
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: gtk4
@@ -18,15 +18,15 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 		// Enums
-		{T: glib.Type(C.gsk_blend_mode_get_type()), F: marshalBlendMode},
-		{T: glib.Type(C.gsk_corner_get_type()), F: marshalCorner},
-		{T: glib.Type(C.gsk_gl_uniform_type_get_type()), F: marshalGLUniformType},
-		{T: glib.Type(C.gsk_render_node_type_get_type()), F: marshalRenderNodeType},
-		{T: glib.Type(C.gsk_scaling_filter_get_type()), F: marshalScalingFilter},
-		{T: glib.Type(C.gsk_serialization_error_get_type()), F: marshalSerializationError},
-		{T: glib.Type(C.gsk_transform_category_get_type()), F: marshalTransformCategory},
+		{T: externglib.Type(C.gsk_blend_mode_get_type()), F: marshalBlendMode},
+		{T: externglib.Type(C.gsk_corner_get_type()), F: marshalCorner},
+		{T: externglib.Type(C.gsk_gl_uniform_type_get_type()), F: marshalGLUniformType},
+		{T: externglib.Type(C.gsk_render_node_type_get_type()), F: marshalRenderNodeType},
+		{T: externglib.Type(C.gsk_scaling_filter_get_type()), F: marshalScalingFilter},
+		{T: externglib.Type(C.gsk_serialization_error_get_type()), F: marshalSerializationError},
+		{T: externglib.Type(C.gsk_transform_category_get_type()), F: marshalTransformCategory},
 
 		// Objects/Classes
 	})
@@ -573,7 +573,7 @@ type CairoRenderer struct {
 }
 
 func wrapCairoRenderer(obj *glib.Object) *CairoRenderer {
-	return &CairoRenderer{Renderer{*glib.Object{obj}}}
+	return &CairoRenderer{Renderer{*externglib.Object{obj}}}
 }
 
 func marshalCairoRenderer(p uintptr) (interface{}, error) {
@@ -694,7 +694,7 @@ type GLRenderer struct {
 }
 
 func wrapGLRenderer(obj *glib.Object) *GLRenderer {
-	return &GLRenderer{Renderer{*glib.Object{obj}}}
+	return &GLRenderer{Renderer{*externglib.Object{obj}}}
 }
 
 func marshalGLRenderer(p uintptr) (interface{}, error) {
@@ -705,11 +705,11 @@ func marshalGLRenderer(p uintptr) (interface{}, error) {
 
 // GLShader: an object representing a GL shader program.
 type GLShader struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapGLShader(obj *glib.Object) *GLShader {
-	return &GLShader{*glib.Object{obj}}
+	return &GLShader{*externglib.Object{obj}}
 }
 
 func marshalGLShader(p uintptr) (interface{}, error) {
@@ -812,11 +812,11 @@ func marshalRadialGradientNode(p uintptr) (interface{}, error) {
 // Renderer: base type for the object managing the rendering pipeline for a
 // Surface.
 type Renderer struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapRenderer(obj *glib.Object) *Renderer {
-	return &Renderer{*glib.Object{obj}}
+	return &Renderer{*externglib.Object{obj}}
 }
 
 func marshalRenderer(p uintptr) (interface{}, error) {
@@ -952,7 +952,7 @@ type VulkanRenderer struct {
 }
 
 func wrapVulkanRenderer(obj *glib.Object) *VulkanRenderer {
-	return &VulkanRenderer{Renderer{*glib.Object{obj}}}
+	return &VulkanRenderer{Renderer{*externglib.Object{obj}}}
 }
 
 func marshalVulkanRenderer(p uintptr) (interface{}, error) {
diff --git a/pkg/gtk/gtk.go b/pkg/gtk/gtk.go
index e1e8a1971..278dcc9c1 100644
--- a/pkg/gtk/gtk.go
+++ b/pkg/gtk/gtk.go
@@ -12,7 +12,7 @@ import (
 	"github.com/diamondburned/gotk4/pkg/gio"
 	"github.com/diamondburned/gotk4/pkg/glib"
 	"github.com/diamondburned/gotk4/pkg/pango"
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: gtk4
@@ -21,101 +21,101 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 		// Enums
-		{T: glib.Type(C.gtk_accessible_autocomplete_get_type()), F: marshalAccessibleAutocomplete},
-		{T: glib.Type(C.gtk_accessible_invalid_state_get_type()), F: marshalAccessibleInvalidState},
-		{T: glib.Type(C.gtk_accessible_property_get_type()), F: marshalAccessibleProperty},
-		{T: glib.Type(C.gtk_accessible_relation_get_type()), F: marshalAccessibleRelation},
-		{T: glib.Type(C.gtk_accessible_role_get_type()), F: marshalAccessibleRole},
-		{T: glib.Type(C.gtk_accessible_sort_get_type()), F: marshalAccessibleSort},
-		{T: glib.Type(C.gtk_accessible_state_get_type()), F: marshalAccessibleState},
-		{T: glib.Type(C.gtk_accessible_tristate_get_type()), F: marshalAccessibleTristate},
-		{T: glib.Type(C.gtk_align_get_type()), F: marshalAlign},
-		{T: glib.Type(C.gtk_arrow_type_get_type()), F: marshalArrowType},
-		{T: glib.Type(C.gtk_assistant_page_type_get_type()), F: marshalAssistantPageType},
-		{T: glib.Type(C.gtk_baseline_position_get_type()), F: marshalBaselinePosition},
-		{T: glib.Type(C.gtk_border_style_get_type()), F: marshalBorderStyle},
-		{T: glib.Type(C.gtk_builder_error_get_type()), F: marshalBuilderError},
-		{T: glib.Type(C.gtk_buttons_type_get_type()), F: marshalButtonsType},
-		{T: glib.Type(C.gtk_cell_renderer_accel_mode_get_type()), F: marshalCellRendererAccelMode},
-		{T: glib.Type(C.gtk_cell_renderer_mode_get_type()), F: marshalCellRendererMode},
-		{T: glib.Type(C.gtk_constraint_attribute_get_type()), F: marshalConstraintAttribute},
-		{T: glib.Type(C.gtk_constraint_relation_get_type()), F: marshalConstraintRelation},
-		{T: glib.Type(C.gtk_constraint_strength_get_type()), F: marshalConstraintStrength},
-		{T: glib.Type(C.gtk_constraint_vfl_parser_error_get_type()), F: marshalConstraintVflParserError},
-		{T: glib.Type(C.gtk_corner_type_get_type()), F: marshalCornerType},
+		{T: externglib.Type(C.gtk_accessible_autocomplete_get_type()), F: marshalAccessibleAutocomplete},
+		{T: externglib.Type(C.gtk_accessible_invalid_state_get_type()), F: marshalAccessibleInvalidState},
+		{T: externglib.Type(C.gtk_accessible_property_get_type()), F: marshalAccessibleProperty},
+		{T: externglib.Type(C.gtk_accessible_relation_get_type()), F: marshalAccessibleRelation},
+		{T: externglib.Type(C.gtk_accessible_role_get_type()), F: marshalAccessibleRole},
+		{T: externglib.Type(C.gtk_accessible_sort_get_type()), F: marshalAccessibleSort},
+		{T: externglib.Type(C.gtk_accessible_state_get_type()), F: marshalAccessibleState},
+		{T: externglib.Type(C.gtk_accessible_tristate_get_type()), F: marshalAccessibleTristate},
+		{T: externglib.Type(C.gtk_align_get_type()), F: marshalAlign},
+		{T: externglib.Type(C.gtk_arrow_type_get_type()), F: marshalArrowType},
+		{T: externglib.Type(C.gtk_assistant_page_type_get_type()), F: marshalAssistantPageType},
+		{T: externglib.Type(C.gtk_baseline_position_get_type()), F: marshalBaselinePosition},
+		{T: externglib.Type(C.gtk_border_style_get_type()), F: marshalBorderStyle},
+		{T: externglib.Type(C.gtk_builder_error_get_type()), F: marshalBuilderError},
+		{T: externglib.Type(C.gtk_buttons_type_get_type()), F: marshalButtonsType},
+		{T: externglib.Type(C.gtk_cell_renderer_accel_mode_get_type()), F: marshalCellRendererAccelMode},
+		{T: externglib.Type(C.gtk_cell_renderer_mode_get_type()), F: marshalCellRendererMode},
+		{T: externglib.Type(C.gtk_constraint_attribute_get_type()), F: marshalConstraintAttribute},
+		{T: externglib.Type(C.gtk_constraint_relation_get_type()), F: marshalConstraintRelation},
+		{T: externglib.Type(C.gtk_constraint_strength_get_type()), F: marshalConstraintStrength},
+		{T: externglib.Type(C.gtk_constraint_vfl_parser_error_get_type()), F: marshalConstraintVflParserError},
+		{T: externglib.Type(C.gtk_corner_type_get_type()), F: marshalCornerType},
 		// Skipped CssParserError.
 		// Skipped CssParserWarning.
-		{T: glib.Type(C.gtk_delete_type_get_type()), F: marshalDeleteType},
-		{T: glib.Type(C.gtk_direction_type_get_type()), F: marshalDirectionType},
-		{T: glib.Type(C.gtk_editable_properties_get_type()), F: marshalEditableProperties},
-		{T: glib.Type(C.gtk_entry_icon_position_get_type()), F: marshalEntryIconPosition},
-		{T: glib.Type(C.gtk_event_sequence_state_get_type()), F: marshalEventSequenceState},
-		{T: glib.Type(C.gtk_file_chooser_action_get_type()), F: marshalFileChooserAction},
-		{T: glib.Type(C.gtk_file_chooser_error_get_type()), F: marshalFileChooserError},
-		{T: glib.Type(C.gtk_filter_change_get_type()), F: marshalFilterChange},
-		{T: glib.Type(C.gtk_filter_match_get_type()), F: marshalFilterMatch},
-		{T: glib.Type(C.gtk_icon_size_get_type()), F: marshalIconSize},
-		{T: glib.Type(C.gtk_icon_theme_error_get_type()), F: marshalIconThemeError},
-		{T: glib.Type(C.gtk_icon_view_drop_position_get_type()), F: marshalIconViewDropPosition},
-		{T: glib.Type(C.gtk_image_type_get_type()), F: marshalImageType},
-		{T: glib.Type(C.gtk_input_purpose_get_type()), F: marshalInputPurpose},
-		{T: glib.Type(C.gtk_justification_get_type()), F: marshalJustification},
-		{T: glib.Type(C.gtk_level_bar_mode_get_type()), F: marshalLevelBarMode},
-		{T: glib.Type(C.gtk_license_get_type()), F: marshalLicense},
-		{T: glib.Type(C.gtk_message_type_get_type()), F: marshalMessageType},
-		{T: glib.Type(C.gtk_movement_step_get_type()), F: marshalMovementStep},
-		{T: glib.Type(C.gtk_notebook_tab_get_type()), F: marshalNotebookTab},
-		{T: glib.Type(C.gtk_number_up_layout_get_type()), F: marshalNumberUpLayout},
-		{T: glib.Type(C.gtk_ordering_get_type()), F: marshalOrdering},
-		{T: glib.Type(C.gtk_orientation_get_type()), F: marshalOrientation},
-		{T: glib.Type(C.gtk_overflow_get_type()), F: marshalOverflow},
-		{T: glib.Type(C.gtk_pack_type_get_type()), F: marshalPackType},
-		{T: glib.Type(C.gtk_pad_action_type_get_type()), F: marshalPadActionType},
-		{T: glib.Type(C.gtk_page_orientation_get_type()), F: marshalPageOrientation},
-		{T: glib.Type(C.gtk_page_set_get_type()), F: marshalPageSet},
-		{T: glib.Type(C.gtk_pan_direction_get_type()), F: marshalPanDirection},
-		{T: glib.Type(C.gtk_policy_type_get_type()), F: marshalPolicyType},
-		{T: glib.Type(C.gtk_position_type_get_type()), F: marshalPositionType},
-		{T: glib.Type(C.gtk_print_duplex_get_type()), F: marshalPrintDuplex},
-		{T: glib.Type(C.gtk_print_error_get_type()), F: marshalPrintError},
-		{T: glib.Type(C.gtk_print_operation_action_get_type()), F: marshalPrintOperationAction},
-		{T: glib.Type(C.gtk_print_operation_result_get_type()), F: marshalPrintOperationResult},
-		{T: glib.Type(C.gtk_print_pages_get_type()), F: marshalPrintPages},
-		{T: glib.Type(C.gtk_print_quality_get_type()), F: marshalPrintQuality},
-		{T: glib.Type(C.gtk_print_status_get_type()), F: marshalPrintStatus},
-		{T: glib.Type(C.gtk_propagation_limit_get_type()), F: marshalPropagationLimit},
-		{T: glib.Type(C.gtk_propagation_phase_get_type()), F: marshalPropagationPhase},
-		{T: glib.Type(C.gtk_recent_manager_error_get_type()), F: marshalRecentManagerError},
-		{T: glib.Type(C.gtk_response_type_get_type()), F: marshalResponseType},
-		{T: glib.Type(C.gtk_revealer_transition_type_get_type()), F: marshalRevealerTransitionType},
-		{T: glib.Type(C.gtk_scroll_step_get_type()), F: marshalScrollStep},
-		{T: glib.Type(C.gtk_scroll_type_get_type()), F: marshalScrollType},
-		{T: glib.Type(C.gtk_scrollable_policy_get_type()), F: marshalScrollablePolicy},
-		{T: glib.Type(C.gtk_selection_mode_get_type()), F: marshalSelectionMode},
-		{T: glib.Type(C.gtk_sensitivity_type_get_type()), F: marshalSensitivityType},
-		{T: glib.Type(C.gtk_shortcut_scope_get_type()), F: marshalShortcutScope},
-		{T: glib.Type(C.gtk_shortcut_type_get_type()), F: marshalShortcutType},
-		{T: glib.Type(C.gtk_size_group_mode_get_type()), F: marshalSizeGroupMode},
-		{T: glib.Type(C.gtk_size_request_mode_get_type()), F: marshalSizeRequestMode},
-		{T: glib.Type(C.gtk_sort_type_get_type()), F: marshalSortType},
-		{T: glib.Type(C.gtk_sorter_change_get_type()), F: marshalSorterChange},
-		{T: glib.Type(C.gtk_sorter_order_get_type()), F: marshalSorterOrder},
-		{T: glib.Type(C.gtk_spin_button_update_policy_get_type()), F: marshalSpinButtonUpdatePolicy},
-		{T: glib.Type(C.gtk_spin_type_get_type()), F: marshalSpinType},
-		{T: glib.Type(C.gtk_stack_transition_type_get_type()), F: marshalStackTransitionType},
-		{T: glib.Type(C.gtk_string_filter_match_mode_get_type()), F: marshalStringFilterMatchMode},
-		{T: glib.Type(C.gtk_system_setting_get_type()), F: marshalSystemSetting},
-		{T: glib.Type(C.gtk_text_direction_get_type()), F: marshalTextDirection},
-		{T: glib.Type(C.gtk_text_extend_selection_get_type()), F: marshalTextExtendSelection},
-		{T: glib.Type(C.gtk_text_view_layer_get_type()), F: marshalTextViewLayer},
-		{T: glib.Type(C.gtk_text_window_type_get_type()), F: marshalTextWindowType},
-		{T: glib.Type(C.gtk_tree_view_column_sizing_get_type()), F: marshalTreeViewColumnSizing},
-		{T: glib.Type(C.gtk_tree_view_drop_position_get_type()), F: marshalTreeViewDropPosition},
-		{T: glib.Type(C.gtk_tree_view_grid_lines_get_type()), F: marshalTreeViewGridLines},
-		{T: glib.Type(C.gtk_unit_get_type()), F: marshalUnit},
-		{T: glib.Type(C.gtk_wrap_mode_get_type()), F: marshalWrapMode},
+		{T: externglib.Type(C.gtk_delete_type_get_type()), F: marshalDeleteType},
+		{T: externglib.Type(C.gtk_direction_type_get_type()), F: marshalDirectionType},
+		{T: externglib.Type(C.gtk_editable_properties_get_type()), F: marshalEditableProperties},
+		{T: externglib.Type(C.gtk_entry_icon_position_get_type()), F: marshalEntryIconPosition},
+		{T: externglib.Type(C.gtk_event_sequence_state_get_type()), F: marshalEventSequenceState},
+		{T: externglib.Type(C.gtk_file_chooser_action_get_type()), F: marshalFileChooserAction},
+		{T: externglib.Type(C.gtk_file_chooser_error_get_type()), F: marshalFileChooserError},
+		{T: externglib.Type(C.gtk_filter_change_get_type()), F: marshalFilterChange},
+		{T: externglib.Type(C.gtk_filter_match_get_type()), F: marshalFilterMatch},
+		{T: externglib.Type(C.gtk_icon_size_get_type()), F: marshalIconSize},
+		{T: externglib.Type(C.gtk_icon_theme_error_get_type()), F: marshalIconThemeError},
+		{T: externglib.Type(C.gtk_icon_view_drop_position_get_type()), F: marshalIconViewDropPosition},
+		{T: externglib.Type(C.gtk_image_type_get_type()), F: marshalImageType},
+		{T: externglib.Type(C.gtk_input_purpose_get_type()), F: marshalInputPurpose},
+		{T: externglib.Type(C.gtk_justification_get_type()), F: marshalJustification},
+		{T: externglib.Type(C.gtk_level_bar_mode_get_type()), F: marshalLevelBarMode},
+		{T: externglib.Type(C.gtk_license_get_type()), F: marshalLicense},
+		{T: externglib.Type(C.gtk_message_type_get_type()), F: marshalMessageType},
+		{T: externglib.Type(C.gtk_movement_step_get_type()), F: marshalMovementStep},
+		{T: externglib.Type(C.gtk_notebook_tab_get_type()), F: marshalNotebookTab},
+		{T: externglib.Type(C.gtk_number_up_layout_get_type()), F: marshalNumberUpLayout},
+		{T: externglib.Type(C.gtk_ordering_get_type()), F: marshalOrdering},
+		{T: externglib.Type(C.gtk_orientation_get_type()), F: marshalOrientation},
+		{T: externglib.Type(C.gtk_overflow_get_type()), F: marshalOverflow},
+		{T: externglib.Type(C.gtk_pack_type_get_type()), F: marshalPackType},
+		{T: externglib.Type(C.gtk_pad_action_type_get_type()), F: marshalPadActionType},
+		{T: externglib.Type(C.gtk_page_orientation_get_type()), F: marshalPageOrientation},
+		{T: externglib.Type(C.gtk_page_set_get_type()), F: marshalPageSet},
+		{T: externglib.Type(C.gtk_pan_direction_get_type()), F: marshalPanDirection},
+		{T: externglib.Type(C.gtk_policy_type_get_type()), F: marshalPolicyType},
+		{T: externglib.Type(C.gtk_position_type_get_type()), F: marshalPositionType},
+		{T: externglib.Type(C.gtk_print_duplex_get_type()), F: marshalPrintDuplex},
+		{T: externglib.Type(C.gtk_print_error_get_type()), F: marshalPrintError},
+		{T: externglib.Type(C.gtk_print_operation_action_get_type()), F: marshalPrintOperationAction},
+		{T: externglib.Type(C.gtk_print_operation_result_get_type()), F: marshalPrintOperationResult},
+		{T: externglib.Type(C.gtk_print_pages_get_type()), F: marshalPrintPages},
+		{T: externglib.Type(C.gtk_print_quality_get_type()), F: marshalPrintQuality},
+		{T: externglib.Type(C.gtk_print_status_get_type()), F: marshalPrintStatus},
+		{T: externglib.Type(C.gtk_propagation_limit_get_type()), F: marshalPropagationLimit},
+		{T: externglib.Type(C.gtk_propagation_phase_get_type()), F: marshalPropagationPhase},
+		{T: externglib.Type(C.gtk_recent_manager_error_get_type()), F: marshalRecentManagerError},
+		{T: externglib.Type(C.gtk_response_type_get_type()), F: marshalResponseType},
+		{T: externglib.Type(C.gtk_revealer_transition_type_get_type()), F: marshalRevealerTransitionType},
+		{T: externglib.Type(C.gtk_scroll_step_get_type()), F: marshalScrollStep},
+		{T: externglib.Type(C.gtk_scroll_type_get_type()), F: marshalScrollType},
+		{T: externglib.Type(C.gtk_scrollable_policy_get_type()), F: marshalScrollablePolicy},
+		{T: externglib.Type(C.gtk_selection_mode_get_type()), F: marshalSelectionMode},
+		{T: externglib.Type(C.gtk_sensitivity_type_get_type()), F: marshalSensitivityType},
+		{T: externglib.Type(C.gtk_shortcut_scope_get_type()), F: marshalShortcutScope},
+		{T: externglib.Type(C.gtk_shortcut_type_get_type()), F: marshalShortcutType},
+		{T: externglib.Type(C.gtk_size_group_mode_get_type()), F: marshalSizeGroupMode},
+		{T: externglib.Type(C.gtk_size_request_mode_get_type()), F: marshalSizeRequestMode},
+		{T: externglib.Type(C.gtk_sort_type_get_type()), F: marshalSortType},
+		{T: externglib.Type(C.gtk_sorter_change_get_type()), F: marshalSorterChange},
+		{T: externglib.Type(C.gtk_sorter_order_get_type()), F: marshalSorterOrder},
+		{T: externglib.Type(C.gtk_spin_button_update_policy_get_type()), F: marshalSpinButtonUpdatePolicy},
+		{T: externglib.Type(C.gtk_spin_type_get_type()), F: marshalSpinType},
+		{T: externglib.Type(C.gtk_stack_transition_type_get_type()), F: marshalStackTransitionType},
+		{T: externglib.Type(C.gtk_string_filter_match_mode_get_type()), F: marshalStringFilterMatchMode},
+		{T: externglib.Type(C.gtk_system_setting_get_type()), F: marshalSystemSetting},
+		{T: externglib.Type(C.gtk_text_direction_get_type()), F: marshalTextDirection},
+		{T: externglib.Type(C.gtk_text_extend_selection_get_type()), F: marshalTextExtendSelection},
+		{T: externglib.Type(C.gtk_text_view_layer_get_type()), F: marshalTextViewLayer},
+		{T: externglib.Type(C.gtk_text_window_type_get_type()), F: marshalTextWindowType},
+		{T: externglib.Type(C.gtk_tree_view_column_sizing_get_type()), F: marshalTreeViewColumnSizing},
+		{T: externglib.Type(C.gtk_tree_view_drop_position_get_type()), F: marshalTreeViewDropPosition},
+		{T: externglib.Type(C.gtk_tree_view_grid_lines_get_type()), F: marshalTreeViewGridLines},
+		{T: externglib.Type(C.gtk_unit_get_type()), F: marshalUnit},
+		{T: externglib.Type(C.gtk_wrap_mode_get_type()), F: marshalWrapMode},
 
 		// Objects/Classes
 	})
@@ -3078,11 +3078,11 @@ func AcceleratorParseWithKeycode(accelerator string, display *gdkx11.X11Display)
 // instance, use the K_KEY_Control_L keyval as an accelerator.
 func AcceleratorValid(keyval uint, modifiers gdk.ModifierType) bool
 
-func AccessiblePropertyInitValue(property AccessibleProperty, value *glib.Value)
+func AccessiblePropertyInitValue(property AccessibleProperty, value *externglib.Value)
 
-func AccessibleRelationInitValue(relation AccessibleRelation, value *glib.Value)
+func AccessibleRelationInitValue(relation AccessibleRelation, value *externglib.Value)
 
-func AccessibleStateInitValue(state AccessibleState, value *glib.Value)
+func AccessibleStateInitValue(state AccessibleState, value *externglib.Value)
 
 // BitsetIterInitAt: initializes @iter to point to @target. If @target is not
 // found, finds the next value after it. If no value >= @target exists in @set,
@@ -3421,7 +3421,7 @@ func TestAccessibleHasState(accessible Accessible, state AccessibleState) bool
 
 // TestListAllTypes: return the type ids that have been registered after calling
 // gtk_test_register_all_types().
-func TestListAllTypes() (uint, []glib.Type)
+func TestListAllTypes() (uint, []externglib.Type)
 
 // TestRegisterAllTypes: force registration of all core GTK object types.
 //
@@ -3445,39 +3445,39 @@ func TreeCreateRowDragContent(treeModel TreeModel, path *TreePath) *gdk.ContentP
 // GTK_TYPE_TREE_ROW_DATA.
 //
 // The returned path must be freed with gtk_tree_path_free().
-func TreeGetRowDragData(value *glib.Value) (TreeModel, *TreePath, bool)
+func TreeGetRowDragData(value *externglib.Value) (TreeModel, *TreePath, bool)
 
 // TreeRowReferenceDeleted: lets a set of row reference created by
 // gtk_tree_row_reference_new_proxy() know that the model emitted the
 // TreeModel::row-deleted signal.
-func TreeRowReferenceDeleted(proxy *glib.Object, path *TreePath)
+func TreeRowReferenceDeleted(proxy *externglib.Object, path *TreePath)
 
 // TreeRowReferenceInserted: lets a set of row reference created by
 // gtk_tree_row_reference_new_proxy() know that the model emitted the
 // TreeModel::row-inserted signal.
-func TreeRowReferenceInserted(proxy *glib.Object, path *TreePath)
+func TreeRowReferenceInserted(proxy *externglib.Object, path *TreePath)
 
 // TreeRowReferenceReordered: lets a set of row reference created by
 // gtk_tree_row_reference_new_proxy() know that the model emitted the
 // TreeModel::rows-reordered signal.
-func TreeRowReferenceReordered(proxy *glib.Object, path *TreePath, iter *TreeIter, newOrder []int)
+func TreeRowReferenceReordered(proxy *externglib.Object, path *TreePath, iter *TreeIter, newOrder []int)
 
 // ValueDupExpression: retrieves the Expression stored inside the given @value,
 // and acquires a reference to it.
-func ValueDupExpression(value *glib.Value) *Expression
+func ValueDupExpression(value *externglib.Value) *Expression
 
 // ValueGetExpression: retrieves the Expression stored inside the given @value.
-func ValueGetExpression(value *glib.Value) *Expression
+func ValueGetExpression(value *externglib.Value) *Expression
 
 // ValueSetExpression: stores the given Expression inside @value.
 //
 // The #GValue will acquire a reference to the @expression.
-func ValueSetExpression(value *glib.Value, expression *Expression)
+func ValueSetExpression(value *externglib.Value, expression *Expression)
 
 // ValueTakeExpression: stores the given Expression inside @value.
 //
 // This function transfers the ownership of the @expression to the #GValue.
-func ValueTakeExpression(value *glib.Value, expression *Expression)
+func ValueTakeExpression(value *externglib.Value, expression *Expression)
 
 // Bitset: gtkBitset is a data structure for representing a set of unsigned
 // integers. Another name for this data structure is "bitmap".
@@ -4006,7 +4006,7 @@ type SettingsValue struct {
 	Origin string
 	// Value: valid types are LONG, DOUBLE and STRING corresponding to the token
 	// parsed, or a GSTRING holding an unparsed statement
-	Value *glib.Value
+	Value *externglib.Value
 
 	native *C.GtkSettingsValue
 }
@@ -4172,7 +4172,7 @@ func (t *TreeRowReference) Native() unsafe.Pointer {
 
 func NewTreeRowReference(model TreeModel, path *TreePath) *TreeRowReference
 
-func NewTreeRowReference(proxy *glib.Object, model TreeModel, path *TreePath) *TreeRowReference
+func NewTreeRowReference(proxy *externglib.Object, model TreeModel, path *TreePath) *TreeRowReference
 
 // ATContext: gtkATContext is an abstract class provided by GTK to communicate
 // to platform-specific assistive technologies API.
@@ -4181,11 +4181,11 @@ func NewTreeRowReference(proxy *glib.Object, model TreeModel, path *TreePath) *T
 // responsible for updating the accessible state in response to state changes in
 // Accessible.
 type ATContext struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapATContext(obj *glib.Object) *ATContext {
-	return &ATContext{*glib.Object{obj}}
+	return &ATContext{*externglib.Object{obj}}
 }
 
 func marshalATContext(p uintptr) (interface{}, error) {
@@ -4238,7 +4238,7 @@ type AboutDialog struct {
 }
 
 func wrapAboutDialog(obj *glib.Object) *AboutDialog {
-	return &AboutDialog{Window{Widget{glib.InitiallyUnowned{obj}}}}
+	return &AboutDialog{Window{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalAboutDialog(p uintptr) (interface{}, error) {
@@ -4265,7 +4265,7 @@ type ActionBar struct {
 }
 
 func wrapActionBar(obj *glib.Object) *ActionBar {
-	return &ActionBar{Widget{glib.InitiallyUnowned{obj}}}
+	return &ActionBar{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalActionBar(p uintptr) (interface{}, error) {
@@ -4280,7 +4280,7 @@ type ActivateAction struct {
 }
 
 func wrapActivateAction(obj *glib.Object) *ActivateAction {
-	return &ActivateAction{ShortcutAction{*glib.Object{obj}}}
+	return &ActivateAction{ShortcutAction{*externglib.Object{obj}}}
 }
 
 func marshalActivateAction(p uintptr) (interface{}, error) {
@@ -4297,11 +4297,11 @@ func marshalActivateAction(p uintptr) (interface{}, error) {
 // The Adjustment object does not update the value itself. Instead it is left up
 // to the owner of the Adjustment to control the value.
 type Adjustment struct {
-	glib.InitiallyUnowned
+	externglib.InitiallyUnowned
 }
 
 func wrapAdjustment(obj *glib.Object) *Adjustment {
-	return &Adjustment{glib.InitiallyUnowned{obj}}
+	return &Adjustment{externglib.InitiallyUnowned{obj}}
 }
 
 func marshalAdjustment(p uintptr) (interface{}, error) {
@@ -4317,7 +4317,7 @@ type AlternativeTrigger struct {
 }
 
 func wrapAlternativeTrigger(obj *glib.Object) *AlternativeTrigger {
-	return &AlternativeTrigger{ShortcutTrigger{*glib.Object{obj}}}
+	return &AlternativeTrigger{ShortcutTrigger{*externglib.Object{obj}}}
 }
 
 func marshalAlternativeTrigger(p uintptr) (interface{}, error) {
@@ -4331,7 +4331,7 @@ type AnyFilter struct {
 }
 
 func wrapAnyFilter(obj *glib.Object) *AnyFilter {
-	return &AnyFilter{MultiFilter{Filter{*glib.Object{obj}}}}
+	return &AnyFilter{MultiFilter{Filter{*externglib.Object{obj}}}}
 }
 
 func marshalAnyFilter(p uintptr) (interface{}, error) {
@@ -4371,7 +4371,7 @@ type AppChooserButton struct {
 }
 
 func wrapAppChooserButton(obj *glib.Object) *AppChooserButton {
-	return &AppChooserButton{Widget{glib.InitiallyUnowned{obj}}}
+	return &AppChooserButton{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalAppChooserButton(p uintptr) (interface{}, error) {
@@ -4395,7 +4395,7 @@ type AppChooserDialog struct {
 }
 
 func wrapAppChooserDialog(obj *glib.Object) *AppChooserDialog {
-	return &AppChooserDialog{Dialog{Window{Widget{glib.InitiallyUnowned{obj}}}}}
+	return &AppChooserDialog{Dialog{Window{Widget{externglib.InitiallyUnowned{obj}}}}}
 }
 
 func marshalAppChooserDialog(p uintptr) (interface{}, error) {
@@ -4428,7 +4428,7 @@ type AppChooserWidget struct {
 }
 
 func wrapAppChooserWidget(obj *glib.Object) *AppChooserWidget {
-	return &AppChooserWidget{Widget{glib.InitiallyUnowned{obj}}}
+	return &AppChooserWidget{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalAppChooserWidget(p uintptr) (interface{}, error) {
@@ -4507,7 +4507,7 @@ type Application struct {
 }
 
 func wrapApplication(obj *glib.Object) *Application {
-	return &Application{Application{*glib.Object{obj}}}
+	return &Application{Application{*externglib.Object{obj}}}
 }
 
 func marshalApplication(p uintptr) (interface{}, error) {
@@ -4588,7 +4588,7 @@ type ApplicationWindow struct {
 }
 
 func wrapApplicationWindow(obj *glib.Object) *ApplicationWindow {
-	return &ApplicationWindow{Window{Widget{glib.InitiallyUnowned{obj}}}}
+	return &ApplicationWindow{Window{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalApplicationWindow(p uintptr) (interface{}, error) {
@@ -4613,7 +4613,7 @@ type AspectFrame struct {
 }
 
 func wrapAspectFrame(obj *glib.Object) *AspectFrame {
-	return &AspectFrame{Widget{glib.InitiallyUnowned{obj}}}
+	return &AspectFrame{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalAspectFrame(p uintptr) (interface{}, error) {
@@ -4662,7 +4662,7 @@ type Assistant struct {
 }
 
 func wrapAssistant(obj *glib.Object) *Assistant {
-	return &Assistant{Window{Widget{glib.InitiallyUnowned{obj}}}}
+	return &Assistant{Window{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalAssistant(p uintptr) (interface{}, error) {
@@ -4672,11 +4672,11 @@ func marshalAssistant(p uintptr) (interface{}, error) {
 }
 
 type AssistantPage struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapAssistantPage(obj *glib.Object) *AssistantPage {
-	return &AssistantPage{*glib.Object{obj}}
+	return &AssistantPage{*externglib.Object{obj}}
 }
 
 func marshalAssistantPage(p uintptr) (interface{}, error) {
@@ -4695,7 +4695,7 @@ type BinLayout struct {
 }
 
 func wrapBinLayout(obj *glib.Object) *BinLayout {
-	return &BinLayout{LayoutManager{*glib.Object{obj}}}
+	return &BinLayout{LayoutManager{*externglib.Object{obj}}}
 }
 
 func marshalBinLayout(p uintptr) (interface{}, error) {
@@ -4711,11 +4711,11 @@ func marshalBinLayout(p uintptr) (interface{}, error) {
 // The Infos in the list have some attributes in the recent namespace added:
 // recent::private (boolean) and recent:applications (stringv).
 type BookmarkList struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapBookmarkList(obj *glib.Object) *BookmarkList {
-	return &BookmarkList{*glib.Object{obj}}
+	return &BookmarkList{*externglib.Object{obj}}
 }
 
 func marshalBookmarkList(p uintptr) (interface{}, error) {
@@ -4731,7 +4731,7 @@ type BoolFilter struct {
 }
 
 func wrapBoolFilter(obj *glib.Object) *BoolFilter {
-	return &BoolFilter{Filter{*glib.Object{obj}}}
+	return &BoolFilter{Filter{*externglib.Object{obj}}}
 }
 
 func marshalBoolFilter(p uintptr) (interface{}, error) {
@@ -4775,7 +4775,7 @@ type Box struct {
 }
 
 func wrapBox(obj *glib.Object) *Box {
-	return &Box{Widget{glib.InitiallyUnowned{obj}}}
+	return &Box{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalBox(p uintptr) (interface{}, error) {
@@ -4800,7 +4800,7 @@ type BoxLayout struct {
 }
 
 func wrapBoxLayout(obj *glib.Object) *BoxLayout {
-	return &BoxLayout{LayoutManager{*glib.Object{obj}}}
+	return &BoxLayout{LayoutManager{*externglib.Object{obj}}}
 }
 
 func marshalBoxLayout(p uintptr) (interface{}, error) {
@@ -4976,11 +4976,11 @@ func marshalBoxLayout(p uintptr) (interface{}, error) {
 // format allowing one to define a widget class’s components. See the [GtkWidget
 // documentation][composite-templates] for details.
 type Builder struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapBuilder(obj *glib.Object) *Builder {
-	return &Builder{*glib.Object{obj}}
+	return &Builder{*externglib.Object{obj}}
 }
 
 func marshalBuilder(p uintptr) (interface{}, error) {
@@ -4990,11 +4990,11 @@ func marshalBuilder(p uintptr) (interface{}, error) {
 }
 
 type BuilderCScope struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapBuilderCScope(obj *glib.Object) *BuilderCScope {
-	return &BuilderCScope{*glib.Object{obj}}
+	return &BuilderCScope{*externglib.Object{obj}}
 }
 
 func marshalBuilderCScope(p uintptr) (interface{}, error) {
@@ -5028,7 +5028,7 @@ type BuilderListItemFactory struct {
 }
 
 func wrapBuilderListItemFactory(obj *glib.Object) *BuilderListItemFactory {
-	return &BuilderListItemFactory{ListItemFactory{*glib.Object{obj}}}
+	return &BuilderListItemFactory{ListItemFactory{*externglib.Object{obj}}}
 }
 
 func marshalBuilderListItemFactory(p uintptr) (interface{}, error) {
@@ -5069,7 +5069,7 @@ type Button struct {
 }
 
 func wrapButton(obj *glib.Object) *Button {
-	return &Button{Widget{glib.InitiallyUnowned{obj}}}
+	return &Button{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalButton(p uintptr) (interface{}, error) {
@@ -5138,7 +5138,7 @@ type Calendar struct {
 }
 
 func wrapCalendar(obj *glib.Object) *Calendar {
-	return &Calendar{Widget{glib.InitiallyUnowned{obj}}}
+	return &Calendar{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalCalendar(p uintptr) (interface{}, error) {
@@ -5153,7 +5153,7 @@ type CallbackAction struct {
 }
 
 func wrapCallbackAction(obj *glib.Object) *CallbackAction {
-	return &CallbackAction{ShortcutAction{*glib.Object{obj}}}
+	return &CallbackAction{ShortcutAction{*externglib.Object{obj}}}
 }
 
 func marshalCallbackAction(p uintptr) (interface{}, error) {
@@ -5456,11 +5456,11 @@ func marshalCallbackAction(p uintptr) (interface{}, error) {
 // value of a cell property, use gtk_cell_area_cell_get_property(),
 // gtk_cell_area_cell_get() or gtk_cell_area_cell_get_valist().
 type CellArea struct {
-	glib.InitiallyUnowned
+	externglib.InitiallyUnowned
 }
 
 func wrapCellArea(obj *glib.Object) *CellArea {
-	return &CellArea{glib.InitiallyUnowned{obj}}
+	return &CellArea{externglib.InitiallyUnowned{obj}}
 }
 
 func marshalCellArea(p uintptr) (interface{}, error) {
@@ -5489,7 +5489,7 @@ type CellAreaBox struct {
 }
 
 func wrapCellAreaBox(obj *glib.Object) *CellAreaBox {
-	return &CellAreaBox{CellArea{glib.InitiallyUnowned{obj}}}
+	return &CellAreaBox{CellArea{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalCellAreaBox(p uintptr) (interface{}, error) {
@@ -5509,11 +5509,11 @@ func marshalCellAreaBox(p uintptr) (interface{}, error) {
 // the same row when calling other CellArea APIs such as gtk_cell_area_render()
 // and gtk_cell_area_event().
 type CellAreaContext struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapCellAreaContext(obj *glib.Object) *CellAreaContext {
-	return &CellAreaContext{*glib.Object{obj}}
+	return &CellAreaContext{*externglib.Object{obj}}
 }
 
 func marshalCellAreaContext(p uintptr) (interface{}, error) {
@@ -5555,11 +5555,11 @@ func marshalCellAreaContext(p uintptr) (interface{}, error) {
 // “set” properties reflect whether a property has been set or not. You should
 // not set them independently.
 type CellRenderer struct {
-	glib.InitiallyUnowned
+	externglib.InitiallyUnowned
 }
 
 func wrapCellRenderer(obj *glib.Object) *CellRenderer {
-	return &CellRenderer{glib.InitiallyUnowned{obj}}
+	return &CellRenderer{externglib.InitiallyUnowned{obj}}
 }
 
 func marshalCellRenderer(p uintptr) (interface{}, error) {
@@ -5576,7 +5576,7 @@ type CellRendererAccel struct {
 }
 
 func wrapCellRendererAccel(obj *glib.Object) *CellRendererAccel {
-	return &CellRendererAccel{CellRendererText{CellRenderer{glib.InitiallyUnowned{obj}}}}
+	return &CellRendererAccel{CellRendererText{CellRenderer{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalCellRendererAccel(p uintptr) (interface{}, error) {
@@ -5600,7 +5600,7 @@ type CellRendererCombo struct {
 }
 
 func wrapCellRendererCombo(obj *glib.Object) *CellRendererCombo {
-	return &CellRendererCombo{CellRendererText{CellRenderer{glib.InitiallyUnowned{obj}}}}
+	return &CellRendererCombo{CellRendererText{CellRenderer{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalCellRendererCombo(p uintptr) (interface{}, error) {
@@ -5626,7 +5626,7 @@ type CellRendererPixbuf struct {
 }
 
 func wrapCellRendererPixbuf(obj *glib.Object) *CellRendererPixbuf {
-	return &CellRendererPixbuf{CellRenderer{glib.InitiallyUnowned{obj}}}
+	return &CellRendererPixbuf{CellRenderer{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalCellRendererPixbuf(p uintptr) (interface{}, error) {
@@ -5643,7 +5643,7 @@ type CellRendererProgress struct {
 }
 
 func wrapCellRendererProgress(obj *glib.Object) *CellRendererProgress {
-	return &CellRendererProgress{CellRenderer{glib.InitiallyUnowned{obj}}}
+	return &CellRendererProgress{CellRenderer{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalCellRendererProgress(p uintptr) (interface{}, error) {
@@ -5671,7 +5671,7 @@ type CellRendererSpin struct {
 }
 
 func wrapCellRendererSpin(obj *glib.Object) *CellRendererSpin {
-	return &CellRendererSpin{CellRendererText{CellRenderer{glib.InitiallyUnowned{obj}}}}
+	return &CellRendererSpin{CellRendererText{CellRenderer{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalCellRendererSpin(p uintptr) (interface{}, error) {
@@ -5695,7 +5695,7 @@ type CellRendererSpinner struct {
 }
 
 func wrapCellRendererSpinner(obj *glib.Object) *CellRendererSpinner {
-	return &CellRendererSpinner{CellRenderer{glib.InitiallyUnowned{obj}}}
+	return &CellRendererSpinner{CellRenderer{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalCellRendererSpinner(p uintptr) (interface{}, error) {
@@ -5716,7 +5716,7 @@ type CellRendererText struct {
 }
 
 func wrapCellRendererText(obj *glib.Object) *CellRendererText {
-	return &CellRendererText{CellRenderer{glib.InitiallyUnowned{obj}}}
+	return &CellRendererText{CellRenderer{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalCellRendererText(p uintptr) (interface{}, error) {
@@ -5734,7 +5734,7 @@ type CellRendererToggle struct {
 }
 
 func wrapCellRendererToggle(obj *glib.Object) *CellRendererToggle {
-	return &CellRendererToggle{CellRenderer{glib.InitiallyUnowned{obj}}}
+	return &CellRendererToggle{CellRenderer{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalCellRendererToggle(p uintptr) (interface{}, error) {
@@ -5765,7 +5765,7 @@ type CellView struct {
 }
 
 func wrapCellView(obj *glib.Object) *CellView {
-	return &CellView{Widget{glib.InitiallyUnowned{obj}}}
+	return &CellView{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalCellView(p uintptr) (interface{}, error) {
@@ -5811,7 +5811,7 @@ type CenterBox struct {
 }
 
 func wrapCenterBox(obj *glib.Object) *CenterBox {
-	return &CenterBox{Widget{glib.InitiallyUnowned{obj}}}
+	return &CenterBox{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalCenterBox(p uintptr) (interface{}, error) {
@@ -5830,7 +5830,7 @@ type CenterLayout struct {
 }
 
 func wrapCenterLayout(obj *glib.Object) *CenterLayout {
-	return &CenterLayout{LayoutManager{*glib.Object{obj}}}
+	return &CenterLayout{LayoutManager{*externglib.Object{obj}}}
 }
 
 func marshalCenterLayout(p uintptr) (interface{}, error) {
@@ -5861,7 +5861,7 @@ type CheckButton struct {
 }
 
 func wrapCheckButton(obj *glib.Object) *CheckButton {
-	return &CheckButton{Widget{glib.InitiallyUnowned{obj}}}
+	return &CheckButton{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalCheckButton(p uintptr) (interface{}, error) {
@@ -5902,7 +5902,7 @@ type ColorButton struct {
 }
 
 func wrapColorButton(obj *glib.Object) *ColorButton {
-	return &ColorButton{Widget{glib.InitiallyUnowned{obj}}}
+	return &ColorButton{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalColorButton(p uintptr) (interface{}, error) {
@@ -5918,7 +5918,7 @@ type ColorChooserDialog struct {
 }
 
 func wrapColorChooserDialog(obj *glib.Object) *ColorChooserDialog {
-	return &ColorChooserDialog{Dialog{Window{Widget{glib.InitiallyUnowned{obj}}}}}
+	return &ColorChooserDialog{Dialog{Window{Widget{externglib.InitiallyUnowned{obj}}}}}
 }
 
 func marshalColorChooserDialog(p uintptr) (interface{}, error) {
@@ -5952,7 +5952,7 @@ type ColorChooserWidget struct {
 }
 
 func wrapColorChooserWidget(obj *glib.Object) *ColorChooserWidget {
-	return &ColorChooserWidget{Widget{glib.InitiallyUnowned{obj}}}
+	return &ColorChooserWidget{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalColorChooserWidget(p uintptr) (interface{}, error) {
@@ -6028,7 +6028,7 @@ type ColumnView struct {
 }
 
 func wrapColumnView(obj *glib.Object) *ColumnView {
-	return &ColumnView{Widget{glib.InitiallyUnowned{obj}}}
+	return &ColumnView{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalColumnView(p uintptr) (interface{}, error) {
@@ -6047,11 +6047,11 @@ func marshalColumnView(p uintptr) (interface{}, error) {
 // gtk_column_view_column_set_sorter(), to let users influence sorting by
 // clicking on the column header.
 type ColumnViewColumn struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapColumnViewColumn(obj *glib.Object) *ColumnViewColumn {
-	return &ColumnViewColumn{*glib.Object{obj}}
+	return &ColumnViewColumn{*externglib.Object{obj}}
 }
 
 func marshalColumnViewColumn(p uintptr) (interface{}, error) {
@@ -6118,7 +6118,7 @@ type ComboBox struct {
 }
 
 func wrapComboBox(obj *glib.Object) *ComboBox {
-	return &ComboBox{Widget{glib.InitiallyUnowned{obj}}}
+	return &ComboBox{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalComboBox(p uintptr) (interface{}, error) {
@@ -6178,7 +6178,7 @@ type ComboBoxText struct {
 }
 
 func wrapComboBoxText(obj *glib.Object) *ComboBoxText {
-	return &ComboBoxText{ComboBox{Widget{glib.InitiallyUnowned{obj}}}}
+	return &ComboBoxText{ComboBox{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalComboBoxText(p uintptr) (interface{}, error) {
@@ -6214,11 +6214,11 @@ func marshalConstantExpression(p uintptr) (interface{}, error) {
 // The source and target widgets, as well as their attributes, of a Constraint
 // instance are immutable after creation.
 type Constraint struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapConstraint(obj *glib.Object) *Constraint {
-	return &Constraint{*glib.Object{obj}}
+	return &Constraint{*externglib.Object{obj}}
 }
 
 func marshalConstraint(p uintptr) (interface{}, error) {
@@ -6233,11 +6233,11 @@ func marshalConstraint(p uintptr) (interface{}, error) {
 //
 // Unlike a Widget, a ConstraintGuide will not be drawn.
 type ConstraintGuide struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapConstraintGuide(obj *glib.Object) *ConstraintGuide {
-	return &ConstraintGuide{*glib.Object{obj}}
+	return &ConstraintGuide{*externglib.Object{obj}}
 }
 
 func marshalConstraintGuide(p uintptr) (interface{}, error) {
@@ -6407,7 +6407,7 @@ type ConstraintLayout struct {
 }
 
 func wrapConstraintLayout(obj *glib.Object) *ConstraintLayout {
-	return &ConstraintLayout{LayoutManager{*glib.Object{obj}}}
+	return &ConstraintLayout{LayoutManager{*externglib.Object{obj}}}
 }
 
 func marshalConstraintLayout(p uintptr) (interface{}, error) {
@@ -6422,7 +6422,7 @@ type ConstraintLayoutChild struct {
 }
 
 func wrapConstraintLayoutChild(obj *glib.Object) *ConstraintLayoutChild {
-	return &ConstraintLayoutChild{LayoutChild{*glib.Object{obj}}}
+	return &ConstraintLayoutChild{LayoutChild{*externglib.Object{obj}}}
 }
 
 func marshalConstraintLayoutChild(p uintptr) (interface{}, error) {
@@ -6455,11 +6455,11 @@ func marshalConstraintLayoutChild(p uintptr) (interface{}, error) {
 // found for the current version, GTK tries older versions all the way back to
 // 4.0.
 type CSSProvider struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapCSSProvider(obj *glib.Object) *CSSProvider {
-	return &CSSProvider{*glib.Object{obj}}
+	return &CSSProvider{*externglib.Object{obj}}
 }
 
 func marshalCSSProvider(p uintptr) (interface{}, error) {
@@ -6475,7 +6475,7 @@ type CustomFilter struct {
 }
 
 func wrapCustomFilter(obj *glib.Object) *CustomFilter {
-	return &CustomFilter{Filter{*glib.Object{obj}}}
+	return &CustomFilter{Filter{*externglib.Object{obj}}}
 }
 
 func marshalCustomFilter(p uintptr) (interface{}, error) {
@@ -6496,7 +6496,7 @@ type CustomLayout struct {
 }
 
 func wrapCustomLayout(obj *glib.Object) *CustomLayout {
-	return &CustomLayout{LayoutManager{*glib.Object{obj}}}
+	return &CustomLayout{LayoutManager{*externglib.Object{obj}}}
 }
 
 func marshalCustomLayout(p uintptr) (interface{}, error) {
@@ -6512,7 +6512,7 @@ type CustomSorter struct {
 }
 
 func wrapCustomSorter(obj *glib.Object) *CustomSorter {
-	return &CustomSorter{Sorter{*glib.Object{obj}}}
+	return &CustomSorter{Sorter{*externglib.Object{obj}}}
 }
 
 func marshalCustomSorter(p uintptr) (interface{}, error) {
@@ -6620,7 +6620,7 @@ type Dialog struct {
 }
 
 func wrapDialog(obj *glib.Object) *Dialog {
-	return &Dialog{Window{Widget{glib.InitiallyUnowned{obj}}}}
+	return &Dialog{Window{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalDialog(p uintptr) (interface{}, error) {
@@ -6649,11 +6649,11 @@ func marshalDialog(p uintptr) (interface{}, error) {
 // means you do not need access to the DirectoryList but can access the #GFile
 // directly from the Info when operating with a ListView or similar.
 type DirectoryList struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDirectoryList(obj *glib.Object) *DirectoryList {
-	return &DirectoryList{*glib.Object{obj}}
+	return &DirectoryList{*externglib.Object{obj}}
 }
 
 func marshalDirectoryList(p uintptr) (interface{}, error) {
@@ -6677,7 +6677,7 @@ type DragIcon struct {
 }
 
 func wrapDragIcon(obj *glib.Object) *DragIcon {
-	return &DragIcon{Widget{glib.InitiallyUnowned{obj}}}
+	return &DragIcon{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalDragIcon(p uintptr) (interface{}, error) {
@@ -6758,7 +6758,7 @@ type DragSource struct {
 }
 
 func wrapDragSource(obj *glib.Object) *DragSource {
-	return &DragSource{GestureSingle{Gesture{EventController{*glib.Object{obj}}}}}
+	return &DragSource{GestureSingle{Gesture{EventController{*externglib.Object{obj}}}}}
 }
 
 func marshalDragSource(p uintptr) (interface{}, error) {
@@ -6846,7 +6846,7 @@ type DrawingArea struct {
 }
 
 func wrapDrawingArea(obj *glib.Object) *DrawingArea {
-	return &DrawingArea{Widget{glib.InitiallyUnowned{obj}}}
+	return &DrawingArea{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalDrawingArea(p uintptr) (interface{}, error) {
@@ -6869,7 +6869,7 @@ type DropControllerMotion struct {
 }
 
 func wrapDropControllerMotion(obj *glib.Object) *DropControllerMotion {
-	return &DropControllerMotion{EventController{*glib.Object{obj}}}
+	return &DropControllerMotion{EventController{*externglib.Object{obj}}}
 }
 
 func marshalDropControllerMotion(p uintptr) (interface{}, error) {
@@ -6908,7 +6908,7 @@ type DropDown struct {
 }
 
 func wrapDropDown(obj *glib.Object) *DropDown {
-	return &DropDown{Widget{glib.InitiallyUnowned{obj}}}
+	return &DropDown{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalDropDown(p uintptr) (interface{}, error) {
@@ -6984,7 +6984,7 @@ type DropTarget struct {
 }
 
 func wrapDropTarget(obj *glib.Object) *DropTarget {
-	return &DropTarget{EventController{*glib.Object{obj}}}
+	return &DropTarget{EventController{*externglib.Object{obj}}}
 }
 
 func marshalDropTarget(p uintptr) (interface{}, error) {
@@ -7028,7 +7028,7 @@ type DropTargetAsync struct {
 }
 
 func wrapDropTargetAsync(obj *glib.Object) *DropTargetAsync {
-	return &DropTargetAsync{EventController{*glib.Object{obj}}}
+	return &DropTargetAsync{EventController{*externglib.Object{obj}}}
 }
 
 func marshalDropTargetAsync(p uintptr) (interface{}, error) {
@@ -7063,7 +7063,7 @@ type EditableLabel struct {
 }
 
 func wrapEditableLabel(obj *glib.Object) *EditableLabel {
-	return &EditableLabel{Widget{glib.InitiallyUnowned{obj}}}
+	return &EditableLabel{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalEditableLabel(p uintptr) (interface{}, error) {
@@ -7097,7 +7097,7 @@ type EmojiChooser struct {
 }
 
 func wrapEmojiChooser(obj *glib.Object) *EmojiChooser {
-	return &EmojiChooser{Popover{Widget{glib.InitiallyUnowned{obj}}}}
+	return &EmojiChooser{Popover{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalEmojiChooser(p uintptr) (interface{}, error) {
@@ -7187,7 +7187,7 @@ type Entry struct {
 }
 
 func wrapEntry(obj *glib.Object) *Entry {
-	return &Entry{Widget{glib.InitiallyUnowned{obj}}}
+	return &Entry{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalEntry(p uintptr) (interface{}, error) {
@@ -7208,11 +7208,11 @@ func marshalEntry(p uintptr) (interface{}, error) {
 // case of important passwords. Or a derived class could integrate with an
 // application’s concept of undo/redo.
 type EntryBuffer struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapEntryBuffer(obj *glib.Object) *EntryBuffer {
-	return &EntryBuffer{*glib.Object{obj}}
+	return &EntryBuffer{*externglib.Object{obj}}
 }
 
 func marshalEntryBuffer(p uintptr) (interface{}, error) {
@@ -7254,11 +7254,11 @@ func marshalEntryBuffer(p uintptr) (interface{}, error) {
 // gtk_tree_model_filter_get_model(). Don’t forget to use
 // gtk_tree_model_filter_convert_iter_to_child_iter() to obtain a matching iter.
 type EntryCompletion struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapEntryCompletion(obj *glib.Object) *EntryCompletion {
-	return &EntryCompletion{*glib.Object{obj}}
+	return &EntryCompletion{*externglib.Object{obj}}
 }
 
 func marshalEntryCompletion(p uintptr) (interface{}, error) {
@@ -7271,11 +7271,11 @@ func marshalEntryCompletion(p uintptr) (interface{}, error) {
 // event controllers. Those react to a series of Events, and possibly trigger
 // actions as a consequence of those.
 type EventController struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapEventController(obj *glib.Object) *EventController {
-	return &EventController{*glib.Object{obj}}
+	return &EventController{*externglib.Object{obj}}
 }
 
 func marshalEventController(p uintptr) (interface{}, error) {
@@ -7291,7 +7291,7 @@ type EventControllerFocus struct {
 }
 
 func wrapEventControllerFocus(obj *glib.Object) *EventControllerFocus {
-	return &EventControllerFocus{EventController{*glib.Object{obj}}}
+	return &EventControllerFocus{EventController{*externglib.Object{obj}}}
 }
 
 func marshalEventControllerFocus(p uintptr) (interface{}, error) {
@@ -7307,7 +7307,7 @@ type EventControllerKey struct {
 }
 
 func wrapEventControllerKey(obj *glib.Object) *EventControllerKey {
-	return &EventControllerKey{EventController{*glib.Object{obj}}}
+	return &EventControllerKey{EventController{*externglib.Object{obj}}}
 }
 
 func marshalEventControllerKey(p uintptr) (interface{}, error) {
@@ -7324,7 +7324,7 @@ type EventControllerLegacy struct {
 }
 
 func wrapEventControllerLegacy(obj *glib.Object) *EventControllerLegacy {
-	return &EventControllerLegacy{EventController{*glib.Object{obj}}}
+	return &EventControllerLegacy{EventController{*externglib.Object{obj}}}
 }
 
 func marshalEventControllerLegacy(p uintptr) (interface{}, error) {
@@ -7340,7 +7340,7 @@ type EventControllerMotion struct {
 }
 
 func wrapEventControllerMotion(obj *glib.Object) *EventControllerMotion {
-	return &EventControllerMotion{EventController{*glib.Object{obj}}}
+	return &EventControllerMotion{EventController{*externglib.Object{obj}}}
 }
 
 func marshalEventControllerMotion(p uintptr) (interface{}, error) {
@@ -7386,7 +7386,7 @@ type EventControllerScroll struct {
 }
 
 func wrapEventControllerScroll(obj *glib.Object) *EventControllerScroll {
-	return &EventControllerScroll{EventController{*glib.Object{obj}}}
+	return &EventControllerScroll{EventController{*externglib.Object{obj}}}
 }
 
 func marshalEventControllerScroll(p uintptr) (interface{}, error) {
@@ -7400,7 +7400,7 @@ type EveryFilter struct {
 }
 
 func wrapEveryFilter(obj *glib.Object) *EveryFilter {
-	return &EveryFilter{MultiFilter{Filter{*glib.Object{obj}}}}
+	return &EveryFilter{MultiFilter{Filter{*externglib.Object{obj}}}}
 }
 
 func marshalEveryFilter(p uintptr) (interface{}, error) {
@@ -7497,7 +7497,7 @@ type Expander struct {
 }
 
 func wrapExpander(obj *glib.Object) *Expander {
-	return &Expander{Widget{glib.InitiallyUnowned{obj}}}
+	return &Expander{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalExpander(p uintptr) (interface{}, error) {
@@ -7672,7 +7672,7 @@ type FileChooserDialog struct {
 }
 
 func wrapFileChooserDialog(obj *glib.Object) *FileChooserDialog {
-	return &FileChooserDialog{Dialog{Window{Widget{glib.InitiallyUnowned{obj}}}}}
+	return &FileChooserDialog{Dialog{Window{Widget{externglib.InitiallyUnowned{obj}}}}}
 }
 
 func marshalFileChooserDialog(p uintptr) (interface{}, error) {
@@ -7827,7 +7827,7 @@ type FileChooserNative struct {
 }
 
 func wrapFileChooserNative(obj *glib.Object) *FileChooserNative {
-	return &FileChooserNative{NativeDialog{*glib.Object{obj}}}
+	return &FileChooserNative{NativeDialog{*externglib.Object{obj}}}
 }
 
 func marshalFileChooserNative(p uintptr) (interface{}, error) {
@@ -7849,7 +7849,7 @@ type FileChooserWidget struct {
 }
 
 func wrapFileChooserWidget(obj *glib.Object) *FileChooserWidget {
-	return &FileChooserWidget{Widget{glib.InitiallyUnowned{obj}}}
+	return &FileChooserWidget{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalFileChooserWidget(p uintptr) (interface{}, error) {
@@ -7898,7 +7898,7 @@ type FileFilter struct {
 }
 
 func wrapFileFilter(obj *glib.Object) *FileFilter {
-	return &FileFilter{Filter{*glib.Object{obj}}}
+	return &FileFilter{Filter{*externglib.Object{obj}}}
 }
 
 func marshalFileFilter(p uintptr) (interface{}, error) {
@@ -7926,11 +7926,11 @@ func marshalFileFilter(p uintptr) (interface{}, error) {
 // However, in particular for large lists or complex search methods, it is also
 // possible to subclass Filter and provide one's own filter.
 type Filter struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFilter(obj *glib.Object) *Filter {
-	return &Filter{*glib.Object{obj}}
+	return &Filter{*externglib.Object{obj}}
 }
 
 func marshalFilter(p uintptr) (interface{}, error) {
@@ -7947,11 +7947,11 @@ func marshalFilter(p uintptr) (interface{}, error) {
 // lists doesn't block the UI. See gtk_filter_list_model_set_incremental() for
 // details.
 type FilterListModel struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFilterListModel(obj *glib.Object) *FilterListModel {
-	return &FilterListModel{*glib.Object{obj}}
+	return &FilterListModel{*externglib.Object{obj}}
 }
 
 func marshalFilterListModel(p uintptr) (interface{}, error) {
@@ -7999,7 +7999,7 @@ type Fixed struct {
 }
 
 func wrapFixed(obj *glib.Object) *Fixed {
-	return &Fixed{Widget{glib.InitiallyUnowned{obj}}}
+	return &Fixed{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalFixed(p uintptr) (interface{}, error) {
@@ -8042,7 +8042,7 @@ type FixedLayout struct {
 }
 
 func wrapFixedLayout(obj *glib.Object) *FixedLayout {
-	return &FixedLayout{LayoutManager{*glib.Object{obj}}}
+	return &FixedLayout{LayoutManager{*externglib.Object{obj}}}
 }
 
 func marshalFixedLayout(p uintptr) (interface{}, error) {
@@ -8056,7 +8056,7 @@ type FixedLayoutChild struct {
 }
 
 func wrapFixedLayoutChild(obj *glib.Object) *FixedLayoutChild {
-	return &FixedLayoutChild{LayoutChild{*glib.Object{obj}}}
+	return &FixedLayoutChild{LayoutChild{*externglib.Object{obj}}}
 }
 
 func marshalFixedLayoutChild(p uintptr) (interface{}, error) {
@@ -8071,11 +8071,11 @@ func marshalFixedLayoutChild(p uintptr) (interface{}, error) {
 // Another term for this is concatenation: FlattenListModel takes a list of
 // lists and concatenates them into a single list.
 type FlattenListModel struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFlattenListModel(obj *glib.Object) *FlattenListModel {
-	return &FlattenListModel{*glib.Object{obj}}
+	return &FlattenListModel{*externglib.Object{obj}}
 }
 
 func marshalFlattenListModel(p uintptr) (interface{}, error) {
@@ -8132,7 +8132,7 @@ type FlowBox struct {
 }
 
 func wrapFlowBox(obj *glib.Object) *FlowBox {
-	return &FlowBox{Widget{glib.InitiallyUnowned{obj}}}
+	return &FlowBox{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalFlowBox(p uintptr) (interface{}, error) {
@@ -8146,7 +8146,7 @@ type FlowBoxChild struct {
 }
 
 func wrapFlowBoxChild(obj *glib.Object) *FlowBoxChild {
-	return &FlowBoxChild{Widget{glib.InitiallyUnowned{obj}}}
+	return &FlowBoxChild{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalFlowBoxChild(p uintptr) (interface{}, error) {
@@ -8172,7 +8172,7 @@ type FontButton struct {
 }
 
 func wrapFontButton(obj *glib.Object) *FontButton {
-	return &FontButton{Widget{glib.InitiallyUnowned{obj}}}
+	return &FontButton{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalFontButton(p uintptr) (interface{}, error) {
@@ -8194,7 +8194,7 @@ type FontChooserDialog struct {
 }
 
 func wrapFontChooserDialog(obj *glib.Object) *FontChooserDialog {
-	return &FontChooserDialog{Dialog{Window{Widget{glib.InitiallyUnowned{obj}}}}}
+	return &FontChooserDialog{Dialog{Window{Widget{externglib.InitiallyUnowned{obj}}}}}
 }
 
 func marshalFontChooserDialog(p uintptr) (interface{}, error) {
@@ -8225,7 +8225,7 @@ type FontChooserWidget struct {
 }
 
 func wrapFontChooserWidget(obj *glib.Object) *FontChooserWidget {
-	return &FontChooserWidget{Widget{glib.InitiallyUnowned{obj}}}
+	return &FontChooserWidget{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalFontChooserWidget(p uintptr) (interface{}, error) {
@@ -8274,7 +8274,7 @@ type Frame struct {
 }
 
 func wrapFrame(obj *glib.Object) *Frame {
-	return &Frame{Widget{glib.InitiallyUnowned{obj}}}
+	return &Frame{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalFrame(p uintptr) (interface{}, error) {
@@ -8388,7 +8388,7 @@ type GLArea struct {
 }
 
 func wrapGLArea(obj *glib.Object) *GLArea {
-	return &GLArea{Widget{glib.InitiallyUnowned{obj}}}
+	return &GLArea{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalGLArea(p uintptr) (interface{}, error) {
@@ -8482,7 +8482,7 @@ type Gesture struct {
 }
 
 func wrapGesture(obj *glib.Object) *Gesture {
-	return &Gesture{EventController{*glib.Object{obj}}}
+	return &Gesture{EventController{*externglib.Object{obj}}}
 }
 
 func marshalGesture(p uintptr) (interface{}, error) {
@@ -8501,7 +8501,7 @@ type GestureClick struct {
 }
 
 func wrapGestureClick(obj *glib.Object) *GestureClick {
-	return &GestureClick{GestureSingle{Gesture{EventController{*glib.Object{obj}}}}}
+	return &GestureClick{GestureSingle{Gesture{EventController{*externglib.Object{obj}}}}}
 }
 
 func marshalGestureClick(p uintptr) (interface{}, error) {
@@ -8520,7 +8520,7 @@ type GestureDrag struct {
 }
 
 func wrapGestureDrag(obj *glib.Object) *GestureDrag {
-	return &GestureDrag{GestureSingle{Gesture{EventController{*glib.Object{obj}}}}}
+	return &GestureDrag{GestureSingle{Gesture{EventController{*externglib.Object{obj}}}}}
 }
 
 func marshalGestureDrag(p uintptr) (interface{}, error) {
@@ -8541,7 +8541,7 @@ type GestureLongPress struct {
 }
 
 func wrapGestureLongPress(obj *glib.Object) *GestureLongPress {
-	return &GestureLongPress{GestureSingle{Gesture{EventController{*glib.Object{obj}}}}}
+	return &GestureLongPress{GestureSingle{Gesture{EventController{*externglib.Object{obj}}}}}
 }
 
 func marshalGestureLongPress(p uintptr) (interface{}, error) {
@@ -8567,7 +8567,7 @@ type GesturePan struct {
 }
 
 func wrapGesturePan(obj *glib.Object) *GesturePan {
-	return &GesturePan{GestureDrag{GestureSingle{Gesture{EventController{*glib.Object{obj}}}}}}
+	return &GesturePan{GestureDrag{GestureSingle{Gesture{EventController{*externglib.Object{obj}}}}}}
 }
 
 func marshalGesturePan(p uintptr) (interface{}, error) {
@@ -8584,7 +8584,7 @@ type GestureRotate struct {
 }
 
 func wrapGestureRotate(obj *glib.Object) *GestureRotate {
-	return &GestureRotate{Gesture{EventController{*glib.Object{obj}}}}
+	return &GestureRotate{Gesture{EventController{*externglib.Object{obj}}}}
 }
 
 func marshalGestureRotate(p uintptr) (interface{}, error) {
@@ -8610,7 +8610,7 @@ type GestureSingle struct {
 }
 
 func wrapGestureSingle(obj *glib.Object) *GestureSingle {
-	return &GestureSingle{Gesture{EventController{*glib.Object{obj}}}}
+	return &GestureSingle{Gesture{EventController{*externglib.Object{obj}}}}
 }
 
 func marshalGestureSingle(p uintptr) (interface{}, error) {
@@ -8627,7 +8627,7 @@ type GestureStylus struct {
 }
 
 func wrapGestureStylus(obj *glib.Object) *GestureStylus {
-	return &GestureStylus{GestureSingle{Gesture{EventController{*glib.Object{obj}}}}}
+	return &GestureStylus{GestureSingle{Gesture{EventController{*externglib.Object{obj}}}}}
 }
 
 func marshalGestureStylus(p uintptr) (interface{}, error) {
@@ -8651,7 +8651,7 @@ type GestureSwipe struct {
 }
 
 func wrapGestureSwipe(obj *glib.Object) *GestureSwipe {
-	return &GestureSwipe{GestureSingle{Gesture{EventController{*glib.Object{obj}}}}}
+	return &GestureSwipe{GestureSingle{Gesture{EventController{*externglib.Object{obj}}}}}
 }
 
 func marshalGestureSwipe(p uintptr) (interface{}, error) {
@@ -8669,7 +8669,7 @@ type GestureZoom struct {
 }
 
 func wrapGestureZoom(obj *glib.Object) *GestureZoom {
-	return &GestureZoom{Gesture{EventController{*glib.Object{obj}}}}
+	return &GestureZoom{Gesture{EventController{*externglib.Object{obj}}}}
 }
 
 func marshalGestureZoom(p uintptr) (interface{}, error) {
@@ -8701,7 +8701,7 @@ type Grid struct {
 }
 
 func wrapGrid(obj *glib.Object) *Grid {
-	return &Grid{Widget{glib.InitiallyUnowned{obj}}}
+	return &Grid{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalGrid(p uintptr) (interface{}, error) {
@@ -8729,7 +8729,7 @@ type GridLayout struct {
 }
 
 func wrapGridLayout(obj *glib.Object) *GridLayout {
-	return &GridLayout{LayoutManager{*glib.Object{obj}}}
+	return &GridLayout{LayoutManager{*externglib.Object{obj}}}
 }
 
 func marshalGridLayout(p uintptr) (interface{}, error) {
@@ -8744,7 +8744,7 @@ type GridLayoutChild struct {
 }
 
 func wrapGridLayoutChild(obj *glib.Object) *GridLayoutChild {
-	return &GridLayoutChild{LayoutChild{*glib.Object{obj}}}
+	return &GridLayoutChild{LayoutChild{*externglib.Object{obj}}}
 }
 
 func marshalGridLayoutChild(p uintptr) (interface{}, error) {
@@ -8791,7 +8791,7 @@ type GridView struct {
 }
 
 func wrapGridView(obj *glib.Object) *GridView {
-	return &GridView{ListBase{Widget{glib.InitiallyUnowned{obj}}}}
+	return &GridView{ListBase{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalGridView(p uintptr) (interface{}, error) {
@@ -8866,7 +8866,7 @@ type HeaderBar struct {
 }
 
 func wrapHeaderBar(obj *glib.Object) *HeaderBar {
-	return &HeaderBar{Widget{glib.InitiallyUnowned{obj}}}
+	return &HeaderBar{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalHeaderBar(p uintptr) (interface{}, error) {
@@ -8937,11 +8937,11 @@ func marshalHeaderBar(p uintptr) (interface{}, error) {
 // [gtk-query-immodules-3.0][gtk-query-immodules-3.0], in order for the new
 // input method to become available to GTK applications.
 type IMContext struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapIMContext(obj *glib.Object) *IMContext {
-	return &IMContext{*glib.Object{obj}}
+	return &IMContext{*externglib.Object{obj}}
 }
 
 func marshalIMContext(p uintptr) (interface{}, error) {
@@ -8972,7 +8972,7 @@ type IMContextSimple struct {
 }
 
 func wrapIMContextSimple(obj *glib.Object) *IMContextSimple {
-	return &IMContextSimple{IMContext{*glib.Object{obj}}}
+	return &IMContextSimple{IMContext{*externglib.Object{obj}}}
 }
 
 func marshalIMContextSimple(p uintptr) (interface{}, error) {
@@ -8986,7 +8986,7 @@ type IMMulticontext struct {
 }
 
 func wrapIMMulticontext(obj *glib.Object) *IMMulticontext {
-	return &IMMulticontext{IMContext{*glib.Object{obj}}}
+	return &IMMulticontext{IMContext{*externglib.Object{obj}}}
 }
 
 func marshalIMMulticontext(p uintptr) (interface{}, error) {
@@ -8998,11 +8998,11 @@ func marshalIMMulticontext(p uintptr) (interface{}, error) {
 // IconPaintable: contains information found when looking up an icon in an icon
 // theme and supports painting it as a Paintable.
 type IconPaintable struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapIconPaintable(obj *glib.Object) *IconPaintable {
-	return &IconPaintable{*glib.Object{obj}}
+	return &IconPaintable{*externglib.Object{obj}}
 }
 
 func marshalIconPaintable(p uintptr) (interface{}, error) {
@@ -9040,11 +9040,11 @@ func marshalIconPaintable(p uintptr) (interface{}, error) {
 //     g_object_unref (icon);
 //
 type IconTheme struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapIconTheme(obj *glib.Object) *IconTheme {
-	return &IconTheme{*glib.Object{obj}}
+	return &IconTheme{*externglib.Object{obj}}
 }
 
 func marshalIconTheme(p uintptr) (interface{}, error) {
@@ -9076,7 +9076,7 @@ type IconView struct {
 }
 
 func wrapIconView(obj *glib.Object) *IconView {
-	return &IconView{Widget{glib.InitiallyUnowned{obj}}}
+	return &IconView{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalIconView(p uintptr) (interface{}, error) {
@@ -9120,7 +9120,7 @@ type Image struct {
 }
 
 func wrapImage(obj *glib.Object) *Image {
-	return &Image{Widget{glib.InitiallyUnowned{obj}}}
+	return &Image{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalImage(p uintptr) (interface{}, error) {
@@ -9189,7 +9189,7 @@ type InfoBar struct {
 }
 
 func wrapInfoBar(obj *glib.Object) *InfoBar {
-	return &InfoBar{Widget{glib.InitiallyUnowned{obj}}}
+	return &InfoBar{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalInfoBar(p uintptr) (interface{}, error) {
@@ -9205,7 +9205,7 @@ type KeyvalTrigger struct {
 }
 
 func wrapKeyvalTrigger(obj *glib.Object) *KeyvalTrigger {
-	return &KeyvalTrigger{ShortcutTrigger{*glib.Object{obj}}}
+	return &KeyvalTrigger{ShortcutTrigger{*externglib.Object{obj}}}
 }
 
 func marshalKeyvalTrigger(p uintptr) (interface{}, error) {
@@ -9380,7 +9380,7 @@ type Label struct {
 }
 
 func wrapLabel(obj *glib.Object) *Label {
-	return &Label{Widget{glib.InitiallyUnowned{obj}}}
+	return &Label{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalLabel(p uintptr) (interface{}, error) {
@@ -9397,11 +9397,11 @@ func marshalLabel(p uintptr) (interface{}, error) {
 //
 // A LayoutChild instance is only ever valid while a widget is part of a layout.
 type LayoutChild struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapLayoutChild(obj *glib.Object) *LayoutChild {
-	return &LayoutChild{*glib.Object{obj}}
+	return &LayoutChild{*externglib.Object{obj}}
 }
 
 func marshalLayoutChild(p uintptr) (interface{}, error) {
@@ -9456,11 +9456,11 @@ func marshalLayoutChild(p uintptr) (interface{}, error) {
 // gtk_layout_manager_layout_changed() every time a property is updated, in
 // order to queue a new size measuring and allocation.
 type LayoutManager struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapLayoutManager(obj *glib.Object) *LayoutManager {
-	return &LayoutManager{*glib.Object{obj}}
+	return &LayoutManager{*externglib.Object{obj}}
 }
 
 func marshalLayoutManager(p uintptr) (interface{}, error) {
@@ -9568,7 +9568,7 @@ type LevelBar struct {
 }
 
 func wrapLevelBar(obj *glib.Object) *LevelBar {
-	return &LevelBar{Widget{glib.InitiallyUnowned{obj}}}
+	return &LevelBar{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalLevelBar(p uintptr) (interface{}, error) {
@@ -9607,7 +9607,7 @@ type LinkButton struct {
 }
 
 func wrapLinkButton(obj *glib.Object) *LinkButton {
-	return &LinkButton{Button{Widget{glib.InitiallyUnowned{obj}}}}
+	return &LinkButton{Button{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalLinkButton(p uintptr) (interface{}, error) {
@@ -9622,7 +9622,7 @@ type ListBase struct {
 }
 
 func wrapListBase(obj *glib.Object) *ListBase {
-	return &ListBase{Widget{glib.InitiallyUnowned{obj}}}
+	return &ListBase{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalListBase(p uintptr) (interface{}, error) {
@@ -9681,7 +9681,7 @@ type ListBox struct {
 }
 
 func wrapListBox(obj *glib.Object) *ListBox {
-	return &ListBox{Widget{glib.InitiallyUnowned{obj}}}
+	return &ListBox{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalListBox(p uintptr) (interface{}, error) {
@@ -9695,7 +9695,7 @@ type ListBoxRow struct {
 }
 
 func wrapListBoxRow(obj *glib.Object) *ListBoxRow {
-	return &ListBoxRow{Widget{glib.InitiallyUnowned{obj}}}
+	return &ListBoxRow{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalListBoxRow(p uintptr) (interface{}, error) {
@@ -9719,11 +9719,11 @@ func marshalListBoxRow(p uintptr) (interface{}, error) {
 // 2. The bound stage where the listitem references an item from the list. The
 // ListItem:item property is not nil.
 type ListItem struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapListItem(obj *glib.Object) *ListItem {
-	return &ListItem{*glib.Object{obj}}
+	return &ListItem{*externglib.Object{obj}}
 }
 
 func marshalListItem(p uintptr) (interface{}, error) {
@@ -9774,11 +9774,11 @@ func marshalListItem(p uintptr) (interface{}, error) {
 // view widget you want to use it with, such as via gtk_list_view_set_factory().
 // Reusing factories across different views is allowed, but very uncommon.
 type ListItemFactory struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapListItemFactory(obj *glib.Object) *ListItemFactory {
-	return &ListItemFactory{*glib.Object{obj}}
+	return &ListItemFactory{*externglib.Object{obj}}
 }
 
 func marshalListItemFactory(p uintptr) (interface{}, error) {
@@ -9897,11 +9897,11 @@ func marshalListItemFactory(p uintptr) (interface{}, error) {
 //      </data>
 //    </object>
 type ListStore struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapListStore(obj *glib.Object) *ListStore {
-	return &ListStore{*glib.Object{obj}}
+	return &ListStore{*externglib.Object{obj}}
 }
 
 func marshalListStore(p uintptr) (interface{}, error) {
@@ -9993,7 +9993,7 @@ type ListView struct {
 }
 
 func wrapListView(obj *glib.Object) *ListView {
-	return &ListView{ListBase{Widget{glib.InitiallyUnowned{obj}}}}
+	return &ListView{ListBase{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalListView(p uintptr) (interface{}, error) {
@@ -10037,7 +10037,7 @@ type LockButton struct {
 }
 
 func wrapLockButton(obj *glib.Object) *LockButton {
-	return &LockButton{Button{Widget{glib.InitiallyUnowned{obj}}}}
+	return &LockButton{Button{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalLockButton(p uintptr) (interface{}, error) {
@@ -10067,11 +10067,11 @@ func marshalLockButton(p uintptr) (interface{}, error) {
 //    MapListModel will attempt to discard the mapped objects as soon as
 //    they are no longer needed and recreate them if necessary.
 type MapListModel struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapMapListModel(obj *glib.Object) *MapListModel {
-	return &MapListModel{*glib.Object{obj}}
+	return &MapListModel{*externglib.Object{obj}}
 }
 
 func marshalMapListModel(p uintptr) (interface{}, error) {
@@ -10087,7 +10087,7 @@ type MediaControls struct {
 }
 
 func wrapMediaControls(obj *glib.Object) *MediaControls {
-	return &MediaControls{Widget{glib.InitiallyUnowned{obj}}}
+	return &MediaControls{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalMediaControls(p uintptr) (interface{}, error) {
@@ -10109,7 +10109,7 @@ type MediaFile struct {
 }
 
 func wrapMediaFile(obj *glib.Object) *MediaFile {
-	return &MediaFile{MediaStream{*glib.Object{obj}}}
+	return &MediaFile{MediaStream{*externglib.Object{obj}}}
 }
 
 func marshalMediaFile(p uintptr) (interface{}, error) {
@@ -10132,11 +10132,11 @@ func marshalMediaFile(p uintptr) (interface{}, error) {
 // gtk_media_stream_seek_failed(), gtk_media_stream_gerror(),
 // gtk_media_stream_error(), gtk_media_stream_error_valist().
 type MediaStream struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapMediaStream(obj *glib.Object) *MediaStream {
-	return &MediaStream{*glib.Object{obj}}
+	return &MediaStream{*externglib.Object{obj}}
 }
 
 func marshalMediaStream(p uintptr) (interface{}, error) {
@@ -10239,7 +10239,7 @@ type MenuButton struct {
 }
 
 func wrapMenuButton(obj *glib.Object) *MenuButton {
-	return &MenuButton{Widget{glib.InitiallyUnowned{obj}}}
+	return &MenuButton{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalMenuButton(p uintptr) (interface{}, error) {
@@ -10298,7 +10298,7 @@ type MessageDialog struct {
 }
 
 func wrapMessageDialog(obj *glib.Object) *MessageDialog {
-	return &MessageDialog{Dialog{Window{Widget{glib.InitiallyUnowned{obj}}}}}
+	return &MessageDialog{Dialog{Window{Widget{externglib.InitiallyUnowned{obj}}}}}
 }
 
 func marshalMessageDialog(p uintptr) (interface{}, error) {
@@ -10313,7 +10313,7 @@ type MnemonicAction struct {
 }
 
 func wrapMnemonicAction(obj *glib.Object) *MnemonicAction {
-	return &MnemonicAction{ShortcutAction{*glib.Object{obj}}}
+	return &MnemonicAction{ShortcutAction{*externglib.Object{obj}}}
 }
 
 func marshalMnemonicAction(p uintptr) (interface{}, error) {
@@ -10329,7 +10329,7 @@ type MnemonicTrigger struct {
 }
 
 func wrapMnemonicTrigger(obj *glib.Object) *MnemonicTrigger {
-	return &MnemonicTrigger{ShortcutTrigger{*glib.Object{obj}}}
+	return &MnemonicTrigger{ShortcutTrigger{*externglib.Object{obj}}}
 }
 
 func marshalMnemonicTrigger(p uintptr) (interface{}, error) {
@@ -10345,7 +10345,7 @@ type MountOperation struct {
 }
 
 func wrapMountOperation(obj *glib.Object) *MountOperation {
-	return &MountOperation{MountOperation{*glib.Object{obj}}}
+	return &MountOperation{MountOperation{*externglib.Object{obj}}}
 }
 
 func marshalMountOperation(p uintptr) (interface{}, error) {
@@ -10367,7 +10367,7 @@ type MultiFilter struct {
 }
 
 func wrapMultiFilter(obj *glib.Object) *MultiFilter {
-	return &MultiFilter{Filter{*glib.Object{obj}}}
+	return &MultiFilter{Filter{*externglib.Object{obj}}}
 }
 
 func marshalMultiFilter(p uintptr) (interface{}, error) {
@@ -10379,11 +10379,11 @@ func marshalMultiFilter(p uintptr) (interface{}, error) {
 // MultiSelection: gtkMultiSelection is an implementation of the SelectionModel
 // interface that allows selecting multiple elements.
 type MultiSelection struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapMultiSelection(obj *glib.Object) *MultiSelection {
-	return &MultiSelection{*glib.Object{obj}}
+	return &MultiSelection{*externglib.Object{obj}}
 }
 
 func marshalMultiSelection(p uintptr) (interface{}, error) {
@@ -10400,7 +10400,7 @@ type MultiSorter struct {
 }
 
 func wrapMultiSorter(obj *glib.Object) *MultiSorter {
-	return &MultiSorter{Sorter{*glib.Object{obj}}}
+	return &MultiSorter{Sorter{*externglib.Object{obj}}}
 }
 
 func marshalMultiSorter(p uintptr) (interface{}, error) {
@@ -10415,7 +10415,7 @@ type NamedAction struct {
 }
 
 func wrapNamedAction(obj *glib.Object) *NamedAction {
-	return &NamedAction{ShortcutAction{*glib.Object{obj}}}
+	return &NamedAction{ShortcutAction{*externglib.Object{obj}}}
 }
 
 func marshalNamedAction(p uintptr) (interface{}, error) {
@@ -10439,11 +10439,11 @@ func marshalNamedAction(p uintptr) (interface{}, error) {
 // GTK does not keep them alive. It is your responsibility to keep a reference
 // until you are done with the object.
 type NativeDialog struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapNativeDialog(obj *glib.Object) *NativeDialog {
-	return &NativeDialog{*glib.Object{obj}}
+	return &NativeDialog{*externglib.Object{obj}}
 }
 
 func marshalNativeDialog(p uintptr) (interface{}, error) {
@@ -10458,7 +10458,7 @@ type NeverTrigger struct {
 }
 
 func wrapNeverTrigger(obj *glib.Object) *NeverTrigger {
-	return &NeverTrigger{ShortcutTrigger{*glib.Object{obj}}}
+	return &NeverTrigger{ShortcutTrigger{*externglib.Object{obj}}}
 }
 
 func marshalNeverTrigger(p uintptr) (interface{}, error) {
@@ -10473,11 +10473,11 @@ func marshalNeverTrigger(p uintptr) (interface{}, error) {
 // This model is meant to be used as a simple wrapper to Models when a
 // SelectionModel is required.
 type NoSelection struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapNoSelection(obj *glib.Object) *NoSelection {
-	return &NoSelection{*glib.Object{obj}}
+	return &NoSelection{*externglib.Object{obj}}
 }
 
 func marshalNoSelection(p uintptr) (interface{}, error) {
@@ -10576,7 +10576,7 @@ type Notebook struct {
 }
 
 func wrapNotebook(obj *glib.Object) *Notebook {
-	return &Notebook{Widget{glib.InitiallyUnowned{obj}}}
+	return &Notebook{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalNotebook(p uintptr) (interface{}, error) {
@@ -10589,11 +10589,11 @@ func marshalNotebook(p uintptr) (interface{}, error) {
 //
 // The `GtkNotebookPage` structure only contains private data.
 type NotebookPage struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapNotebookPage(obj *glib.Object) *NotebookPage {
-	return &NotebookPage{*glib.Object{obj}}
+	return &NotebookPage{*externglib.Object{obj}}
 }
 
 func marshalNotebookPage(p uintptr) (interface{}, error) {
@@ -10608,7 +10608,7 @@ type NothingAction struct {
 }
 
 func wrapNothingAction(obj *glib.Object) *NothingAction {
-	return &NothingAction{ShortcutAction{*glib.Object{obj}}}
+	return &NothingAction{ShortcutAction{*externglib.Object{obj}}}
 }
 
 func marshalNothingAction(p uintptr) (interface{}, error) {
@@ -10625,7 +10625,7 @@ type NumericSorter struct {
 }
 
 func wrapNumericSorter(obj *glib.Object) *NumericSorter {
-	return &NumericSorter{Sorter{*glib.Object{obj}}}
+	return &NumericSorter{Sorter{*externglib.Object{obj}}}
 }
 
 func marshalNumericSorter(p uintptr) (interface{}, error) {
@@ -10681,7 +10681,7 @@ type Overlay struct {
 }
 
 func wrapOverlay(obj *glib.Object) *Overlay {
-	return &Overlay{Widget{glib.InitiallyUnowned{obj}}}
+	return &Overlay{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalOverlay(p uintptr) (interface{}, error) {
@@ -10700,7 +10700,7 @@ type OverlayLayout struct {
 }
 
 func wrapOverlayLayout(obj *glib.Object) *OverlayLayout {
-	return &OverlayLayout{LayoutManager{*glib.Object{obj}}}
+	return &OverlayLayout{LayoutManager{*externglib.Object{obj}}}
 }
 
 func marshalOverlayLayout(p uintptr) (interface{}, error) {
@@ -10714,7 +10714,7 @@ type OverlayLayoutChild struct {
 }
 
 func wrapOverlayLayoutChild(obj *glib.Object) *OverlayLayoutChild {
-	return &OverlayLayoutChild{LayoutChild{*glib.Object{obj}}}
+	return &OverlayLayoutChild{LayoutChild{*externglib.Object{obj}}}
 }
 
 func marshalOverlayLayoutChild(p uintptr) (interface{}, error) {
@@ -10766,7 +10766,7 @@ type PadController struct {
 }
 
 func wrapPadController(obj *glib.Object) *PadController {
-	return &PadController{EventController{*glib.Object{obj}}}
+	return &PadController{EventController{*externglib.Object{obj}}}
 }
 
 func marshalPadController(p uintptr) (interface{}, error) {
@@ -10813,11 +10813,11 @@ func marshalPadController(p uintptr) (interface{}, error) {
 //    }
 //
 type PageSetup struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapPageSetup(obj *glib.Object) *PageSetup {
-	return &PageSetup{*glib.Object{obj}}
+	return &PageSetup{*externglib.Object{obj}}
 }
 
 func marshalPageSetup(p uintptr) (interface{}, error) {
@@ -10890,7 +10890,7 @@ type Paned struct {
 }
 
 func wrapPaned(obj *glib.Object) *Paned {
-	return &Paned{Widget{glib.InitiallyUnowned{obj}}}
+	return &Paned{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalPaned(p uintptr) (interface{}, error) {
@@ -10932,7 +10932,7 @@ type PasswordEntry struct {
 }
 
 func wrapPasswordEntry(obj *glib.Object) *PasswordEntry {
-	return &PasswordEntry{Widget{glib.InitiallyUnowned{obj}}}
+	return &PasswordEntry{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalPasswordEntry(p uintptr) (interface{}, error) {
@@ -10987,7 +10987,7 @@ type Picture struct {
 }
 
 func wrapPicture(obj *glib.Object) *Picture {
-	return &Picture{Widget{glib.InitiallyUnowned{obj}}}
+	return &Picture{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalPicture(p uintptr) (interface{}, error) {
@@ -11069,7 +11069,7 @@ type Popover struct {
 }
 
 func wrapPopover(obj *glib.Object) *Popover {
-	return &Popover{Widget{glib.InitiallyUnowned{obj}}}
+	return &Popover{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalPopover(p uintptr) (interface{}, error) {
@@ -11168,7 +11168,7 @@ type PopoverMenu struct {
 }
 
 func wrapPopoverMenu(obj *glib.Object) *PopoverMenu {
-	return &PopoverMenu{Popover{Widget{glib.InitiallyUnowned{obj}}}}
+	return &PopoverMenu{Popover{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalPopoverMenu(p uintptr) (interface{}, error) {
@@ -11206,7 +11206,7 @@ type PopoverMenuBar struct {
 }
 
 func wrapPopoverMenuBar(obj *glib.Object) *PopoverMenuBar {
-	return &PopoverMenuBar{Widget{glib.InitiallyUnowned{obj}}}
+	return &PopoverMenuBar{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalPopoverMenuBar(p uintptr) (interface{}, error) {
@@ -11280,11 +11280,11 @@ func marshalPopoverMenuBar(p uintptr) (interface{}, error) {
 //    }
 //
 type PrintContext struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapPrintContext(obj *glib.Object) *PrintContext {
-	return &PrintContext{*glib.Object{obj}}
+	return &PrintContext{*externglib.Object{obj}}
 }
 
 func marshalPrintContext(p uintptr) (interface{}, error) {
@@ -11352,11 +11352,11 @@ func marshalPrintContext(p uintptr) (interface{}, error) {
 // gtk_print_operation_preview_is_selected() are useful when implementing a
 // print preview.
 type PrintOperation struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapPrintOperation(obj *glib.Object) *PrintOperation {
-	return &PrintOperation{*glib.Object{obj}}
+	return &PrintOperation{*externglib.Object{obj}}
 }
 
 func marshalPrintOperation(p uintptr) (interface{}, error) {
@@ -11376,11 +11376,11 @@ func marshalPrintOperation(p uintptr) (interface{}, error) {
 // The predefined keys try to use shared values as much as possible so that
 // moving such a document between systems still works.
 type PrintSettings struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapPrintSettings(obj *glib.Object) *PrintSettings {
-	return &PrintSettings{*glib.Object{obj}}
+	return &PrintSettings{*externglib.Object{obj}}
 }
 
 func marshalPrintSettings(p uintptr) (interface{}, error) {
@@ -11436,7 +11436,7 @@ type ProgressBar struct {
 }
 
 func wrapProgressBar(obj *glib.Object) *ProgressBar {
-	return &ProgressBar{Widget{glib.InitiallyUnowned{obj}}}
+	return &ProgressBar{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalProgressBar(p uintptr) (interface{}, error) {
@@ -11470,7 +11470,7 @@ type Range struct {
 }
 
 func wrapRange(obj *glib.Object) *Range {
-	return &Range{Widget{glib.InitiallyUnowned{obj}}}
+	return &Range{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalRange(p uintptr) (interface{}, error) {
@@ -11533,11 +11533,11 @@ func marshalRange(p uintptr) (interface{}, error) {
 // Note that the maximum age of the recently used files list is controllable
 // through the Settings:gtk-recent-files-max-age property.
 type RecentManager struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapRecentManager(obj *glib.Object) *RecentManager {
-	return &RecentManager{*glib.Object{obj}}
+	return &RecentManager{*externglib.Object{obj}}
 }
 
 func marshalRecentManager(p uintptr) (interface{}, error) {
@@ -11574,7 +11574,7 @@ type Revealer struct {
 }
 
 func wrapRevealer(obj *glib.Object) *Revealer {
-	return &Revealer{Widget{glib.InitiallyUnowned{obj}}}
+	return &Revealer{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalRevealer(p uintptr) (interface{}, error) {
@@ -11663,7 +11663,7 @@ type Scale struct {
 }
 
 func wrapScale(obj *glib.Object) *Scale {
-	return &Scale{Range{Widget{glib.InitiallyUnowned{obj}}}}
+	return &Scale{Range{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalScale(p uintptr) (interface{}, error) {
@@ -11687,7 +11687,7 @@ type ScaleButton struct {
 }
 
 func wrapScaleButton(obj *glib.Object) *ScaleButton {
-	return &ScaleButton{Widget{glib.InitiallyUnowned{obj}}}
+	return &ScaleButton{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalScaleButton(p uintptr) (interface{}, error) {
@@ -11737,7 +11737,7 @@ type Scrollbar struct {
 }
 
 func wrapScrollbar(obj *glib.Object) *Scrollbar {
-	return &Scrollbar{Widget{glib.InitiallyUnowned{obj}}}
+	return &Scrollbar{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalScrollbar(p uintptr) (interface{}, error) {
@@ -11835,7 +11835,7 @@ type ScrolledWindow struct {
 }
 
 func wrapScrolledWindow(obj *glib.Object) *ScrolledWindow {
-	return &ScrolledWindow{Widget{glib.InitiallyUnowned{obj}}}
+	return &ScrolledWindow{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalScrolledWindow(p uintptr) (interface{}, error) {
@@ -11888,7 +11888,7 @@ type SearchBar struct {
 }
 
 func wrapSearchBar(obj *glib.Object) *SearchBar {
-	return &SearchBar{Widget{glib.InitiallyUnowned{obj}}}
+	return &SearchBar{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalSearchBar(p uintptr) (interface{}, error) {
@@ -11936,7 +11936,7 @@ type SearchEntry struct {
 }
 
 func wrapSearchEntry(obj *glib.Object) *SearchEntry {
-	return &SearchEntry{Widget{glib.InitiallyUnowned{obj}}}
+	return &SearchEntry{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalSearchEntry(p uintptr) (interface{}, error) {
@@ -11948,11 +11948,11 @@ func marshalSearchEntry(p uintptr) (interface{}, error) {
 // SelectionFilterModel: gtkSelectionFilterModel is a list model that presents
 // the selected items in a SelectionModel as its own list model.
 type SelectionFilterModel struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSelectionFilterModel(obj *glib.Object) *SelectionFilterModel {
-	return &SelectionFilterModel{*glib.Object{obj}}
+	return &SelectionFilterModel{*externglib.Object{obj}}
 }
 
 func marshalSelectionFilterModel(p uintptr) (interface{}, error) {
@@ -11981,7 +11981,7 @@ type Separator struct {
 }
 
 func wrapSeparator(obj *glib.Object) *Separator {
-	return &Separator{Widget{glib.InitiallyUnowned{obj}}}
+	return &Separator{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalSeparator(p uintptr) (interface{}, error) {
@@ -12017,11 +12017,11 @@ func marshalSeparator(p uintptr) (interface{}, error) {
 // gtk_settings_get_for_display(), but in many cases, it is more convenient to
 // use gtk_widget_get_settings().
 type Settings struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSettings(obj *glib.Object) *Settings {
-	return &Settings{*glib.Object{obj}}
+	return &Settings{*externglib.Object{obj}}
 }
 
 func marshalSettings(p uintptr) (interface{}, error) {
@@ -12046,11 +12046,11 @@ func marshalSettings(p uintptr) (interface{}, error) {
 // shortcuts, either by providing informational strings for display purposes or
 // by allowing shortcuts to be configured.
 type Shortcut struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapShortcut(obj *glib.Object) *Shortcut {
-	return &Shortcut{*glib.Object{obj}}
+	return &Shortcut{*externglib.Object{obj}}
 }
 
 func marshalShortcut(p uintptr) (interface{}, error) {
@@ -12085,11 +12085,11 @@ func marshalShortcut(p uintptr) (interface{}, error) {
 //
 // GtkShortcut
 type ShortcutAction struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapShortcutAction(obj *glib.Object) *ShortcutAction {
-	return &ShortcutAction{*glib.Object{obj}}
+	return &ShortcutAction{*externglib.Object{obj}}
 }
 
 func marshalShortcutAction(p uintptr) (interface{}, error) {
@@ -12142,7 +12142,7 @@ type ShortcutController struct {
 }
 
 func wrapShortcutController(obj *glib.Object) *ShortcutController {
-	return &ShortcutController{EventController{*glib.Object{obj}}}
+	return &ShortcutController{EventController{*externglib.Object{obj}}}
 }
 
 func marshalShortcutController(p uintptr) (interface{}, error) {
@@ -12158,7 +12158,7 @@ type ShortcutLabel struct {
 }
 
 func wrapShortcutLabel(obj *glib.Object) *ShortcutLabel {
-	return &ShortcutLabel{Widget{glib.InitiallyUnowned{obj}}}
+	return &ShortcutLabel{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalShortcutLabel(p uintptr) (interface{}, error) {
@@ -12178,11 +12178,11 @@ func marshalShortcutLabel(p uintptr) (interface{}, error) {
 // during construction. If you want to change a trigger, you have to replace it
 // with a new one.
 type ShortcutTrigger struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapShortcutTrigger(obj *glib.Object) *ShortcutTrigger {
-	return &ShortcutTrigger{*glib.Object{obj}}
+	return &ShortcutTrigger{*externglib.Object{obj}}
 }
 
 func marshalShortcutTrigger(p uintptr) (interface{}, error) {
@@ -12202,7 +12202,7 @@ type ShortcutsGroup struct {
 }
 
 func wrapShortcutsGroup(obj *glib.Object) *ShortcutsGroup {
-	return &ShortcutsGroup{Box{Widget{glib.InitiallyUnowned{obj}}}}
+	return &ShortcutsGroup{Box{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalShortcutsGroup(p uintptr) (interface{}, error) {
@@ -12226,7 +12226,7 @@ type ShortcutsSection struct {
 }
 
 func wrapShortcutsSection(obj *glib.Object) *ShortcutsSection {
-	return &ShortcutsSection{Box{Widget{glib.InitiallyUnowned{obj}}}}
+	return &ShortcutsSection{Box{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalShortcutsSection(p uintptr) (interface{}, error) {
@@ -12243,7 +12243,7 @@ type ShortcutsShortcut struct {
 }
 
 func wrapShortcutsShortcut(obj *glib.Object) *ShortcutsShortcut {
-	return &ShortcutsShortcut{Widget{glib.InitiallyUnowned{obj}}}
+	return &ShortcutsShortcut{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalShortcutsShortcut(p uintptr) (interface{}, error) {
@@ -12300,7 +12300,7 @@ type ShortcutsWindow struct {
 }
 
 func wrapShortcutsWindow(obj *glib.Object) *ShortcutsWindow {
-	return &ShortcutsWindow{Window{Widget{glib.InitiallyUnowned{obj}}}}
+	return &ShortcutsWindow{Window{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalShortcutsWindow(p uintptr) (interface{}, error) {
@@ -12318,7 +12318,7 @@ type SignalAction struct {
 }
 
 func wrapSignalAction(obj *glib.Object) *SignalAction {
-	return &SignalAction{ShortcutAction{*glib.Object{obj}}}
+	return &SignalAction{ShortcutAction{*externglib.Object{obj}}}
 }
 
 func marshalSignalAction(p uintptr) (interface{}, error) {
@@ -12369,7 +12369,7 @@ type SignalListItemFactory struct {
 }
 
 func wrapSignalListItemFactory(obj *glib.Object) *SignalListItemFactory {
-	return &SignalListItemFactory{ListItemFactory{*glib.Object{obj}}}
+	return &SignalListItemFactory{ListItemFactory{*externglib.Object{obj}}}
 }
 
 func marshalSignalListItemFactory(p uintptr) (interface{}, error) {
@@ -12387,11 +12387,11 @@ func marshalSignalListItemFactory(p uintptr) (interface{}, error) {
 // particular, this means that changing the sort order of an underlying sort
 // model will preserve the selection.
 type SingleSelection struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSingleSelection(obj *glib.Object) *SingleSelection {
-	return &SingleSelection{*glib.Object{obj}}
+	return &SingleSelection{*externglib.Object{obj}}
 }
 
 func marshalSingleSelection(p uintptr) (interface{}, error) {
@@ -12463,11 +12463,11 @@ func marshalSingleSelection(p uintptr) (interface{}, error) {
 //      </widgets>
 //    </object>
 type SizeGroup struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSizeGroup(obj *glib.Object) *SizeGroup {
-	return &SizeGroup{*glib.Object{obj}}
+	return &SizeGroup{*externglib.Object{obj}}
 }
 
 func marshalSizeGroup(p uintptr) (interface{}, error) {
@@ -12483,11 +12483,11 @@ func marshalSizeGroup(p uintptr) (interface{}, error) {
 // elements per page and updating the offset whenever a different page is
 // opened.
 type SliceListModel struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSliceListModel(obj *glib.Object) *SliceListModel {
-	return &SliceListModel{*glib.Object{obj}}
+	return &SliceListModel{*externglib.Object{obj}}
 }
 
 func marshalSliceListModel(p uintptr) (interface{}, error) {
@@ -12513,7 +12513,7 @@ type Snapshot struct {
 }
 
 func wrapSnapshot(obj *glib.Object) *Snapshot {
-	return &Snapshot{Snapshot{*glib.Object{obj}}}
+	return &Snapshot{Snapshot{*externglib.Object{obj}}}
 }
 
 func marshalSnapshot(p uintptr) (interface{}, error) {
@@ -12533,11 +12533,11 @@ func marshalSnapshot(p uintptr) (interface{}, error) {
 // with SortListModel, it is strongly recommended that you write your own
 // sorting list model.
 type SortListModel struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSortListModel(obj *glib.Object) *SortListModel {
-	return &SortListModel{*glib.Object{obj}}
+	return &SortListModel{*externglib.Object{obj}}
 }
 
 func marshalSortListModel(p uintptr) (interface{}, error) {
@@ -12565,11 +12565,11 @@ func marshalSortListModel(p uintptr) (interface{}, error) {
 // Of course, in particular for large lists, it is also possible to subclass
 // Sorter and provide one's own sorter.
 type Sorter struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapSorter(obj *glib.Object) *Sorter {
-	return &Sorter{*glib.Object{obj}}
+	return &Sorter{*externglib.Object{obj}}
 }
 
 func marshalSorter(p uintptr) (interface{}, error) {
@@ -12684,7 +12684,7 @@ type SpinButton struct {
 }
 
 func wrapSpinButton(obj *glib.Object) *SpinButton {
-	return &SpinButton{Widget{glib.InitiallyUnowned{obj}}}
+	return &SpinButton{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalSpinButton(p uintptr) (interface{}, error) {
@@ -12710,7 +12710,7 @@ type Spinner struct {
 }
 
 func wrapSpinner(obj *glib.Object) *Spinner {
-	return &Spinner{Widget{glib.InitiallyUnowned{obj}}}
+	return &Spinner{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalSpinner(p uintptr) (interface{}, error) {
@@ -12763,7 +12763,7 @@ type Stack struct {
 }
 
 func wrapStack(obj *glib.Object) *Stack {
-	return &Stack{Widget{glib.InitiallyUnowned{obj}}}
+	return &Stack{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalStack(p uintptr) (interface{}, error) {
@@ -12773,11 +12773,11 @@ func marshalStack(p uintptr) (interface{}, error) {
 }
 
 type StackPage struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapStackPage(obj *glib.Object) *StackPage {
-	return &StackPage{*glib.Object{obj}}
+	return &StackPage{*externglib.Object{obj}}
 }
 
 func marshalStackPage(p uintptr) (interface{}, error) {
@@ -12806,7 +12806,7 @@ type StackSidebar struct {
 }
 
 func wrapStackSidebar(obj *glib.Object) *StackSidebar {
-	return &StackSidebar{Widget{glib.InitiallyUnowned{obj}}}
+	return &StackSidebar{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalStackSidebar(p uintptr) (interface{}, error) {
@@ -12845,7 +12845,7 @@ type StackSwitcher struct {
 }
 
 func wrapStackSwitcher(obj *glib.Object) *StackSwitcher {
-	return &StackSwitcher{Widget{glib.InitiallyUnowned{obj}}}
+	return &StackSwitcher{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalStackSwitcher(p uintptr) (interface{}, error) {
@@ -12891,7 +12891,7 @@ type Statusbar struct {
 }
 
 func wrapStatusbar(obj *glib.Object) *Statusbar {
-	return &Statusbar{Widget{glib.InitiallyUnowned{obj}}}
+	return &Statusbar{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalStatusbar(p uintptr) (interface{}, error) {
@@ -12911,7 +12911,7 @@ type StringFilter struct {
 }
 
 func wrapStringFilter(obj *glib.Object) *StringFilter {
-	return &StringFilter{Filter{*glib.Object{obj}}}
+	return &StringFilter{Filter{*externglib.Object{obj}}}
 }
 
 func marshalStringFilter(p uintptr) (interface{}, error) {
@@ -12944,11 +12944,11 @@ func marshalStringFilter(p uintptr) (interface{}, error) {
 //      </items>
 //    </object>
 type StringList struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapStringList(obj *glib.Object) *StringList {
-	return &StringList{*glib.Object{obj}}
+	return &StringList{*externglib.Object{obj}}
 }
 
 func marshalStringList(p uintptr) (interface{}, error) {
@@ -12958,11 +12958,11 @@ func marshalStringList(p uintptr) (interface{}, error) {
 }
 
 type StringObject struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapStringObject(obj *glib.Object) *StringObject {
-	return &StringObject{*glib.Object{obj}}
+	return &StringObject{*externglib.Object{obj}}
 }
 
 func marshalStringObject(p uintptr) (interface{}, error) {
@@ -12982,7 +12982,7 @@ type StringSorter struct {
 }
 
 func wrapStringSorter(obj *glib.Object) *StringSorter {
-	return &StringSorter{Sorter{*glib.Object{obj}}}
+	return &StringSorter{Sorter{*externglib.Object{obj}}}
 }
 
 func marshalStringSorter(p uintptr) (interface{}, error) {
@@ -13031,11 +13031,11 @@ func marshalStringSorter(p uintptr) (interface{}, error) {
 // still take precedence over your changes, as it uses the
 // GTK_STYLE_PROVIDER_PRIORITY_USER priority.
 type StyleContext struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapStyleContext(obj *glib.Object) *StyleContext {
-	return &StyleContext{*glib.Object{obj}}
+	return &StyleContext{*externglib.Object{obj}}
 }
 
 func marshalStyleContext(p uintptr) (interface{}, error) {
@@ -13071,7 +13071,7 @@ type Switch struct {
 }
 
 func wrapSwitch(obj *glib.Object) *Switch {
-	return &Switch{Widget{glib.InitiallyUnowned{obj}}}
+	return &Switch{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalSwitch(p uintptr) (interface{}, error) {
@@ -13140,7 +13140,7 @@ type Text struct {
 }
 
 func wrapText(obj *glib.Object) *Text {
-	return &Text{Widget{glib.InitiallyUnowned{obj}}}
+	return &Text{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalText(p uintptr) (interface{}, error) {
@@ -13153,11 +13153,11 @@ func marshalText(p uintptr) (interface{}, error) {
 // overview][TextWidget] which gives an overview of all the objects and data
 // types related to the text widget and how they work together.
 type TextBuffer struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTextBuffer(obj *glib.Object) *TextBuffer {
-	return &TextBuffer{*glib.Object{obj}}
+	return &TextBuffer{*externglib.Object{obj}}
 }
 
 func marshalTextBuffer(p uintptr) (interface{}, error) {
@@ -13170,11 +13170,11 @@ func marshalTextBuffer(p uintptr) (interface{}, error) {
 // widgets can be “anchored” (inserted inline, as if they were characters). The
 // anchor can have multiple widgets anchored, to allow for multiple views.
 type TextChildAnchor struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTextChildAnchor(obj *glib.Object) *TextChildAnchor {
-	return &TextChildAnchor{*glib.Object{obj}}
+	return &TextChildAnchor{*externglib.Object{obj}}
 }
 
 func marshalTextChildAnchor(p uintptr) (interface{}, error) {
@@ -13211,11 +13211,11 @@ func marshalTextChildAnchor(p uintptr) (interface{}, error) {
 //
 // Marks are typically created using the gtk_text_buffer_create_mark() function.
 type TextMark struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTextMark(obj *glib.Object) *TextMark {
-	return &TextMark{*glib.Object{obj}}
+	return &TextMark{*externglib.Object{obj}}
 }
 
 func marshalTextMark(p uintptr) (interface{}, error) {
@@ -13239,11 +13239,11 @@ func marshalTextMark(p uintptr) (interface{}, error) {
 // been set or not. They are maintained by GTK+ and you should not set them
 // independently.
 type TextTag struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTextTag(obj *glib.Object) *TextTag {
-	return &TextTag{*glib.Object{obj}}
+	return &TextTag{*externglib.Object{obj}}
 }
 
 func marshalTextTag(p uintptr) (interface{}, error) {
@@ -13269,11 +13269,11 @@ func marshalTextTag(p uintptr) (interface{}, error) {
 //     </child>
 //    </object>
 type TextTagTable struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTextTagTable(obj *glib.Object) *TextTagTable {
-	return &TextTagTable{*glib.Object{obj}}
+	return &TextTagTable{*externglib.Object{obj}}
 }
 
 func marshalTextTagTable(p uintptr) (interface{}, error) {
@@ -13316,7 +13316,7 @@ type TextView struct {
 }
 
 func wrapTextView(obj *glib.Object) *TextView {
-	return &TextView{Widget{glib.InitiallyUnowned{obj}}}
+	return &TextView{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalTextView(p uintptr) (interface{}, error) {
@@ -13385,7 +13385,7 @@ type ToggleButton struct {
 }
 
 func wrapToggleButton(obj *glib.Object) *ToggleButton {
-	return &ToggleButton{Button{Widget{glib.InitiallyUnowned{obj}}}}
+	return &ToggleButton{Button{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalToggleButton(p uintptr) (interface{}, error) {
@@ -13417,11 +13417,11 @@ func marshalToggleButton(p uintptr) (interface{}, error) {
 // Return true from your query-tooltip handler. This causes the tooltip to be
 // show. If you return false, it will not be shown.
 type Tooltip struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTooltip(obj *glib.Object) *Tooltip {
-	return &Tooltip{*glib.Object{obj}}
+	return &Tooltip{*externglib.Object{obj}}
 }
 
 func marshalTooltip(p uintptr) (interface{}, error) {
@@ -13472,7 +13472,7 @@ type TreeExpander struct {
 }
 
 func wrapTreeExpander(obj *glib.Object) *TreeExpander {
-	return &TreeExpander{Widget{glib.InitiallyUnowned{obj}}}
+	return &TreeExpander{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalTreeExpander(p uintptr) (interface{}, error) {
@@ -13484,11 +13484,11 @@ func marshalTreeExpander(p uintptr) (interface{}, error) {
 // TreeListModel: gtkTreeListModel is a Model implementation that can expand
 // rows by creating new child list models on demand.
 type TreeListModel struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTreeListModel(obj *glib.Object) *TreeListModel {
-	return &TreeListModel{*glib.Object{obj}}
+	return &TreeListModel{*externglib.Object{obj}}
 }
 
 func marshalTreeListModel(p uintptr) (interface{}, error) {
@@ -13508,11 +13508,11 @@ func marshalTreeListModel(p uintptr) (interface{}, error) {
 // collapse a row or TreeListRowSorter that makes it possible to sort trees
 // properly.
 type TreeListRow struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTreeListRow(obj *glib.Object) *TreeListRow {
-	return &TreeListRow{*glib.Object{obj}}
+	return &TreeListRow{*externglib.Object{obj}}
 }
 
 func marshalTreeListRow(p uintptr) (interface{}, error) {
@@ -13539,7 +13539,7 @@ type TreeListRowSorter struct {
 }
 
 func wrapTreeListRowSorter(obj *glib.Object) *TreeListRowSorter {
-	return &TreeListRowSorter{Sorter{*glib.Object{obj}}}
+	return &TreeListRowSorter{Sorter{*externglib.Object{obj}}}
 }
 
 func marshalTreeListRowSorter(p uintptr) (interface{}, error) {
@@ -13610,11 +13610,11 @@ func marshalTreeListRowSorter(p uintptr) (interface{}, error) {
 // reference counting, or for models that do implement reference counting,
 // obtain references on these child levels yourself.
 type TreeModelFilter struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTreeModelFilter(obj *glib.Object) *TreeModelFilter {
-	return &TreeModelFilter{*glib.Object{obj}}
+	return &TreeModelFilter{*externglib.Object{obj}}
 }
 
 func marshalTreeModelFilter(p uintptr) (interface{}, error) {
@@ -13715,11 +13715,11 @@ func marshalTreeModelFilter(p uintptr) (interface{}, error) {
 //    }
 //
 type TreeModelSort struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTreeModelSort(obj *glib.Object) *TreeModelSort {
-	return &TreeModelSort{*glib.Object{obj}}
+	return &TreeModelSort{*externglib.Object{obj}}
 }
 
 func marshalTreeModelSort(p uintptr) (interface{}, error) {
@@ -13751,11 +13751,11 @@ func marshalTreeModelSort(p uintptr) (interface{}, error) {
 // happened (mostly as a result of programmers calling select_row on an already
 // selected row).
 type TreeSelection struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTreeSelection(obj *glib.Object) *TreeSelection {
-	return &TreeSelection{*glib.Object{obj}}
+	return &TreeSelection{*externglib.Object{obj}}
 }
 
 func marshalTreeSelection(p uintptr) (interface{}, error) {
@@ -13787,11 +13787,11 @@ func marshalTreeSelection(p uintptr) (interface{}, error) {
 //      </columns>
 //    </object>
 type TreeStore struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapTreeStore(obj *glib.Object) *TreeStore {
-	return &TreeStore{*glib.Object{obj}}
+	return &TreeStore{*externglib.Object{obj}}
 }
 
 func marshalTreeStore(p uintptr) (interface{}, error) {
@@ -13882,7 +13882,7 @@ type TreeView struct {
 }
 
 func wrapTreeView(obj *glib.Object) *TreeView {
-	return &TreeView{Widget{glib.InitiallyUnowned{obj}}}
+	return &TreeView{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalTreeView(p uintptr) (interface{}, error) {
@@ -13900,11 +13900,11 @@ func marshalTreeView(p uintptr) (interface{}, error) {
 // overview of all the objects and data types related to the tree widget and how
 // they work together.
 type TreeViewColumn struct {
-	glib.InitiallyUnowned
+	externglib.InitiallyUnowned
 }
 
 func wrapTreeViewColumn(obj *glib.Object) *TreeViewColumn {
-	return &TreeViewColumn{glib.InitiallyUnowned{obj}}
+	return &TreeViewColumn{externglib.InitiallyUnowned{obj}}
 }
 
 func marshalTreeViewColumn(p uintptr) (interface{}, error) {
@@ -13928,7 +13928,7 @@ type Video struct {
 }
 
 func wrapVideo(obj *glib.Object) *Video {
-	return &Video{Widget{glib.InitiallyUnowned{obj}}}
+	return &Video{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalVideo(p uintptr) (interface{}, error) {
@@ -13958,7 +13958,7 @@ type Viewport struct {
 }
 
 func wrapViewport(obj *glib.Object) *Viewport {
-	return &Viewport{Widget{glib.InitiallyUnowned{obj}}}
+	return &Viewport{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalViewport(p uintptr) (interface{}, error) {
@@ -13975,7 +13975,7 @@ type VolumeButton struct {
 }
 
 func wrapVolumeButton(obj *glib.Object) *VolumeButton {
-	return &VolumeButton{ScaleButton{Widget{glib.InitiallyUnowned{obj}}}}
+	return &VolumeButton{ScaleButton{Widget{externglib.InitiallyUnowned{obj}}}}
 }
 
 func marshalVolumeButton(p uintptr) (interface{}, error) {
@@ -14316,11 +14316,11 @@ func marshalVolumeButton(p uintptr) (interface{}, error) {
 //    }
 //
 type Widget struct {
-	glib.InitiallyUnowned
+	externglib.InitiallyUnowned
 }
 
 func wrapWidget(obj *glib.Object) *Widget {
-	return &Widget{glib.InitiallyUnowned{obj}}
+	return &Widget{externglib.InitiallyUnowned{obj}}
 }
 
 func marshalWidget(p uintptr) (interface{}, error) {
@@ -14349,11 +14349,11 @@ func marshalWidget(p uintptr) (interface{}, error) {
 // Picture:can-shrink property is set to true or you might end up with an
 // infinitely growing widget.
 type WidgetPaintable struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapWidgetPaintable(obj *glib.Object) *WidgetPaintable {
-	return &WidgetPaintable{*glib.Object{obj}}
+	return &WidgetPaintable{*externglib.Object{obj}}
 }
 
 func marshalWidgetPaintable(p uintptr) (interface{}, error) {
@@ -14409,7 +14409,7 @@ type Window struct {
 }
 
 func wrapWindow(obj *glib.Object) *Window {
-	return &Window{Widget{glib.InitiallyUnowned{obj}}}
+	return &Window{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalWindow(p uintptr) (interface{}, error) {
@@ -14467,7 +14467,7 @@ type WindowControls struct {
 }
 
 func wrapWindowControls(obj *glib.Object) *WindowControls {
-	return &WindowControls{Widget{glib.InitiallyUnowned{obj}}}
+	return &WindowControls{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalWindowControls(p uintptr) (interface{}, error) {
@@ -14491,11 +14491,11 @@ func marshalWindowControls(p uintptr) (interface{}, error) {
 // window group and drop their references on the window group; when all window
 // have been removed, the window group will be freed.
 type WindowGroup struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapWindowGroup(obj *glib.Object) *WindowGroup {
-	return &WindowGroup{*glib.Object{obj}}
+	return &WindowGroup{*externglib.Object{obj}}
 }
 
 func marshalWindowGroup(p uintptr) (interface{}, error) {
@@ -14522,7 +14522,7 @@ type WindowHandle struct {
 }
 
 func wrapWindowHandle(obj *glib.Object) *WindowHandle {
-	return &WindowHandle{Widget{glib.InitiallyUnowned{obj}}}
+	return &WindowHandle{Widget{externglib.InitiallyUnowned{obj}}}
 }
 
 func marshalWindowHandle(p uintptr) (interface{}, error) {
diff --git a/pkg/pango/pango.go b/pkg/pango/pango.go
index 86eeee20f..466ebea83 100644
--- a/pkg/pango/pango.go
+++ b/pkg/pango/pango.go
@@ -7,7 +7,7 @@ import (
 	"unsafe"
 
 	"github.com/diamondburned/gotk4/pkg/glib"
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: pango
@@ -16,26 +16,26 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 		// Enums
-		{T: glib.Type(C.pango_alignment_get_type()), F: marshalAlignment},
-		{T: glib.Type(C.pango_attr_type_get_type()), F: marshalAttrType},
-		{T: glib.Type(C.pango_bidi_type_get_type()), F: marshalBidiType},
-		{T: glib.Type(C.pango_coverage_level_get_type()), F: marshalCoverageLevel},
-		{T: glib.Type(C.pango_direction_get_type()), F: marshalDirection},
-		{T: glib.Type(C.pango_ellipsize_mode_get_type()), F: marshalEllipsizeMode},
-		{T: glib.Type(C.pango_gravity_get_type()), F: marshalGravity},
-		{T: glib.Type(C.pango_gravity_hint_get_type()), F: marshalGravityHint},
-		{T: glib.Type(C.pango_overline_get_type()), F: marshalOverline},
-		{T: glib.Type(C.pango_render_part_get_type()), F: marshalRenderPart},
-		{T: glib.Type(C.pango_script_get_type()), F: marshalScript},
-		{T: glib.Type(C.pango_stretch_get_type()), F: marshalStretch},
-		{T: glib.Type(C.pango_style_get_type()), F: marshalStyle},
-		{T: glib.Type(C.pango_tab_align_get_type()), F: marshalTabAlign},
-		{T: glib.Type(C.pango_underline_get_type()), F: marshalUnderline},
-		{T: glib.Type(C.pango_variant_get_type()), F: marshalVariant},
-		{T: glib.Type(C.pango_weight_get_type()), F: marshalWeight},
-		{T: glib.Type(C.pango_wrap_mode_get_type()), F: marshalWrapMode},
+		{T: externglib.Type(C.pango_alignment_get_type()), F: marshalAlignment},
+		{T: externglib.Type(C.pango_attr_type_get_type()), F: marshalAttrType},
+		{T: externglib.Type(C.pango_bidi_type_get_type()), F: marshalBidiType},
+		{T: externglib.Type(C.pango_coverage_level_get_type()), F: marshalCoverageLevel},
+		{T: externglib.Type(C.pango_direction_get_type()), F: marshalDirection},
+		{T: externglib.Type(C.pango_ellipsize_mode_get_type()), F: marshalEllipsizeMode},
+		{T: externglib.Type(C.pango_gravity_get_type()), F: marshalGravity},
+		{T: externglib.Type(C.pango_gravity_hint_get_type()), F: marshalGravityHint},
+		{T: externglib.Type(C.pango_overline_get_type()), F: marshalOverline},
+		{T: externglib.Type(C.pango_render_part_get_type()), F: marshalRenderPart},
+		{T: externglib.Type(C.pango_script_get_type()), F: marshalScript},
+		{T: externglib.Type(C.pango_stretch_get_type()), F: marshalStretch},
+		{T: externglib.Type(C.pango_style_get_type()), F: marshalStyle},
+		{T: externglib.Type(C.pango_tab_align_get_type()), F: marshalTabAlign},
+		{T: externglib.Type(C.pango_underline_get_type()), F: marshalUnderline},
+		{T: externglib.Type(C.pango_variant_get_type()), F: marshalVariant},
+		{T: externglib.Type(C.pango_weight_get_type()), F: marshalWeight},
+		{T: externglib.Type(C.pango_wrap_mode_get_type()), F: marshalWrapMode},
 
 		// Objects/Classes
 	})
@@ -1327,7 +1327,7 @@ func NewMarkupParser(accelMarker uint32) *glib.MarkupParseContext
 // @possible_values. The list is slash-separated, eg. "none/start/middle/end".
 // If failed and @possible_values is not nil, returned string should be freed
 // using g_free().
-func ParseEnum(_type glib.Type, str string, warn bool) (int, string, bool)
+func ParseEnum(_type externglib.Type, str string, warn bool) (int, string, bool)
 
 // ParseMarkup: parses marked-up text to create a plain-text string and an
 // attribute list.
@@ -2888,11 +2888,11 @@ func NewTabArray(initialSize int, positionsInPixels bool) *TabArray
 //
 // To obtain a `PangoContext`, use [method@Pango.FontMap.create_context].
 type Context struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapContext(obj *glib.Object) *Context {
-	return &Context{*glib.Object{obj}}
+	return &Context{*externglib.Object{obj}}
 }
 
 func marshalContext(p uintptr) (interface{}, error) {
@@ -2909,11 +2909,11 @@ func marshalContext(p uintptr) (interface{}, error) {
 // character. The Coverage is a data structure that is used to represent that
 // information. It is an opaque structure with no public fields.
 type Coverage struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapCoverage(obj *glib.Object) *Coverage {
-	return &Coverage{*glib.Object{obj}}
+	return &Coverage{*externglib.Object{obj}}
 }
 
 func marshalCoverage(p uintptr) (interface{}, error) {
@@ -2925,11 +2925,11 @@ func marshalCoverage(p uintptr) (interface{}, error) {
 // Font: a `PangoFont` is used to represent a font in a
 // rendering-system-independent manner.
 type Font struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFont(obj *glib.Object) *Font {
-	return &Font{*glib.Object{obj}}
+	return &Font{*externglib.Object{obj}}
 }
 
 func marshalFont(p uintptr) (interface{}, error) {
@@ -2941,11 +2941,11 @@ func marshalFont(p uintptr) (interface{}, error) {
 // FontFace: a `PangoFontFace` is used to represent a group of fonts with the
 // same family, slant, weight, and width, but varying sizes.
 type FontFace struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFontFace(obj *glib.Object) *FontFace {
-	return &FontFace{*glib.Object{obj}}
+	return &FontFace{*externglib.Object{obj}}
 }
 
 func marshalFontFace(p uintptr) (interface{}, error) {
@@ -2960,11 +2960,11 @@ func marshalFontFace(p uintptr) (interface{}, error) {
 // The font faces in a family share a common design, but differ in slant,
 // weight, width or other aspects.
 type FontFamily struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFontFamily(obj *glib.Object) *FontFamily {
-	return &FontFamily{*glib.Object{obj}}
+	return &FontFamily{*externglib.Object{obj}}
 }
 
 func marshalFontFamily(p uintptr) (interface{}, error) {
@@ -2979,11 +2979,11 @@ func marshalFontFamily(p uintptr) (interface{}, error) {
 // This is a virtual object with implementations being specific to particular
 // rendering systems.
 type FontMap struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFontMap(obj *glib.Object) *FontMap {
-	return &FontMap{*glib.Object{obj}}
+	return &FontMap{*externglib.Object{obj}}
 }
 
 func marshalFontMap(p uintptr) (interface{}, error) {
@@ -3000,11 +3000,11 @@ func marshalFontMap(p uintptr) (interface{}, error) {
 // for a particular Unicode character, and for finding a composite set of
 // metrics for the entire fontset.
 type Fontset struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapFontset(obj *glib.Object) *Fontset {
-	return &Fontset{*glib.Object{obj}}
+	return &Fontset{*externglib.Object{obj}}
 }
 
 func marshalFontset(p uintptr) (interface{}, error) {
@@ -3023,7 +3023,7 @@ type FontsetSimple struct {
 }
 
 func wrapFontsetSimple(obj *glib.Object) *FontsetSimple {
-	return &FontsetSimple{Fontset{*glib.Object{obj}}}
+	return &FontsetSimple{Fontset{*externglib.Object{obj}}}
 }
 
 func marshalFontsetSimple(p uintptr) (interface{}, error) {
@@ -3056,11 +3056,11 @@ func marshalFontsetSimple(p uintptr) (interface{}, error) {
 // It is possible, as well, to ignore the 2-D setup, and simply treat the
 // results of a `PangoLayout` as a list of lines.
 type Layout struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapLayout(obj *glib.Object) *Layout {
-	return &Layout{*glib.Object{obj}}
+	return &Layout{*externglib.Object{obj}}
 }
 
 func marshalLayout(p uintptr) (interface{}, error) {
@@ -3076,11 +3076,11 @@ func marshalLayout(p uintptr) (interface{}, error) {
 // and @draw_rectangle, renderers for particular font backends and destinations
 // can be created.
 type Renderer struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapRenderer(obj *glib.Object) *Renderer {
-	return &Renderer{*glib.Object{obj}}
+	return &Renderer{*externglib.Object{obj}}
 }
 
 func marshalRenderer(p uintptr) (interface{}, error) {
diff --git a/pkg/pangocairo/pangocairo.go b/pkg/pangocairo/pangocairo.go
index a521be8dc..f775e2340 100644
--- a/pkg/pangocairo/pangocairo.go
+++ b/pkg/pangocairo/pangocairo.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/diamondburned/gotk4/pkg/cairo"
 	"github.com/diamondburned/gotk4/pkg/pango"
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: pangocairo
@@ -16,7 +16,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 
 		// Objects/Classes
 	})
diff --git a/pkg/pangofc/pangofc.go b/pkg/pangofc/pangofc.go
index 1a1a697d2..3ebaa4cbe 100644
--- a/pkg/pangofc/pangofc.go
+++ b/pkg/pangofc/pangofc.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/diamondburned/gotk4/pkg/pango"
 	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: pangofc
@@ -15,7 +16,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 
 		// Objects/Classes
 	})
@@ -31,11 +32,11 @@ func init() {
 // individual character to glyph conversions. Pango gets that information via
 // the #get_charset and #get_glyph callbacks into your object implementation.
 type Decoder struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapDecoder(obj *glib.Object) *Decoder {
-	return &Decoder{*glib.Object{obj}}
+	return &Decoder{*externglib.Object{obj}}
 }
 
 func marshalDecoder(p uintptr) (interface{}, error) {
@@ -56,7 +57,7 @@ type Font struct {
 }
 
 func wrapFont(obj *glib.Object) *Font {
-	return &Font{Font{*glib.Object{obj}}}
+	return &Font{Font{*externglib.Object{obj}}}
 }
 
 func marshalFont(p uintptr) (interface{}, error) {
@@ -77,7 +78,7 @@ type FontMap struct {
 }
 
 func wrapFontMap(obj *glib.Object) *FontMap {
-	return &FontMap{FontMap{*glib.Object{obj}}}
+	return &FontMap{FontMap{*externglib.Object{obj}}}
 }
 
 func marshalFontMap(p uintptr) (interface{}, error) {
diff --git a/pkg/pangoft2/pangoft2.go b/pkg/pangoft2/pangoft2.go
index 528c17fcf..ef2c84296 100644
--- a/pkg/pangoft2/pangoft2.go
+++ b/pkg/pangoft2/pangoft2.go
@@ -9,6 +9,7 @@ import (
 	"github.com/diamondburned/gotk4/pkg/pango"
 	"github.com/diamondburned/gotk4/pkg/pangofc"
 	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: pangoft2
@@ -17,7 +18,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 
 		// Objects/Classes
 	})
@@ -92,7 +93,7 @@ type FontMap struct {
 }
 
 func wrapFontMap(obj *glib.Object) *FontMap {
-	return &FontMap{FontMap{FontMap{*glib.Object{obj}}}}
+	return &FontMap{FontMap{FontMap{*externglib.Object{obj}}}}
 }
 
 func marshalFontMap(p uintptr) (interface{}, error) {
diff --git a/pkg/pangoot/pangoot.go b/pkg/pangoot/pangoot.go
index fb31385c5..fd1cf36f0 100644
--- a/pkg/pangoot/pangoot.go
+++ b/pkg/pangoot/pangoot.go
@@ -9,6 +9,7 @@ import (
 	"github.com/diamondburned/gotk4/pkg/pango"
 	"github.com/diamondburned/gotk4/pkg/pangofc"
 	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: pangoot
@@ -17,7 +18,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 		// Enums
 		// Skipped TableType.
 
@@ -238,11 +239,11 @@ func (r *RulesetDescription) Native() unsafe.Pointer {
 }
 
 type Info struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapInfo(obj *glib.Object) *Info {
-	return &Info{*glib.Object{obj}}
+	return &Info{*externglib.Object{obj}}
 }
 
 func marshalInfo(p uintptr) (interface{}, error) {
@@ -258,11 +259,11 @@ func marshalInfo(p uintptr) (interface{}, error) {
 // are added to it with pango_ot_ruleset_add_feature(), then it is applied to a
 // GlyphString with pango_ot_ruleset_shape().
 type Ruleset struct {
-	*glib.Object
+	*externglib.Object
 }
 
 func wrapRuleset(obj *glib.Object) *Ruleset {
-	return &Ruleset{*glib.Object{obj}}
+	return &Ruleset{*externglib.Object{obj}}
 }
 
 func marshalRuleset(p uintptr) (interface{}, error) {
diff --git a/pkg/pangoxft/pangoxft.go b/pkg/pangoxft/pangoxft.go
index 4f5fa0ebd..5c6ebf6a1 100644
--- a/pkg/pangoxft/pangoxft.go
+++ b/pkg/pangoxft/pangoxft.go
@@ -10,6 +10,7 @@ import (
 	"github.com/diamondburned/gotk4/pkg/xft"
 	"github.com/diamondburned/gotk4/pkg/xlib"
 	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config: pangoxft
@@ -18,7 +19,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 
 		// Objects/Classes
 	})
@@ -75,7 +76,7 @@ type Font struct {
 }
 
 func wrapFont(obj *glib.Object) *Font {
-	return &Font{Font{Font{*glib.Object{obj}}}}
+	return &Font{Font{Font{*externglib.Object{obj}}}}
 }
 
 func marshalFont(p uintptr) (interface{}, error) {
@@ -91,7 +92,7 @@ type FontMap struct {
 }
 
 func wrapFontMap(obj *glib.Object) *FontMap {
-	return &FontMap{FontMap{FontMap{*glib.Object{obj}}}}
+	return &FontMap{FontMap{FontMap{*externglib.Object{obj}}}}
 }
 
 func marshalFontMap(p uintptr) (interface{}, error) {
@@ -108,7 +109,7 @@ type Renderer struct {
 }
 
 func wrapRenderer(obj *glib.Object) *Renderer {
-	return &Renderer{Renderer{*glib.Object{obj}}}
+	return &Renderer{Renderer{*externglib.Object{obj}}}
 }
 
 func marshalRenderer(p uintptr) (interface{}, error) {
diff --git a/pkg/vulkan/vulkan.go b/pkg/vulkan/vulkan.go
index c30e6381b..ac7de808f 100644
--- a/pkg/vulkan/vulkan.go
+++ b/pkg/vulkan/vulkan.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"unsafe"
 
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config:
@@ -14,7 +14,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 
 		// Objects/Classes
 	})
diff --git a/pkg/xft/xft.go b/pkg/xft/xft.go
index d4197d77d..ef8a8104a 100644
--- a/pkg/xft/xft.go
+++ b/pkg/xft/xft.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"unsafe"
 
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config:
@@ -14,7 +14,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 
 		// Objects/Classes
 	})
diff --git a/pkg/xlib/xlib.go b/pkg/xlib/xlib.go
index 51815f5d9..8fbeec85f 100644
--- a/pkg/xlib/xlib.go
+++ b/pkg/xlib/xlib.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"unsafe"
 
-	"github.com/gotk3/gotk3/glib"
+	externglib "github.com/gotk3/gotk3/glib"
 )
 
 // #cgo pkg-config:
@@ -14,7 +14,7 @@ import (
 import "C"
 
 func init() {
-	glib.RegisterGValueMarshalers([]glib.TypeMarshaler{
+	externglib.RegisterGValueMarshalers([]externglib.TypeMarshaler{
 
 		// Objects/Classes
 	})