Index: share/mk/bsd.README
===================================================================
--- share/mk/bsd.README
+++ share/mk/bsd.README
@@ -379,10 +379,6 @@
 MAN		Manual pages.  If no MAN variable is defined,
 		"MAN=${PROG}.1" is assumed. See bsd.man.mk for more details.
 
-NEED_COMPAT	Build and link targeting a compatability ABI or fail if it
-		is not available.  Supported values are "32", "soft", and
-		"any" being a wildcard.
-
 PROG		The name of the program to build.  If not supplied, nothing
 		is built.
 
@@ -445,9 +441,6 @@
 		Each of the targets will execute the same target in the
 		subdirectories.
 
-WANT_COMPAT	Similar to NEED_COMPAT, but build with the base ABI if
-		the specified ABI is not available.
-
 The include file <bsd.prog.mk> includes the file named "../Makefile.inc"
 if it exists, as well as the include file <bsd.man.mk>.
 
@@ -473,6 +466,20 @@
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
+The include file, <bsd.compat.mk>, allows programs (built with
+<bsd.prog.mk>) to be built for one the ABI(s) supported by the
+top-level Makefile.libcompat.  It requires that <bsd.prog.mk> also be
+included.
+
+NEED_COMPAT	Build and link targeting a compatability ABI or fail if it
+		is not available.  Supported values are "32", "soft", and
+		"any" being a wildcard.
+
+WANT_COMPAT	Similar to NEED_COMPAT, but build with the base ABI if
+		the specified ABI is not available.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
 The include file, <bsd.snmpmod.mk>, handles building MIB modules for bsnmpd
 from one or more source files, along with their manual pages.  It has a
 limited number of suffixes, consistent with the current needs of the BSD
Index: share/mk/bsd.prog.mk
===================================================================
--- share/mk/bsd.prog.mk
+++ share/mk/bsd.prog.mk
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
-# .include <bsd.compat.mk>
 .include <bsd.compiler.mk>
 .include <bsd.linker.mk>
 
Index: sys/kern/subr_stats.c
===================================================================
--- sys/kern/subr_stats.c
+++ sys/kern/subr_stats.c
@@ -124,7 +124,8 @@
 	struct voi	vois[];		/* Array indexed by [voi_id]. */
 } __aligned(sizeof(void *));
 _Static_assert(offsetof(struct statsblobv1, cursz) +
-    SIZEOF_MEMBER(struct statsblobv1, cursz) == sizeof(struct statsblob),
+    SIZEOF_MEMBER(struct statsblobv1, cursz) ==
+    offsetof(struct statsblob, opaque),
     "statsblobv1 ABI mismatch");
 
 struct statsblobv1_tpl {