Merge remote-tracking branch 'neel/fbsd-cfix'

diff --cc src/lib/net/inaddr_st.h
index cc72621e996834f740489ea41de06e4d6a7d756d,fd3fc12ba0ea1db1f43948234ab4ebdd7aa91f9b..dc4c6e3a003c54e4a0d6a2f3e413c0a0d10d2550
--- 1/src/lib/net/inaddr_st.h
--- 2/src/lib/net/ipv6.h
+++ b/src/lib/net/inaddr_st.h
@@@ -3,20 -3,23 +3,32 @@@
   * Copyright (c) 2007-2018, The Tor Project, Inc. */
  /* See LICENSE for licensing information */
  
 -#ifndef TOR_IPV6_H
 -#define TOR_IPV6_H
 +/**
 + * \file inaddr_st.h
 + *
 + * \brief Define in6_addr, its members, and related types on platforms that
 + *    lack it.
 + **/
 +
 +#ifndef TOR_INADDR_ST_H
 +#define TOR_INADDR_ST_H
  
+ #include "orconfig.h"
+ #include <stddef.h>
++
+ #ifdef HAVE_ARPA_INET_H
+ #include <arpa/inet.h>
+ #endif
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
  #ifdef HAVE_NETINET_IN6_H
  #include <netinet/in6.h>
  #endif
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
 +
  #ifdef _WIN32
  #include <winsock2.h>
  #include <ws2tcpip.h>