Merge pull request #438 from apache/feature/add_missing_includes

Add some missing include headers