diff --git a/lib/netfilter/ct.c b/lib/netfilter/ct.c
index 9d61b6c..59ee1d9 100644
--- a/lib/netfilter/ct.c
+++ b/lib/netfilter/ct.c
@@ -38,7 +38,7 @@ static uint64_t ntohll(uint64_t x)
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 static uint64_t ntohll(uint64_t x)
 {
-	return __bswap_64(x);
+	return bswap_64(x);
 }
 #endif
 
diff --git a/lib/netfilter/log_msg.c b/lib/netfilter/log_msg.c
index cad6ddd..65448f9 100644
--- a/lib/netfilter/log_msg.c
+++ b/lib/netfilter/log_msg.c
@@ -26,6 +26,7 @@
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/log_msg.h>
+#include <byteswap.h>
 
 #if __BYTE_ORDER == __BIG_ENDIAN
 static uint64_t ntohll(uint64_t x)
@@ -35,7 +36,7 @@ static uint64_t ntohll(uint64_t x)
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 static uint64_t ntohll(uint64_t x)
 {
-	return __bswap_64(x);
+	return bswap_64(x);
 }
 #endif
 
diff --git a/lib/netfilter/queue_msg.c b/lib/netfilter/queue_msg.c
index c40f8c2..30c522f 100644
--- a/lib/netfilter/queue_msg.c
+++ b/lib/netfilter/queue_msg.c
@@ -24,6 +24,7 @@
 #include <netlink/attr.h>
 #include <netlink/netfilter/nfnl.h>
 #include <netlink/netfilter/queue_msg.h>
+#include <byteswap.h>
 
 static struct nl_cache_ops nfnl_queue_msg_ops;
 
@@ -35,7 +36,7 @@ static uint64_t ntohll(uint64_t x)
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 static uint64_t ntohll(uint64_t x)
 {
-	return __bswap_64(x);
+	return bswap_64(x);
 }
 #endif
 
diff --git a/src/nf-queue.c b/src/nf-queue.c
index bd10adf..922d9c8 100644
--- a/src/nf-queue.c
+++ b/src/nf-queue.c
@@ -13,6 +13,7 @@
 
 #include <netlink/cli/utils.h>
 #include <netlink/cli/link.h>
+#include <netinet/in.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter/nfnetlink_queue.h>
 #include <netlink/netfilter/nfnl.h>