PF_V6_PROXIES
+		ipn = nat->nat_ptr;
 		if ((ipn != NULL) && (nat->nat_aps != NULL))
 			if (appr_match(fin, nat) != 0)
 				continue;
@@ -2568,7 +2558,6 @@ ipf_nat6_checkout(fr_info_t *fin, u_32_t *passp)
 	ipf_nat_softc_t *softn = softc->ipf_nat_soft;
 	struct icmp6_hdr *icmp6 = NULL;
 	struct ifnet *ifp, *sifp;
-	tcphdr_t *tcp = NULL;
 	int rval, natfailed;
 	ipnat_t *np = NULL;
 	u_int nflags = 0;
@@ -2621,9 +2610,6 @@ ipf_nat6_checkout(fr_info_t *fin, u_32_t *passp)
 		default :
 			break;
 		}
-
-		if ((nflags & IPN_TCPUDP))
-			tcp = fin->fin_dp;
 	}
 
 	ipa = fin->fin_src6;
@@ -2965,7 +2951,9 @@ ipf_nat6_checkin(fr_info_t *fin, u_32_t *passp)
 	int rval, natfailed;
 	struct ifnet *ifp;
 	i6addr_t ipa, iph;
-	tcphdr_t *tcp;
+#ifdef IPF_V6_PROXIES
+	tcphdr_t *tcp = NULL;
+#endif
 	u_short dport;
 	ipnat_t *np;
 	nat_t *nat;
@@ -2973,7 +2961,6 @@ ipf_nat6_checkin(fr_info_t *fin, u_32_t *passp)
 	if (softn->ipf_nat_stats.ns_rules == 0 || softn->ipf_nat_lock != 0)
 		return (0);
 
-	tcp = NULL;
 	icmp6 = NULL;
 	dport = 0;
 	natadd = 1;
@@ -3014,7 +3001,9 @@ ipf_nat6_checkin(fr_info_t *fin, u_32_t *passp)
 		}
 
 		if ((nflags & IPN_TCPUDP)) {
+#ifdef IPF_V6_PROXIES
 			tcp = fin->fin_dp;
+#endif
 			dport = fin->fin_data[1];
 		}
 	}
@@ -3802,32 +3791,19 @@ ipf_nat6_nextaddr(fr_info_t *fin, nat_addr_t *na, i6addr_t *old, i6addr_t *dst)
 	ipf_main_softc_t *softc = fin->fin_main_soft;
 	ipf_nat_softc_t *softn = softc->ipf_nat_soft;
 	i6addr_t newip, new;
-	u_32_t amin, amax;
 	int error;
 
 	new.i6[0] = 0;
 	new.i6[1] = 0;
 	new.i6[2] = 0;
 	new.i6[3] = 0;
-	amin = na->na_addr[0].in4.s_addr;
 
 	switch (na->na_atype)
 	{
 	case FRI_RANGE :
-		amax = na->na_addr[1].in4.s_addr;
-		break;
-
 	case FRI_NETMASKED :
 	case FRI_DYNAMIC :
 	case FRI_NORMAL :
-		/*
-		 * Compute the maximum address by adding the inverse of the
-		 * netmask to the minimum address.
-		 */
-		amax = ~na->na_addr[1].in4.s_addr;
-		amax |= amin;
-		break;
-
 	case FRI_LOOKUP :
 		break;