Remove some more unused includes
More include tweaks
Fix some ifndef/defs not following global style