Add some more includes.
Fix comparison.