From 3824a6c0417a551961d1a1bf4f94f10eff736afc Mon Sep 17 00:00:00 2001
From: guy <guy>
Date: Sat, 15 Nov 2003 00:39:12 +0000
Subject: [PATCH] From Neil Spring:

	use "_U_" in the definitions of "rcsid[]", to eliminate
	complaints about those variables being unused;

	move the definitions after the include of "interface.h", or add
	an include of "interface.h", so that "_U_" is defined.

Include "config.h" before including "tcpdump-stdinc.h" in
"missing/datalinks.c".
---
 addrtoname.c          |  8 ++++----
 bpf_dump.c            |  8 ++++----
 gmpls.c               |  8 ++++----
 gmt2local.c           | 12 ++++++++----
 machdep.c             | 12 ++++++++----
 missing/datalinks.c   | 12 +++++++++---
 missing/dlnames.c     | 12 ++++++++----
 missing/getaddrinfo.c |  7 ++++++-
 missing/getnameinfo.c |  7 ++++++-
 missing/inet_aton.c   | 14 +++++++++-----
 missing/inet_ntop.c   | 14 +++++++++-----
 missing/inet_pton.c   | 14 +++++++++-----
 missing/snprintf.c    | 10 +++++-----
 missing/strlcat.c     | 12 ++++++++----
 missing/strlcpy.c     | 12 ++++++++----
 parsenfsfh.c          |  8 ++++----
 print-802_11.c        |  8 ++++----
 print-ah.c            |  8 ++++----
 print-aodv.c          |  8 ++++----
 print-arcnet.c        |  8 ++++----
 print-arp.c           |  8 ++++----
 print-ascii.c         |  8 ++++----
 print-atalk.c         |  8 ++++----
 print-atm.c           |  8 ++++----
 print-beep.c          |  8 ++++----
 print-bfd.c           |  8 ++++----
 print-bgp.c           |  8 ++++----
 print-bootp.c         |  8 ++++----
 print-cdp.c           |  8 ++++----
 print-chdlc.c         |  8 ++++----
 print-cip.c           |  8 ++++----
 print-cnfp.c          |  8 ++++----
 print-decnet.c        |  8 ++++----
 print-dhcp6.c         |  8 ++++----
 print-domain.c        |  8 ++++----
 print-dvmrp.c         |  8 ++++----
 print-egp.c           |  8 ++++----
 print-enc.c           |  8 ++++----
 print-esp.c           |  8 ++++----
 print-ether.c         |  8 ++++----
 print-fddi.c          |  8 ++++----
 print-fr.c            |  8 ++++----
 print-frag6.c         |  8 ++++----
 print-gre.c           |  8 ++++----
 print-hsrp.c          |  8 ++++----
 print-icmp.c          |  8 ++++----
 print-icmp6.c         |  8 ++++----
 print-igmp.c          |  8 ++++----
 print-igrp.c          |  8 ++++----
 print-ip.c            |  8 ++++----
 print-ip6.c           |  8 ++++----
 print-ip6opts.c       |  8 ++++----
 print-ipcomp.c        |  8 ++++----
 print-ipfc.c          |  8 ++++----
 print-ipx.c           |  8 ++++----
 print-isakmp.c        |  8 ++++----
 print-isoclns.c       |  8 ++++----
 print-krb.c           |  8 ++++----
 print-l2tp.c          |  8 ++++----
 print-lane.c          |  8 ++++----
 print-ldp.c           |  8 ++++----
 print-llc.c           |  8 ++++----
 print-lwres.c         |  8 ++++----
 print-mobile.c        |  8 ++++----
 print-mobility.c      |  8 ++++----
 print-mpls.c          |  8 ++++----
 print-msdp.c          |  8 ++++----
 print-netbios.c       |  8 ++++----
 print-nfs.c           |  8 ++++----
 print-ntp.c           |  8 ++++----
 print-null.c          |  8 ++++----
 print-ospf.c          |  8 ++++----
 print-ospf6.c         |  8 ++++----
 print-pflog.c         |  8 ++++----
 print-pim.c           |  8 ++++----
 print-ppp.c           |  8 ++++----
 print-pppoe.c         |  8 ++++----
 print-pptp.c          |  8 ++++----
 print-radius.c        |  8 ++++----
 print-raw.c           |  8 ++++----
 print-rip.c           |  8 ++++----
 print-ripng.c         |  8 ++++----
 print-rsvp.c          |  8 ++++----
 print-rt6.c           |  8 ++++----
 print-rx.c            |  8 ++++----
 print-sctp.c          |  8 ++++----
 print-sl.c            |  8 ++++----
 print-sll.c           |  8 ++++----
 print-smb.c           |  8 ++++----
 print-snmp.c          |  8 ++++----
 print-stp.c           |  8 ++++----
 print-sunatm.c        |  8 ++++----
 print-sunrpc.c        |  8 ++++----
 print-tcp.c           |  8 ++++----
 print-telnet.c        |  8 ++++----
 print-tftp.c          |  8 ++++----
 print-timed.c         |  8 ++++----
 print-token.c         |  8 ++++----
 print-udp.c           |  8 ++++----
 print-vjc.c           |  8 ++++----
 print-vrrp.c          |  8 ++++----
 print-wb.c            |  8 ++++----
 print-zephyr.c        |  8 ++++----
 setsignal.c           | 12 ++++++++----
 smbutil.c             |  8 ++++----
 strcasecmp.c          |  8 ++++----
 tcpdump.c             | 14 +++++++-------
 util.c                |  8 ++++----
 vfprintf.c            |  8 ++++----
 109 files changed, 488 insertions(+), 436 deletions(-)

diff --git a/addrtoname.c b/addrtoname.c
index b440e4cc..797dcd0c 100644
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -21,10 +21,6 @@
  *  Internet, ethernet, port, and protocol string to address
  *  and address to string conversion routines
  */
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.96 2003-07-31 22:36:44 fenner Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -56,6 +52,10 @@ struct rtentry;		/* declarations in <net/if.h> */
 #include "llc.h"
 #include "setsignal.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.97 2003-11-15 00:39:12 guy Exp $ (LBL)";
