diff -ur libnl-3.2.9/lib/netfilter/ct.c libnl-3.2.9-dirty/lib/netfilter/ct.c
--- libnl-3.2.9/lib/netfilter/ct.c	2011-08-16 07:16:14.000000000 -0700
+++ libnl-3.2.9-dirty/lib/netfilter/ct.c	2012-05-12 16:27:53.247222488 -0700
@@ -38,7 +38,7 @@
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 static uint64_t ntohll(uint64_t x)
 {
-	return __bswap_64(x);
+	return bswap_64(x);
 }
 #endif
 
diff -ur libnl-3.2.9/lib/netfilter/log_msg.c libnl-3.2.9-dirty/lib/netfilter/log_msg.c
--- libnl-3.2.9/lib/netfilter/log_msg.c	2011-08-16 07:16:13.000000000 -0700
+++ libnl-3.2.9-dirty/lib/netfilter/log_msg.c	2012-05-12 16:41:22.507777660 -0700
@@ -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 @@
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 static uint64_t ntohll(uint64_t x)
 {
-	return __bswap_64(x);
+	return bswap_64(x);
 }
 #endif
 
diff -ur libnl-3.2.9/lib/netfilter/queue_msg.c libnl-3.2.9-dirty/lib/netfilter/queue_msg.c
--- libnl-3.2.9/lib/netfilter/queue_msg.c	2011-08-16 07:16:13.000000000 -0700
+++ libnl-3.2.9-dirty/lib/netfilter/queue_msg.c	2012-05-12 16:42:24.003228478 -0700
@@ -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 @@
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 static uint64_t ntohll(uint64_t x)
 {
-	return __bswap_64(x);
+	return bswap_64(x);
 }
 #endif
 
diff -ur libnl-3.2.9/src/nf-queue.c libnl-3.2.9-dirty/src/nf-queue.c
--- libnl-3.2.9/src/nf-queue.c	2011-08-16 07:15:56.000000000 -0700
+++ libnl-3.2.9-dirty/src/nf-queue.c	2012-05-12 21:59:57.879229486 -0700
@@ -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>