Fix some declarations/inclusions
Merge pull request #1783 from jtanx/fixings

Fix some declarations/inclusions