+#endif
 /*
  * hash tables for whatever-to-name translations
  *
diff --git a/bpf_dump.c b/bpf_dump.c
index cc6b98d3..bec00797 100644
--- a/bpf_dump.c
+++ b/bpf_dump.c
@@ -18,10 +18,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.14 2002-08-01 08:52:56 risso Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -34,6 +30,10 @@ static const char rcsid[] =
 
 #include "interface.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.15 2003-11-15 00:39:12 guy Exp $ (LBL)";
+#endif
 void
 bpf_dump(struct bpf_program *p, int option)
 {
diff --git a/gmpls.c b/gmpls.c
index 33c6a2c6..cfedee59 100644
--- a/gmpls.c
+++ b/gmpls.c
@@ -13,10 +13,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/gmpls.c,v 1.2 2003-10-20 10:32:46 hannes Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -26,6 +22,10 @@ static const char rcsid[] =
 
 #include "interface.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/gmpls.c,v 1.3 2003-11-15 00:39:13 guy Exp $ (LBL)";
+#endif
 /* rfc3471 */
 struct tok gmpls_link_prot_values[] = {
     { 0x01, "Extra Traffic"},
diff --git a/gmt2local.c b/gmt2local.c
index 68b65379..067812a1 100644
--- a/gmt2local.c
+++ b/gmt2local.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/gmt2local.c,v 1.7 2002-08-06 04:42:04 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,6 +26,14 @@ static const char rcsid[] =
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/gmt2local.c,v 1.8 2003-11-15 00:39:13 guy Exp $ (LBL)";
+#endif
+
 #include <stdio.h>
 
 #ifdef HAVE_OS_PROTO_H
diff --git a/machdep.c b/machdep.c
index fdfcac59..d181945d 100644
--- a/machdep.c
+++ b/machdep.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/machdep.c,v 1.10 2002-09-05 21:25:36 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -36,6 +32,14 @@ static const char rcsid[] =
  */
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/machdep.c,v 1.11 2003-11-15 00:39:13 guy Exp $ (LBL)";
+#endif
+
 #ifndef HAVE___ATTRIBUTE__
 #define __attribute__(x)
 #endif /* HAVE___ATTRIBUTE__ */
diff --git a/missing/datalinks.c b/missing/datalinks.c
index 64996971..36eb1c46 100644
--- a/missing/datalinks.c
+++ b/missing/datalinks.c
@@ -31,13 +31,19 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/datalinks.c,v 1.1 2002-12-19 09:27:58 guy Exp $ (LBL)";
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/datalinks.c,v 1.2 2003-11-15 00:39:46 guy Exp $ (LBL)";
+#endif
+
 #include <pcap.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/missing/dlnames.c b/missing/dlnames.c
index 7db76a2a..9dececf6 100644
--- a/missing/dlnames.c
+++ b/missing/dlnames.c
@@ -31,10 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/dlnames.c,v 1.2 2003-05-02 08:46:29 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -42,6 +38,14 @@ static const char rcsid[] =
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/dlnames.c,v 1.3 2003-11-15 00:39:47 guy Exp $ (LBL)";
+#endif
+
 #include <pcap.h>
 #include <string.h>
 
diff --git a/missing/getaddrinfo.c b/missing/getaddrinfo.c
index 458fe014..e37f9363 100644
--- a/missing/getaddrinfo.c
+++ b/missing/getaddrinfo.c
@@ -49,9 +49,14 @@
 #include <config.h>
 #endif
 
+#include "tcpdump-stdinc.h"
+
+#include "interface.h"
+
+
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/getaddrinfo.c,v 1.11 2002-06-11 17:13:37 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/getaddrinfo.c,v 1.12 2003-11-15 00:39:47 guy Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/missing/getnameinfo.c b/missing/getnameinfo.c
index 9ea76b48..f37e6b13 100644
--- a/missing/getnameinfo.c
+++ b/missing/getnameinfo.c
@@ -41,9 +41,14 @@
 #include <config.h>
 #endif
 
+#include "tcpdump-stdinc.h"
+
+#include "interface.h"
+
+
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.9 2002-06-11 17:13:37 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.10 2003-11-15 00:39:47 guy Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/missing/inet_aton.c b/missing/inet_aton.c
index 5d71e066..a35312a8 100644
--- a/missing/inet_aton.c
+++ b/missing/inet_aton.c
@@ -36,15 +36,19 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_aton.c,v 1.4 2002-08-01 08:53:38 risso Exp $ */
+/* $Id: inet_aton.c,v 1.5 2003-11-15 00:39:47 guy Exp $ */
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_aton.c,v 1.4 2002-08-01 08:53:38 risso Exp $";
-#endif
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_aton.c,v 1.5 2003-11-15 00:39:47 guy Exp $";
+#endif
+
 /* Minimal implementation of inet_aton.
  * Cannot distinguish between failure and a local broadcast address. */
 
diff --git a/missing/inet_ntop.c b/missing/inet_ntop.c
index 811db5de..0c2a4877 100644
--- a/missing/inet_ntop.c
+++ b/missing/inet_ntop.c
@@ -36,15 +36,19 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_ntop.c,v 1.5 2002-08-01 08:53:39 risso Exp $ */
+/* $Id: inet_ntop.c,v 1.6 2003-11-15 00:39:48 guy Exp $ */
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_ntop.c,v 1.5 2002-08-01 08:53:39 risso Exp $";
-#endif
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_ntop.c,v 1.6 2003-11-15 00:39:48 guy Exp $";
+#endif
+
 #include <stdio.h>
 #include <errno.h>
 
diff --git a/missing/inet_pton.c b/missing/inet_pton.c
index 7608e7be..5d35bc80 100644
--- a/missing/inet_pton.c
+++ b/missing/inet_pton.c
@@ -36,15 +36,19 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_pton.c,v 1.4 2002-08-01 08:53:40 risso Exp $ */
+/* $Id: inet_pton.c,v 1.5 2003-11-15 00:39:48 guy Exp $ */
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_pton.c,v 1.4 2002-08-01 08:53:40 risso Exp $";
-#endif
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_pton.c,v 1.5 2003-11-15 00:39:48 guy Exp $";
+#endif
+
 #include <errno.h>
 
 int
diff --git a/missing/snprintf.c b/missing/snprintf.c
index 8e5994c4..4a6bf11d 100644
--- a/missing/snprintf.c
+++ b/missing/snprintf.c
@@ -31,16 +31,12 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: snprintf.c,v 1.6 2002-06-11 17:13:39 itojun Exp $ */
+/* $Id: snprintf.c,v 1.7 2003-11-15 00:39:48 guy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/snprintf.c,v 1.6 2002-06-11 17:13:39 itojun Exp $";
-#endif
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -51,6 +47,10 @@ static const char rcsid[] =
 
 #include <interface.h>
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/snprintf.c,v 1.7 2003-11-15 00:39:48 guy Exp $";
+#endif
 enum format_flags {
     minus_flag     =  1,
     plus_flag      =  2,
diff --git a/missing/strlcat.c b/missing/strlcat.c
index 89878df0..1497883e 100644
--- a/missing/strlcat.c
+++ b/missing/strlcat.c
@@ -28,10 +28,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcat.c,v 1.3 2002-08-02 04:38:12 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H 
 #include <config.h>
@@ -39,6 +35,14 @@ static const char rcsid[] =
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcat.c,v 1.4 2003-11-15 00:39:48 guy Exp $ (LBL)";
+#endif
+
 #include <string.h>
 
 /*
diff --git a/missing/strlcpy.c b/missing/strlcpy.c
index 793605d1..dec09fe7 100644
--- a/missing/strlcpy.c
+++ b/missing/strlcpy.c
@@ -28,10 +28,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcpy.c,v 1.3 2002-08-02 04:38:13 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H 
 #include <config.h>
@@ -39,6 +35,14 @@ static const char rcsid[] =
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcpy.c,v 1.4 2003-11-15 00:39:48 guy Exp $ (LBL)";
+#endif
+
 #include <string.h>
 
 /*
diff --git a/parsenfsfh.c b/parsenfsfh.c
index 5ca11eff..7f2e4471 100644
--- a/parsenfsfh.c
+++ b/parsenfsfh.c
@@ -40,10 +40,6 @@
  * Western Research Laboratory
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.25 2002-08-01 08:52:58 risso Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -57,6 +53,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "nfsfh.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.26 2003-11-15 00:39:13 guy Exp $ (LBL)";
+#endif
 /*
  * This routine attempts to parse a file handle (in network byte order),
  * using heuristics to guess what kind of format it is in.  See the
diff --git a/print-802_11.c b/print-802_11.c
index 7e14c9d1..0d0865a9 100644
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -20,10 +20,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.22 2003-07-22 17:36:57 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -39,6 +35,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "ethertype.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.23 2003-11-15 00:39:14 guy Exp $ (LBL)";
+#endif
 #include "extract.h"
 
 #include "ieee802_11.h"
diff --git a/print-ah.c b/print-ah.c
index e106d467..7d4438e8 100644
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,10 +21,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.19 2002-12-11 07:13:57 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,6 +36,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.20 2003-11-15 00:39:14 guy Exp $ (LBL)";
+#endif
 int
 ah_print(register const u_char *bp)
 {
diff --git a/print-aodv.c b/print-aodv.c
index c3d97ae1..fa4a6ed4 100644
--- a/print-aodv.c
+++ b/print-aodv.c
@@ -30,10 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-aodv.c,v 1.8 2003-09-13 01:34:42 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -50,6 +46,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-aodv.c,v 1.9 2003-11-15 00:39:14 guy Exp $ (LBL)";
+#endif
 #include "aodv.h"
 
 static void
diff --git a/print-arcnet.c b/print-arcnet.c
index 08da74f0..d404e8d2 100644
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -20,10 +20,6 @@
  *
  * From: NetBSD: print-arcnet.c,v 1.2 2000/04/24 13:02:28 itojun Exp
  */
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.15 2003-01-23 09:15:14 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +33,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "arcnet.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.16 2003-11-15 00:39:15 guy Exp $ (LBL)";
+#endif
 static int arcnet_encap_print(u_char arctype, const u_char *p,
     u_int length, u_int caplen);
 
diff --git a/print-arp.c b/print-arp.c
index cee79469..31926654 100644
--- a/print-arp.c
+++ b/print-arp.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.61 2003-01-25 23:27:09 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -39,6 +35,10 @@ static const char rcsid[] =
 #include "ethertype.h"
 #include "extract.h"			/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.62 2003-11-15 00:39:15 guy Exp $ (LBL)";
+#endif
 /*
  * Address Resolution Protocol.
  *
diff --git a/print-ascii.c b/print-ascii.c
index 1bbc8be4..f6d32c3f 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -40,15 +40,15 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.10 2002-09-05 00:00:10 guy Exp $";
-#endif
 #include <tcpdump-stdinc.h>
 #include <stdio.h>
 
 #include "interface.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.11 2003-11-15 00:39:15 guy Exp $";
+#endif
 #define ASCII_LINELENGTH 300
 #define HEXDUMP_BYTES_PER_LINE 16
 #define HEXDUMP_SHORTS_PER_LINE (HEXDUMP_BYTES_PER_LINE / 2)
diff --git a/print-atalk.c b/print-atalk.c
index b4970654..09518dd7 100644
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -21,10 +21,6 @@
  * Format and print AppleTalk packets.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.78 2002-12-19 09:39:11 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -43,6 +39,10 @@ static const char rcsid[] =
 #include "extract.h"			/* must come after interface.h */
 #include "appletalk.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.79 2003-11-15 00:39:16 guy Exp $ (LBL)";
+#endif
 static struct tok type2str[] = {
 	{ ddpRTMP,		"rtmp" },
 	{ ddpRTMPrequest,	"rtmpReq" },
diff --git a/print-atm.c b/print-atm.c
index f7978721..f9731c54 100644
--- a/print-atm.c
+++ b/print-atm.c
@@ -18,10 +18,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.33 2002-12-19 09:39:11 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -41,6 +37,10 @@ static const char rcsid[] =
 #include "atmuni31.h"
 #include "llc.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.34 2003-11-15 00:39:16 guy Exp $ (LBL)";
+#endif
 #include "ether.h"
 
 /*
diff --git a/print-beep.c b/print-beep.c
index 815b429d..edfad54f 100644
--- a/print-beep.c
+++ b/print-beep.c
@@ -9,10 +9,6 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "@(#) $Header: /tcpdump/master/tcpdump/print-beep.c,v 1.4 2002-08-01 08:53:01 risso Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,6 +26,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+  "@(#) $Header: /tcpdump/master/tcpdump/print-beep.c,v 1.5 2003-11-15 00:39:16 guy Exp $";
+#endif
 /* Check for a string but not go beyond length
  * Return TRUE on match, FALSE otherwise
  *
diff --git a/print-bfd.c b/print-bfd.c
index e61268ba..0d5b8d90 100644
--- a/print-bfd.c
+++ b/print-bfd.c
@@ -13,10 +13,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bfd.c,v 1.3 2003-10-27 22:44:37 hannes Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,6 +27,10 @@ static const char rcsid[] =
 #include "extract.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-bfd.c,v 1.4 2003-11-15 00:39:16 guy Exp $";
+#endif
 #include "udp.h"
 
 /*
diff --git a/print-bgp.c b/print-bgp.c
index c0b1bfe8..90de8b08 100644
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -34,10 +34,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.72 2003-10-27 08:18:57 hannes Exp $";
-#endif
 
 #include <tcpdump-stdinc.h>
 
@@ -48,6 +44,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.73 2003-11-15 00:39:17 guy Exp $";
+#endif
 struct bgp {
 	u_int8_t bgp_marker[16];
 	u_int16_t bgp_len;
diff --git a/print-bootp.c b/print-bootp.c
index dc9dda85..dbb9f370 100644
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -20,10 +20,6 @@
  *
  * Format and print bootp packets.
  */
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.75 2003-08-01 03:10:11 fenner Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,6 +36,10 @@ static const char rcsid[] =
 #include "ether.h"
 #include "bootp.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.76 2003-11-15 00:39:17 guy Exp $ (LBL)";
+#endif
 static void rfc1048_print(const u_char *);
 static void cmu_print(const u_char *);
 
diff --git a/print-cdp.c b/print-cdp.c
index ae918cf2..2e605fd3 100644
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -24,10 +24,6 @@
  *    http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cdp.c,v 1.19 2003-01-08 12:45:26 hannes Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -42,6 +38,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-cdp.c,v 1.20 2003-11-15 00:39:17 guy Exp $";
+#endif
 #define CDP_HEADER_LEN  4
 
 static struct tok cdp_tlv_values[] = {
diff --git a/print-chdlc.c b/print-chdlc.c
index 36ddd0d7..786aec36 100644
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.28 2003-05-22 16:52:36 hannes Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,6 +36,10 @@ static const char rcsid[] =
 #include "ppp.h"
 #include "chdlc.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.29 2003-11-15 00:39:18 guy Exp $ (LBL)";
+#endif
 static void chdlc_slarp_print(const u_char *, u_int);
 
 /* Standard CHDLC printer */
diff --git a/print-cip.c b/print-cip.c
index 9e656a10..f889acf2 100644
--- a/print-cip.c
+++ b/print-cip.c
@@ -20,10 +20,6 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.21 2002-12-19 09:39:12 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -41,6 +37,10 @@ static const char rcsid[] =
 #include "ethertype.h"
 #include "ether.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.22 2003-11-15 00:39:18 guy Exp $ (LBL)";
+#endif
 #define RFC1483LLC_LEN	8
 
 static unsigned char rfcllc[] = {
diff --git a/print-cnfp.c b/print-cnfp.c
index 5cc19981..8d47e584 100644
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -32,10 +32,6 @@
 
 /* Cisco NetFlow protocol */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cnfp.c,v 1.14 2003-06-07 11:57:52 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -50,6 +46,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-cnfp.c,v 1.15 2003-11-15 00:39:18 guy Exp $";
+#endif
 #include "tcp.h"
 #include "ipproto.h"
 
diff --git a/print-decnet.c b/print-decnet.c
index da5a0ca1..5a3f29fa 100644
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-decnet.c,v 1.36 2002-09-05 21:25:39 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -46,6 +42,10 @@ struct rtentry;
 #include "interface.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-decnet.c,v 1.37 2003-11-15 00:39:19 guy Exp $ (LBL)";
+#endif
 /* Forwards */
 static void print_decnet_ctlmsg(const union routehdr *, u_int);
 static void print_t_info(int);
diff --git a/print-dhcp6.c b/print-dhcp6.c
index a2796109..8e483f4d 100644
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -35,10 +35,6 @@
  *  draft-ietf-dhc-dhcpv6-opt-timeconfig-02.txt,
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.27 2003-10-29 03:54:14 itojun Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -53,6 +49,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.28 2003-11-15 00:39:19 guy Exp $";
+#endif
 /* lease duration */
 #define DHCP6_DURATITION_INFINITE 0xffffffff
 
diff --git a/print-domain.c b/print-domain.c
index 788be7f1..ff16d737 100644
--- a/print-domain.c
+++ b/print-domain.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.86 2003-11-05 06:03:00 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -39,6 +35,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"                    /* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.87 2003-11-15 00:39:19 guy Exp $ (LBL)";
+#endif
 static const char *ns_ops[] = {
 	"", " inv_q", " stat", " op3", " notify", " update", " op6", " op7",
 	" op8", " updataA", " updateD", " updateDA",
diff --git a/print-dvmrp.c b/print-dvmrp.c
index 0c72264a..3f07a26e 100644
--- a/print-dvmrp.c
+++ b/print-dvmrp.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-dvmrp.c,v 1.24 2002-09-05 21:25:40 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -38,6 +34,10 @@ static const char rcsid[] =
 #include "extract.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-dvmrp.c,v 1.25 2003-11-15 00:39:20 guy Exp $ (LBL)";
+#endif
 /*
  * DVMRP message types and flag values shamelessly stolen from
  * mrouted/dvmrp.h.
diff --git a/print-egp.c b/print-egp.c
index 2f449a07..f75f3d55 100644
--- a/print-egp.c
+++ b/print-egp.c
@@ -18,10 +18,6 @@
  * Initial contribution from Jeff Honig (jch@MITCHELL.CIT.CORNELL.EDU).
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-egp.c,v 1.34 2002-12-11 07:13:59 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -35,6 +31,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-egp.c,v 1.35 2003-11-15 00:39:20 guy Exp $ (LBL)";
+#endif
 #include "ip.h"
 
 struct egp_packet {
diff --git a/print-enc.c b/print-enc.c
index 061d6913..14b08f1c 100644
--- a/print-enc.c
+++ b/print-enc.c
@@ -21,10 +21,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-enc.c,v 1.1 2003-03-08 08:55:34 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +33,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-enc.c,v 1.2 2003-11-15 00:39:21 guy Exp $ (LBL)";
+#endif
 #include "enc.h"
 
 #define ENC_PRINT_TYPE(wh, xf, nam) \
diff --git a/print-esp.c b/print-esp.c
index 9dbc0b3f..7894fd48 100644
--- a/print-esp.c
+++ b/print-esp.c
@@ -21,10 +21,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.44 2003-10-28 03:16:36 itojun Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -58,6 +54,10 @@ extern char *strsep(char **stringp, const char *delim); /* Missing/strsep.c */
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.45 2003-11-15 00:39:22 guy Exp $ (LBL)";
+#endif
 #ifndef HAVE_SOCKADDR_STORAGE
 #ifdef INET6
 struct sockaddr_storage {
diff --git a/print-ether.c b/print-ether.c
index 9cfe9361..d1a490bf 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -18,10 +18,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.82 2003-07-01 19:10:26 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -36,6 +32,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "ethertype.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.83 2003-11-15 00:39:22 guy Exp $ (LBL)";
+#endif
 #include "ether.h"
 
 const u_char *snapend;
diff --git a/print-fddi.c b/print-fddi.c
index 315eb337..3b19c3a8 100644
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.61 2002-12-19 09:39:12 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -38,6 +34,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "ethertype.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.62 2003-11-15 00:39:22 guy Exp $ (LBL)";
+#endif
 #include "ether.h"
 #include "fddi.h"
 
diff --git a/print-fr.c b/print-fr.c
index 872a6370..4235cc6b 100644
--- a/print-fr.c
+++ b/print-fr.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-	"@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.17 2003-11-08 09:00:51 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -39,6 +35,10 @@ static const char rcsid[] =
 #include "ethertype.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+	"@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.18 2003-11-15 00:39:22 guy Exp $ (LBL)";
+#endif
 static void lmi_print(const u_char *, u_int);
 
 #define NLPID_LMI       0x08   /* ANSI T1.617 Annex D or ITU-T Q.933 Annex A */
diff --git a/print-frag6.c b/print-frag6.c
index 267ad650..43509510 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.16 2002-12-11 22:29:21 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,6 +36,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.17 2003-11-15 00:39:23 guy Exp $";
+#endif
 int
 frag6_print(register const u_char *bp, register const u_char *bp2)
 {
diff --git a/print-gre.c b/print-gre.c
index 1ec298f8..d95e69a5 100644
--- a/print-gre.c
+++ b/print-gre.c
@@ -36,10 +36,6 @@
  * RFC1701 (GRE), RFC1702 (GRE IPv4), and RFC2637 (Enhanced GRE)
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-gre.c,v 1.22 2003-05-22 16:52:37 hannes Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -54,6 +50,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-gre.c,v 1.23 2003-11-15 00:39:23 guy Exp $ (LBL)";
+#endif
 #include "ip.h"
 
 #define	GRE_CP		0x8000		/* checksum present */
diff --git a/print-hsrp.c b/print-hsrp.c
index 4db84f5a..199e32ac 100644
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -29,10 +29,6 @@
 
 /* Cisco Hot Standby Router Protocol (HSRP). */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-hsrp.c,v 1.7 2002-12-11 07:14:00 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -45,6 +41,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-hsrp.c,v 1.8 2003-11-15 00:39:24 guy Exp $";
+#endif
 /* HSRP op code types. */
 static const char *op_code_str[] = {
 	"hello",
diff --git a/print-icmp.c b/print-icmp.c
index 4ea464a0..a2b721ab 100644
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.73 2003-06-07 11:57:53 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +33,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.74 2003-11-15 00:39:24 guy Exp $ (LBL)";
+#endif
 #include "ip.h"
 #include "udp.h"
 #include "ipproto.h"
diff --git a/print-icmp6.c b/print-icmp6.c
index e252563a..3e565304 100644
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.72 2003-10-28 03:16:36 itojun Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -43,6 +39,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.73 2003-11-15 00:39:26 guy Exp $";
+#endif
 #include "udp.h"
 #include "ah.h"
 
diff --git a/print-igmp.c b/print-igmp.c
index 84fc7621..156780aa 100644
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-igmp.c,v 1.11 2002-12-11 07:14:02 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +33,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"            /* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-igmp.c,v 1.12 2003-11-15 00:39:26 guy Exp $ (LBL)";
+#endif
 #ifndef IN_CLASSD
 #define IN_CLASSD(i) (((int32_t)(i) & 0xf0000000) == 0xe0000000)
 #endif
diff --git a/print-igrp.c b/print-igrp.c
index a9ac1172..53a07c52 100644
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -21,10 +21,6 @@
  * Initial contribution from Francis Dupont (francis.dupont@inria.fr)
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-igrp.c,v 1.18 2002-08-06 04:42:05 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,6 +36,10 @@ static const char rcsid[] =
 #include "ip.h"
 #include "extract.h"			/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-igrp.c,v 1.19 2003-11-15 00:39:26 guy Exp $ (LBL)";
+#endif
 static void
 igrp_entry_print(register struct igrprte *igr, register int is_interior,
     register int is_exterior)
diff --git a/print-ip.c b/print-ip.c
index b02427b4..45e84f0c 100644
--- a/print-ip.c
+++ b/print-ip.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.128 2003-07-08 01:14:44 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -38,6 +34,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "extract.h"			/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.129 2003-11-15 00:39:27 guy Exp $ (LBL)";
+#endif
 #include "ip.h"
 #include "ipproto.h"
 
diff --git a/print-ip6.c b/print-ip6.c
index ac3b7133..e3aa0195 100644
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.32 2003-10-28 03:14:16 itojun Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,6 +36,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.33 2003-11-15 00:39:27 guy Exp $";
+#endif
 #include "ip6.h"
 #include "ipproto.h"
 
diff --git a/print-ip6opts.c b/print-ip6opts.c
index 75252a62..9d80f196 100644
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -31,10 +31,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.14 2003-01-10 08:11:00 guy Exp $";
-#endif
 
 #ifdef INET6
 #include <tcpdump-stdinc.h>
@@ -47,6 +43,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.15 2003-11-15 00:39:27 guy Exp $";
+#endif
 /* items outside of rfc2292bis */
 #ifndef IP6OPT_MINLEN
 #define IP6OPT_MINLEN	2
diff --git a/print-ipcomp.c b/print-ipcomp.c
index bc76448f..53c913c0 100644
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.17 2002-12-11 07:14:03 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -47,6 +43,10 @@ struct ipcomp {
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.18 2003-11-15 00:39:28 guy Exp $";
+#endif
 int
 ipcomp_print(register const u_char *bp, int *nhdr)
 {
diff --git a/print-ipfc.c b/print-ipfc.c
index 7c527e37..4ed69e9a 100644
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.4 2002-12-19 09:39:13 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -38,6 +34,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "ethertype.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.5 2003-11-15 00:39:28 guy Exp $ (LBL)";
+#endif
 #include "ether.h"
 #include "ipfc.h"
 
diff --git a/print-ipx.c b/print-ipx.c
index 0f35a853..18a91b14 100644
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -22,10 +22,6 @@
  * Contributed by Brad Parker (brad@fcr.com).
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.34 2002-08-01 08:53:11 risso Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -42,6 +38,10 @@ static const char rcsid[] =
 #include "ipx.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.35 2003-11-15 00:39:28 guy Exp $";
+#endif
 
 static const char *ipxaddr_string(u_int32_t, const u_char *);
 void ipx_decode(const struct ipxHdr *, const u_char *, u_int);
diff --git a/print-isakmp.c b/print-isakmp.c
index bccfe6a0..19107311 100644
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -28,10 +28,6 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.36 2002-12-11 07:14:03 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -50,6 +46,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"                    /* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.37 2003-11-15 00:39:28 guy Exp $ (LBL)";
+#endif
 #include "ip.h"
 #ifdef INET6
 #include "ip6.h"
diff --git a/print-isoclns.c b/print-isoclns.c
index 8b1e9fc9..6b7a4183 100644
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -24,10 +24,6 @@
  * complete IS-IS support.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.106 2003-11-05 23:11:03 hannes Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -45,6 +41,10 @@ static const char rcsid[] =
 #include "extract.h"
 #include "gmpls.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.107 2003-11-15 00:39:29 guy Exp $ (LBL)";
+#endif
 #define	NLPID_CLNS	129	/* 0x81 */
 #define	NLPID_ESIS	130	/* 0x82 */
 #define	NLPID_ISIS	131	/* 0x83 */
diff --git a/print-krb.c b/print-krb.c
index 2bb544b6..2b196a5b 100644
--- a/print-krb.c
+++ b/print-krb.c
@@ -21,10 +21,6 @@
  * Initial contribution from John Hawkinson (jhawk@mit.edu).
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-krb.c,v 1.21 2002-12-11 07:14:04 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -38,6 +34,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-krb.c,v 1.22 2003-11-15 00:39:29 guy Exp $";
+#endif
 static const u_char *c_print(register const u_char *, register const u_char *);
 static const u_char *krb4_print_hdr(const u_char *);
 static void krb4_print(const u_char *);
diff --git a/print-l2tp.c b/print-l2tp.c
index 5ce40b64..b94036d2 100644
--- a/print-l2tp.c
+++ b/print-l2tp.c
@@ -21,10 +21,6 @@
  * L2TP support contributed by Motonori Shindo (mshindo@mshindo.net)
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-l2tp.c,v 1.14 2002-09-05 00:00:14 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -38,6 +34,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-l2tp.c,v 1.15 2003-11-15 00:39:30 guy Exp $";
+#endif
 static char tstr[] = " [|l2tp]";
 
 #ifndef TRUE
diff --git a/print-lane.c b/print-lane.c
index 3a21c148..363caa5b 100644
--- a/print-lane.c
+++ b/print-lane.c
@@ -20,10 +20,6 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.20 2002-12-19 09:39:13 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,6 +36,10 @@ static const char rcsid[] =
 #include "ether.h"
 #include "lane.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.21 2003-11-15 00:39:30 guy Exp $ (LBL)";
+#endif
 static const struct tok lecop2str[] = {
 	{ 0x0001,	"configure request" },
 	{ 0x0101,	"configure response" },
diff --git a/print-ldp.c b/print-ldp.c
index edcc9de2..63f46556 100644
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -13,10 +13,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ldp.c,v 1.4 2002-12-14 13:50:16 hannes Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,6 +28,10 @@ static const char rcsid[] =
 #include "extract.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ldp.c,v 1.5 2003-11-15 00:39:30 guy Exp $";
+#endif
 /*
  * ldp common header
  *
diff --git a/print-llc.c b/print-llc.c
index 8eb37b39..df7e2953 100644
--- a/print-llc.c
+++ b/print-llc.c
@@ -22,10 +22,6 @@
  *	with an awful lot of hacking by Jeffrey Mogul, DECWRL
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.53 2003-05-28 12:53:00 hannes Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,6 +36,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.54 2003-11-15 00:39:30 guy Exp $";
+#endif
 #include "llc.h"
 #include "ethertype.h"
 
diff --git a/print-lwres.c b/print-lwres.c
index abc6fbe3..de3ebfdd 100644
--- a/print-lwres.c
+++ b/print-lwres.c
@@ -27,10 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lwres.c,v 1.10 2003-07-30 20:34:58 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -47,6 +43,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"                    /* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-lwres.c,v 1.11 2003-11-15 00:39:31 guy Exp $ (LBL)";
+#endif
 /* BIND9 lib/lwres/include/lwres */
 typedef u_int32_t lwres_uint32_t;
 typedef u_int16_t lwres_uint16_t;
diff --git a/print-mobile.c b/print-mobile.c
index b9f7e7a1..31a98cdb 100644
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -40,10 +40,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-mobile.c,v 1.12 2002-12-11 07:14:05 guy Exp $";
-#endif
 
 #include <tcpdump-stdinc.h>
 
@@ -53,6 +49,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"		/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-mobile.c,v 1.13 2003-11-15 00:39:31 guy Exp $";
+#endif
 #define MOBILE_SIZE (8)
 
 struct mobile_ip {
diff --git a/print-mobility.c b/print-mobility.c
index d2123b05..8311a03a 100644
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -31,10 +31,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-mobility.c,v 1.9 2003-02-05 02:36:25 guy Exp $";
-#endif
 
 #ifdef INET6
 #include <tcpdump-stdinc.h>
@@ -47,6 +43,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"		/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-mobility.c,v 1.10 2003-11-15 00:39:31 guy Exp $";
+#endif
 /* Mobility header */
 struct ip6_mobility {
 	u_int8_t ip6m_pproto;	/* following payload protocol (for PG) */
diff --git a/print-mpls.c b/print-mpls.c
index 7161b7b3..04712fc0 100644
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -26,10 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.8 2003-05-22 16:52:38 hannes Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -45,6 +41,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "extract.h"			/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.9 2003-11-15 00:39:32 guy Exp $ (LBL)";
+#endif
 #define LABEL_MASK	0xfffff000
 #define LABEL_SHIFT	12
 #define	EXP_MASK	0x00000e00
diff --git a/print-msdp.c b/print-msdp.c
index cf21f3f4..b7025452 100644
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -15,10 +15,6 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  */
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-msdp.c,v 1.4 2002-09-05 00:00:16 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -33,6 +29,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-msdp.c,v 1.5 2003-11-15 00:39:32 guy Exp $";
+#endif
 #define MSDP_TYPE_MAX	7
 
 void
diff --git a/print-netbios.c b/print-netbios.c
index b34affb8..14ac0c84 100644
--- a/print-netbios.c
+++ b/print-netbios.c
@@ -22,10 +22,6 @@
  * Contributed by Brad Parker (brad@fcr.com).
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-netbios.c,v 1.18 2002-08-01 08:53:20 risso Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -42,6 +38,10 @@ static const char rcsid[] =
 #include "netbios.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-netbios.c,v 1.19 2003-11-15 00:39:33 guy Exp $";
+#endif
 /*
  * Print NETBIOS packets.
  */
diff --git a/print-nfs.c b/print-nfs.c
index cfad81f6..74082ad4 100644
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.99 2002-12-12 07:57:50 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,6 +36,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.100 2003-11-15 00:39:33 guy Exp $ (LBL)";
+#endif
 #include "nfs.h"
 #include "nfsfh.h"
 
diff --git a/print-ntp.c b/print-ntp.c
index 6be68be1..5de5a875 100644
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -23,10 +23,6 @@
  *	loosely based on print-bootp.c
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.37 2003-08-01 01:18:24 fenner Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -44,6 +40,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 #ifdef MODEMASK
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.38 2003-11-15 00:39:33 guy Exp $ (LBL)";
+#endif
 #undef MODEMASK					/* Solaris sucks */
 #endif
 #include "ntp.h"
diff --git a/print-null.c b/print-null.c
index f0c246d6..831f79c6 100644
--- a/print-null.c
+++ b/print-null.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.49 2003-05-22 16:52:38 hannes Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +33,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.50 2003-11-15 00:39:34 guy Exp $ (LBL)";
+#endif
 #include "ip.h"
 #ifdef INET6
 #include "ip6.h"
diff --git a/print-ospf.c b/print-ospf.c
index 4b3ade7b..fe20bcc9 100644
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -21,10 +21,6 @@
  * OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu)
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.45 2003-10-22 20:00:03 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -39,6 +35,10 @@ static const char rcsid[] =
 #include "extract.h"
 #include "gmpls.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.46 2003-11-15 00:39:34 guy Exp $ (LBL)";
+#endif
 #include "ospf.h"
 
 #include "ip.h"
diff --git a/print-ospf6.c b/print-ospf6.c
index 4618579b..eeefb9ce 100644
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -21,10 +21,6 @@
  * OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu)
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf6.c,v 1.11 2002-12-11 22:29:22 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -39,6 +35,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf6.c,v 1.12 2003-11-15 00:39:35 guy Exp $ (LBL)";
+#endif
 #include "ospf6.h"
 
 struct bits {
diff --git a/print-pflog.c b/print-pflog.c
index d0ac305c..e4e30a28 100644
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -21,10 +21,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-pflog.c,v 1.7 2002-12-19 09:39:14 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -38,6 +34,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-pflog.c,v 1.8 2003-11-15 00:39:35 guy Exp $ (LBL)";
+#endif
 /* The header in OpenBSD pflog files. */
 
 struct pfloghdr {
diff --git a/print-pim.c b/print-pim.c
index 1b027903..59e32459 100644
--- a/print-pim.c
+++ b/print-pim.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.37 2003-10-29 02:07:57 itojun Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -57,6 +53,10 @@ struct pim {
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.38 2003-11-15 00:39:35 guy Exp $ (LBL)";
+#endif
 #include "ip.h"
 
 static void pimv2_print(register const u_char *bp, register u_int len);
diff --git a/print-ppp.c b/print-ppp.c
index 6fbfe250..60ad12dc 100644
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -29,10 +29,6 @@
  * o BAP support
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.89 2003-10-20 08:26:49 hannes Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -55,6 +51,10 @@ static const char rcsid[] =
 #include "chdlc.h"
 #include "ethertype.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.90 2003-11-15 00:39:36 guy Exp $ (LBL)";
+#endif
 /*
  * The following constatns are defined by IANA. Please refer to
  *    http://www.isi.edu/in-notes/iana/assignments/ppp-numbers
diff --git a/print-pppoe.c b/print-pppoe.c
index ef031331..5b817c1a 100644
--- a/print-pppoe.c
+++ b/print-pppoe.c
@@ -21,10 +21,6 @@
  * Original code by Greg Stark <gsstark@mit.edu> 
  */
 
-#ifndef lint
-static const char rcsid[] =
-"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.24 2003-07-01 08:36:53 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -42,6 +38,10 @@ static const char rcsid[] =
 #include "ether.h"
 #include "extract.h"			/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.25 2003-11-15 00:39:36 guy Exp $ (LBL)";
+#endif
 /* Codes */
 enum {
 	PPPOE_PADI = 0x09,
diff --git a/print-pptp.c b/print-pptp.c
index 8ab8fa59..a18703a6 100644
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -22,10 +22,6 @@
  */
 
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-pptp.c,v 1.9 2002-12-11 07:14:07 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -38,6 +34,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-pptp.c,v 1.10 2003-11-15 00:39:36 guy Exp $";
+#endif
 static char tstr[] = " [|pptp]";
 
 #ifndef TRUE
diff --git a/print-radius.c b/print-radius.c
index ca3526bb..232c8968 100644
--- a/print-radius.c
+++ b/print-radius.c
@@ -42,10 +42,6 @@
  * TODO: Among other things to print ok MacIntosh and Vendor values
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "$Id: print-radius.c,v 1.19 2002-12-11 07:14:07 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -61,6 +57,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "$Id: print-radius.c,v 1.20 2003-11-15 00:39:37 guy Exp $";
+#endif
 #define TAM_SIZE(x) (sizeof(x)/sizeof(x[0]) )
 
 #define PRINT_HEX(bytes_len, ptr_data)                               \
diff --git a/print-raw.c b/print-raw.c
index 08cee76c..43dbff48 100644
--- a/print-raw.c
+++ b/print-raw.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.39 2002-12-19 09:39:15 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +33,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "interface.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.40 2003-11-15 00:39:37 guy Exp $ (LBL)";
+#endif
 /*
  * The DLT_RAW packet has no header. It contains a raw IP packet.
  */
diff --git a/print-rip.c b/print-rip.c
index 61c131f4..58cb8803 100644
--- a/print-rip.c
+++ b/print-rip.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rip.c,v 1.55 2002-12-22 02:01:49 hannes Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +33,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rip.c,v 1.56 2003-11-15 00:39:37 guy Exp $ (LBL)";
+#endif
 struct rip {
 	u_int8_t rip_cmd;		/* request/response */
 	u_int8_t rip_vers;		/* protocol version # */
diff --git a/print-ripng.c b/print-ripng.c
index b1f7ec27..5f231d0f 100644
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.15 2002-12-11 22:29:22 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -54,6 +50,10 @@ IN6_ADDR_EQUAL(const struct in6_addr *a, const struct in6_addr *b)
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.16 2003-11-15 00:39:37 guy Exp $";
+#endif
 static int
 rip6_entry_print(register const struct netinfo6 *ni, int metric)
 {
diff --git a/print-rsvp.c b/print-rsvp.c
index c2ff5f63..14ad1c36 100644
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -13,10 +13,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rsvp.c,v 1.24 2003-10-22 11:43:04 hannes Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -34,6 +30,10 @@ static const char rcsid[] =
 #include "ethertype.h"
 #include "gmpls.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rsvp.c,v 1.25 2003-11-15 00:39:38 guy Exp $";
+#endif
 /*
  * RFC 2205 common header
  *
diff --git a/print-rt6.c b/print-rt6.c
index 6b8bae64..994a717b 100644
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.23 2003-02-05 02:36:26 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,6 +36,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.24 2003-11-15 00:39:38 guy Exp $";
+#endif
 int
 rt6_print(register const u_char *bp, register const u_char *bp2)
 {
diff --git a/print-rx.c b/print-rx.c
index b48da39f..bf846f3e 100644
--- a/print-rx.c
+++ b/print-rx.c
@@ -32,10 +32,6 @@
  * Ken Hornstein <kenh@cmf.nrl.navy.mil>
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.35 2003-01-25 23:49:04 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -50,6 +46,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.36 2003-11-15 00:39:38 guy Exp $";
+#endif
 #include "rx.h"
 
 #include "ip.h"
diff --git a/print-sctp.c b/print-sctp.c
index 937f5e5c..37a9cc5a 100644
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -33,10 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.13 2003-08-06 05:02:13 guy Exp $ (NETLAB/PEL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -56,6 +52,10 @@ static const char rcsid[] =
 #include "extract.h"			/* must come after interface.h */
 #include "ip.h"
 #ifdef INET6
+#ifndef lint
+static const char rcsid[] _U_ =
+"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.14 2003-11-15 00:39:39 guy Exp $ (NETLAB/PEL)";
+#endif
 #include "ip6.h"
 #endif
 
diff --git a/print-sl.c b/print-sl.c
index e96c5358..547996fe 100644
--- a/print-sl.c
+++ b/print-sl.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.62 2002-12-19 09:39:15 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +33,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"			/* must come after interface.h */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.63 2003-11-15 00:39:39 guy Exp $ (LBL)";
+#endif
 #include "ip.h"
 #include "tcp.h"
 #include "slip.h"
diff --git a/print-sll.c b/print-sll.c
index eaf77978..b3ac18d2 100644
--- a/print-sll.c
+++ b/print-sll.c
@@ -18,10 +18,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sll.c,v 1.12 2002-12-19 09:39:16 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +33,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "ethertype.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-sll.c,v 1.13 2003-11-15 00:39:39 guy Exp $ (LBL)";
+#endif
 #include "ether.h"
 #include "sll.h"
 
diff --git a/print-smb.c b/print-smb.c
index 985575c2..00d3b47d 100644
--- a/print-smb.c
+++ b/print-smb.c
@@ -10,10 +10,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.27 2002-09-05 21:25:48 guy Exp $";
-#endif
 
 #include <tcpdump-stdinc.h>
 
@@ -24,6 +20,10 @@ static const char rcsid[] =
 #include "extract.h"
 #include "smb.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.28 2003-11-15 00:39:40 guy Exp $";
+#endif
 static int request = 0;
 
 const u_char *startbuf = NULL;
diff --git a/print-snmp.c b/print-snmp.c
index 46e23d51..b3c3f6a5 100644
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -56,10 +56,6 @@
  #	@(#)snmp.awk.x	1.1 (LANL) 1/15/90
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.56 2002-09-05 00:00:21 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -77,6 +73,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.57 2003-11-15 00:39:40 guy Exp $ (LBL)";
+#endif
 /*
  * Universal ASN.1 types
  * (we only care about the tag values for those allowed in the Internet SMI)
diff --git a/print-stp.c b/print-stp.c
index 1d4754fd..19e5c82d 100644
--- a/print-stp.c
+++ b/print-stp.c
@@ -9,10 +9,6 @@
  * Contributed by Lennert Buytenhek <buytenh@gnu.org>
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.11 2003-09-12 20:53:19 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,6 +24,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.12 2003-11-15 00:39:41 guy Exp $";
+#endif
 static void
 stp_print_bridge_id(const u_char *p)
 {
diff --git a/print-sunatm.c b/print-sunatm.c
index a7ebe067..18516cb7 100644
--- a/print-sunatm.c
+++ b/print-sunatm.c
@@ -29,10 +29,6 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sunatm.c,v 1.5 2002-12-19 09:39:16 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -50,6 +46,10 @@ struct rtentry;
 #include "extract.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-sunatm.c,v 1.6 2003-11-15 00:39:41 guy Exp $ (LBL)";
+#endif
 #include "atm.h"
 #include "atmuni31.h"
 
diff --git a/print-sunrpc.c b/print-sunrpc.c
index 83a73f11..f02862e3 100644
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.43 2002-12-11 07:14:09 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -45,6 +41,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.44 2003-11-15 00:39:41 guy Exp $ (LBL)";
+#endif
 #include "ip.h"
 #ifdef INET6
 #include "ip6.h"
diff --git a/print-tcp.c b/print-tcp.c
index c69dbcd0..1528b3b9 100644
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.107 2003-11-05 06:03:01 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,6 +36,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.108 2003-11-15 00:39:41 guy Exp $ (LBL)";
+#endif
 #include "tcp.h"
 
 #include "ip.h"
diff --git a/print-telnet.c b/print-telnet.c
index b3d99cb5..ffb10c41 100644
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -49,10 +49,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-telnet.c,v 1.21 2002-09-05 00:00:22 guy Exp $";
-#endif
 
 #include <tcpdump-stdinc.h>
 
@@ -63,6 +59,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-telnet.c,v 1.22 2003-11-15 00:39:42 guy Exp $";
+#endif
 #define TELCMDS
 #define TELOPTS
 #include "telnet.h"
diff --git a/print-tftp.c b/print-tftp.c
index 9d1c064e..31f24e8a 100644
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -21,10 +21,6 @@
  * Format and print trivial file transfer protocol packets.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.35 2003-05-02 08:45:21 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -44,6 +40,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.36 2003-11-15 00:39:42 guy Exp $ (LBL)";
+#endif
 /* op code to string mapping */
 static struct tok op2str[] = {
 	{ RRQ,		"RRQ" },	/* read request */
diff --git a/print-timed.c b/print-timed.c
index 3448865c..8ea6aeac 100644
--- a/print-timed.c
+++ b/print-timed.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-timed.c,v 1.7 2002-12-11 07:14:10 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +33,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-timed.c,v 1.8 2003-11-15 00:39:42 guy Exp $";
+#endif
 static const char *tsptype[TSPTYPENUMBER] =
   { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",
   "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT",
diff --git a/print-token.c b/print-token.c
index 6478ff27..37fa2c28 100644
--- a/print-token.c
+++ b/print-token.c
@@ -23,10 +23,6 @@
  * Further tweaked to more closely resemble print-fddi.c
  *	Guy Harris <guy@alum.mit.edu>
  */
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.22 2002-12-19 09:39:16 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -42,6 +38,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "ethertype.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.23 2003-11-15 00:39:42 guy Exp $";
+#endif
 #include "ether.h"
 #include "token.h"
 
diff --git a/print-udp.c b/print-udp.c
index 2888a6d7..7c303d63 100644
--- a/print-udp.c
+++ b/print-udp.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.124 2003-11-05 06:03:01 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -45,6 +41,10 @@ static const char rcsid[] =
 #include "extract.h"
 #include "appletalk.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.125 2003-11-15 00:39:43 guy Exp $ (LBL)";
+#endif
 #include "udp.h"
 
 #include "ip.h"
diff --git a/print-vjc.c b/print-vjc.c
index 52c083ba..f85e2de7 100644
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -23,10 +23,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vjc.c,v 1.11 2002-09-05 21:25:51 guy Exp $ (LBL)";
-#endif
 
 #include <tcpdump-stdinc.h>
 
@@ -36,6 +32,10 @@ static const char rcsid[] =
 #include "interface.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-vjc.c,v 1.12 2003-11-15 00:39:43 guy Exp $ (LBL)";
+#endif
 #include "slcompress.h"
 #include "ppp.h"
 
diff --git a/print-vrrp.c b/print-vrrp.c
index e087d527..a93caa27 100644
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -23,10 +23,6 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.7 2003-09-05 17:42:41 hannes Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -41,6 +37,10 @@ static const char rcsid[] =
 #include "extract.h"
 #include "addrtoname.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.8 2003-11-15 00:39:44 guy Exp $";
+#endif
 /*
  * RFC 2338:
  *     0                   1                   2                   3
diff --git a/print-wb.c b/print-wb.c
index 6ac4535c..a1455b22 100644
--- a/print-wb.c
+++ b/print-wb.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-wb.c,v 1.30 2002-12-11 07:14:10 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -36,6 +32,10 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-wb.c,v 1.31 2003-11-15 00:39:44 guy Exp $ (LBL)";
+#endif
 /* XXX need to add byte-swapping macros! */
 /* XXX - you mean like the ones in "extract.h"? */
 
diff --git a/print-zephyr.c b/print-zephyr.c
index db8acecc..a9833785 100644
--- a/print-zephyr.c
+++ b/print-zephyr.c
@@ -18,10 +18,6 @@
  * PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-zephyr.c,v 1.6 2002-09-05 00:00:24 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -35,6 +31,10 @@ static const char rcsid[] =
 
 #include "interface.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-zephyr.c,v 1.7 2003-11-15 00:39:44 guy Exp $";
+#endif
 struct z_packet {
     char *version;
     int numfields;
diff --git a/setsignal.c b/setsignal.c
index 1eeda639..a8d89325 100644
--- a/setsignal.c
+++ b/setsignal.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/setsignal.c,v 1.9 2003-11-04 07:29:16 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,6 +26,14 @@ static const char rcsid[] =
 
 #include <tcpdump-stdinc.h>
 
+
+#include "interface.h"
+
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/setsignal.c,v 1.10 2003-11-15 00:39:45 guy Exp $ (LBL)";
+#endif
+
 #include <signal.h>
 #ifdef HAVE_SIGACTION
 #include <string.h>
diff --git a/smbutil.c b/smbutil.c
index 314a9704..de8906ba 100644
--- a/smbutil.c
+++ b/smbutil.c
@@ -10,10 +10,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.26 2003-08-10 19:47:39 guy Exp $";
-#endif
 
 #include <tcpdump-stdinc.h>
 
@@ -25,6 +21,10 @@ static const char rcsid[] =
 #include "extract.h"
 #include "smb.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.27 2003-11-15 00:39:45 guy Exp $";
+#endif
 extern const u_char *startbuf;
 
 /*
diff --git a/strcasecmp.c b/strcasecmp.c
index ebb7288f..7fb721ec 100644
--- a/strcasecmp.c
+++ b/strcasecmp.c
@@ -14,15 +14,15 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/strcasecmp.c,v 1.4 2002-08-01 08:53:36 risso Exp $";
-#endif
 
 #include <tcpdump-stdinc.h>
 
 #include "interface.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/strcasecmp.c,v 1.5 2003-11-15 00:39:45 guy Exp $";
+#endif
 /*
  * This array is designed for mapping upper and lower case letter
  * together for a case independent comparison.  The mappings are
diff --git a/tcpdump.c b/tcpdump.c
index be016431..0946c2bc 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -25,13 +25,6 @@
  *	Seth Webster <swebster@sst.ll.mit.edu>
  */
 
-#ifndef lint
-static const char copyright[] =
-    "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
-The Regents of the University of California.  All rights reserved.\n";
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.216 2003-11-04 07:29:16 guy Exp $ (LBL)";
-#endif
 
 /*
  * tcpdump - monitor tcp/ip traffic on an ethernet.
@@ -69,6 +62,13 @@ extern int SIZE_BUF;
 #include "gmt2local.h"
 #include "pcap-missing.h"
 
+#ifndef lint
+static const char copyright[] _U_ =
+    "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
+The Regents of the University of California.  All rights reserved.\n";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.217 2003-11-15 00:39:45 guy Exp $ (LBL)";
+#endif
 int dflag;			/* print filter code */
 int eflag;			/* print ethernet header */
 int fflag;			/* don't translate "foreign" IP address */
diff --git a/util.c b/util.c
index 7326a62e..b03c16fa 100644
--- a/util.c
+++ b/util.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.87 2003-10-02 13:16:14 hannes Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -44,6 +40,10 @@ static const char rcsid[] =
 
 #include "interface.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.88 2003-11-15 00:39:46 guy Exp $ (LBL)";
+#endif
 /*
  * Print out a filename (or other ascii string).
  * If ep is NULL, assume no truncation check is needed.
diff --git a/vfprintf.c b/vfprintf.c
index 7bd3329a..b24c1293 100644
--- a/vfprintf.c
+++ b/vfprintf.c
@@ -19,10 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/vfprintf.c,v 1.4 2000-07-01 03:39:12 assar Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +33,10 @@ static const char rcsid[] =
 
 #include "interface.h"
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/vfprintf.c,v 1.5 2003-11-15 00:39:46 guy Exp $ (LBL)";
+#endif
 /*
  * Stock 4.3 doesn't have vfprintf.
  * This routine is due to Chris Torek.