Get rid of userland includes

diff --git a/sys/lib/libsa/exec.c b/sys/lib/libsa/exec.c
index aaeff07..a86cbbd 100644 (file)
--- a/sys/lib/libsa/exec.c
+++ b/sys/lib/libsa/exec.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: exec.c,v 1.9 1997/02/05 11:14:24 downsj Exp $ */
+/*     $OpenBSD: exec.c,v 1.10 1997/03/25 20:30:41 niklas Exp $        */
 /*     $NetBSD: exec.c,v 1.15 1996/10/13 02:29:01 christos Exp $       */
 
 /*-
@@ -35,12 +35,11 @@
  */
 
 #include <sys/param.h>
+#include <sys/exec.h>
 #include <sys/reboot.h>
 #ifndef INSECURE
 #include <sys/stat.h>
 #endif
-#include <a.out.h>
-#include <string.h>
 
 #include "stand.h"
 

diff --git a/sys/lib/libsa/nfs.c b/sys/lib/libsa/nfs.c
index 9e266aa..309afb4 100644 (file)
--- a/sys/lib/libsa/nfs.c
+++ b/sys/lib/libsa/nfs.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: nfs.c,v 1.7 1997/02/16 14:39:39 mickey Exp $  */
+/*     $OpenBSD: nfs.c,v 1.8 1997/03/25 20:30:43 niklas Exp $  */
 /*     $NetBSD: nfs.c,v 1.19 1996/10/13 02:29:04 christos Exp $        */
 
 /*-
@@ -33,7 +33,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <string.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

diff --git a/sys/lib/libsa/ufs.c b/sys/lib/libsa/ufs.c
index dd41f56..4c6041e 100644 (file)
--- a/sys/lib/libsa/ufs.c
+++ b/sys/lib/libsa/ufs.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ufs.c,v 1.9 1997/02/16 14:39:37 mickey Exp $  */
+/*     $OpenBSD: ufs.c,v 1.10 1997/03/25 20:30:44 niklas Exp $ */
 /*     $NetBSD: ufs.c,v 1.16 1996/09/30 16:01:22 ws Exp $      */
 
 /*-
@@ -75,8 +75,6 @@
 #include <ufs/ufs/dir.h>
 #include <lib/libkern/libkern.h>
 
-#include <string.h>
-
 #include "stand.h"
 
 /*

diff --git a/sys/lib/libsa/unixdev.c b/sys/lib/libsa/unixdev.c
index a74e164..fdb7335 100644 (file)
--- a/sys/lib/libsa/unixdev.c
+++ b/sys/lib/libsa/unixdev.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: unixdev.c,v 1.1 1997/02/16 14:51:58 mickey Exp $      */
+/*     $OpenBSD: unixdev.c,v 1.2 1997/03/25 20:30:46 niklas Exp $      */
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -34,11 +34,9 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/fcntl.h>
 #include <sys/syscall.h>
-#include <string.h>
-#define open uopen
-#include <fcntl.h>
-#undef open
+
 #include "libsa.h"
 #include "unixdev.h"