Merge pull request #1347 from comex/header-hygiene Add missing includes where headers depend on other headers having been included first.