diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index 41a1621dff49..fb094d061cb5 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -37,8 +37,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/sockio.h>
 #include <sys/socket.h>
 #include <sys/vimage.h>
-#include <net/if.h>
 
+#include <net/if.h>
 
 #include <compat/svr4/svr4.h>
 #include <compat/svr4/svr4_util.h>
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c
index f58899aeeb8c..6a17274e27fe 100644
--- a/sys/netinet/ip_fw2.c
+++ b/sys/netinet/ip_fw2.c
@@ -3470,7 +3470,7 @@ add_rule(struct ip_fw_chain *chain, struct ip_fw *input_rule)
 	flush_rule_ptrs(chain);
 done:
 	V_static_count++;
-	static_len += l;
+	V_static_len += l;
 	IPFW_WUNLOCK(chain);
 	DEB(printf("ipfw: installed rule %d, static count now %d\n",
 		rule->rulenum, V_static_count);)
@@ -3503,7 +3503,7 @@ remove_rule(struct ip_fw_chain *chain, struct ip_fw *rule,
 	else
 		prev->next = n;
 	V_static_count--;
-	static_len -= l;
+	V_static_len -= l;
 
 	rule->next = chain->reap;
 	chain->reap = rule;
@@ -4187,7 +4187,7 @@ ipfw_ctl(struct sockopt *sopt)
 		 * change between calculating the size and returning the
 		 * data in which case we'll just return what fits.
 		 */
-		size = static_len;	/* size of static rules */
+		size = V_static_len;	/* size of static rules */
 		if (V_ipfw_dyn_v)		/* add size of dyn.rules */
 			size += (V_dyn_count * sizeof(ipfw_dyn_rule));
 
diff --git a/sys/sys/vimage.h b/sys/sys/vimage.h
index 864d5aaab4af..5c2855546852 100644
--- a/sys/sys/vimage.h
+++ b/sys/sys/vimage.h
@@ -293,6 +293,7 @@
 #define	V_sptree sptree
 #define	V_ss_fltsz ss_fltsz
 #define	V_ss_fltsz_local ss_fltsz_local
+#define	V_static_len static_len
 #define	V_static_count static_count
 #define	V_subnetsarelocal subnetsarelocal
 #define	V_tcb tcb