Revert repeat includes

Rationale is given, with references, in the extended commit messages on this branch.