Add missing #includes
standardize includes
Merge pull request #546 from wmtan/AddMissingIncludes

Add missing #includes