Reorganize includes to resolve winsock2 compilation warnings