Add the explicit include of vimage.h to another five .c files still

missing it.

Remove the "hidden" kernel only include of vimage.h from ip_var.h added
with the very first Vimage commit r181803 to avoid further kernel poisoning.

sys/fs/nfs/nfsport.h

@@ -78,6 +78,7 @@
 #include <sys/priv.h>
 #include <sys/kthread.h>
 #include <sys/syscallsubr.h>
+#include <sys/vimage.h>
 #include <fs/fifofs/fifo.h>
 #include <net/if.h>
 #include <net/radix.h>

sys/net/if_enc.c

@@ -38,6 +38,7 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
+#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_clone.h>

sys/net/if_gre.c

@@ -64,6 +64,7 @@
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
+#include <sys/vimage.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>

sys/netinet/in_proto.c

@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/protosw.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
+#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/route.h>

sys/netinet/ip_var.h

@@ -34,9 +34,6 @@
 #define	_NETINET_IP_VAR_H_
 
 #include <sys/queue.h>
-#ifdef _KERNEL
-#include <sys/vimage.h>
-#endif
 
 /*
  * Overlay for ip header used by other protocols (tcp, udp).

sys/netipsec/xform_tcp.c

@@ -39,6 +39,7 @@
 #include <sys/kernel.h>
 #include <sys/protosw.h>
 #include <sys/sysctl.h>
+#include <sys/vimage.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>