Fix char* -> const char *

Fixes warning which is now fatal on our modern RHEL builds.
Clean up #includes, hope to fix WIN32

I think WIN32 build problem may be the result of header order mattering
(where really, it shouldn't).  Either way, this should simplify things a
bit.