Revert "Merge pull request #1007 from joakim-noah/move_winsock"

This reverts commit b9473662b12766178a24f25da9573e886df4f8b5, reversing
changes made to dc73f310fd39b4095c4310e4194a37c9a898b9f4.