From fe3253b9b8fad9e75f863157eba0780418182f17 Mon Sep 17 00:00:00 2001
From: Denis Ovsienko <infrastation@yandex.ru>
Date: Fri, 3 Jan 2014 00:59:08 +0400
Subject: remove tcpdump's own CVS keywords

Remove lots of $Header's and a few $Id's that all belong to the former
CVS repository of tcpdump itself. These keywords have been frozen since
the migration to git in late 2008.
---
 INSTALL.txt           | 2 --
 Makefile.in           | 2 --
 aclocal.m4            | 2 --
 addrtoname.c          | 4 ----
 addrtoname.h          | 2 --
 af.c                  | 5 -----
 af.h                  | 2 --
 appletalk.h           | 2 --
 atm.h                 | 2 --
 atmuni31.h            | 2 --
 bgp.h                 | 1 -
 bootp.h               | 1 -
 bpf_dump.c            | 4 ----
 chdlc.h               | 1 -
 checksum.c            | 5 -----
 configure.in          | 2 --
 decnet.h              | 2 --
 ether.h               | 1 -
 ethertype.h           | 2 --
 extract.h             | 2 --
 gmpls.c               | 5 -----
 gmpls.h               | 1 -
 gmt2local.c           | 5 -----
 gmt2local.h           | 2 --
 interface.h           | 2 --
 ip.h                  | 1 -
 ip6.h                 | 1 -
 ipproto.c             | 5 -----
 ipproto.h             | 2 --
 l2vpn.c               | 5 -----
 l2vpn.h               | 1 -
 lbl/os-osf4.h         | 2 --
 lbl/os-solaris2.h     | 2 --
 lbl/os-sunos4.h       | 2 --
 lbl/os-ultrix4.h      | 2 --
 llc.h                 | 2 --
 machdep.c             | 5 -----
 machdep.h             | 2 --
 makemib               | 2 --
 missing/addrinfo.h    | 2 --
 missing/datalinks.c   | 5 -----
 missing/dlnames.c     | 5 -----
 missing/getnameinfo.c | 5 -----
 missing/inet_aton.c   | 7 -------
 missing/inet_ntop.c   | 7 -------
 missing/inet_pton.c   | 7 -------
 missing/snprintf.c    | 7 -------
 missing/strdup.c      | 5 -----
 missing/strlcat.c     | 5 -----
 missing/strlcpy.c     | 5 -----
 missing/strsep.c      | 5 -----
 mpls.h                | 2 +-
 nameser.h             | 1 -
 netdissect.h          | 2 --
 nfs.h                 | 1 -
 nfsfh.h               | 2 --
 nlpid.c               | 5 -----
 nlpid.h               | 1 -
 ospf.h                | 1 -
 oui.c                 | 5 -----
 oui.h                 | 1 -
 parsenfsfh.c          | 5 -----
 pcap-missing.h        | 2 --
 pcap_dump_ftell.c     | 5 -----
 ppp.h                 | 1 -
 print-802_11.c        | 6 ------
 print-ah.c            | 5 -----
 print-aodv.c          | 5 -----
 print-ap1394.c        | 4 ----
 print-arcnet.c        | 4 ----
 print-arp.c           | 5 -----
 print-ascii.c         | 4 ----
 print-atalk.c         | 5 -----
 print-atm.c           | 4 ----
 print-beep.c          | 5 -----
 print-bfd.c           | 5 -----
 print-bgp.c           | 5 -----
 print-bootp.c         | 4 ----
 print-bt.c            | 5 -----
 print-cdp.c           | 5 -----
 print-cfm.c           | 5 -----
 print-chdlc.c         | 5 -----
 print-cip.c           | 5 -----
 print-cnfp.c          | 5 -----
 print-dccp.c          | 5 -----
 print-decnet.c        | 5 -----
 print-dhcp6.c         | 5 -----
 print-domain.c        | 5 -----
 print-dvmrp.c         | 5 -----
 print-eap.c           | 5 -----
 print-egp.c           | 5 -----
 print-eigrp.c         | 5 -----
 print-enc.c           | 5 -----
 print-esp.c           | 5 -----
 print-ether.c         | 4 ----
 print-fddi.c          | 5 -----
 print-fr.c            | 5 -----
 print-frag6.c         | 5 -----
 print-gre.c           | 5 -----
 print-hsrp.c          | 5 -----
 print-icmp.c          | 5 -----
 print-icmp6.c         | 5 -----
 print-igmp.c          | 5 -----
 print-igrp.c          | 5 -----
 print-ip.c            | 5 -----
 print-ip6.c           | 5 -----
 print-ip6opts.c       | 5 -----
 print-ipcomp.c        | 5 -----
 print-ipfc.c          | 5 -----
 print-ipx.c           | 5 -----
 print-isakmp.c        | 5 -----
 print-isoclns.c       | 5 -----
 print-juniper.c       | 2 --
 print-krb.c           | 5 -----
 print-l2tp.c          | 5 -----
 print-lane.c          | 5 -----
 print-ldp.c           | 5 -----
 print-llc.c           | 5 -----
 print-lldp.c          | 5 -----
 print-lmp.c           | 5 -----
 print-lspping.c       | 5 -----
 print-lwapp.c         | 5 -----
 print-lwres.c         | 5 -----
 print-mobile.c        | 5 -----
 print-mobility.c      | 5 -----
 print-mpcp.c          | 5 -----
 print-mpls.c          | 5 -----
 print-msdp.c          | 4 ----
 print-netbios.c       | 5 -----
 print-nfs.c           | 5 -----
 print-ntp.c           | 5 -----
 print-null.c          | 5 -----
 print-ospf.c          | 5 -----
 print-ospf6.c         | 5 -----
 print-pflog.c         | 5 -----
 print-pgm.c           | 5 -----
 print-pim.c           | 5 -----
 print-ppp.c           | 5 -----
 print-pppoe.c         | 5 -----
 print-pptp.c          | 6 ------
 print-radius.c        | 5 -----
 print-raw.c           | 5 -----
 print-rip.c           | 5 -----
 print-ripng.c         | 5 -----
 print-rpki-rtr.c      | 5 -----
 print-rrcp.c          | 5 -----
 print-rsvp.c          | 5 -----
 print-rt6.c           | 5 -----
 print-rx.c            | 5 -----
 print-sctp.c          | 5 -----
 print-sflow.c         | 5 -----
 print-sip.c           | 5 -----
 print-sl.c            | 5 -----
 print-sll.c           | 4 ----
 print-slow.c          | 5 -----
 print-smb.c           | 5 -----
 print-snmp.c          | 5 -----
 print-stp.c           | 5 -----
 print-sunatm.c        | 4 ----
 print-sunrpc.c        | 5 -----
 print-symantec.c      | 4 ----
 print-syslog.c        | 5 -----
 print-tcp.c           | 2 --
 print-telnet.c        | 5 -----
 print-tftp.c          | 5 -----
 print-timed.c         | 5 -----
 print-tipc.c          | 5 -----
 print-token.c         | 4 ----
 print-udp.c           | 5 -----
 print-vjc.c           | 5 -----
 print-vqp.c           | 5 -----
 print-vrrp.c          | 5 -----
 print-wb.c            | 5 -----
 print-zephyr.c        | 5 -----
 rpc_auth.h            | 1 -
 rpc_msg.h             | 1 -
 setsignal.c           | 5 -----
 setsignal.h           | 2 --
 signature.c           | 5 -----
 signature.h           | 2 --
 slcompress.h          | 2 --
 smb.h                 | 1 -
 smbutil.c             | 5 -----
 strcasecmp.c          | 5 -----
 tcp.h                 | 1 -
 tcpdump-stdinc.h      | 3 ---
 tcpdump.1.in          | 2 --
 tcpdump.c             | 2 --
 udp.h                 | 1 -
 util.c                | 5 -----
 vfprintf.c            | 5 -----
 191 files changed, 1 insertion(+), 771 deletions(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index f7766316..132e118b 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,3 @@
-@(#) $Header: /tcpdump/master/tcpdump/INSTALL.txt,v 1.2 2008-02-06 10:47:53 guy Exp $ (LBL)
-
 If you have not built libpcap, and your system does not have libpcap
 installed, install libpcap first.  Your system might provide a version
 of libpcap that can be installed; if so, to compile tcpdump you might
diff --git a/Makefile.in b/Makefile.in
index 7cdc7a74..bc75ba5a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,8 +16,6 @@
 #  THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.325 2008-11-21 23:17:26 guy Exp $ (LBL)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
diff --git a/aclocal.m4 b/aclocal.m4
index 59ddcfca..056b22db 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,3 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.116 2008-09-25 21:45:50 guy Exp $ (LBL)
-dnl
 dnl Copyright (c) 1995, 1996, 1997, 1998
 dnl	The Regents of the University of California.  All rights reserved.
 dnl
diff --git a/addrtoname.c b/addrtoname.c
index 745ffe30..1d7e60f9 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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.119 2007-08-08 14:06:34 hannes Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/addrtoname.h b/addrtoname.h
index cd5c41f4..ff03a4ac 100644
--- a/addrtoname.h
+++ b/addrtoname.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/addrtoname.h,v 1.20 2007-08-08 14:06:34 hannes Exp $ (LBL)
  */
 
 /* Name to address translation routines. */
diff --git a/af.c b/af.c
index 2c8a928e..2a2159d7 100644
--- a/af.c
+++ b/af.c
@@ -15,11 +15,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/af.c,v 1.3 2006-03-23 14:58:44 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/af.h b/af.h
index 679cc8e5..bbe1a16f 100644
--- a/af.h
+++ b/af.h
@@ -1,5 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/af.h,v 1.3 2006-03-23 14:58:44 hannes Exp $ (LBL) */
-
 /*
  * Copyright (c) 1998-2006 The TCPDUMP project
  *
diff --git a/appletalk.h b/appletalk.h
index ff972f65..06677767 100644
--- a/appletalk.h
+++ b/appletalk.h
@@ -19,8 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * AppleTalk protocol formats (courtesy Bill Croft of Stanford/SUMEX).
- *
- * @(#) $Header: /tcpdump/master/tcpdump/appletalk.h,v 1.16 2004-05-01 09:41:50 hannes Exp $ (LBL)
  */
 
 struct LAP {
diff --git a/atm.h b/atm.h
index 65ac5c17..8d1737ed 100644
--- a/atm.h
+++ b/atm.h
@@ -13,8 +13,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/atm.h,v 1.3 2006-02-08 01:43:00 hannes Exp $
  */
 
 /*
diff --git a/atmuni31.h b/atmuni31.h
index ab7a03dd..0f854300 100644
--- a/atmuni31.h
+++ b/atmuni31.h
@@ -28,8 +28,6 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/atmuni31.h,v 1.3 2007-10-22 19:37:51 guy Exp $ (LBL)
  */
 
 /* Based on UNI3.1 standard by ATM Forum */
diff --git a/bgp.h b/bgp.h
index 88a59079..c0f07035 100644
--- a/bgp.h
+++ b/bgp.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/bgp.h,v 1.3 2004-06-16 08:45:15 hannes Exp $ (LBL) */
 /*
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
diff --git a/bootp.h b/bootp.h
index b1b81dce..4420f2b3 100644
--- a/bootp.h
+++ b/bootp.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/bootp.h,v 1.19 2008-04-22 09:46:03 hannes Exp $ (LBL) */
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1048.
  *
diff --git a/bpf_dump.c b/bpf_dump.c
index b50d7e7b..209cfbb1 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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.17 2008-02-14 20:53:49 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/chdlc.h b/chdlc.h
index d1172633..d5a2d915 100644
--- a/chdlc.h
+++ b/chdlc.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/chdlc.h,v 1.1 2000-09-18 05:11:43 guy Exp $ (LBL) */
 /*
  * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
diff --git a/checksum.c b/checksum.c
index 76e2ea07..9d5daa8b 100644
--- a/checksum.c
+++ b/checksum.c
@@ -17,11 +17,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/checksum.c,v 1.4 2006-09-25 09:23:32 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/configure.in b/configure.in
index a024d5f6..08fac5d2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,3 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.204 2008-11-18 07:39:20 guy Exp $ (LBL)
-dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl	The Regents of the University of California.  All rights reserved.
 dnl
diff --git a/decnet.h b/decnet.h
index d25d157d..dfe51b2a 100644
--- a/decnet.h
+++ b/decnet.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/decnet.h,v 1.11 2002-12-11 07:13:50 guy Exp $ (LBL)
  */
 
 #ifndef WIN32
diff --git a/ether.h b/ether.h
index e8b3a713..cd407db2 100644
--- a/ether.h
+++ b/ether.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ether.h,v 1.8 2002-12-11 07:13:51 guy Exp $ (LBL) */
 /*
  * Copyright (c) 1982, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/ethertype.h b/ethertype.h
index c98cff9d..1a5791ea 100644
--- a/ethertype.h
+++ b/ethertype.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.30 2008-02-06 10:47:53 guy Exp $ (LBL)
  */
 
 /*
diff --git a/extract.h b/extract.h
index 60ecd680..2af90d07 100644
--- a/extract.h
+++ b/extract.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/extract.h,v 1.25 2006-01-30 16:20:07 hannes Exp $ (LBL)
  */
 
 /*
diff --git a/gmpls.c b/gmpls.c
index 4852933a..b4837a1e 100644
--- a/gmpls.c
+++ b/gmpls.c
@@ -13,11 +13,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/gmpls.c,v 1.7 2006-04-14 07:11:59 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/gmpls.h b/gmpls.h
index 3e1ffc38..8b44f949 100644
--- a/gmpls.h
+++ b/gmpls.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/gmpls.h,v 1.5 2006-04-14 07:11:59 hannes Exp $ (LBL) */
 /*
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
diff --git a/gmt2local.c b/gmt2local.c
index 1fe0e8a9..2ab9c102 100644
--- a/gmt2local.c
+++ b/gmt2local.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/gmt2local.c,v 1.9 2003-11-16 09:36:09 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/gmt2local.h b/gmt2local.h
index f7b3841e..89254df9 100644
--- a/gmt2local.h
+++ b/gmt2local.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/gmt2local.h,v 1.2 1999-10-07 23:47:10 mcr Exp $ (LBL)
  */
 #ifndef gmt2local_h
 #define gmt2local_h
diff --git a/interface.h b/interface.h
index 7c3a4683..6ab40c69 100644
--- a/interface.h
+++ b/interface.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.285 2008-08-16 11:36:20 hannes Exp $ (LBL)
  */
 
 #ifndef tcpdump_interface_h
diff --git a/ip.h b/ip.h
index 8a97632e..fd8ee92b 100644
--- a/ip.h
+++ b/ip.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ip.h,v 1.12 2007-09-14 01:29:28 guy Exp $ (LBL) */
 /*
  * Copyright (c) 1982, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/ip6.h b/ip6.h
index 2ac7af65..da5a570a 100644
--- a/ip6.h
+++ b/ip6.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ip6.h,v 1.8 2007-08-29 02:31:44 mcr Exp $ (LBL) */
 /*	NetBSD: ip6.h,v 1.9 2000/07/13 05:34:21 itojun Exp 	*/
 /*	$KAME: ip6.h,v 1.9 2000/07/02 21:01:32 itojun Exp $	*/
 
diff --git a/ipproto.c b/ipproto.c
index 2812538d..8143eda8 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -13,11 +13,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/ipproto.c,v 1.6 2005-09-20 06:01:22 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/ipproto.h b/ipproto.h
index c9801a62..75def3d8 100644
--- a/ipproto.h
+++ b/ipproto.h
@@ -30,8 +30,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/ipproto.h,v 1.6 2005-09-20 06:01:22 guy Exp $ (LBL)
- *
  * From:
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
  * $FreeBSD: src/sys/netinet/in.h,v 1.38.2.3 1999/08/29 16:29:34 peter Exp $
diff --git a/l2vpn.c b/l2vpn.c
index 2f19dfd0..e9b72fff 100644
--- a/l2vpn.c
+++ b/l2vpn.c
@@ -13,11 +13,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/l2vpn.c,v 1.1 2004-06-15 09:42:40 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/l2vpn.h b/l2vpn.h
index 83f7e2b4..151228fc 100644
--- a/l2vpn.h
+++ b/l2vpn.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/l2vpn.h,v 1.1 2004-06-15 09:42:41 hannes Exp $ (LBL) */
 /*
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
diff --git a/lbl/os-osf4.h b/lbl/os-osf4.h
index 5682b7e6..359bf365 100644
--- a/lbl/os-osf4.h
+++ b/lbl/os-osf4.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/lbl/os-osf4.h,v 1.1 2002-12-11 05:03:13 guy Exp $ (LBL)
  */
 
 /* Prototypes missing in Digital UNIX 4.x */
diff --git a/lbl/os-solaris2.h b/lbl/os-solaris2.h
index 5c01b872..9f94da97 100644
--- a/lbl/os-solaris2.h
+++ b/lbl/os-solaris2.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/lbl/os-solaris2.h,v 1.19 2000-10-11 04:02:15 guy Exp $ (LBL)
  */
 
 /* Prototypes missing in SunOS 5 */
diff --git a/lbl/os-sunos4.h b/lbl/os-sunos4.h
index ab0a12c5..b7358570 100644
--- a/lbl/os-sunos4.h
+++ b/lbl/os-sunos4.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/lbl/os-sunos4.h,v 1.32 1999-10-07 23:47:13 mcr Exp $ (LBL)
  */
 
 /* Prototypes missing in SunOS 4 */
diff --git a/lbl/os-ultrix4.h b/lbl/os-ultrix4.h
index 347485ec..fa1f770f 100644
--- a/lbl/os-ultrix4.h
+++ b/lbl/os-ultrix4.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/lbl/os-ultrix4.h,v 1.19 1999-10-07 23:47:13 mcr Exp $ (LBL)
  */
 
 /* Prototypes missing in Ultrix 4 */
diff --git a/llc.h b/llc.h
index 66046699..ec8d069e 100644
--- a/llc.h
+++ b/llc.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.23 2007-04-13 09:43:11 hannes Exp $ (LBL)
  */
 
 /*
diff --git a/machdep.c b/machdep.c
index 6b3d473e..3b8c9664 100644
--- a/machdep.c
+++ b/machdep.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/machdep.c,v 1.13 2003-12-15 03:53:21 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/machdep.h b/machdep.h
index 6328c826..d1c7d4b5 100644
--- a/machdep.h
+++ b/machdep.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/machdep.h,v 1.2 2000-01-17 06:24:24 itojun Exp $ (LBL)
  */
 #ifndef tcpdump_machdep_h
 #define tcpdump_machdep_h
diff --git a/makemib b/makemib
index b59e2f10..8d666a8e 100755
--- a/makemib
+++ b/makemib
@@ -26,8 +26,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# @(#) $Id: makemib,v 1.3 2001-09-17 22:16:52 fenner Exp $ (jlv)
 
 #
 # This script will read either ASN.1-style MIB files or the ".defs" files
diff --git a/missing/addrinfo.h b/missing/addrinfo.h
index d3d63cd7..bf4bbf6e 100644
--- a/missing/addrinfo.h
+++ b/missing/addrinfo.h
@@ -27,8 +27,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: addrinfo.h,v 1.4 2002-06-11 17:13:36 itojun Exp $ */
-
 #ifndef HAVE_ADDRINFO
 
 /*
diff --git a/missing/datalinks.c b/missing/datalinks.c
index 1bd86448..e7d526bc 100644
--- a/missing/datalinks.c
+++ b/missing/datalinks.c
@@ -31,11 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/datalinks.c,v 1.3 2003-11-16 09:36:47 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/missing/dlnames.c b/missing/dlnames.c
index 32072b78..a10cd398 100644
--- a/missing/dlnames.c
+++ b/missing/dlnames.c
@@ -31,11 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/dlnames.c,v 1.5 2003-11-18 23:09:43 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/missing/getnameinfo.c b/missing/getnameinfo.c
index c287221c..9134ef07 100644
--- a/missing/getnameinfo.c
+++ b/missing/getnameinfo.c
@@ -41,11 +41,6 @@
 #include <config.h>
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.11 2003-11-16 09:36:49 guy Exp $";
-#endif
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/missing/inet_aton.c b/missing/inet_aton.c
index bc1461aa..e85ad5f8 100644
--- a/missing/inet_aton.c
+++ b/missing/inet_aton.c
@@ -36,13 +36,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_aton.c,v 1.6 2003-11-16 09:36:49 guy Exp $ */
-
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_aton.c,v 1.6 2003-11-16 09:36:49 guy Exp $";
-#endif
-
 #include <tcpdump-stdinc.h>
 
 /* Minimal implementation of inet_aton.
diff --git a/missing/inet_ntop.c b/missing/inet_ntop.c
index d17d5925..db741a8f 100644
--- a/missing/inet_ntop.c
+++ b/missing/inet_ntop.c
@@ -36,13 +36,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_ntop.c,v 1.8 2005-02-09 02:25:46 guy Exp $ */
-
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_ntop.c,v 1.8 2005-02-09 02:25:46 guy Exp $";
-#endif
-
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
diff --git a/missing/inet_pton.c b/missing/inet_pton.c
index 83f67e1e..e5d20ca3 100644
--- a/missing/inet_pton.c
+++ b/missing/inet_pton.c
@@ -36,13 +36,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_pton.c,v 1.6 2003-11-16 09:36:51 guy Exp $ */
-
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/inet_pton.c,v 1.6 2003-11-16 09:36:51 guy Exp $";
-#endif
-
 #include <tcpdump-stdinc.h>
 
 #include <errno.h>
diff --git a/missing/snprintf.c b/missing/snprintf.c
index 79329977..21d235d2 100644
--- a/missing/snprintf.c
+++ b/missing/snprintf.c
@@ -31,17 +31,10 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: snprintf.c,v 1.8 2003-11-16 09:36:51 guy Exp $ */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/snprintf.c,v 1.8 2003-11-16 09:36:51 guy Exp $";
-#endif
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/missing/strdup.c b/missing/strdup.c
index 079a8ff8..9fca7529 100644
--- a/missing/strdup.c
+++ b/missing/strdup.c
@@ -31,11 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/strdup.c,v 1.1 2001-01-20 07:26:08 guy Exp $ (LBL)";
-#endif /* LIBC_SCCS and not lint */
-
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/missing/strlcat.c b/missing/strlcat.c
index a3d3face..41cb5b48 100644
--- a/missing/strlcat.c
+++ b/missing/strlcat.c
@@ -28,11 +28,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcat.c,v 1.5 2003-11-16 09:36:51 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H 
 #include <config.h>
 #endif
diff --git a/missing/strlcpy.c b/missing/strlcpy.c
index a92e4d13..5f3f31e9 100644
--- a/missing/strlcpy.c
+++ b/missing/strlcpy.c
@@ -28,11 +28,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/strlcpy.c,v 1.5 2003-11-16 09:36:52 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H 
 #include <config.h>
 #endif
diff --git a/missing/strsep.c b/missing/strsep.c
index 0362d1f5..bcce4c46 100644
--- a/missing/strsep.c
+++ b/missing/strsep.c
@@ -31,11 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/missing/strsep.c,v 1.3 2003-03-25 08:33:48 guy Exp $ (LBL)";
-#endif /* LIBC_SCCS and not lint */
-
 #ifdef HAVE_CONFIG_H 
 #include <config.h>
 #endif
diff --git a/mpls.h b/mpls.h
index ae1c97e6..03cb4bf5 100644
--- a/mpls.h
+++ b/mpls.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/mpls.h,v 1.1 2004-06-14 14:47:58 hannes Exp $ (LBL)
+/*
  * Copyright (C) 2001 WIDE Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nameser.h b/nameser.h
index f441f3ea..517544cf 100644
--- a/nameser.h
+++ b/nameser.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.16 2006-11-10 03:18:21 guy Exp $ (LBL) */
 /*
  * Copyright (c) 1983, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/netdissect.h b/netdissect.h
index f82027c3..bbb37e7b 100644
--- a/netdissect.h
+++ b/netdissect.h
@@ -20,8 +20,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/netdissect.h,v 1.27 2008-08-16 11:36:20 hannes Exp $ (LBL)
  */
 
 #ifndef netdissect_h
diff --git a/nfs.h b/nfs.h
index a5b50258..056a9099 100644
--- a/nfs.h
+++ b/nfs.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/nfs.h,v 1.9 2007-11-18 03:24:38 guy Exp $ (LBL) */
 /*	NetBSD: nfs.h,v 1.1 1996/05/23 22:49:53 fvdl Exp 	*/
 
 /*
diff --git a/nfsfh.h b/nfsfh.h
index 1d96f13e..2703415a 100644
--- a/nfsfh.h
+++ b/nfsfh.h
@@ -1,5 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/nfsfh.h,v 1.13 2002-04-24 06:27:05 guy Exp $ (LBL) */
-
 /*
  * Copyright (c) 1993, 1994 Jeffrey C. Mogul, Digital Equipment Corporation,
  * Western Research Laboratory. All rights reserved.
diff --git a/nlpid.c b/nlpid.c
index 8c89ca79..b9d59c4c 100644
--- a/nlpid.c
+++ b/nlpid.c
@@ -13,11 +13,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/nlpid.c,v 1.4 2004-10-19 15:27:55 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/nlpid.h b/nlpid.h
index 161417a8..63a2e709 100644
--- a/nlpid.h
+++ b/nlpid.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/nlpid.h,v 1.4 2004-10-19 15:27:55 hannes Exp $ (LBL) */
 /*
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
diff --git a/ospf.h b/ospf.h
index 47a523b7..65398028 100644
--- a/ospf.h
+++ b/ospf.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ospf.h,v 1.23 2007-10-08 07:53:21 hannes Exp $ (LBL) */
 /*
  * Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
  *	The Regents of the University of California.  All rights reserved.
diff --git a/oui.c b/oui.c
index 3c7ee9d0..b170b0eb 100644
--- a/oui.c
+++ b/oui.c
@@ -13,11 +13,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/oui.c,v 1.9 2008-01-09 09:40:47 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/oui.h b/oui.h
index 46549b5e..bf87099d 100644
--- a/oui.h
+++ b/oui.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/oui.h,v 1.8 2008-01-09 09:40:47 hannes Exp $ (LBL) */
 /*
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
diff --git a/parsenfsfh.c b/parsenfsfh.c
index 5ee7e68e..923b063a 100644
--- a/parsenfsfh.c
+++ b/parsenfsfh.c
@@ -40,11 +40,6 @@
  * Western Research Laboratory
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.29 2006-06-13 22:21:38 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/pcap-missing.h b/pcap-missing.h
index 5c0ece25..d776810f 100644
--- a/pcap-missing.h
+++ b/pcap-missing.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/pcap-missing.h,v 1.3 2005-06-03 22:08:52 guy Exp $ (LBL)
  */
 
 #ifndef tcpdump_pcap_missing_h
diff --git a/pcap_dump_ftell.c b/pcap_dump_ftell.c
index 6eb3a4ab..1b652b54 100644
--- a/pcap_dump_ftell.c
+++ b/pcap_dump_ftell.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/pcap_dump_ftell.c,v 1.1 2005-06-03 22:08:52 guy Exp $ (LBL)";
-#endif
-
 #include <stdio.h>
 #include <pcap.h>
 
diff --git a/ppp.h b/ppp.h
index ba7aea72..9d53423f 100644
--- a/ppp.h
+++ b/ppp.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ppp.h,v 1.16 2004-10-20 16:14:16 hannes Exp $ (LBL) */
 /*
  * Point to Point Protocol (PPP) RFC1331
  *
diff --git a/print-802_11.c b/print-802_11.c
index 18d68bee..e08258bb 100644
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -20,11 +20,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.49 2007-12-29 23:25:02 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -371,7 +366,6 @@ struct meshcntl_t {
 
 /* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
 /* NetBSD: ieee802_11_radio.h,v 1.2 2006/02/26 03:04:03 dyoung Exp  */
-/* $Header: /tcpdump/master/tcpdump/ieee802_11_radio.h,v 1.3 2007-08-29 02:31:44 mcr Exp $ */
 
 /*-
  * Copyright (c) 2003, 2004 David Young.  All rights reserved.
diff --git a/print-ah.c b/print-ah.c
index ecd106b7..a37574d1 100644
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,11 +21,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.22 2003-11-19 00:36:06 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-aodv.c b/print-aodv.c
index a45c192c..ed64dfb6 100644
--- a/print-aodv.c
+++ b/print-aodv.c
@@ -30,11 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-aodv.c,v 1.11 2004-03-24 00:30:19 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ap1394.c b/print-ap1394.c
index f83d1628..1efabe75 100644
--- a/print-ap1394.c
+++ b/print-ap1394.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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ap1394.c,v 1.5 2006-02-11 22:12:06 hannes Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/print-arcnet.c b/print-arcnet.c
index 20ed703a..d3d92938 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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.20 2005-04-06 21:32:38 mcr Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/print-arp.c b/print-arp.c
index 291d3097..fbc8411e 100644
--- a/print-arp.c
+++ b/print-arp.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.66 2006-03-03 22:53:21 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ascii.c b/print-ascii.c
index ba788ec5..9315edd2 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -40,10 +40,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.17 2005-07-06 20:53:32 guy Exp $";
-#endif
 #include <tcpdump-stdinc.h>
 #include <stdio.h>
 
diff --git a/print-atalk.c b/print-atalk.c
index bc2003b1..7546543b 100644
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -21,11 +21,6 @@
  * Format and print AppleTalk packets.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.81 2004-05-01 09:41:50 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-atm.c b/print-atm.c
index f75f8ab6..611f27cd 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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.49 2007-10-22 19:37:51 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/print-beep.c b/print-beep.c
index b476dbf9..c8145658 100644
--- a/print-beep.c
+++ b/print-beep.c
@@ -9,11 +9,6 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-  "@(#) $Header: /tcpdump/master/tcpdump/print-beep.c,v 1.6 2003-11-16 09:36:13 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-bfd.c b/print-bfd.c
index dc03a8b4..18a5cfbd 100644
--- a/print-bfd.c
+++ b/print-bfd.c
@@ -13,11 +13,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bfd.c,v 1.10 2006-02-02 06:35:52 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-bgp.c b/print-bgp.c
index 5acdbc31..017e70c8 100644
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -34,11 +34,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.118 2007-12-07 15:54:52 hannes Exp $";
-#endif
-
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
diff --git a/print-bootp.c b/print-bootp.c
index c4601567..58fd02dd 100644
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -20,10 +20,6 @@
  *
  * Format and print bootp packets.
  */
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.89 2008-04-22 09:45:08 hannes Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/print-bt.c b/print-bt.c
index 3c89a291..a80afc3f 100644
--- a/print-bt.c
+++ b/print-bt.c
@@ -17,11 +17,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bt.c,v 1.2 2008-09-25 21:45:50 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-cdp.c b/print-cdp.c
index 12f2d4bf..5383fd50 100644
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -24,11 +24,6 @@
  *    http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cdp.c,v 1.25 2004-10-07 14:53:11 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-cfm.c b/print-cfm.c
index 81f2df65..d36a50f1 100644
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -17,11 +17,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cfm.c,v 1.5 2007-07-24 16:01:42 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-chdlc.c b/print-chdlc.c
index 5685cc13..00cbd8d8 100644
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.43 2005-11-29 08:56:19 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-cip.c b/print-cip.c
index 1a8d1054..82e1de65 100644
--- a/print-cip.c
+++ b/print-cip.c
@@ -20,11 +20,6 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.26 2005-07-07 01:22:17 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-cnfp.c b/print-cnfp.c
index 86d71282..79ca9819 100644
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -32,11 +32,6 @@
 
 /* Cisco NetFlow protocol */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cnfp.c,v 1.17 2005-04-20 20:53:18 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-dccp.c b/print-dccp.c
index a7f07b43..1c354a6a 100644
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -7,11 +7,6 @@
  * BSD-style license that accompanies tcpdump or the GNU GPL version 2
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-dccp.c,v 1.8 2007-11-09 00:44:09 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-decnet.c b/print-decnet.c
index f7d59283..83c1518c 100644
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-decnet.c,v 1.39 2005-05-06 02:16:26 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-dhcp6.c b/print-dhcp6.c
index c210ebc1..d8b374ba 100644
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -40,11 +40,6 @@
  *  RFC6334: Dual-Stack Lite option,
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.37 2008-02-06 10:26:09 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-domain.c b/print-domain.c
index 80e8ce9d..9c229e03 100644
--- a/print-domain.c
+++ b/print-domain.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.98 2007-12-09 01:40:32 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-dvmrp.c b/print-dvmrp.c
index 1353c46c..31d27d94 100644
--- a/print-dvmrp.c
+++ b/print-dvmrp.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-dvmrp.c,v 1.27 2003-11-19 09:42:04 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-eap.c b/print-eap.c
index b1dea6d0..a5071bd4 100644
--- a/print-eap.c
+++ b/print-eap.c
@@ -21,11 +21,6 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-eap.c,v 1.5 2007-10-04 16:41:33 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-egp.c b/print-egp.c
index 5d0bb79f..b1cf2626 100644
--- a/print-egp.c
+++ b/print-egp.c
@@ -18,11 +18,6 @@
  * Initial contribution from Jeff Honig (jch@MITCHELL.CIT.CORNELL.EDU).
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-egp.c,v 1.38 2006-02-11 22:13:24 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-eigrp.c b/print-eigrp.c
index 4177564d..5a8c035d 100644
--- a/print-eigrp.c
+++ b/print-eigrp.c
@@ -14,11 +14,6 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-eigrp.c,v 1.7 2005-05-06 02:53:26 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-enc.c b/print-enc.c
index 103e542e..e187de71 100644
--- a/print-enc.c
+++ b/print-enc.c
@@ -21,11 +21,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-enc.c,v 1.6 2008-11-18 07:35:32 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-esp.c b/print-esp.c
index ee04ea53..d1ed4334 100644
--- a/print-esp.c
+++ b/print-esp.c
@@ -21,11 +21,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.58 2007-12-07 00:03:07 mcr Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ether.c b/print-ether.c
index 1ade6c26..d90a2f16 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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.106 2008-02-06 10:47:53 guy Exp $ (LBL)";
-#endif
 
 #define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
diff --git a/print-fddi.c b/print-fddi.c
index 490b10aa..7011c55e 100644
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.66 2005-11-13 12:12:41 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-fr.c b/print-fr.c
index 56cc47de..6273b9c2 100644
--- a/print-fr.c
+++ b/print-fr.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-	"@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.51 2006-06-23 22:20:32 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-frag6.c b/print-frag6.c
index e125bd3e..124124be 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.20 2005-04-20 22:33:06 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-gre.c b/print-gre.c
index f734251f..ed26054e 100644
--- a/print-gre.c
+++ b/print-gre.c
@@ -36,11 +36,6 @@
  * RFC1701 (GRE), RFC1702 (GRE IPv4), and RFC2637 (Enhanced GRE)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-gre.c,v 1.28 2005-04-06 21:32:39 mcr Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-hsrp.c b/print-hsrp.c
index 9f0f40c5..fbcf5834 100644
--- a/print-hsrp.c
+++ b/print-hsrp.c
@@ -29,11 +29,6 @@
 
 /* Cisco Hot Standby Router Protocol (HSRP). */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-hsrp.c,v 1.10 2005-05-06 07:56:52 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-icmp.c b/print-icmp.c
index cbc342b3..32357dfa 100644
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.87 2007-09-13 17:42:31 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-icmp6.c b/print-icmp6.c
index 7f1ce10e..8b5e65c6 100644
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.86 2008-02-05 19:36:13 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-igmp.c b/print-igmp.c
index b7a22f8c..d1cc4f35 100644
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-igmp.c,v 1.15 2004-03-24 00:59:16 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-igrp.c b/print-igrp.c
index 221d43fb..fb3228cd 100644
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -21,11 +21,6 @@
  * Initial contribution from Francis Dupont (francis.dupont@inria.fr)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-igrp.c,v 1.21 2005-04-20 21:01:56 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ip.c b/print-ip.c
index 8a2fa2e3..128834c4 100644
--- a/print-ip.c
+++ b/print-ip.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.159 2007-09-14 01:29:28 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ip6.c b/print-ip6.c
index 23b54316..3113cc6c 100644
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.52 2007-09-21 07:05:33 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ip6opts.c b/print-ip6opts.c
index 2121b460..409d42a6 100644
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -31,11 +31,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.18 2005-04-20 22:18:50 guy Exp $";
-#endif
-
 #ifdef INET6
 #include <tcpdump-stdinc.h>
 
diff --git a/print-ipcomp.c b/print-ipcomp.c
index 89130a37..344ccc80 100644
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.20 2003-11-19 00:36:08 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ipfc.c b/print-ipfc.c
index cc5e7bd6..e0f696d0 100644
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.9 2005-11-13 12:12:42 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ipx.c b/print-ipx.c
index bc597d40..e7102a5e 100644
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -22,11 +22,6 @@
  * Contributed by Brad Parker (brad@fcr.com).
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.42 2005-05-06 08:26:44 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-isakmp.c b/print-isakmp.c
index 76a7838d..e43381fb 100644
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -28,11 +28,6 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.61 2008-02-05 19:34:25 guy Exp $ (LBL)";
-#endif
-
 #define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/print-isoclns.c b/print-isoclns.c
index cc441c11..661aa062 100644
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -24,11 +24,6 @@
  * complete IS-IS & CLNP support.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.165 2008-08-16 13:38:15 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-juniper.c b/print-juniper.c
index efc3789b..556df93a 100644
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -16,8 +16,6 @@
  */
 
 #ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.34 2007-08-29 02:31:44 mcr Exp $ (LBL)";
 #else
 __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp ");
 #endif
diff --git a/print-krb.c b/print-krb.c
index 2cf9c989..d2c81239 100644
--- a/print-krb.c
+++ b/print-krb.c
@@ -21,11 +21,6 @@
  * Initial contribution from John Hawkinson (jhawk@mit.edu).
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-krb.c,v 1.23 2003-11-16 09:36:26 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-l2tp.c b/print-l2tp.c
index f0708ddb..ca98e9a9 100644
--- a/print-l2tp.c
+++ b/print-l2tp.c
@@ -21,11 +21,6 @@
  * L2TP support contributed by Motonori Shindo (mshindo@mshindo.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-l2tp.c,v 1.20 2006-06-23 02:03:09 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-lane.c b/print-lane.c
index 81b0bb66..4784b6ad 100644
--- a/print-lane.c
+++ b/print-lane.c
@@ -20,11 +20,6 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.25 2005-11-13 12:12:42 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ldp.c b/print-ldp.c
index 58f63247..bff0455f 100644
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -14,11 +14,6 @@
  *  and Steinar Haug (sthaug@nethelp.no)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ldp.c,v 1.20 2006-06-23 02:03:09 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-llc.c b/print-llc.c
index 5c0d1ced..597773bb 100644
--- a/print-llc.c
+++ b/print-llc.c
@@ -22,11 +22,6 @@
  *	with an awful lot of hacking by Jeffrey Mogul, DECWRL
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.75 2007-04-13 09:43:11 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-lldp.c b/print-lldp.c
index f9acfb5d..e6cad7eb 100644
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -19,11 +19,6 @@
  * DCBX extensions by Kaladhar Musunuru <kaladharm@sourceforge.net>
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-"@(#) $Header: /tcpdump/master/tcpdump/print-lldp.c,v 1.10 2008-03-20 09:30:56 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-lmp.c b/print-lmp.c
index 5a3c4edc..22a26643 100644
--- a/print-lmp.c
+++ b/print-lmp.c
@@ -17,11 +17,6 @@
  * by Manu Pathak (mapathak@cisco.com), May 2005
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lmp.c,v 1.11 2007-08-02 17:32:49 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-lspping.c b/print-lspping.c
index 18ff102c..b920ae77 100644
--- a/print-lspping.c
+++ b/print-lspping.c
@@ -13,11 +13,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lspping.c,v 1.20 2008-01-28 14:20:43 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-lwapp.c b/print-lwapp.c
index 8a8c9e0a..eed9cdd8 100644
--- a/print-lwapp.c
+++ b/print-lwapp.c
@@ -17,11 +17,6 @@
  * Original code by Carles Kishimoto <carles.kishimoto@gmail.com>
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-"@(#) $Header: /tcpdump/master/tcpdump/print-lwapp.c,v 1.1 2007-07-24 16:07:30 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-lwres.c b/print-lwres.c
index 60acc5b5..6272ae2d 100644
--- a/print-lwres.c
+++ b/print-lwres.c
@@ -27,11 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lwres.c,v 1.13 2004-03-24 01:54:29 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-mobile.c b/print-mobile.c
index de4eab1d..530f26ef 100644
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -40,11 +40,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-mobile.c,v 1.15 2004-03-24 01:58:14 guy Exp $";
-#endif
-
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
diff --git a/print-mobility.c b/print-mobility.c
index a63e574d..efc18131 100644
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -31,11 +31,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-mobility.c,v 1.12 2005-04-20 22:21:00 guy Exp $";
-#endif
-
 #ifdef INET6
 #include <tcpdump-stdinc.h>
 
diff --git a/print-mpcp.c b/print-mpcp.c
index fcffcf2c..cf36866f 100644
--- a/print-mpcp.c
+++ b/print-mpcp.c
@@ -17,11 +17,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-mpcp.c,v 1.2 2006-02-10 17:24:55 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-mpls.c b/print-mpls.c
index ac9358f6..245d0298 100644
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -26,11 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.14 2005-07-05 09:38:19 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-msdp.c b/print-msdp.c
index a228ab7c..e1ec2b42 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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-msdp.c,v 1.7 2005-04-06 21:32:41 mcr Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/print-netbios.c b/print-netbios.c
index a55a8afc..664d568a 100644
--- a/print-netbios.c
+++ b/print-netbios.c
@@ -22,11 +22,6 @@
  * Contributed by Brad Parker (brad@fcr.com).
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-netbios.c,v 1.20 2003-11-16 09:36:29 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-nfs.c b/print-nfs.c
index eeb00c28..50183916 100644
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.111 2007-12-22 03:08:04 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ntp.c b/print-ntp.c
index 85c9bb75..21bb7374 100644
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -23,11 +23,6 @@
  *	loosely based on print-bootp.c
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.43 2007-11-30 13:45:10 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-null.c b/print-null.c
index 8eabe5dd..c6b73897 100644
--- a/print-null.c
+++ b/print-null.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.57 2006-03-23 14:58:44 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ospf.c b/print-ospf.c
index efd013ee..23fb1ce0 100644
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -21,11 +21,6 @@
  * OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.66 2007-10-08 07:53:21 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ospf6.c b/print-ospf6.c
index e25ad3f6..98352cbd 100644
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -21,11 +21,6 @@
  * OSPF support contributed by Jeffrey Honig (jch@mitchell.cit.cornell.edu)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf6.c,v 1.15 2006-09-13 06:31:11 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-pflog.c b/print-pflog.c
index b38fd99b..39b30bec 100644
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-pflog.c,v 1.16 2007-09-12 19:36:18 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-pgm.c b/print-pgm.c
index 2f899bcc..b1bc77ff 100644
--- a/print-pgm.c
+++ b/print-pgm.c
@@ -13,11 +13,6 @@
  * Original code by Andy Heffernan (ahh@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-pgm.c,v 1.5 2005-06-07 22:05:58 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-pim.c b/print-pim.c
index 157df46f..792dd224 100644
--- a/print-pim.c
+++ b/print-pim.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.49 2006-02-13 01:31:35 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ppp.c b/print-ppp.c
index d45d4441..c19fcf74 100644
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -29,11 +29,6 @@
  * o BAP support
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.114 2005-12-05 11:35:58 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-pppoe.c b/print-pppoe.c
index 6b08b6f1..6fbc669b 100644
--- a/print-pppoe.c
+++ b/print-pppoe.c
@@ -21,11 +21,6 @@
  * Original code by Greg Stark <gsstark@mit.edu>
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.31 2005-04-26 19:48:38 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-pptp.c b/print-pptp.c
index ce39b6d2..7e8d1d3f 100644
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -21,12 +21,6 @@
  * PPTP support contributed by Motonori Shindo (mshindo@mshindo.net)
  */
 
-
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-pptp.c,v 1.12 2006-06-23 02:03:09 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-radius.c b/print-radius.c
index d16c794d..da2fd991 100644
--- a/print-radius.c
+++ b/print-radius.c
@@ -42,11 +42,6 @@
  * TODO: Among other things to print ok MacIntosh and Vendor values
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "$Id: print-radius.c,v 1.28 2005-09-26 01:01:55 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-raw.c b/print-raw.c
index 8e376ce5..85e8914c 100644
--- a/print-raw.c
+++ b/print-raw.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.41 2003-11-16 09:36:34 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-rip.c b/print-rip.c
index c0b5f09a..dbda1462 100644
--- a/print-rip.c
+++ b/print-rip.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rip.c,v 1.59 2006-03-23 14:58:44 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-ripng.c b/print-ripng.c
index f16212bb..b50b0814 100644
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.18 2005-01-04 00:15:54 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-rpki-rtr.c b/print-rpki-rtr.c
index c335c3b7..5e4e4539 100644
--- a/print-rpki-rtr.c
+++ b/print-rpki-rtr.c
@@ -17,11 +17,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-"@(#) $Header: /tcpdump/master/tcpdump/print-rpki_rtr.c,v 1.10 2008-03-20 09:30:56 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-rrcp.c b/print-rrcp.c
index d4af9a43..d2cbc5c1 100644
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -21,11 +21,6 @@
  * and Realtek Echo Protocol (RRCP-REP) packets.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rrcp.c,v 1.2 2008-04-11 17:21:34 gianluca Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-rsvp.c b/print-rsvp.c
index ed228d9e..8d2f0264 100644
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -15,11 +15,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rsvp.c,v 1.50 2008-08-16 11:36:20 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-rt6.c b/print-rt6.c
index dc196b4e..b3064eb8 100644
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.27 2005-04-20 22:34:57 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-rx.c b/print-rx.c
index e02799fc..72c4822b 100644
--- a/print-rx.c
+++ b/print-rx.c
@@ -32,11 +32,6 @@
  * Ken Hornstein <kenh@cmf.nrl.navy.mil>
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.42 2008-07-01 07:44:50 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-sctp.c b/print-sctp.c
index 171e9fc9..dc7916b3 100644
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -33,11 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-"@(#) $Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.21 2007-09-13 18:03:49 guy Exp $ (NETLAB/PEL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-sflow.c b/print-sflow.c
index 44e826f9..ab54435d 100644
--- a/print-sflow.c
+++ b/print-sflow.c
@@ -19,11 +19,6 @@
  * Expansion and refactoring by Rick Jones <rick.jones2@hp.com>
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-"@(#) $Header: /tcpdump/master/tcpdump/print-sflow.c,v 1.1 2007-08-08 17:20:58 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-sip.c b/print-sip.c
index 080d5606..a0223f22 100644
--- a/print-sip.c
+++ b/print-sip.c
@@ -13,11 +13,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sip.c,v 1.1 2004-07-27 17:04:20 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-sl.c b/print-sl.c
index b73efcc4..c17c915d 100644
--- a/print-sl.c
+++ b/print-sl.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.65 2005-04-06 21:32:42 mcr Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-sll.c b/print-sll.c
index af14a4e2..dd8ceef7 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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sll.c,v 1.19 2005-11-13 12:12:43 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/print-slow.c b/print-slow.c
index b4ba2ab9..7462ab81 100644
--- a/print-slow.c
+++ b/print-slow.c
@@ -18,11 +18,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-slow.c,v 1.8 2006-10-12 05:44:33 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-smb.c b/print-smb.c
index 7a9044c5..32edd196 100644
--- a/print-smb.c
+++ b/print-smb.c
@@ -10,11 +10,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.47 2007-12-09 00:30:47 guy Exp $";
-#endif
-
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
diff --git a/print-snmp.c b/print-snmp.c
index 1fd34eab..4acc5b28 100644
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -56,11 +56,6 @@
  #	@(#)snmp.awk.x	1.1 (LANL) 1/15/90
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.64 2005-05-06 07:56:53 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-stp.c b/print-stp.c
index 76d1c094..bc9e86eb 100644
--- a/print-stp.c
+++ b/print-stp.c
@@ -9,11 +9,6 @@
  * Contributed by Lennert Buytenhek <buytenh@gnu.org>
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-"@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.20 2007-03-18 17:11:46 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-sunatm.c b/print-sunatm.c
index 94a17b40..12975d96 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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sunatm.c,v 1.8 2004-03-17 23:24:38 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/print-sunrpc.c b/print-sunrpc.c
index 4652e8f2..16a524b5 100644
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.47 2005-04-27 21:43:48 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-symantec.c b/print-symantec.c
index 84a2e7f5..cd8caf30 100644
--- a/print-symantec.c
+++ b/print-symantec.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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-symantec.c,v 1.5 2005-07-07 01:22:21 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/print-syslog.c b/print-syslog.c
index 89019bf5..40c8a924 100644
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -14,11 +14,6 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-syslog.c,v 1.1 2004-10-29 11:42:53 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-tcp.c b/print-tcp.c
index e28994e6..dbb40416 100644
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -24,8 +24,6 @@
  */
 
 #ifndef lint
-static const char rcsid[] _U_ =
-"@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.135 2008-11-09 23:35:03 mcr Exp $ (LBL)";
 #else
 __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 #endif
diff --git a/print-telnet.c b/print-telnet.c
index d0821bde..25484cd5 100644
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -49,11 +49,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-telnet.c,v 1.24 2003-12-29 11:05:10 hannes Exp $";
-#endif
-
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
diff --git a/print-tftp.c b/print-tftp.c
index 03421da6..2808bcc1 100644
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -21,11 +21,6 @@
  * Format and print trivial file transfer protocol packets.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.39 2008-04-11 16:47:38 gianluca Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-timed.c b/print-timed.c
index 40908dd0..cbeaf00d 100644
--- a/print-timed.c
+++ b/print-timed.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-timed.c,v 1.9 2003-11-16 09:36:40 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-tipc.c b/print-tipc.c
index 56c1b660..69be4caa 100644
--- a/print-tipc.c
+++ b/print-tipc.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.66 2006-03-03 22:53:21 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-token.c b/print-token.c
index d1b20756..ba6a8c68 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[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.27 2005-11-13 12:12:43 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/print-udp.c b/print-udp.c
index 5d985b85..babdf7c2 100644
--- a/print-udp.c
+++ b/print-udp.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.142 2007-08-08 17:20:58 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-vjc.c b/print-vjc.c
index 2dc89aa5..43eae996 100644
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -23,11 +23,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vjc.c,v 1.15 2004-03-25 03:31:17 mcr Exp $ (LBL)";
-#endif
-
 #include <tcpdump-stdinc.h>
 
 #include <pcap.h>
diff --git a/print-vqp.c b/print-vqp.c
index e3d9ecf2..89355459 100644
--- a/print-vqp.c
+++ b/print-vqp.c
@@ -17,11 +17,6 @@
  * Original code by Carles Kishimoto <Carles.Kishimoto@bsc.es>
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vqp.c,v 1.3 2006-08-19 06:51:13 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-vrrp.c b/print-vrrp.c
index 8b733d22..f0414d9f 100644
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -23,11 +23,6 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vrrp.c,v 1.10 2005-05-06 07:56:54 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-wb.c b/print-wb.c
index c478bf4c..7f013d0f 100644
--- a/print-wb.c
+++ b/print-wb.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-wb.c,v 1.33 2004-03-24 04:06:28 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/print-zephyr.c b/print-zephyr.c
index d8252cca..a08ab04c 100644
--- a/print-zephyr.c
+++ b/print-zephyr.c
@@ -20,11 +20,6 @@
  * PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-zephyr.c,v 1.10 2007-08-09 18:47:27 hannes Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/rpc_auth.h b/rpc_auth.h
index fe9a40b2..ef921b09 100644
--- a/rpc_auth.h
+++ b/rpc_auth.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/rpc_auth.h,v 1.2 2005-04-27 21:43:48 guy Exp $ (LBL) */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/rpc_msg.h b/rpc_msg.h
index 3e79ac71..1f304ab6 100644
--- a/rpc_msg.h
+++ b/rpc_msg.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/rpc_msg.h,v 1.2 2005-04-27 21:43:48 guy Exp $ (LBL) */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
diff --git a/setsignal.c b/setsignal.c
index 6032835e..1bcc032e 100644
--- a/setsignal.c
+++ b/setsignal.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/setsignal.c,v 1.11 2003-11-16 09:36:42 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/setsignal.h b/setsignal.h
index 984c3407..91a2048a 100644
--- a/setsignal.h
+++ b/setsignal.h
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/setsignal.h,v 1.2 1999-10-07 23:47:13 mcr Exp $ (LBL)
  */
 #ifndef setsignal_h
 #define setsignal_h
diff --git a/signature.c b/signature.c
index 55b69b86..f80c2853 100644
--- a/signature.c
+++ b/signature.c
@@ -15,11 +15,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/signature.c,v 1.2 2008-09-22 20:22:10 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/signature.h b/signature.h
index f6389013..3f664c5b 100644
--- a/signature.h
+++ b/signature.h
@@ -15,8 +15,6 @@
  * Original code by Hannes Gredler (hannes@juniper.net)
  */
 
-/* @(#) $Header: /tcpdump/master/tcpdump/signature.h,v 1.1 2008-08-16 11:36:20 hannes Exp $ (LBL) */
-
 /* signature checking result codes */
 #define SIGNATURE_VALID		0
 #define SIGNATURE_INVALID	1
diff --git a/slcompress.h b/slcompress.h
index d10243a9..644c7559 100644
--- a/slcompress.h
+++ b/slcompress.h
@@ -1,8 +1,6 @@
 /*
  * Definitions for tcp compression routines.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/slcompress.h,v 1.2 2000-10-09 02:03:44 guy Exp $ (LBL)
- *
  * Copyright (c) 1989, 1990, 1992, 1993 Regents of the University of
  * California. All rights reserved.
  *
diff --git a/smb.h b/smb.h
index 8eeb303f..fea9fa46 100644
--- a/smb.h
+++ b/smb.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/smb.h,v 1.9 2004-12-28 22:29:44 guy Exp $ (LBL) */
 /*
  * Copyright (C) Andrew Tridgell 1995-1999
  *
diff --git a/smbutil.c b/smbutil.c
index 5eadb4fd..13333d00 100644
--- a/smbutil.c
+++ b/smbutil.c
@@ -10,11 +10,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.39 2007-07-15 19:07:39 guy Exp $";
-#endif
-
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
diff --git a/strcasecmp.c b/strcasecmp.c
index 5504e0af..7ee4e383 100644
--- a/strcasecmp.c
+++ b/strcasecmp.c
@@ -14,11 +14,6 @@
 #include "config.h"
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/strcasecmp.c,v 1.6 2003-11-16 09:36:43 guy Exp $";
-#endif
-
 #include <tcpdump-stdinc.h>
 
 #include "interface.h"
diff --git a/tcp.h b/tcp.h
index 19611570..1ed67bcb 100644
--- a/tcp.h
+++ b/tcp.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/tcp.h,v 1.14 2007-12-09 00:30:47 guy Exp $ (LBL) */
 /*
  * Copyright (c) 1982, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h
index 34cfb76b..dde6c507 100644
--- a/tcpdump-stdinc.h
+++ b/tcpdump-stdinc.h
@@ -27,9 +27,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- * @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.18 2007-11-24 18:13:33 mcr Exp $ (LBL)
  */
 
 /*
diff --git a/tcpdump.1.in b/tcpdump.1.in
index 67114d21..0bf030c1 100644
--- a/tcpdump.1.in
+++ b/tcpdump.1.in
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/tcpdump/tcpdump.1.in,v 1.2 2008-11-09 23:35:03 mcr Exp $ (LBL)
-.\"
 .\"	$NetBSD: tcpdump.8,v 1.9 2003/03/31 00:18:17 perry Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997
diff --git a/tcpdump.c b/tcpdump.c
index 63e85aed..e62babf7 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -29,8 +29,6 @@
 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.283 2008-09-25 21:45:50 guy Exp $ (LBL)";
 #endif
 
 /*
diff --git a/udp.h b/udp.h
index 3a35fe07..084fe843 100644
--- a/udp.h
+++ b/udp.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/udp.h,v 1.13 2007-08-08 17:20:58 hannes Exp $ (LBL) */
 /*
  * Copyright (c) 1982, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/util.c b/util.c
index 4d25d6f0..d7aa1fa7 100644
--- a/util.c
+++ b/util.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.109 2007-01-29 09:59:42 hannes Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/vfprintf.c b/vfprintf.c
index 6f8407af..6f3e15f7 100644
--- a/vfprintf.c
+++ b/vfprintf.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/vfprintf.c,v 1.6 2003-11-16 09:36:45 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-- 
cgit v1.2.1