diff --git a/admin/admin_locl.h b/admin/admin_locl.h
index 15b54547f..5e962f2bf 100644
--- a/admin/admin_locl.h
+++ b/admin/admin_locl.h
@@ -63,6 +63,13 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
diff --git a/appl/popper/popper.h b/appl/popper/popper.h
index f433779bb..1101aa0ef 100644
--- a/appl/popper/popper.h
+++ b/appl/popper/popper.h
@@ -70,6 +70,13 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
diff --git a/appl/push/push_locl.h b/appl/push/push_locl.h
index 9ad30126d..75082d83a 100644
--- a/appl/push/push_locl.h
+++ b/appl/push/push_locl.h
@@ -72,6 +72,12 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
 #endif
diff --git a/appl/rsh/rsh_locl.h b/appl/rsh/rsh_locl.h
index deacd17ea..f1ca5874d 100644
--- a/appl/rsh/rsh_locl.h
+++ b/appl/rsh/rsh_locl.h
@@ -60,6 +60,13 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
diff --git a/appl/telnet/telnet/telnet_locl.h b/appl/telnet/telnet/telnet_locl.h
index 8365a69f6..59f8e3689 100644
--- a/appl/telnet/telnet/telnet_locl.h
+++ b/appl/telnet/telnet/telnet_locl.h
@@ -118,6 +118,13 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 #ifdef HAVE_NETINET_IN_SYSTM_H
 #include <netinet/in_systm.h>
 #endif
diff --git a/appl/telnet/telnetd/telnetd.h b/appl/telnet/telnetd/telnetd.h
index 5ca59bfda..c41041785 100644
--- a/appl/telnet/telnetd/telnetd.h
+++ b/appl/telnet/telnetd/telnetd.h
@@ -91,6 +91,13 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
diff --git a/appl/test/test_locl.h b/appl/test/test_locl.h
index 4faae270e..65d389b90 100644
--- a/appl/test/test_locl.h
+++ b/appl/test/test_locl.h
@@ -57,6 +57,13 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
diff --git a/kdc/headers.h b/kdc/headers.h
index 6fe11139f..09dfbc1e5 100644
--- a/kdc/headers.h
+++ b/kdc/headers.h
@@ -67,6 +67,12 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
diff --git a/kpasswd/kpasswd_locl.h b/kpasswd/kpasswd_locl.h
index c8cbe2fed..374fb20e6 100644
--- a/kpasswd/kpasswd_locl.h
+++ b/kpasswd/kpasswd_locl.h
@@ -75,6 +75,13 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
diff --git a/kuser/kuser_locl.h b/kuser/kuser_locl.h
index abb36f2ee..73052bd1e 100644
--- a/kuser/kuser_locl.h
+++ b/kuser/kuser_locl.h
@@ -64,6 +64,13 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
diff --git a/lib/kafs/kafs_locl.h b/lib/kafs/kafs_locl.h
index 7cbf2799d..60ec11d05 100644
--- a/lib/kafs/kafs_locl.h
+++ b/lib/kafs/kafs_locl.h
@@ -74,6 +74,13 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
diff --git a/lib/krb5/krb5_locl.h b/lib/krb5/krb5_locl.h
index f7edcf336..ad1e24b3d 100644
--- a/lib/krb5/krb5_locl.h
+++ b/lib/krb5/krb5_locl.h
@@ -87,6 +87,9 @@
 #ifdef HAVE_NETINET_IN6_H
 #include <netinet/in6.h>
 #endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
diff --git a/lib/roken/inaddr2str.c b/lib/roken/inaddr2str.c
index 91e0c6f99..06423b581 100644
--- a/lib/roken/inaddr2str.c
+++ b/lib/roken/inaddr2str.c
@@ -52,6 +52,13 @@ RCSID("$Id$");
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
diff --git a/lib/roken/inet_aton.c b/lib/roken/inet_aton.c
index e3abebb21..214a75c36 100644
--- a/lib/roken/inet_aton.c
+++ b/lib/roken/inet_aton.c
@@ -50,6 +50,13 @@ RCSID("$Id$");
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
diff --git a/lib/roken/mini_inetd.c b/lib/roken/mini_inetd.c
index 47aa3d4df..f97afada0 100644
--- a/lib/roken/mini_inetd.c
+++ b/lib/roken/mini_inetd.c
@@ -53,6 +53,13 @@ RCSID("$Id$");
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 
 #include <roken.h>
 
diff --git a/lib/roken/roken.h b/lib/roken/roken.h
index c92ffdc25..d8ced8912 100644
--- a/lib/roken/roken.h
+++ b/lib/roken/roken.h
@@ -60,6 +60,13 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index c92ffdc25..d8ced8912 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -60,6 +60,13 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
+#endif
+
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>