Improve includes, other nits.