Bug #2638: Only include winsock and windows headers if requested by client code
Merge branch 'b2638-fix-multiple-include-winsock' into development