reorder/clean includes so windows.h is never included before winsock headers

Winsock emits a warning when windows.h is included before winsock.h. The contribs are clean so we should also be clean.