-/* Create a new client socket; returns (FILE *)NULL on error */
-#if INET6
-int SockOpen(const char *host, const char *service, const char *options,
- const char *plugin);
-#else /* INET6 */
-int SockOpen(const char *host, int clientPort, const char *options,
- const char *plugin);
-#endif /* INET6 */
-
-/* Returns 1 if this socket is OK, 0 if it isn't select()able
- * on - probably because it's been closed. You should
- * always check this function before passing stuff to the
- * select()-based waiter, as otherwise it may loop.
- */
-int SockCheckOpen(int fd);
+struct addrinfo;
+
+#include <config.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#elif HAVE_NET_SOCKET_H
+#include <net/socket.h>
+#endif
+#include <netdb.h>
+
+/** Create a new client socket; returns -1 on error */
+int SockOpen(const char *host, const char *service, const char *plugin, struct addrinfo **);
+