Remove unused includes
Merge pull request #1233 from ianna/static-analyser-errors-cleanup

Misc fixes -- Remove unused includes.