From ce704e6a58d73d0f394ba9fe27b39ad0b44328a9 Mon Sep 17 00:00:00 2001
From: mpi <mpi@openbsd.org>
Date: Fri, 5 Jan 2018 08:13:31 +0000
Subject: [PATCH] Remove useless <sys/socketvar.h> includes.

ok kettenis@, visa@, claudio@, deraadt@
---
 sbin/mount_nfs/mount_nfs.c     | 3 +--
 sbin/nfsd/nfsd.c               | 3 +--
 sbin/umount/umount.c           | 3 +--
 usr.bin/showmount/showmount.c  | 3 +--
 usr.sbin/identd/identd.c       | 4 ++--
 usr.sbin/npppd/common/radish.c | 3 +--
 usr.sbin/snmpd/agentx.c        | 4 ++--
 usr.sbin/snmpd/traphandler.c   | 3 +--
 8 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 21b4cc54e77..3ddd5f8981d 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_nfs.c,v 1.53 2016/05/27 19:45:04 deraadt Exp $	*/
+/*	$OpenBSD: mount_nfs.c,v 1.54 2018/01/05 08:13:31 mpi Exp $	*/
 /*	$NetBSD: mount_nfs.c,v 1.12.4.1 1996/05/25 22:48:05 fvdl Exp $	*/
 
 /*
@@ -36,7 +36,6 @@
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/stat.h>
 #include <syslog.h>
 
diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c
index 73508290882..41448a2a301 100644
--- a/sbin/nfsd/nfsd.c
+++ b/sbin/nfsd/nfsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfsd.c,v 1.37 2017/08/31 06:50:56 mestre Exp $	*/
+/*	$OpenBSD: nfsd.c,v 1.38 2018/01/05 08:13:31 mpi Exp $	*/
 /*	$NetBSD: nfsd.c,v 1.19 1996/02/18 23:18:56 mycroft Exp $	*/
 
 /*
@@ -40,7 +40,6 @@
 #include <sys/ucred.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 
 #include <rpc/rpc.h>
 #include <rpc/pmap_clnt.h>
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index 570d18414c3..9f6d1323f97 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umount.c,v 1.27 2016/12/16 17:44:59 krw Exp $	*/
+/*	$OpenBSD: umount.c,v 1.28 2018/01/05 08:13:31 mpi Exp $	*/
 /*	$NetBSD: umount.c,v 1.16 1996/05/11 14:13:55 mycroft Exp $	*/
 
 /*-
@@ -34,7 +34,6 @@
 #include <sys/mount.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 
 #include <netdb.h>
 #include <rpc/rpc.h>
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index 05db23d7527..0cf8db350e6 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: showmount.c,v 1.21 2017/01/21 11:32:04 guenther Exp $	*/
+/*	$OpenBSD: showmount.c,v 1.22 2018/01/05 08:13:31 mpi Exp $	*/
 /*	$NetBSD: showmount.c,v 1.7 1996/05/01 18:14:10 cgd Exp $	*/
 
 /*
@@ -36,7 +36,6 @@
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 
 #include <netdb.h>
 #include <rpc/rpc.h>
diff --git a/usr.sbin/identd/identd.c b/usr.sbin/identd/identd.c
index 431c2481318..f0ffc612499 100644
--- a/usr.sbin/identd/identd.c
+++ b/usr.sbin/identd/identd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: identd.c,v 1.38 2017/07/04 01:09:42 dlg Exp $ */
+/*	$OpenBSD: identd.c,v 1.39 2018/01/05 08:13:31 mpi Exp $ */
 
 /*
  * Copyright (c) 2013 David Gwynne <dlg@openbsd.org>
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
+#include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/uio.h>
diff --git a/usr.sbin/npppd/common/radish.c b/usr.sbin/npppd/common/radish.c
index 9c99aa77017..ddc487b0193 100644
--- a/usr.sbin/npppd/common/radish.c
+++ b/usr.sbin/npppd/common/radish.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radish.c,v 1.5 2017/05/30 17:52:05 yasuoka Exp $ */
+/*	$OpenBSD: radish.c,v 1.6 2018/01/05 08:13:31 mpi Exp $ */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
@@ -41,7 +41,6 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/usr.sbin/snmpd/agentx.c b/usr.sbin/snmpd/agentx.c
index 6ae159b2268..85f6c47162c 100644
--- a/usr.sbin/snmpd/agentx.c
+++ b/usr.sbin/snmpd/agentx.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: agentx.c,v 1.10 2015/12/05 06:42:18 mmcc Exp $    */
+/*      $OpenBSD: agentx.c,v 1.11 2018/01/05 08:13:32 mpi Exp $    */
 /*
  * Copyright (c) 2013,2014 Bret Stephen Lambert <blambert@openbsd.org>
  *
@@ -17,7 +17,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
+#include <sys/queue.h>
 #include <sys/uio.h>
 #include <sys/un.h>
 
diff --git a/usr.sbin/snmpd/traphandler.c b/usr.sbin/snmpd/traphandler.c
index f118ea4774c..a301d40bd6f 100644
--- a/usr.sbin/snmpd/traphandler.c
+++ b/usr.sbin/snmpd/traphandler.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traphandler.c,v 1.9 2017/08/12 04:29:57 rob Exp $	*/
+/*	$OpenBSD: traphandler.c,v 1.10 2018/01/05 08:13:32 mpi Exp $	*/
 
 /*
  * Copyright (c) 2014 Bret Stephen Lambert <blambert@openbsd.org>
@@ -18,7 +18,6 @@
 
 #include <sys/queue.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/uio.h>
-- 
2.20.1