Merge the changes to these few files with the windows port branch to test just these changes under linux and altix.