Fixed a few small type inconsistencies.

I noticed a couple of stale include lines which are not being used as well as a few type inconsistencies. I tested these changes and they do not appear to affect  building or running the code, at least on OSX.