Small cleanup of headers, compile errors.

This is just a step along the way in cleaning up some header issues.  Pushing so Rame can get these changes.