Miscellaneous additions to 'msvc_extra_headers'