diff --git a/sbin/ipf/common/lexer.c b/sbin/ipf/common/lexer.c
index 5a898c72032..d1980765ef9 100644
--- a/sbin/ipf/common/lexer.c
+++ b/sbin/ipf/common/lexer.c
@@ -10,6 +10,7 @@
 # include "netinet/ip_scan.h"
 #endif
 #include <sys/ioctl.h>
+#include <sys/param.h>
 #include <syslog.h>
 #ifdef	TEST_LEXER
 # define	NO_YACC
@@ -675,7 +676,7 @@ yysetfixeddict(wordtab_t *newdict)
 	if (yydebug)
 		printf("yysetfixeddict(%lx)\n", (u_long)newdict);
 
-	if (yysavedepth == sizeof(yysavewords)/sizeof(yysavewords[0])) {
+	if (yysavedepth == nitems(yysavewords)) {
 		fprintf(stderr, "%d: at maximum dictionary depth\n",
 			yylineNum);
 		return;
@@ -694,7 +695,7 @@ yysetdict(wordtab_t *newdict)
 	if (yydebug)
 		printf("yysetdict(%lx)\n", (u_long)newdict);
 
-	if (yysavedepth == sizeof(yysavewords)/sizeof(yysavewords[0])) {
+	if (yysavedepth == nitems(yysavewords)) {
 		fprintf(stderr, "%d: at maximum dictionary depth\n",
 			yylineNum);
 		return;
diff --git a/sbin/ipf/libipf/facpri.c b/sbin/ipf/libipf/facpri.c
index 9f66cedc7df..9325a03c8dc 100644
--- a/sbin/ipf/libipf/facpri.c
+++ b/sbin/ipf/libipf/facpri.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
-#include <sys/types.h>
+#include <sys/param.h>
 #if !defined(__SVR4) && !defined(__svr4__)
 #include <strings.h>
 #endif
@@ -76,7 +76,7 @@ fac_toname(int facpri)
 
 	fac = facpri & LOG_FACMASK;
 	j = fac >> 3;
-	if (j < (sizeof(facs)/sizeof(facs[0]))) {
+	if (j < nitems(facs)) {
 		if (facs[j].value == fac)
 			return (facs[j].name);
 	}