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