Instead of having all structures in one huge headers, move them in the appropriate place, and create one header for surface state. https://bugzilla.gnome.org/show_bug.cgi?id=707128