Trivial s/foo/foo_/ fixes to make <glib.h> includable with -Wshadow