Reorder some inclusions and remove a few blank lines. https://bugzilla.gnome.org/show_bug.cgi?id=697076