Sort #includes a bit better, and don't include platform-specific
headers in gio.h.