diff --git a/usr.sbin/tcpdump/print-ah.c b/usr.sbin/tcpdump/print-ah.c
index 67b070b22558..9c8a3d8035ea 100644
--- a/usr.sbin/tcpdump/print-ah.c
+++ b/usr.sbin/tcpdump/print-ah.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-ah.c,v 1.2 1999/07/04 02:57:51 itojun Exp $	*/
+/*	$NetBSD: print-ah.c,v 1.3 1999/09/04 03:36:41 itojun Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
@@ -22,8 +22,13 @@
  */
 
 #ifndef lint
+#if 0
 static const char rcsid[] =
     "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
+#else
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-ah.c,v 1.3 1999/09/04 03:36:41 itojun Exp $");
+#endif
 #endif
 
 #include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-esp.c b/usr.sbin/tcpdump/print-esp.c
index 7e4736979002..c24d5ead25be 100644
--- a/usr.sbin/tcpdump/print-esp.c
+++ b/usr.sbin/tcpdump/print-esp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-esp.c,v 1.2 1999/07/04 02:57:51 itojun Exp $	*/
+/*	$NetBSD: print-esp.c,v 1.3 1999/09/04 03:36:41 itojun Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
@@ -22,8 +22,13 @@
  */
 
 #ifndef lint
+#if 0
 static const char rcsid[] =
     "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
+#else
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-esp.c,v 1.3 1999/09/04 03:36:41 itojun Exp $");
+#endif
 #endif
 
 #include <string.h>
diff --git a/usr.sbin/tcpdump/print-frag6.c b/usr.sbin/tcpdump/print-frag6.c
index 2016d61d5ccd..098e70fc5833 100644
--- a/usr.sbin/tcpdump/print-frag6.c
+++ b/usr.sbin/tcpdump/print-frag6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-frag6.c,v 1.3 1999/08/26 11:16:06 itojun Exp $	*/
+/*	$NetBSD: print-frag6.c,v 1.4 1999/09/04 03:36:41 itojun Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
@@ -22,8 +22,13 @@
  */
 
 #ifndef lint
+#if 0
 static const char rcsid[] =
     "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
+#else
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-frag6.c,v 1.4 1999/09/04 03:36:41 itojun Exp $");
+#endif
 #endif
 
 #ifdef INET6
diff --git a/usr.sbin/tcpdump/print-hdlc.c b/usr.sbin/tcpdump/print-hdlc.c
index eab50ffa9f9b..10d5e99ab20d 100644
--- a/usr.sbin/tcpdump/print-hdlc.c
+++ b/usr.sbin/tcpdump/print-hdlc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-hdlc.c,v 1.2 1998/07/25 11:39:53 explorer Exp $	*/
+/*	$NetBSD: print-hdlc.c,v 1.3 1999/09/04 03:36:41 itojun Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1993, 1994
@@ -21,6 +21,11 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#ifndef lint
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-hdlc.c,v 1.3 1999/09/04 03:36:41 itojun Exp $");
+#endif
+
 #ifdef HAVE_HDLC
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-icmp6.c b/usr.sbin/tcpdump/print-icmp6.c
index 398a109b6f1e..73524f5b4e6a 100644
--- a/usr.sbin/tcpdump/print-icmp6.c
+++ b/usr.sbin/tcpdump/print-icmp6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-icmp6.c,v 1.4 1999/07/26 06:26:58 itojun Exp $	*/
+/*	$NetBSD: print-icmp6.c,v 1.5 1999/09/04 03:36:41 itojun Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
@@ -22,8 +22,13 @@
  */
 
 #ifndef lint
+#if 0
 static const char rcsid[] =
     "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
+#else
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-icmp6.c,v 1.5 1999/09/04 03:36:41 itojun Exp $");
+#endif
 #endif
 
 #ifdef INET6
diff --git a/usr.sbin/tcpdump/print-ip6.c b/usr.sbin/tcpdump/print-ip6.c
index 3f065866b050..1939aaae567d 100644
--- a/usr.sbin/tcpdump/print-ip6.c
+++ b/usr.sbin/tcpdump/print-ip6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-ip6.c,v 1.2 1999/07/04 02:57:51 itojun Exp $	*/
+/*	$NetBSD: print-ip6.c,v 1.3 1999/09/04 03:36:41 itojun Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994
@@ -22,8 +22,13 @@
  */
 
 #ifndef lint
