diff --git a/usr.sbin/rtadvctl/rtadvctl.c b/usr.sbin/rtadvctl/rtadvctl.c
index 727fa6ee1a5..9fdb643cef1 100644
--- a/usr.sbin/rtadvctl/rtadvctl.c
+++ b/usr.sbin/rtadvctl/rtadvctl.c
@@ -27,8 +27,8 @@
  *
  */
 
+#include <sys/param.h>
 #include <sys/queue.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/un.h>
@@ -137,7 +137,7 @@ usage(void)
 {
 	int i;
 
-	for (i = 0; (size_t)i < sizeof(dtable)/sizeof(dtable[0]); i++) {
+	for (i = 0; (size_t)i < nitems(dtable); i++) {
 		if (dtable[i].dt_comm == NULL)
 			break;
 		printf("%s\n", dtable[i].dt_comm);
@@ -172,7 +172,7 @@ main(int argc, char *argv[])
 	if (argc == 0)
 		usage();
 
-	for (i = 0; (size_t)i < sizeof(dtable)/sizeof(dtable[0]); i++) {
+	for (i = 0; (size_t)i < nitems(dtable); i++) {
 		if (dtable[i].dt_comm == NULL ||
 		    strcmp(dtable[i].dt_comm, argv[0]) == 0) {
 			action = dtable[i].dt_act;