diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c
index abba033a8c52..37432b45a11a 100644
--- a/lib/libprocstat/libprocstat.c
+++ b/lib/libprocstat/libprocstat.c
@@ -617,9 +617,9 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap
 		}
 		map = &vmspace.vm_map;
 
-		for (entryp = map->header.next;
+		for (entryp = vm_map_entry_first(map);
 		    entryp != &kp->ki_vmspace->vm_map.header;
-		    entryp = vmentry.next) {
+		    entryp = vm_map_entry_succ(vmentry)) {
 			if (!kvm_read_all(kd, (unsigned long)entryp, &vmentry,
 			    sizeof(vmentry))) {
 				warnx("can't read vm_map_entry at %p",