+#if 0
 static const char rcsid[] =
     "@(#) /master/usr.sbin/tcpdump/tcpdump/print-ip.c,v 2.1 1995/02/03 18:14:45 polk Exp (LBL)";
+#else
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-ip6.c,v 1.3 1999/09/04 03:36:41 itojun Exp $");
+#endif
 #endif
 
 #ifdef INET6
diff --git a/usr.sbin/tcpdump/print-ip6opts.c b/usr.sbin/tcpdump/print-ip6opts.c
index 209507a7e269..a45ea7306d30 100644
--- a/usr.sbin/tcpdump/print-ip6opts.c
+++ b/usr.sbin/tcpdump/print-ip6opts.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-ip6opts.c,v 1.2 1999/07/04 02:57:51 itojun Exp $	*/
+/*	$NetBSD: print-ip6opts.c,v 1.3 1999/09/04 03:36:41 itojun Exp $	*/
 
 /*
  * Copyright (C) 1998 WIDE Project.
@@ -29,6 +29,11 @@
  * SUCH DAMAGE.
  */
 
+#ifndef lint
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-ip6opts.c,v 1.3 1999/09/04 03:36:41 itojun Exp $");
+#endif
+
 #ifdef INET6
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.sbin/tcpdump/print-ipcomp.c b/usr.sbin/tcpdump/print-ipcomp.c
index ed2f49d07e11..8d29b3482520 100644
--- a/usr.sbin/tcpdump/print-ipcomp.c
+++ b/usr.sbin/tcpdump/print-ipcomp.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: print-ipcomp.c,v 1.2 1999/09/04 03:36:41 itojun Exp $	*/
+
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -20,8 +22,13 @@
  */
 
 #ifndef lint
+#if 0
 static const char rcsid[] =
     "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
+#else
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-ipcomp.c,v 1.2 1999/09/04 03:36:41 itojun Exp $");
+#endif
 #endif
 
 #include <string.h>
diff --git a/usr.sbin/tcpdump/print-isakmp.c b/usr.sbin/tcpdump/print-isakmp.c
index 4d1d523372f8..460ba75d3c07 100644
--- a/usr.sbin/tcpdump/print-isakmp.c
+++ b/usr.sbin/tcpdump/print-isakmp.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: print-isakmp.c,v 1.2 1999/09/04 03:36:41 itojun Exp $	*/
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
@@ -29,8 +31,13 @@
  */
 
 #ifndef lint
+#if 0
 static const char rcsid[] =
-    "@(#) $Header: /cvsroot/src/usr.sbin/tcpdump/Attic/print-isakmp.c,v 1.1 1999/07/02 11:31:34 itojun Exp $ (LBL)";
+    "@(#) $Header: /cvsroot/src/usr.sbin/tcpdump/Attic/print-isakmp.c,v 1.2 1999/09/04 03:36:41 itojun Exp $ (LBL)";
+#else
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-isakmp.c,v 1.2 1999/09/04 03:36:41 itojun Exp $");
+#endif
 #endif
 
 #include <string.h>
