Keep gobject and glib separate

Sometimes we need GLib, sometimes we need GObject.