Reorder headers according to lint.