Merge "Move winsock2.h in front of a potential windows.h include."