glib.h: general cleanup