Include header files whose declarations are used

The xcode clang compiler on Mac requires these

I electronically signed the CLA. Might not have been processed yet.