+ * gnutls.c (wgnutls_close): Use always `close', not `closesocket'.
+
+ * openssl.c (openssl_close): Use always `close', not `closesocket'.
+ (ssl_connect_wget): Get the real socket handle by FD_TO_SOCKET.
+ Define FD_TO_SOCKET if it is not yet defined.
+
+ * Makefile.am (libunittest_a_CPPFLAGS): Add -I$(top_builddir)/lib.
+
+ * mswindows.h: Always include <winsock2.h> and <ws2tcpip.h>. Do not
+ include <winsock.h>.
+ [! INHIBIT_WRAP]: Remove macro's socket, bind, connect, accept, recv,
+ send, select, getsockname, getpeername, setsockopt, closesocket.
+ Remove wrapped_socket, wrapped_bind, wrapped_connect, wrapped_listen,
+ wrapped_accept, wrapped_recv, wrapped_send, wrapped_select,
+ wrapped_getsockname, wrapped_getpeername, wrapped_setsockopt,
+ wrapped_closesocket prototypes.
+
+ * mswindows.c: Remove wrapped_socket, wrapped_bind, wrapped_connect,
+ wrapped_listen, wrapped_accept, wrapped_recv, wrapped_send,
+ wrapped_select, wrapped_getsockname, wrapped_getpeername,
+ wrapped_setsockopt, wrapped_closesocket functions. Remove WRAP macro.
+
+ * host.h [WINDOWS]: Include <winsock2.h> not <winsock.h>.
+
+ * connect.c: Include <sys/socket.h> and <sys/select.h> on any platform,
+ gnulib ensures they exist. Remove `read', `write', `close' macros.
+