Fix the Solaris and FreeBSD compilation errors introduced by the

recent winsock update.

dlls/wsock32/protocol.c

@@ -11,12 +11,22 @@
 
 #include "config.h"
 
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <netinet/in.h>
 #include <stdio.h>
 #include <string.h>
+
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
 
 #include "winbase.h"
 #include "winnls.h"

dlls/wsock32/socket.c

@@ -28,27 +28,32 @@
 
 #include "config.h"
 
+#include <errno.h>
 #include <string.h>
-#include <sys/types.h>
-#include "windef.h"
-#include "winbase.h"
-#include "debugtools.h"
-#include "winsock2.h"
-#include "winnt.h"
-#include "wscontrol.h"
 #include <ctype.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <sys/ioctl.h>
+
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 #ifdef HAVE_SYS_SOCKIO_H
 # include <sys/sockio.h>
 #endif
 #ifdef HAVE_NET_IF_H
 # include <net/if.h>
 #endif
-#include <errno.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "debugtools.h"
+#include "winsock2.h"
+#include "winnt.h"
+#include "wscontrol.h"
 
 #ifdef __NetBSD__
 #undef if_type

server/trace.c

@@ -11,7 +11,6 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 
-#include "winsock2.h"
 #include "winnt.h"
 #include "winbase.h"
 #include "wincon.h"