Initial Windows Clean up

This is incomplete. It shows some windows header macro clean up that I consolidated and want review on.
WinSock2.h can include or does include "windows.h" That's why I commented like that.