More formatting cleanup.
Formatting/cleanup; remove some unnecessary includes from header file.
Move include guards into header file where they belong.
Formatting; remove a function from the header file that didn't need to be exposed there.
Formatting.