Use <fcntl.h> instead of <sys/file.h> for open() and friends.

Delete a bunch of unnecessary #includes and sort to match style(9)
while doing the above cleanup.

ok deraadt@ krw@

2 files changed, 3 insertions, 14 deletions

diff --git a/libexec/ld.so/ldconfig/ldconfig.c b/libexec/ld.so/ldconfig/ldconfig.c
index 1badc8ca32d..6511c8a218d 100644
--- a/libexec/ld.so/ldconfig/ldconfig.c
+++ b/libexec/ld.so/ldconfig/ldconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldconfig.c,v 1.36 2016/07/04 20:56:50 kettenis Exp $	*/
+/*	$OpenBSD: ldconfig.c,v 1.37 2018/04/26 12:42:50 guenther Exp $	*/
 
 /*
  * Copyright (c) 1993,1995 Paul Kranenburg
@@ -32,11 +32,8 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/file.h>
-#include <sys/time.h>
 #include <sys/mman.h>
-#include <sys/resource.h>
-#include <ctype.h>
+
 #include <dirent.h>
 #include <err.h>
 #include <errno.h>
diff --git a/libexec/ld.so/ldconfig/shlib.c b/libexec/ld.so/ldconfig/shlib.c
index eced53c4b18..f496c5581ae 100644
--- a/libexec/ld.so/ldconfig/shlib.c
+++ b/libexec/ld.so/ldconfig/shlib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shlib.c,v 1.12 2015/12/22 08:15:05 mmcc Exp $	*/
+/*	$OpenBSD: shlib.c,v 1.13 2018/04/26 12:42:50 guenther Exp $	*/
 /*	$NetBSD: shlib.c,v 1.13 1998/04/04 01:00:29 fvdl Exp $	*/
 
 /*
@@ -32,16 +32,8 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <sys/time.h>
-#include <ranlib.h>
 #include <ctype.h>
-#include <dirent.h>
 #include <err.h>
-#include <fcntl.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>