From e74b6a84ce2dd9e091aabfbaca4d692983662c0d Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@FreeBSD.org>
Date: Sun, 30 Sep 2001 22:28:01 +0000
Subject: [PATCH] Add __FBSDID()s to libstand

---
 lib/libstand/__main.c        | 3 +++
 lib/libstand/arp.c           | 3 +++
 lib/libstand/assert.c        | 5 +++--
 lib/libstand/bcd.c           | 5 +++--
 lib/libstand/bootp.c         | 4 +++-
 lib/libstand/bootparam.c     | 3 +++
 lib/libstand/bswap.c         | 3 +++
 lib/libstand/bzipfs.c        | 6 +++---
 lib/libstand/cd9660.c        | 4 +++-
 lib/libstand/close.c         | 4 +++-
 lib/libstand/closeall.c      | 3 +++
 lib/libstand/dev.c           | 3 +++
 lib/libstand/dev_net.c       | 3 +++
 lib/libstand/dosfs.c         | 5 +++--
 lib/libstand/environment.c   | 6 +++---
 lib/libstand/ether.c         | 3 +++
 lib/libstand/ext2fs.c        | 6 ++++--
 lib/libstand/fstat.c         | 3 +++
 lib/libstand/getopt.c        | 3 +++
 lib/libstand/gets.c          | 3 +++
 lib/libstand/globals.c       | 3 +++
 lib/libstand/gzipfs.c        | 6 +++---
 lib/libstand/in_cksum.c      | 3 +++
 lib/libstand/inet_ntoa.c     | 3 +++
 lib/libstand/ioctl.c         | 3 +++
 lib/libstand/lseek.c         | 4 +++-
 lib/libstand/net.c           | 4 +++-
 lib/libstand/netif.c         | 5 +++--
 lib/libstand/nfs.c           | 4 +++-
 lib/libstand/nullfs.c        | 4 +++-
 lib/libstand/open.c          | 4 +++-
 lib/libstand/pager.c         | 5 +++--
 lib/libstand/printf.c        | 4 +++-
 lib/libstand/qdivrem.c       | 4 +++-
 lib/libstand/random.c        | 4 +++-
 lib/libstand/rarp.c          | 4 ++++
 lib/libstand/read.c          | 4 +++-
 lib/libstand/readdir.c       | 5 +++--
 lib/libstand/rpc.c           | 3 +++
 lib/libstand/sbrk.c          | 5 +++--
 lib/libstand/stat.c          | 3 +++
 lib/libstand/strcasecmp.c    | 3 +++
 lib/libstand/strdup.c        | 3 +++
 lib/libstand/strerror.c      | 3 +++
 lib/libstand/strtol.c        | 3 +++
 lib/libstand/tftp.c          | 5 +++--
 lib/libstand/twiddle.c       | 4 +++-
 lib/libstand/udp.c           | 4 +++-
 lib/libstand/ufs.c           | 4 +++-
 lib/libstand/write.c         | 3 +++
 lib/libstand/zalloc.c        | 5 +++--
 lib/libstand/zalloc_malloc.c | 5 +++--
 lib/libstand/zipfs.c         | 6 +++---
 53 files changed, 161 insertions(+), 49 deletions(-)

diff --git a/lib/libstand/__main.c b/lib/libstand/__main.c
index be23105b64b2..1c7e67703e0d 100644
--- a/lib/libstand/__main.c
+++ b/lib/libstand/__main.c
@@ -30,6 +30,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 
 void __main(void);
