From 4face9d937e9704aa3335c93742e8d5b419a6b27 Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Fri, 26 Aug 2016 04:11:16 +0000
Subject: [PATCH] Don't need <sys/time.h> or "options.h" here

---
 bin/pax/buf_subs.c  | 3 +--
 bin/pax/cpio.c      | 3 +--
 bin/pax/file_subs.c | 4 +---
 bin/pax/gen_subs.c  | 3 +--
 bin/pax/pax.c       | 3 +--
 bin/pax/tar.c       | 3 +--
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index bd9c435f0c2..bb0582b0167 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf_subs.c,v 1.28 2016/08/14 18:30:33 guenther Exp $	*/
+/*	$OpenBSD: buf_subs.c,v 1.29 2016/08/26 04:11:16 guenther Exp $	*/
 /*	$NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $	*/
 
 /*-
@@ -35,7 +35,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 40505be943e..d6b7f70f186 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpio.c,v 1.29 2016/08/14 18:30:33 guenther Exp $	*/
+/*	$OpenBSD: cpio.c,v 1.30 2016/08/26 04:11:16 guenther Exp $	*/
 /*	$NetBSD: cpio.c,v 1.5 1995/03/21 09:07:13 cgd Exp $	*/
 
 /*-
@@ -35,7 +35,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <limits.h>
 #include <string.h>
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 6f6a7833833..7d50e23cdef 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file_subs.c,v 1.51 2016/08/23 06:00:28 guenther Exp $	*/
+/*	$OpenBSD: file_subs.c,v 1.52 2016/08/26 04:11:16 guenther Exp $	*/
 /*	$NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $	*/
 
 /*-
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <err.h>
 #include <errno.h>
@@ -45,7 +44,6 @@
 #include <string.h>
 #include <unistd.h>
 #include "pax.h"
-#include "options.h"
 #include "extern.h"
 
 static int
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index af56c16a7ae..d712fbe2210 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gen_subs.c,v 1.30 2016/08/25 01:44:55 guenther Exp $	*/
+/*	$OpenBSD: gen_subs.c,v 1.31 2016/08/26 04:11:16 guenther Exp $	*/
 /*	$NetBSD: gen_subs.c,v 1.5 1995/03/21 09:07:26 cgd Exp $	*/
 
 /*-
@@ -35,7 +35,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <grp.h>
 #include <pwd.h>
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index a8e365a8900..6745f560fce 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pax.c,v 1.46 2016/08/23 06:00:28 guenther Exp $	*/
+/*	$OpenBSD: pax.c,v 1.47 2016/08/26 04:11:16 guenther Exp $	*/
 /*	$NetBSD: pax.c,v 1.5 1996/03/26 23:54:20 mrg Exp $	*/
 
 /*-
@@ -36,7 +36,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/resource.h>
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index bfccf280e14..9b5b3668968 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tar.c,v 1.62 2016/08/25 01:44:55 guenther Exp $	*/
+/*	$OpenBSD: tar.c,v 1.63 2016/08/26 04:11:16 guenther Exp $	*/
 /*	$NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $	*/
 
 /*-
@@ -35,7 +35,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <errno.h>
-- 
2.20.1