diff --git a/usr.sbin/usbconfig/usbconfig.c b/usr.sbin/usbconfig/usbconfig.c
index 7d257fea52cd..e28f8de9f75c 100644
--- a/usr.sbin/usbconfig/usbconfig.c
+++ b/usr.sbin/usbconfig/usbconfig.c
@@ -36,7 +36,7 @@
 #include <grp.h>
 #include <errno.h>
 #include <ctype.h>
-#include <sys/types.h>
+#include <sys/param.h>
 
 #include <libusb20_desc.h>
 #include <libusb20.h>
@@ -210,7 +210,7 @@ get_token(const char *str, uint8_t narg)
 {
 	uint8_t n;
 
-	for (n = 0; n != (sizeof(token) / sizeof(token[0])); n++) {
+	for (n = 0; n != nitems(token); n++) {
 		if (strcasecmp(str, token[n].name) == 0) {
 			if (token[n].narg > narg) {
 				/* too few arguments */