Index: contrib/ipfilter/lib/familyname.c
===================================================================
--- contrib/ipfilter/lib/familyname.c	(revision 320221)
+++ contrib/ipfilter/lib/familyname.c	(working copy)
@@ -4,7 +4,7 @@
 {
 	if (family == AF_INET)
 		return "inet";
-#ifdef AF_INET6
+#ifdef USE_INET6
 	if (family == AF_INET6)
 		return "inet6";
 #endif
Index: contrib/ipfilter/lib/printhashnode.c
===================================================================
--- contrib/ipfilter/lib/printhashnode.c	(revision 320221)
+++ contrib/ipfilter/lib/printhashnode.c	(working copy)
@@ -35,7 +35,7 @@
 		}
 		printf("\n");
 	} else if ((opts & OPT_DEBUG) != 0) {
-#ifdef AF_INET6
+#ifdef USE_INET6
 		if (ipe.ipe_family == AF_INET6) {
 			char buf[INET6_ADDRSTRLEN + 1];
 			const char *str;
@@ -59,7 +59,7 @@
 		} else if (ipe.ipe_family == AF_INET) {
 #else
 		if (ipe.ipe_family == AF_INET) {
-#endif /* AF_INET6 */
+#endif /* USE_INET6 */
 			PRINTF("\t%d\tAddress: %s", hv,
 				inet_ntoa(ipe.ipe_addr.in4));
 			printmask(ipe.ipe_family, (u_32_t *)&ipe.ipe_mask.in4_addr);
Index: contrib/ipfilter/lib/printip.c
===================================================================
--- contrib/ipfilter/lib/printip.c	(revision 320221)
+++ contrib/ipfilter/lib/printip.c	(working copy)
@@ -25,7 +25,7 @@
 		else
 			PRINTF("%s", inet_ntoa(ipa));
 	}
-#ifdef AF_INET6
+#ifdef USE_INET6
 	else if (family == AF_INET6) {
 		char buf[INET6_ADDRSTRLEN + 1];
 		const char *str;
Index: contrib/ipfilter/lib/printpoolnode.c
===================================================================
--- contrib/ipfilter/lib/printpoolnode.c	(revision 320221)
+++ contrib/ipfilter/lib/printpoolnode.c	(working copy)
@@ -33,7 +33,7 @@
 		printmask(np->ipn_addr.adf_family,
 			  (u_32_t *)&np->ipn_mask.adf_addr);
 	} else {
-#ifdef AF_INET6
+#ifdef USE_INET6
 		if (np->ipn_addr.adf_family == AF_INET6) {
 			char buf[INET6_ADDRSTRLEN + 1];
 			const char *str;
@@ -54,9 +54,7 @@
 		} else {
 			PRINTF("\tAddress: family: %d\n",
 				np->ipn_addr.adf_family);
-#ifdef AF_INET6
 		}
-#endif
 		printmask(np->ipn_addr.adf_family,
 			  (u_32_t *)&np->ipn_mask.adf_addr);
 #ifdef USE_QUAD_T