Ironed out some more hidden dependencies on glib.h