The order and way include macros were structured was chaotic, with no real common thread between files. Try to tidy up the mess with some common scheme, to make things look less messy.
https://bugzilla.gnome.org/show_bug.cgi?id=759538