diff --git a/usr.sbin/tcpdump/print-nfs.c b/usr.sbin/tcpdump/print-nfs.c
index f5dd52970d11..b16d74df40a1 100644
--- a/usr.sbin/tcpdump/print-nfs.c
+++ b/usr.sbin/tcpdump/print-nfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-nfs.c,v 1.9 1998/07/26 16:01:12 mycroft Exp $	*/
+/*	$NetBSD: print-nfs.c,v 1.10 1999/09/04 03:36:41 itojun Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -27,7 +27,7 @@
 static const char rcsid[] =
     "@(#) Header: print-nfs.c,v 1.65 97/08/17 13:24:22 leres Exp  (LBL)";
 #else
-__RCSID("$NetBSD: print-nfs.c,v 1.9 1998/07/26 16:01:12 mycroft Exp $");
+__RCSID("$NetBSD: print-nfs.c,v 1.10 1999/09/04 03:36:41 itojun Exp $");
 #endif
 #endif
 
@@ -1587,5 +1587,5 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt
 	}
 	if (!nfserr)
 		fputs(" [|nfs]", stdout);
-trunc:
+trunc:;
 }
diff --git a/usr.sbin/tcpdump/print-ospf6.c b/usr.sbin/tcpdump/print-ospf6.c
index 0f2371d673a5..01cc8bf5afa8 100644
--- a/usr.sbin/tcpdump/print-ospf6.c
+++ b/usr.sbin/tcpdump/print-ospf6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-ospf6.c,v 1.3 1999/07/06 13:05:14 itojun Exp $	*/
+/*	$NetBSD: print-ospf6.c,v 1.4 1999/09/04 03:36:42 itojun Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997
@@ -24,8 +24,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /cvsroot/src/usr.sbin/tcpdump/Attic/print-ospf6.c,v 1.3 1999/07/06 13:05:14 itojun Exp $ (LBL)";
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-ospf6.c,v 1.4 1999/09/04 03:36:42 itojun Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/usr.sbin/tcpdump/print-ripng.c b/usr.sbin/tcpdump/print-ripng.c
index fbabc577f207..5a9258d62b66 100644
--- a/usr.sbin/tcpdump/print-ripng.c
+++ b/usr.sbin/tcpdump/print-ripng.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-ripng.c,v 1.2 1999/07/04 02:57:51 itojun Exp $	*/
+/*	$NetBSD: print-ripng.c,v 1.3 1999/09/04 03:36:42 itojun Exp $	*/
 
 /*
  * Copyright (c) 1989, 1990, 1991, 1993, 1994
@@ -22,8 +22,13 @@
  */
 
 #ifndef lint
+#if 0
 static const char rcsid[] =
     "@(#) /master/usr.sbin/tcpdump/tcpdump/print-rip.c,v 2.1 1995/02/03 18:15:05 polk Exp (LBL)";
+#else
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-ripng.c,v 1.3 1999/09/04 03:36:42 itojun Exp $");
+#endif
 #endif
 
 #ifdef INET6
diff --git a/usr.sbin/tcpdump/print-rt6.c b/usr.sbin/tcpdump/print-rt6.c
index 1e8d037a7c26..d9323eccb4e7 100644
--- a/usr.sbin/tcpdump/print-rt6.c
+++ b/usr.sbin/tcpdump/print-rt6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print-rt6.c,v 1.2 1999/07/04 02:57:51 itojun Exp $	*/
+/*	$NetBSD: print-rt6.c,v 1.3 1999/09/04 03:36:42 itojun Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
@@ -22,8 +22,13 @@
  */
 
 #ifndef lint
+#if 0
 static const char rcsid[] =
     "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
+#else
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-rt6.c,v 1.3 1999/09/04 03:36:42 itojun Exp $");
+#endif
 #endif
 
 #ifdef INET6
diff --git a/usr.sbin/tcpdump/print-token.c b/usr.sbin/tcpdump/print-token.c
index 4213dd7d3cf0..006352bae137 100644
--- a/usr.sbin/tcpdump/print-token.c
+++ b/usr.sbin/tcpdump/print-token.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: print-token.c,v 1.3 1999/09/04 03:36:42 itojun Exp $	*/
+
 /*
  * Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
  *	The Regents of the University of California.  All rights reserved.
@@ -19,9 +21,14 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#ifndef lint
 #if 0
 static  char rcsid[] =
-	"@(#)$Header: /cvsroot/src/usr.sbin/tcpdump/Attic/print-token.c,v 1.2 1999/03/25 05:07:34 itohy Exp $ (LBL)";
+	"@(#)$Header: /cvsroot/src/usr.sbin/tcpdump/Attic/print-token.c,v 1.3 1999/09/04 03:36:42 itojun Exp $ (LBL)";
+#else
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-token.c,v 1.3 1999/09/04 03:36:42 itojun Exp $");
+#endif
 #endif
 
 #ifdef HAVE_TOKEN