diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc
index 6bb86cec5..af4d228cf 100644
--- a/libnetutil/netutil.cc
+++ b/libnetutil/netutil.cc
@@ -116,7 +116,6 @@
 #if HAVE_SYS_SOCKIO_H
 #include <sys/sockio.h>  /* SIOCGIFCONF for Solaris */
 #endif
-#include <net/if_arp.h>
 
 /* Define CMSG_* symbols for Solaris 9 and earlier. See
    http://wiki.opencsw.org/porting-faq#toc10. */
@@ -162,6 +161,7 @@
 #include <netinet/ip.h> 
 #define NETINET_IP_H
 #endif
+#include <net/if_arp.h>
 
 #if HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
diff --git a/struct_ip.h b/struct_ip.h
index a25d85787..9b8c4db9f 100644
--- a/struct_ip.h
+++ b/struct_ip.h
@@ -31,15 +31,21 @@ struct ip {
 /* BSDI needs this to insure the correct struct ip */
 #undef _IP_VHL
 
-#include <net/if_arp.h>
 #ifndef NETINET_IN_SYSTM_H  /* This guarding is needed for at least some versions of OpenBSD */
 #include <netinet/in_systm.h> /* defines n_long needed for netinet/ip.h */
 #define NETINET_IN_SYSTM_H
 #endif
+#if HAVE_NET_IF_H
+#ifndef NET_IF_H /* This guarding is needed for at least some versions of OpenBSD */
+#include <net/if.h>
+#define NET_IF_H
+#endif
+#endif
 #ifndef NETINET_IP_H  /* This guarding is needed for at least some versions of OpenBSD */
 #include <netinet/ip.h>
 #define NETINET_IP_H
 #endif
+#include <net/if_arp.h>
 
 #ifndef WIN32
 #include <netinet/ip_icmp.h>