diff --git a/struct_ip.h b/struct_ip.h
index b66904545..a25d85787 100644
--- a/struct_ip.h
+++ b/struct_ip.h
@@ -31,6 +31,7 @@ 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
diff --git a/tcpip.cc b/tcpip.cc
index aaf76a4ea..050f702c1 100644
--- a/tcpip.cc
+++ b/tcpip.cc
@@ -116,18 +116,6 @@
 #include <unistd.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>
-
 #if HAVE_NETINET_IF_ETHER_H
 #ifndef NETINET_IF_ETHER_H
 #include <netinet/if_ether.h>