Fix some lingering build failures caused by fixing implicit inclusion of

if_var.h. Also explicitly include lock.h and mutex.h in if_kr.c rather than
depending on if_var.h to bring them in.

sys/mips/adm5120/if_admsw.c

@@ -98,6 +98,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_media.h>
 #include <net/if_mib.h>
 #include <net/if_types.h>
+#include <net/if_var.h>
 
 #ifdef INET
 #include <netinet/in.h>

sys/mips/idt/if_kr.c

@@ -40,7 +40,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/taskqueue.h>
 
@@ -50,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
+#include <net/if_var.h>
 
 #include <net/bpf.h>
 

sys/mips/rmi/dev/nlge/if_nlge.c

@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_media.h>
 #include <net/bpf.h>
 #include <net/if_types.h>
+#include <net/if_var.h>
 #include <net/if_vlan_var.h>
 
 #include <netinet/in_systm.h>