diff --git a/lib/libstand/arp.c b/lib/libstand/arp.c
index 4736b516d08c..b84fe47f4e95 100644
--- a/lib/libstand/arp.c
+++ b/lib/libstand/arp.c
@@ -39,6 +39,9 @@
  * @(#) Header: arp.c,v 1.5 93/07/15 05:52:26 leres Exp  (LBL)
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/lib/libstand/assert.c b/lib/libstand/assert.c
index a0b2cbf631e2..9edba3c5ffa4 100644
--- a/lib/libstand/assert.c
+++ b/lib/libstand/assert.c
@@ -22,10 +22,11 @@
  * 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.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <assert.h>
 
 #include "stand.h"
diff --git a/lib/libstand/bcd.c b/lib/libstand/bcd.c
index 296c8e94c276..7bd67c91620a 100644
--- a/lib/libstand/bcd.c
+++ b/lib/libstand/bcd.c
@@ -1,10 +1,11 @@
 /*
  * Some data-tables that are often used.
  * Cannot be copyrighted.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 
 u_char const bcd2bin_data[] = {
diff --git a/lib/libstand/bootp.c b/lib/libstand/bootp.c
index 5ac38b35dbe1..2de2f1fa891c 100644
--- a/lib/libstand/bootp.c
+++ b/lib/libstand/bootp.c
@@ -37,9 +37,11 @@
  * SUCH DAMAGE.
  *
  * @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp  (LBL)
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/lib/libstand/bootparam.c b/lib/libstand/bootparam.c
index 6d64e7a87d2e..e4d2f1022c92 100644
--- a/lib/libstand/bootparam.c
+++ b/lib/libstand/bootparam.c
@@ -30,6 +30,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * RPC/bootparams
  */
diff --git a/lib/libstand/bswap.c b/lib/libstand/bswap.c
index 1951509df93f..a9bd323b7f62 100644
--- a/lib/libstand/bswap.c
+++ b/lib/libstand/bswap.c
@@ -3,6 +3,9 @@
  * Public domain.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char *rcsid = "$NetBSD: bswap32.c,v 1.1 1997/10/09 15:42:33 bouyer Exp $";
 static char *rcsid = "$NetBSD: bswap64.c,v 1.1 1997/10/09 15:42:33 bouyer Exp $";
diff --git a/lib/libstand/bzipfs.c b/lib/libstand/bzipfs.c
index 749ea9d76e6e..88b7940924a0 100644
--- a/lib/libstand/bzipfs.c
+++ b/lib/libstand/bzipfs.c
@@ -23,11 +23,11 @@
  * 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.
- *
- * $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 #include <sys/stat.h>
diff --git a/lib/libstand/cd9660.c b/lib/libstand/cd9660.c
index da34ab915a64..e53ea3442cc4 100644
--- a/lib/libstand/cd9660.c
+++ b/lib/libstand/cd9660.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: cd9660.c,v 1.5 1997/06/26 19:11:33 drochner Exp $	*/
 
 /*
@@ -32,6 +31,9 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Stand-alone ISO9660 file reading package.
  *
diff --git a/lib/libstand/close.c b/lib/libstand/close.c
index bf8109489217..8ad628b87608 100644
--- a/lib/libstand/close.c
+++ b/lib/libstand/close.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: close.c,v 1.7 1997/01/22 00:38:09 cgd Exp $	*/
 
 /*-
@@ -65,6 +64,9 @@
  * rights to redistribute these changes.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 int
diff --git a/lib/libstand/closeall.c b/lib/libstand/closeall.c
index 8da450a00ae9..2f7be72e9a94 100644
--- a/lib/libstand/closeall.c
+++ b/lib/libstand/closeall.c
@@ -64,6 +64,9 @@
  * rights to redistribute these changes.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 void
diff --git a/lib/libstand/dev.c b/lib/libstand/dev.c
index c5b9c2780495..12d7130cca7b 100644
--- a/lib/libstand/dev.c
+++ b/lib/libstand/dev.c
@@ -35,6 +35,9 @@
  *	@(#)dev.c	8.1 (Berkeley) 6/11/93
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/reboot.h>
 
diff --git a/lib/libstand/dev_net.c b/lib/libstand/dev_net.c
index cfa9fbff8a94..3ddc24fcc92a 100644
--- a/lib/libstand/dev_net.c
+++ b/lib/libstand/dev_net.c
@@ -36,6 +36,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * This module implements a "raw device" interface suitable for
  * use by the stand-alone I/O library NFS code.  This interface
diff --git a/lib/libstand/dosfs.c b/lib/libstand/dosfs.c
index 3646a9ea7233..792e0beb8620 100644
--- a/lib/libstand/dosfs.c
+++ b/lib/libstand/dosfs.c
@@ -23,10 +23,11 @@
  * 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.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Readonly filesystem for Microsoft FAT12/FAT16/FAT32 filesystems,
  * also supports VFAT.
diff --git a/lib/libstand/environment.c b/lib/libstand/environment.c
index 158e8452f3eb..1365a1c601d4 100644
--- a/lib/libstand/environment.c
+++ b/lib/libstand/environment.c
@@ -22,11 +22,11 @@
  * 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.
- *
- * $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Manage an environment-like space in which string variables may be stored.
  * Provide support for some method-like operations for setting/retrieving
diff --git a/lib/libstand/ether.c b/lib/libstand/ether.c
index 871dad49b87c..af26bcf9c493 100644
--- a/lib/libstand/ether.c
+++ b/lib/libstand/ether.c
@@ -39,6 +39,9 @@
  * @(#) Header: net.c,v 1.9 93/08/06 19:32:15 leres Exp  (LBL)
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <string.h>
diff --git a/lib/libstand/ext2fs.c b/lib/libstand/ext2fs.c
index 6c05cf5a5cfa..b025f6434b46 100644
--- a/lib/libstand/ext2fs.c
+++ b/lib/libstand/ext2fs.c
@@ -22,9 +22,11 @@
  * 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.
- *
- *	$FreeBSD$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/lib/libstand/fstat.c b/lib/libstand/fstat.c
index aa8b89826fd0..8504acfb8bb0 100644
--- a/lib/libstand/fstat.c
+++ b/lib/libstand/fstat.c
@@ -35,6 +35,9 @@
  *	@(#)stat.c	8.1 (Berkeley) 6/11/93
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 int
diff --git a/lib/libstand/getopt.c b/lib/libstand/getopt.c
index f788fe0fd946..9af05e096632 100644
--- a/lib/libstand/getopt.c
+++ b/lib/libstand/getopt.c
@@ -31,6 +31,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
 #endif /* LIBC_SCCS and not lint */
diff --git a/lib/libstand/gets.c b/lib/libstand/gets.c
index dc26a998b325..dec627dd192f 100644
--- a/lib/libstand/gets.c
+++ b/lib/libstand/gets.c
@@ -35,6 +35,9 @@
  *	@(#)gets.c	8.1 (Berkeley) 6/11/93
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 /* gets() with constrained input length */
diff --git a/lib/libstand/globals.c b/lib/libstand/globals.c
index c35021c9e277..03108232fff0 100644
--- a/lib/libstand/globals.c
+++ b/lib/libstand/globals.c
@@ -7,6 +7,9 @@
  *	must be included extraneously.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/lib/libstand/gzipfs.c b/lib/libstand/gzipfs.c
index c95621cc6d9d..59034ffd102b 100644
--- a/lib/libstand/gzipfs.c
+++ b/lib/libstand/gzipfs.c
@@ -22,11 +22,11 @@
  * 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.
- *
- * $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 #include <sys/stat.h>
diff --git a/lib/libstand/in_cksum.c b/lib/libstand/in_cksum.c
index d9b8964c62c3..11bc75c45cf9 100644
--- a/lib/libstand/in_cksum.c
+++ b/lib/libstand/in_cksum.c
@@ -39,6 +39,9 @@
  * @(#) Header: in_cksum.c,v 1.1 92/09/11 01:15:55 leres Exp  (LBL)
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 
 /*
diff --git a/lib/libstand/inet_ntoa.c b/lib/libstand/inet_ntoa.c
index c7efb0a3f61d..3bfe09eb883b 100644
--- a/lib/libstand/inet_ntoa.c
+++ b/lib/libstand/inet_ntoa.c
@@ -31,6 +31,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
diff --git a/lib/libstand/ioctl.c b/lib/libstand/ioctl.c
index 1b0f353f8996..45a014c39d4e 100644
--- a/lib/libstand/ioctl.c
+++ b/lib/libstand/ioctl.c
@@ -64,6 +64,9 @@
  * rights to redistribute these changes.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 int
diff --git a/lib/libstand/lseek.c b/lib/libstand/lseek.c
index f9454607c445..6880ef9297c5 100644
--- a/lib/libstand/lseek.c
+++ b/lib/libstand/lseek.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: lseek.c,v 1.4 1997/01/22 00:38:10 cgd Exp $	*/
 
 /*-
@@ -65,6 +64,9 @@
  * rights to redistribute these changes.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 off_t
diff --git a/lib/libstand/net.c b/lib/libstand/net.c
index b01c3c60ab4f..6ac0de818984 100644
--- a/lib/libstand/net.c
+++ b/lib/libstand/net.c
@@ -37,9 +37,11 @@
  * SUCH DAMAGE.
  *
  * @(#) Header: net.c,v 1.9 93/08/06 19:32:15 leres Exp  (LBL)
- *	$FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/socket.h>
 
diff --git a/lib/libstand/netif.c b/lib/libstand/netif.c
index d63f953aa823..4d852d490c9f 100644
--- a/lib/libstand/netif.c
+++ b/lib/libstand/netif.c
@@ -29,10 +29,11 @@
  * 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.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
diff --git a/lib/libstand/nfs.c b/lib/libstand/nfs.c
index 67fc1bc64407..1fc62b7bb70b 100644
--- a/lib/libstand/nfs.c
+++ b/lib/libstand/nfs.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: nfs.c,v 1.2 1998/01/24 12:43:09 drochner Exp $	*/
 
 /*-
@@ -29,6 +28,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/lib/libstand/nullfs.c b/lib/libstand/nullfs.c
index 0f77bd4c185c..ae12cb077289 100644
--- a/lib/libstand/nullfs.c
+++ b/lib/libstand/nullfs.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: nullfs.c,v 1.1 1996/01/13 22:25:39 leo Exp $	*/
 
 /*-
@@ -65,6 +64,9 @@
  * rights to redistribute these changes.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 /*
diff --git a/lib/libstand/open.c b/lib/libstand/open.c
index 471f93745f01..64721e51d4f1 100644
--- a/lib/libstand/open.c
+++ b/lib/libstand/open.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: open.c,v 1.16 1997/01/28 09:41:03 pk Exp $	*/
 
 /*-
@@ -65,6 +64,9 @@
  * rights to redistribute these changes.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 struct open_file files[SOPEN_MAX];
diff --git a/lib/libstand/pager.c b/lib/libstand/pager.c
index 265ccdc00ee6..a966b0bd7992 100644
--- a/lib/libstand/pager.c
+++ b/lib/libstand/pager.c
@@ -22,13 +22,14 @@
  * 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.
- *
- * $FreeBSD$
  */
 /*
  * Simple paged-output and paged-viewing functions
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 #include <string.h>
 
diff --git a/lib/libstand/printf.c b/lib/libstand/printf.c
index 6e3702e59f4d..a9ed2258e11c 100644
--- a/lib/libstand/printf.c
+++ b/lib/libstand/printf.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Standaloneified version of the FreeBSD kernel printf family.
  */
diff --git a/lib/libstand/qdivrem.c b/lib/libstand/qdivrem.c
index a8231f0c1545..d064c426a877 100644
--- a/lib/libstand/qdivrem.c
+++ b/lib/libstand/qdivrem.c
@@ -34,10 +34,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
  * 	From: Id: qdivrem.c,v 1.7 1997/11/07 09:20:40 phk Exp
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Multiprecision divide.  This algorithm is from Knuth vol. 2 (2nd ed),
  * section 4.3.1, pp. 257--259.
diff --git a/lib/libstand/random.c b/lib/libstand/random.c
index 13af195f49cd..994d3076e3aa 100644
--- a/lib/libstand/random.c
+++ b/lib/libstand/random.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)random.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 
 static u_long randseed = 1;
diff --git a/lib/libstand/rarp.c b/lib/libstand/rarp.c
index 898e4756aeda..b9b317fec2a7 100644
--- a/lib/libstand/rarp.c
+++ b/lib/libstand/rarp.c
@@ -38,6 +38,10 @@
  *
  * @(#) Header: arp.c,v 1.5 93/07/15 05:52:26 leres Exp  (LBL)
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/lib/libstand/read.c b/lib/libstand/read.c
index 28ff47e07e33..36f0f224ed03 100644
--- a/lib/libstand/read.c
+++ b/lib/libstand/read.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: read.c,v 1.8 1997/01/22 00:38:12 cgd Exp $	*/
 
 /*-
@@ -65,6 +64,9 @@
  * rights to redistribute these changes.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include "stand.h"
 
diff --git a/lib/libstand/readdir.c b/lib/libstand/readdir.c
index f34dc881558f..e49d93d15ed6 100644
--- a/lib/libstand/readdir.c
+++ b/lib/libstand/readdir.c
@@ -22,10 +22,11 @@
  * 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.
- *
- *	$FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include "stand.h"
 
diff --git a/lib/libstand/rpc.c b/lib/libstand/rpc.c
index 9f0fa32764e4..17f4362fc530 100644
--- a/lib/libstand/rpc.c
+++ b/lib/libstand/rpc.c
@@ -39,6 +39,9 @@
  * @(#) Header: rpc.c,v 1.12 93/09/28 08:31:56 leres Exp  (LBL)
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * RPC functions used by NFS and bootparams.
  * Note that bootparams requires the ability to find out the
diff --git a/lib/libstand/sbrk.c b/lib/libstand/sbrk.c
index 326311130c4f..b6245f96f8fc 100644
--- a/lib/libstand/sbrk.c
+++ b/lib/libstand/sbrk.c
@@ -22,10 +22,11 @@
  * 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.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Minimal sbrk() emulation required for malloc support.
  */
diff --git a/lib/libstand/stat.c b/lib/libstand/stat.c
index bdc97d571ca9..8593281c57cd 100644
--- a/lib/libstand/stat.c
+++ b/lib/libstand/stat.c
@@ -35,6 +35,9 @@
  *	@(#)stat.c	8.1 (Berkeley) 6/11/93
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 int
diff --git a/lib/libstand/strcasecmp.c b/lib/libstand/strcasecmp.c
index 247484d331b6..05b6c369004c 100644
--- a/lib/libstand/strcasecmp.c
+++ b/lib/libstand/strcasecmp.c
@@ -31,6 +31,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/cdefs.h>
 #include <string.h>
 #include "stand.h"
diff --git a/lib/libstand/strdup.c b/lib/libstand/strdup.c
index ee46e7d1670b..2204d33e052f 100644
--- a/lib/libstand/strdup.c
+++ b/lib/libstand/strdup.c
@@ -31,6 +31,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strdup.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
diff --git a/lib/libstand/strerror.c b/lib/libstand/strerror.c
index e84a4d4275b3..7c7f579cc2f5 100644
--- a/lib/libstand/strerror.c
+++ b/lib/libstand/strerror.c
@@ -33,6 +33,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 static struct 
diff --git a/lib/libstand/strtol.c b/lib/libstand/strtol.c
index 02c59200a18c..30c5cbbf1026 100644
--- a/lib/libstand/strtol.c
+++ b/lib/libstand/strtol.c
@@ -31,6 +31,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strtol.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
diff --git a/lib/libstand/tftp.c b/lib/libstand/tftp.c
index eb9b56f8bd41..e0190105dbbf 100644
--- a/lib/libstand/tftp.c
+++ b/lib/libstand/tftp.c
@@ -29,10 +29,11 @@
  * 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.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Simple TFTP implementation for libsa.
  * Assumes:
diff --git a/lib/libstand/twiddle.c b/lib/libstand/twiddle.c
index 7a9a6692bd93..46bd8958e29d 100644
--- a/lib/libstand/twiddle.c
+++ b/lib/libstand/twiddle.c
@@ -36,9 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include "stand.h"
 
diff --git a/lib/libstand/udp.c b/lib/libstand/udp.c
index ffb0f708352f..4dbd7957bd87 100644
--- a/lib/libstand/udp.c
+++ b/lib/libstand/udp.c
@@ -37,9 +37,11 @@
  * SUCH DAMAGE.
  *
  * @(#) Header: net.c,v 1.9 93/08/06 19:32:15 leres Exp  (LBL)
- *	$FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/socket.h>
 
diff --git a/lib/libstand/ufs.c b/lib/libstand/ufs.c
index 0db2393d9e13..c501fe95ffad 100644
--- a/lib/libstand/ufs.c
+++ b/lib/libstand/ufs.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*	$NetBSD: ufs.c,v 1.20 1998/03/01 07:15:39 ross Exp $	*/
 
 /*-
@@ -63,6 +62,9 @@
  * rights to redistribute these changes.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  *	Stand-alone file reading package.
  */
diff --git a/lib/libstand/write.c b/lib/libstand/write.c
index 7c30926313f1..022e77068383 100644
--- a/lib/libstand/write.c
+++ b/lib/libstand/write.c
@@ -64,6 +64,9 @@
  * rights to redistribute these changes.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include "stand.h"
 
diff --git a/lib/libstand/zalloc.c b/lib/libstand/zalloc.c
index 16a4163a88fb..e83fccb8ced3 100644
--- a/lib/libstand/zalloc.c
+++ b/lib/libstand/zalloc.c
@@ -25,10 +25,11 @@
  * 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.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * LIB/MEMORY/ZALLOC.C	- self contained low-overhead memory pool/allocation 
  *			  subsystem
diff --git a/lib/libstand/zalloc_malloc.c b/lib/libstand/zalloc_malloc.c
index 83e5290a95cd..c1e9ab11d93a 100644
--- a/lib/libstand/zalloc_malloc.c
+++ b/lib/libstand/zalloc_malloc.c
@@ -25,10 +25,11 @@
  * 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.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * MALLOC.C - malloc equivalent, runs on top of zalloc and uses sbrk
  */
diff --git a/lib/libstand/zipfs.c b/lib/libstand/zipfs.c
index c95621cc6d9d..59034ffd102b 100644
--- a/lib/libstand/zipfs.c
+++ b/lib/libstand/zipfs.c
@@ -22,11 +22,11 @@
  * 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.
- *
- * $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "stand.h"
 
 #include <sys/stat.h>