Removed redundant includes a la issue #3570
Merge branch '5.0-wip' of github.com:shreve/foundation into 5.0-wip