Merge "Pull in Windows compatibility header."