Clean up some header files and fix compilation with MSC.