Whitespace and include file clean-up.

Based on review comments by Brian Paul.
1 file changed