Add missing includes
Merge pull request #4193 from wmtan/AddMissingIncludes

Add missing includes.