misc small changes to polish after include cleanup
Merge pull request #3235 from Diapolo/misc

misc small changes to polish after include cleanup