diff --git a/src/common/compat.h b/src/common/compat.h
index cd93452268..2371ee4676 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -42,8 +42,8 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_NETINET_IN6_H
-#include <netinet/in6.h>
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
 #endif
 
 #ifndef NULL_REP_IS_ZERO_BYTES
@@ -283,8 +283,9 @@ struct in6_addr
 };
 #endif
 
-#if defined(__APPLE__) || defined(__darwin__)
-/* OSX seems not to define these. */
+#if defined(__APPLE__) || defined(__darwin__) || defined(__FreeBSD__) \
+    || defined (__NetBSD__) || defined(__OpenBSD__)
+/* Many BSD variants seem not to define these. */
 #ifndef s6_addr16
 #define s6_addr16 __u6_addr.__u6_addr16
 #endif
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index a1a9f2eb62..228e5b1bcd 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -104,7 +104,7 @@
 #endif
 
 #ifdef HAVE_NETINET_IN6_H
-#include <netinet/in6.h>
+#include <netinet6/in6.h>
 #endif
 
 #ifdef WIN32