-Also threw out a few more unneeded includes. Next up: Tests and then remerge. Former-commit-id: 79f35c4409
79f35c4409