Check in some minor modifications (to MSVC specific headers)