(oops) Apologies all, that last header-cleanup commit was from the wrong

tree. This further reduces header interdependencies, and makes some
associated cleanups.