More xMath3 Cleanup (#704)

* Header changes

* Mostly cleanup, small progress on a few.

* Clang and put back a function definition I goofed by removing.

Author: daft7