diff --git a/cmake/CheckHeaders.cmake b/cmake/CheckHeaders.cmake
index 9e5480aed5..ff206679d2 100644
--- a/cmake/CheckHeaders.cmake
+++ b/cmake/CheckHeaders.cmake
@@ -4,9 +4,11 @@ include(CheckStructHasMember)
 check_include_files(getopt.h HAVE_GETOPT_H)
 check_include_files(magic.h HAVE_MAGIC_H)
 check_include_files(memory.h HAVE_MEMORY_H)
-check_include_files(netinet/if_ether.h HAVE_NETINET_IF_ETHER_H)
-check_include_files(netinet/ip6.h HAVE_NETINET_IP6_H)
-check_include_files(net/ethernet.h HAVE_NET_ETHERNET_H)
+check_include_files("sys/socket.h;netinet/in.h;net/if.h;netinet/if_ether.h"
+                    HAVE_NETINET_IF_ETHER_H)
+check_include_files("sys/socket.h;netinet/in.h;net/if.h;netinet/ip6.h"
+                    HAVE_NETINET_IP6_H)
+check_include_files("sys/socket.h;net/if.h;net/ethernet.h" HAVE_NET_ETHERNET_H)
 check_include_files(sys/ethernet.h HAVE_SYS_ETHERNET_H)
 check_include_files(sys/time.h HAVE_SYS_TIME_H)
 check_include_files("time.h;sys/time.h" TIME_WITH_SYS_TIME)
diff --git a/src/ARP.h b/src/ARP.h
index e815c038d9..c7765eb9a9 100644
--- a/src/ARP.h
+++ b/src/ARP.h
@@ -13,9 +13,9 @@
 #include <net/if_arp.h>
 #ifdef HAVE_NET_ETHERNET_H
 #include <net/ethernet.h>
-#elif HAVE_SYS_ETHERNET_H
+#elif defined(HAVE_SYS_ETHERNET_H)
 #include <sys/ethernet.h>
-#elif HAVE_NETINET_IF_ETHER_H
+#elif defined(HAVE_NETINET_IF_ETHER_H)
 #include <netinet/if_ether.h>
 #endif