diff --git a/sys/lib/libsa/Makefile b/sys/lib/libsa/Makefile
index 66ae35b78d12..3c2b98a6ab65 100644
--- a/sys/lib/libsa/Makefile
+++ b/sys/lib/libsa/Makefile
@@ -1,9 +1,10 @@
-#	$Id: Makefile,v 1.3 1994/07/27 07:40:52 cgd Exp $
+#	$Id: Makefile,v 1.4 1994/08/04 19:39:32 brezak Exp $
 
 LIB=	sa
 
 #DEBUGFLAGS= -DNFS_DEBUG -DRPC_DEBUG -DRARP_DEBUG -DDEBUG -DPARANOID -Wall
-CFLAGS+=-DSTANDALONE $(DEBUGFLAGS) -I${.CURDIR} -I${.CURDIR}/../.. -DKERNEL
+#DEBUGFLAGS= -ansi -pedantic -Wall
+CFLAGS+=-DSTANDALONE $(DEBUGFLAGS) -I${.CURDIR} -I${.CURDIR}/../..
 
 # stand routines
 SRCS+=	alloc.c bcopy.c exit.c exec.c getfile.c gets.c globals.c \
diff --git a/sys/lib/libsa/arp.c b/sys/lib/libsa/arp.c
index 7dfd977a0fc1..77203fe57f86 100644
--- a/sys/lib/libsa/arp.c
+++ b/sys/lib/libsa/arp.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  * from @(#) Header: arp.c,v 1.5 93/07/15 05:52:26 leres Exp  (LBL)
- *     $Id: arp.c,v 1.1 1994/05/08 16:11:16 brezak Exp $
+ *     $Id: arp.c,v 1.2 1994/08/04 19:39:34 brezak Exp $
  */
 
 #include <sys/types.h>
@@ -46,7 +46,6 @@
 #include <netinet/if_ether.h>
 #include <netinet/in_systm.h>
 
-#include <errno.h>
 #include <string.h>
 
 #include "stand.h"
diff --git a/sys/lib/libsa/net.c b/sys/lib/libsa/net.c
index 23990921e69d..2950b0704f10 100644
--- a/sys/lib/libsa/net.c
+++ b/sys/lib/libsa/net.c
@@ -52,8 +52,6 @@
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 
-#include <errno.h>
-
 #include "stand.h"
 #include "net.h"
 #include "netif.h"
diff --git a/sys/lib/libsa/rarp.c b/sys/lib/libsa/rarp.c
index 6c883787fbc8..d41347f26e7e 100644
--- a/sys/lib/libsa/rarp.c
+++ b/sys/lib/libsa/rarp.c
@@ -1,3 +1,42 @@
+/*
+ * Copyright (c) 1992 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This software was developed by the Computer Systems Engineering group
+ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ * contributed to Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Lawrence Berkeley Laboratory and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from @(#) Header: arp.c,v 1.5 93/07/15 05:52:26 leres Exp  (LBL)
+ *     $Id: rarp.c,v 1.3 1994/08/04 19:39:37 brezak Exp $
+ */
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>
@@ -6,7 +45,6 @@
 #include <netinet/if_ether.h>
 #include <netinet/in_systm.h>
 
-#include <errno.h>
 #include <string.h>
 
 #include "stand.h"
diff --git a/sys/lib/libsa/saerrno.h b/sys/lib/libsa/saerrno.h
index 0e4f29d18592..a7e3822ac8d1 100644
--- a/sys/lib/libsa/saerrno.h
+++ b/sys/lib/libsa/saerrno.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: saerrno.h,v 1.2 1994/07/24 01:22:01 mycroft Exp $	*/
+/*	$NetBSD: saerrno.h,v 1.3 1994/08/04 19:39:38 brezak Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -54,3 +54,14 @@ extern	int errno;	/* just like unix */
 #define	EWCK	14	/* write check error */
 #define	EECC	15	/* uncorrectable ecc error */
 #define	EHER	16	/* hard error */
+#define	ENOEXEC	17	/* Exec format error */
+#define	EPERM	18	/* Operation not permitted */
+#define	ENOENT	19	/* No such file or directory */
+#define	ESTALE	20	/* Stale NFS file handle */
+#define	EINVAL	21	/* Invalid argument */
+#define	EMFILE	22	/* Too many open files */
+#define	EOPNOTSUPP	23	/* Operation not supported */
+#define	EFBIG	24	/* File too large */
+#define	ENOTDIR	25	/* Not a directory */
+#define	EROFS	26	/* Read-only file system */
+#define	ENODEV	27	/* Operation not supported by device */
diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h
index 0e31b1771323..75a8659c05f6 100644
--- a/sys/lib/libsa/stand.h
+++ b/sys/lib/libsa/stand.h
@@ -31,12 +31,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)stand.h	8.1 (Berkeley) 6/11/93
- * 	     $Id: stand.h,v 1.2 1994/05/08 16:11:37 brezak Exp $
+ * 	     $Id: stand.h,v 1.3 1994/08/04 19:39:40 brezak Exp $
  */
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
-#include <sys/errno.h>
 #include <sys/stat.h>
 #include "saioctl.h"
 #include "saerrno.h"
diff --git a/sys/lib/libsa/strerror.c b/sys/lib/libsa/strerror.c
index b211bdb17d1b..bb35f584a0f5 100644
--- a/sys/lib/libsa/strerror.c
+++ b/sys/lib/libsa/strerror.c
@@ -30,10 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: strerror.c,v 1.2 1994/02/26 10:29:44 pk Exp $
+ *	$Id: strerror.c,v 1.3 1994/08/04 19:39:41 brezak Exp $
  */
 
-#include <sys/errno.h>
 #include "saerrno.h"