diff --git a/INSTALL.txt b/INSTALL.txt
index 58d8e3c..ad78746 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,3 @@
-@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.29 2008-06-12 20:21:51 guy Exp $ (LBL)
-
 To build libpcap, run "./configure" (a shell script). The configure
 script will determine your system attributes and generate an
 appropriate Makefile from Makefile.in. Next run "make". If everything
diff --git a/Makefile.in b/Makefile.in
index 31f3bdb..1a6cde5 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/libpcap/Makefile.in,v 1.142 2008-11-22 17:30:24 guy Exp $ (LBL)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
diff --git a/README b/README
index 2f14aac..46fcc56 100644
--- a/README
+++ b/README
@@ -1,5 +1,3 @@
-@(#) $Header: /tcpdump/master/libpcap/README,v 1.34 2008-12-14 19:44:14 guy Exp $ (LBL)
-
 LIBPCAP 1.x.y
 
 www.tcpdump.org
diff --git a/Win32/Include/Gnuc.h b/Win32/Include/Gnuc.h
index 0bf4b73..aa49598 100644
--- a/Win32/Include/Gnuc.h
+++ b/Win32/Include/Gnuc.h
@@ -1,5 +1,3 @@
-/* @(#) $Header: /tcpdump/master/libpcap/Win32/Include/Gnuc.h,v 1.1 2002-08-01 08:33:05 risso Exp $ (LBL) */
-
 /* Define __P() macro, if necessary */
 
 #ifndef __P
diff --git a/Win32/Include/addrinfo.h b/Win32/Include/addrinfo.h
index 8cb2e65..4db7384 100644
--- a/Win32/Include/addrinfo.h
+++ b/Win32/Include/addrinfo.h
@@ -27,8 +27,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: addrinfo.h,v 1.1 2002-08-01 08:33:05 risso Exp $ */
-
 #ifndef HAVE_ADDRINFO
 
 /*
diff --git a/Win32/Include/ip6_misc.h b/Win32/Include/ip6_misc.h
index 562fa61..0b578c3 100644
--- a/Win32/Include/ip6_misc.h
+++ b/Win32/Include/ip6_misc.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/libpcap/Win32/Include/ip6_misc.h,v 1.5 2006-01-22 18:02:18 gianluca Exp $ (LBL)
  */
 
 /*
diff --git a/Win32/Src/getaddrinfo.c b/Win32/Src/getaddrinfo.c
index ebfe8c2..19ffa68 100644
--- a/Win32/Src/getaddrinfo.c
+++ b/Win32/Src/getaddrinfo.c
@@ -55,11 +55,6 @@
 #include <config.h>
 #endif 
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/libpcap/Win32/Src/getaddrinfo.c,v 1.3 2008-09-15 23:37:51 guy Exp $";
-#endif
-
 #include <pcap-stdinc.h>
 #if 0
 #include <sys/sysctl.h>
diff --git a/Win32/Src/inet_aton.c b/Win32/Src/inet_aton.c
index 3da6667..cbd4361 100644
--- a/Win32/Src/inet_aton.c
+++ b/Win32/Src/inet_aton.c
@@ -36,13 +36,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_aton.c,v 1.2 2003-11-15 23:24:06 guy Exp $ */
-
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/libpcap/Win32/Src/inet_aton.c,v 1.2 2003-11-15 23:24:06 guy Exp $";
-#endif
-
 #include <sys/types.h>
 #include <pcap-stdinc.h>
 
diff --git a/Win32/Src/inet_pton.c b/Win32/Src/inet_pton.c
index 7933a4e..fe89bb5 100644
--- a/Win32/Src/inet_pton.c
+++ b/Win32/Src/inet_pton.c
@@ -36,13 +36,6 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_pton.c,v 1.3 2007-09-27 18:02:20 gianluca Exp $ */
-
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/libpcap/Win32/Src/inet_pton.c,v 1.3 2007-09-27 18:02:20 gianluca Exp $";
-#endif
-
 #include <errno.h>
 
 #ifdef WIN32
diff --git a/aclocal.m4 b/aclocal.m4
index 4b643ef..31a18e1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,3 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/aclocal.m4,v 1.93 2008-11-18 07:29:48 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/arcnet.h b/arcnet.h
index 4f86043..5869098 100644
--- a/arcnet.h
+++ b/arcnet.h
@@ -30,8 +30,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#) $Id: arcnet.h,v 1.2 2001-04-24 02:17:52 guy Exp $ (LBL)
- *
  * from: NetBSD: if_arc.h,v 1.13 1999/11/19 20:41:19 thorpej Exp
  */
 
diff --git a/atmuni31.h b/atmuni31.h
index 880cc1a..0f85430 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/libpcap/atmuni31.h,v 1.3 2007-10-22 19:28:58 guy Exp $ (LBL)
  */
 
 /* Based on UNI3.1 standard by ATM Forum */
diff --git a/bpf/net/bpf_filter.c b/bpf/net/bpf_filter.c
index 0c4fb00..28c6df7 100644
--- a/bpf/net/bpf_filter.c
+++ b/bpf/net/bpf_filter.c
@@ -38,11 +38,6 @@
  *	@(#)bpf.c	7.5 (Berkeley) 7/15/91
  */
 
-#if !(defined(lint) || defined(KERNEL) || defined(_KERNEL))
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/bpf/net/bpf_filter.c,v 1.46 2008-01-02 04:16:46 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/bpf_dump.c b/bpf_dump.c
index e4ff4a2..5eaadc0 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/libpcap/bpf_dump.c,v 1.15 2008-01-02 04:16:46 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/bpf_image.c b/bpf_image.c
index e6c0f62..2f16c45 100644
--- a/bpf_image.c
+++ b/bpf_image.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.28 2008-01-02 04:16:46 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/configure.in b/configure.in
index 2cae646..f0aa2c5 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,3 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.168 2008-12-23 20:49:26 guy Exp $ (LBL)
 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl	The Regents of the University of California.  All rights reserved.
diff --git a/dlpisubs.c b/dlpisubs.c
index 671302f..131fa27 100644
--- a/dlpisubs.c
+++ b/dlpisubs.c
@@ -10,10 +10,6 @@
  * This file contains dlpi/libdlpi related common functions used
  * by pcap-[dlpi,libdlpi].c.
  */
-#ifndef lint
-static const char rcsid[] _U_ =
-	"@(#) $Header: /tcpdump/master/libpcap/dlpisubs.c,v 1.3 2008-12-02 16:40:19 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/dlpisubs.h b/dlpisubs.h
index 858bca3..cdc531c 100644
--- a/dlpisubs.h
+++ b/dlpisubs.h
@@ -1,7 +1,3 @@
-/*
- * @(#) $Header: /tcpdump/master/libpcap/dlpisubs.h,v 1.2 2008-04-04 19:37:45 guy Exp $
- */
-
 #ifndef dlpisubs_h
 #define	dlpisubs_h
 
diff --git a/etherent.c b/etherent.c
index d9de114..707fd9d 100644
--- a/etherent.c
+++ b/etherent.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/etherent.c,v 1.23 2006-10-04 18:09:22 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/ethertype.h b/ethertype.h
index 2d6bbeb..8bab881 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/libpcap/ethertype.h,v 1.14 2005-09-05 09:06:58 guy Exp $ (LBL)
  */
 
 /*
diff --git a/fad-getad.c b/fad-getad.c
index af371d4..69240d2 100644
--- a/fad-getad.c
+++ b/fad-getad.c
@@ -32,11 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/fad-getad.c,v 1.12 2007-09-14 00:44:55 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/fad-gifc.c b/fad-gifc.c
index d453518..eef3ae9 100644
--- a/fad-gifc.c
+++ b/fad-gifc.c
@@ -32,11 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/fad-gifc.c,v 1.12 2008-08-06 07:34:09 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/fad-glifc.c b/fad-glifc.c
index b24b564..00eccb5 100644
--- a/fad-glifc.c
+++ b/fad-glifc.c
@@ -32,11 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/fad-glifc.c,v 1.7 2008-01-30 09:35:48 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/fad-null.c b/fad-null.c
index f6384fd..cecfbcb 100644
--- a/fad-null.c
+++ b/fad-null.c
@@ -32,11 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/fad-null.c,v 1.2 2003-11-15 23:23:58 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/fad-sita.c b/fad-sita.c
index 76dcb2e..34ddf1d 100644
--- a/fad-sita.c
+++ b/fad-sita.c
@@ -24,8 +24,6 @@
  *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
- /* $Id: fad-sita.c */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/fad-win32.c b/fad-win32.c
index 6536695..743539a 100644
--- a/fad-win32.c
+++ b/fad-win32.c
@@ -31,11 +31,6 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/fad-win32.c,v 1.15 2007-09-25 20:34:36 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/gencode.c b/gencode.c
index d58ea30..8152459 100644
--- a/gencode.c
+++ b/gencode.c
@@ -19,10 +19,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/libpcap/gencode.c,v 1.309 2008-12-23 20:13:29 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/gencode.h b/gencode.h
index afb6933..ee0f9ee 100644
--- a/gencode.h
+++ b/gencode.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/libpcap/gencode.h,v 1.71 2007-11-18 02:03:52 guy Exp $ (LBL)
  */
 
 /*
diff --git a/grammar.y b/grammar.y
index e9cc6e6..05785bb 100644
--- a/grammar.y
+++ b/grammar.y
@@ -20,10 +20,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  */
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.101 2007-11-18 02:03:52 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/inet.c b/inet.c
index 6ae46ef..8f50d31 100644
--- a/inet.c
+++ b/inet.c
@@ -32,11 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/inet.c,v 1.79 2008-04-20 18:19:02 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/lbl/os-aix4.h b/lbl/os-aix4.h
index c5dfce2..5cf4586 100644
--- a/lbl/os-aix4.h
+++ b/lbl/os-aix4.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/libpcap/lbl/os-aix4.h,v 1.1 2002-06-01 09:37:40 guy Exp $
  */
 
 /* Prototypes missing in AIX 4.x */
diff --git a/lbl/os-hpux11.h b/lbl/os-hpux11.h
index 5e325a9..42c6b60 100644
--- a/lbl/os-hpux11.h
+++ b/lbl/os-hpux11.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/libpcap/lbl/os-hpux11.h,v 1.1 2002-06-01 09:37:41 guy Exp $
  */
 
 /* Prototypes missing in HP-UX 11.x */
diff --git a/lbl/os-osf4.h b/lbl/os-osf4.h
index 60abcd9..6b87bc0 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/libpcap/lbl/os-osf4.h,v 1.2 2000-12-22 11:51:33 guy Exp $ (LBL)
  */
 
 /* Prototypes missing in Digital UNIX 4.x */
diff --git a/lbl/os-osf5.h b/lbl/os-osf5.h
index 1ebcac6..4c73c69 100644
--- a/lbl/os-osf5.h
+++ b/lbl/os-osf5.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/libpcap/lbl/os-osf5.h,v 1.2 2002-08-02 03:24:15 guy Exp $ (LBL)
  */
 
 /*
diff --git a/lbl/os-solaris2.h b/lbl/os-solaris2.h
index fae2aa3..22948b4 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/libpcap/lbl/os-solaris2.h,v 1.19 2000-10-11 04:02:52 guy Exp $ (LBL)
  */
 
 /* Prototypes missing in SunOS 5 */
diff --git a/lbl/os-sunos4.h b/lbl/os-sunos4.h
index cfd4b04..b735857 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/libpcap/lbl/os-sunos4.h,v 1.32 1999-10-07 23:46:41 mcr Exp $ (LBL)
  */
 
 /* Prototypes missing in SunOS 4 */
diff --git a/lbl/os-ultrix4.h b/lbl/os-ultrix4.h
index 9f2a155..fa1f770 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/libpcap/lbl/os-ultrix4.h,v 1.19 1999-10-07 23:46:41 mcr Exp $ (LBL)
  */
 
 /* Prototypes missing in Ultrix 4 */
diff --git a/llc.h b/llc.h
index b8c221f..a02d158 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/libpcap/llc.h,v 1.2 2001-01-28 09:44:50 guy Exp $ (LBL)
  */
 
 /*
diff --git a/missing/snprintf.c b/missing/snprintf.c
index 8991f24..9b63f8b 100644
--- a/missing/snprintf.c
+++ b/missing/snprintf.c
@@ -31,17 +31,10 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: snprintf.c,v 1.1 2004-04-05 22:43:51 guy Exp $ */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#ifndef lint
-static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/libpcap/missing/snprintf.c,v 1.1 2004-04-05 22:43:51 guy Exp $";
-#endif
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/msdos/common.dj b/msdos/common.dj
index 3f64d14..ec0ce02 100644
--- a/msdos/common.dj
+++ b/msdos/common.dj
@@ -1,7 +1,6 @@
 #
 # Common defines for libpcap and 16/32-bit network drivers (djgpp)
 #
-# @(#) $Header: /tcpdump/master/libpcap/msdos/common.dj,v 1.2 2004-12-19 19:36:33 guy Exp $ (LBL)
 
 .SUFFIXES: .exe .wlm .dxe .l .y
 .PHONY:    check_gcclib
diff --git a/msdos/makefile.dj b/msdos/makefile.dj
index 7ce58b4..28e3f2d 100644
--- a/msdos/makefile.dj
+++ b/msdos/makefile.dj
@@ -6,7 +6,6 @@
 #
 #  c:\net\pcap> make -f msdos/makefile.dj
 #
-# @(#) $Header: /tcpdump/master/libpcap/msdos/makefile.dj,v 1.2 2004-12-19 19:41:06 guy Exp $ (LBL)
 
 VPATH = missing msdos
 
diff --git a/msdos/readme.dos b/msdos/readme.dos
index 02ef1f7..913c4e6 100644
--- a/msdos/readme.dos
+++ b/msdos/readme.dos
@@ -1,5 +1,3 @@
-@(#) $Header: /tcpdump/master/libpcap/msdos/readme.dos,v 1.3 2004-12-19 19:47:01 guy Exp $ (LBL)
-
 libpcap for DOS
 ---------------
 
diff --git a/nametoaddr.c b/nametoaddr.c
index 55439f7..e6483a3 100644
--- a/nametoaddr.c
+++ b/nametoaddr.c
@@ -22,11 +22,6 @@
  * These functions are not time critical.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.83 2008-02-06 10:21:30 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/nlpid.h b/nlpid.h
index 5327a36..9dfa752 100644
--- a/nlpid.h
+++ b/nlpid.h
@@ -14,8 +14,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/libpcap/nlpid.h,v 1.2 2002-12-06 00:01:34 hannes Exp $ (Juniper)
  */
 
 /* Types missing from some systems */
diff --git a/optimize.c b/optimize.c
index 8215543..d9bb4ee 100644
--- a/optimize.c
+++ b/optimize.c
@@ -20,10 +20,6 @@
  *
  *  Optimization module for tcpdump intermediate representation.
  */
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.91 2008-01-02 04:16:46 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/pcap-bpf.c b/pcap-bpf.c
index 250298a..ad897b7 100644
--- a/pcap-bpf.c
+++ b/pcap-bpf.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/libpcap/pcap-bpf.c,v 1.116 2008-09-16 18:42:29 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/pcap-bpf.h b/pcap-bpf.h
index 7b7e90a..9374522 100644
--- a/pcap-bpf.h
+++ b/pcap-bpf.h
@@ -34,8 +34,6 @@
  * 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/libpcap/pcap-bpf.h,v 1.50 2007-04-01 21:43:55 guy Exp $ (LBL)
  */
 
 /*
diff --git a/pcap-bt-linux.c b/pcap-bt-linux.c
index 6435bcf..a32691d 100644
--- a/pcap-bt-linux.c
+++ b/pcap-bt-linux.c
@@ -31,10 +31,6 @@
  * By Paolo Abeni <paolo.abeni@email.it>
  *
  */
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-bt-linux.c,v 1.15 2008-07-01 07:05:54 guy Exp $ (LBL)";
-#endif
  
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/pcap-bt-linux.h b/pcap-bt-linux.h
index fbe8f48..cacbd2f 100644
--- a/pcap-bt-linux.h
+++ b/pcap-bt-linux.h
@@ -29,8 +29,6 @@
  *
  * Bluetooth sniffing API implementation for Linux platform
  * By Paolo Abeni <paolo.abeni@email.it>
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-bt-linux.h,v 1.5 2008-04-04 19:37:45 guy Exp $ (LBL)
  */
 
 /*
diff --git a/pcap-config.1 b/pcap-config.1
index 021f450..82373ee 100644
--- a/pcap-config.1
+++ b/pcap-config.1
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap-config.1,v 1.1 2008-09-23 18:04:01 guy Exp $ (LBL)
-.\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\" All rights reserved.
diff --git a/pcap-dag.c b/pcap-dag.c
index 70a6d6c..aaa3fae 100644
--- a/pcap-dag.c
+++ b/pcap-dag.c
@@ -15,11 +15,6 @@
  *                Stephen Donnelly <support@endace.com>
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-	"@(#) $Header: /tcpdump/master/libpcap/pcap-dag.c,v 1.39 2008-04-14 20:40:58 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/pcap-dag.h b/pcap-dag.h
index 4751186..68520dc 100644
--- a/pcap-dag.h
+++ b/pcap-dag.h
@@ -6,8 +6,6 @@
  * at the same time as another type of device.
  *
  * Author: Richard Littin, Sean Irvine ({richard,sean}@reeltwo.com)
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-dag.h,v 1.7 2008-04-04 19:37:45 guy Exp $ (LBL)
  */
 
 pcap_t *dag_create(const char *, char *, int *);
diff --git a/pcap-dlpi.c b/pcap-dlpi.c
index 8993134..22053bf 100644
--- a/pcap-dlpi.c
+++ b/pcap-dlpi.c
@@ -68,11 +68,6 @@
  *      DL_HP_RAWDLS?
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.128 2008-12-02 16:20:23 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/pcap-dos.c b/pcap-dos.c
index cecc73c..43f50c7 100644
--- a/pcap-dos.c
+++ b/pcap-dos.c
@@ -4,8 +4,6 @@
  *
  *  pcap-dos.c: Interface to PKTDRVR, NDIS2 and 32-bit pmode
  *              network drivers.
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-dos.c,v 1.7 2008-04-22 17:16:30 guy Exp $ (LBL)
  */
 
 #include <stdio.h>
diff --git a/pcap-dos.h b/pcap-dos.h
index f474437..8f92252 100644
--- a/pcap-dos.h
+++ b/pcap-dos.h
@@ -1,8 +1,6 @@
 /*
  * Internal details for libpcap on DOS.
  * 32-bit targets: djgpp, Pharlap or DOS4GW.
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-dos.h,v 1.1 2004-12-18 08:52:10 guy Exp $ (LBL)
  */
 
 #ifndef __PCAP_DOS_H
diff --git a/pcap-enet.c b/pcap-enet.c
index 5ad921c..777d3e3 100644
--- a/pcap-enet.c
+++ b/pcap-enet.c
@@ -6,10 +6,6 @@
  *
  * Rayan Zachariassen, CA*Net
  */
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-enet.c,v 1.9 2006-10-04 18:09:22 guy Exp $";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/pcap-filter.manmisc.in b/pcap-filter.manmisc.in
index 36befae..41046c1 100644
--- a/pcap-filter.manmisc.in
+++ b/pcap-filter.manmisc.in
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap-filter.manmisc.in,v 1.1 2008-10-21 07:33:01 guy Exp $ (LBL)
-.\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\" All rights reserved.
diff --git a/pcap-int.h b/pcap-int.h
index 0c27ec7..9f80fa6 100644
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -29,8 +29,6 @@
  * 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/libpcap/pcap-int.h,v 1.94 2008-09-16 00:20:23 guy Exp $ (LBL)
  */
 
 #ifndef pcap_int_h
diff --git a/pcap-libdlpi.c b/pcap-libdlpi.c
index 5bc9374..93d9021 100644
--- a/pcap-libdlpi.c
+++ b/pcap-libdlpi.c
@@ -24,11 +24,6 @@
  * Packet capture routines for DLPI using libdlpi under SunOS 5.11.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-	"@(#) $Header: /tcpdump/master/libpcap/pcap-libdlpi.c,v 1.6 2008-04-14 20:40:58 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/pcap-linktype.manmisc.in b/pcap-linktype.manmisc.in
index 8904387..0534146 100644
--- a/pcap-linktype.manmisc.in
+++ b/pcap-linktype.manmisc.in
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap-linktype.manmisc.in,v 1.3 2008-10-27 22:52:30 guy Exp $
-.\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\" All rights reserved.
diff --git a/pcap-linux.c b/pcap-linux.c
index 74de6a3..08030cb 100644
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -67,11 +67,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.164 2008-12-14 22:00:57 guy Exp $ (LBL)";
-#endif
-
 /*
  * Known problems with 2.0[.x] kernels:
  *
diff --git a/pcap-namedb.h b/pcap-namedb.h
index d0b2231..d5908c9 100644
--- a/pcap-namedb.h
+++ b/pcap-namedb.h
@@ -29,8 +29,6 @@
  * 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/libpcap/pcap-namedb.h,v 1.13 2006-10-04 18:13:32 guy Exp $ (LBL)
  */
 
 /*
diff --git a/pcap-nit.c b/pcap-nit.c
index 40e640c..ea81eb5 100644
--- a/pcap-nit.c
+++ b/pcap-nit.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/libpcap/pcap-nit.c,v 1.62 2008-04-14 20:40:58 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/pcap-null.c b/pcap-null.c
index 6737386..934fb2c 100644
--- a/pcap-null.c
+++ b/pcap-null.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/libpcap/pcap-null.c,v 1.22 2008-04-04 19:37:45 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/pcap-pf.c b/pcap-pf.c
index 8de6e58..96a4a50 100644
--- a/pcap-pf.c
+++ b/pcap-pf.c
@@ -22,11 +22,6 @@
  *	Extraction/creation by Jeffrey Mogul, DECWRL
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-pf.c,v 1.97 2008-04-14 20:40:58 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/pcap-savefile.manfile.in b/pcap-savefile.manfile.in
index c20e003..7571646 100644
--- a/pcap-savefile.manfile.in
+++ b/pcap-savefile.manfile.in
@@ -1,6 +1,3 @@
-'\" t
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap-savefile.manfile.in,v 1.2 2008-10-24 07:33:50 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap-septel.c b/pcap-septel.c
index 4ca7a60..596467c 100644
--- a/pcap-septel.c
+++ b/pcap-septel.c
@@ -14,11 +14,6 @@
  * (+961 3 485243)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-septel.c,v 1.4 2008-04-14 20:40:58 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/pcap-septel.h b/pcap-septel.h
index b72f35b..b6e1168 100644
--- a/pcap-septel.h
+++ b/pcap-septel.h
@@ -7,8 +7,6 @@
  *
  * Authors: Gilbert HOYEK (gil_hoyek@hotmail.com), Elias M. KHOURY
  * (+961 3 485343);
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-septel.h,v 1.2 2008-04-04 19:37:45 guy Exp $
  */
 
 pcap_t *septel_create(const char *device, char *ebuf, int *is_ours);
diff --git a/pcap-sita.c b/pcap-sita.c
index 7ab801e..d507e1e 100644
--- a/pcap-sita.c
+++ b/pcap-sita.c
@@ -24,8 +24,6 @@
  *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
- /* $Id: pcap-sita.c */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/pcap-sita.h b/pcap-sita.h
index b232ee2..9c35c6a 100644
--- a/pcap-sita.h
+++ b/pcap-sita.h
@@ -2,8 +2,6 @@
  * pcap-sita.h: Packet capture interface for SITA WAN devices
  *
  * Authors: Fulko Hew (fulko.hew@sita.aero) (+1 905 6815570);
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-sita.h
  */
 
 extern int acn_parse_hosts_file(char *errbuf);
diff --git a/pcap-snit.c b/pcap-snit.c
index 12656b8..e6232c2 100644
--- a/pcap-snit.c
+++ b/pcap-snit.c
@@ -23,11 +23,6 @@
  * This module now handles the STREAMS based NIT.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-snit.c,v 1.77 2008-04-14 20:40:58 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/pcap-snoop.c b/pcap-snoop.c
index a49db87..7993e70 100644
--- a/pcap-snoop.c
+++ b/pcap-snoop.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/libpcap/pcap-snoop.c,v 1.59 2008-12-02 16:25:14 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/pcap-stdinc.h b/pcap-stdinc.h
index f1c736e..cbf9abf 100644
--- a/pcap-stdinc.h
+++ b/pcap-stdinc.h
@@ -27,8 +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/libpcap/pcap-stdinc.h,v 1.10.2.1 2008-10-06 15:38:39 gianluca Exp $ (LBL)
  */
 #ifndef pcap_stdinc_h
 #define pcap_stdinc_h
diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
index f0892a7..675c8b1 100644
--- a/pcap-usb-linux.c
+++ b/pcap-usb-linux.c
@@ -32,10 +32,6 @@
  * Modifications: Kris Katterjohn <katterjohn@gmail.com>
  *
  */
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-usb-linux.c,v 1.33 2008-12-23 21:38:50 guy Exp $ (LBL)";
-#endif
  
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/pcap-usb-linux.h b/pcap-usb-linux.h
index d64386d..06dee01 100644
--- a/pcap-usb-linux.h
+++ b/pcap-usb-linux.h
@@ -29,8 +29,6 @@
  *
  * USB sniffing API implementation for Linux platform
  * By Paolo Abeni <paolo.abeni@email.it>
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-usb-linux.h,v 1.5 2008-04-04 19:37:45 guy Exp $ (LBL)
  */
 
 /*
diff --git a/pcap-win32.c b/pcap-win32.c
index 87b3fc6..e7ed849 100644
--- a/pcap-win32.c
+++ b/pcap-win32.c
@@ -31,11 +31,6 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-win32.c,v 1.42 2008-05-21 22:15:25 gianluca Exp $ (LBL)";
-#endif
-
 #include <pcap-int.h>
 #include <Packet32.h>
 #ifdef __MINGW32__
diff --git a/pcap.3pcap.in b/pcap.3pcap.in
index ecb31ad..7d234c9 100644
--- a/pcap.3pcap.in
+++ b/pcap.3pcap.in
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap.3pcap.in,v 1.1 2008-10-21 07:33:01 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap.c b/pcap.c
index 83d4bb1..26f1816 100644
--- a/pcap.c
+++ b/pcap.c
@@ -31,11 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.128 2008-12-23 20:13:29 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/pcap.h b/pcap.h
index 490a4bf..174e32d 100644
--- a/pcap.h
+++ b/pcap.h
@@ -29,8 +29,6 @@
  * 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/libpcap/pcap.h,v 1.59 2006-10-04 18:09:22 guy Exp $ (LBL)
  */
 
 /*
diff --git a/pcap/bluetooth.h b/pcap/bluetooth.h
index 813bea3..06e8689 100644
--- a/pcap/bluetooth.h
+++ b/pcap/bluetooth.h
@@ -29,8 +29,6 @@
  *
  * bluetooth data struct
  * By Paolo Abeni <paolo.abeni@email.it>
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap/bluetooth.h,v 1.1 2007-09-22 02:10:17 guy Exp $
  */
  
 #ifndef _PCAP_BLUETOOTH_STRUCTS_H__
diff --git a/pcap/bpf.h b/pcap/bpf.h
index 8286ed5..51cd0dd 100644
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -36,8 +36,6 @@
  * SUCH DAMAGE.
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.32 2008-12-23 20:13:29 guy Exp $ (LBL)
  */
 
 /*
diff --git a/pcap/namedb.h b/pcap/namedb.h
index e314557..d3a3432 100644
--- a/pcap/namedb.h
+++ b/pcap/namedb.h
@@ -29,8 +29,6 @@
  * 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/libpcap/pcap/namedb.h,v 1.1 2006-10-04 18:09:22 guy Exp $ (LBL)
  */
 
 #ifndef lib_pcap_namedb_h
diff --git a/pcap/pcap.h b/pcap/pcap.h
index f2dd2d6..d1b79ef 100644
--- a/pcap/pcap.h
+++ b/pcap/pcap.h
@@ -30,8 +30,6 @@
  * 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/libpcap/pcap/pcap.h,v 1.15 2008-10-06 15:27:32 gianluca Exp $ (LBL)
  */
 
 #ifndef lib_pcap_pcap_h
diff --git a/pcap/sll.h b/pcap/sll.h
index 7ad811d..38da29f 100644
--- a/pcap/sll.h
+++ b/pcap/sll.h
@@ -34,8 +34,6 @@
  * 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/libpcap/pcap/sll.h,v 1.3 2008-05-30 01:35:33 guy Exp $ (LBL)
  */
 
 /*
diff --git a/pcap/usb.h b/pcap/usb.h
index aa35122..52cb5a3 100644
--- a/pcap/usb.h
+++ b/pcap/usb.h
@@ -29,8 +29,6 @@
  *
  * Basic USB data struct
  * By Paolo Abeni <paolo.abeni@email.it>
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap/usb.h,v 1.9 2008-12-23 20:13:29 guy Exp $
  */
  
 #ifndef _PCAP_USB_STRUCTS_H__
diff --git a/pcap/vlan.h b/pcap/vlan.h
index 41aa8c7..021f612 100644
--- a/pcap/vlan.h
+++ b/pcap/vlan.h
@@ -29,8 +29,6 @@
  * 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/libpcap/pcap/vlan.h,v 1.1 2008-08-06 07:45:00 guy Exp $
  */
 
 #ifndef lib_pcap_vlan_h
diff --git a/pcap1.h b/pcap1.h
index 2cb532f..5710265 100644
--- a/pcap1.h
+++ b/pcap1.h
@@ -30,8 +30,6 @@
  * 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/libpcap/pcap1.h,v 1.5 2008-05-30 01:43:21 guy Exp $ (LBL)
  */
 
 #ifndef lib_pcap_h
diff --git a/pcap_activate.3pcap b/pcap_activate.3pcap
index f963d35..12bcddc 100644
--- a/pcap_activate.3pcap
+++ b/pcap_activate.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_activate.3pcap,v 1.5 2008-07-01 08:02:33 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_breakloop.3pcap b/pcap_breakloop.3pcap
index e437af8..a395820 100644
--- a/pcap_breakloop.3pcap
+++ b/pcap_breakloop.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_breakloop.3pcap,v 1.3 2008-04-06 02:53:21 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_can_set_rfmon.3pcap b/pcap_can_set_rfmon.3pcap
index 00b92a4..b579804 100644
--- a/pcap_can_set_rfmon.3pcap
+++ b/pcap_can_set_rfmon.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_can_set_rfmon.3pcap,v 1.1 2008-04-06 02:53:21 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_close.3pcap b/pcap_close.3pcap
index 810664d..91eb677 100644
--- a/pcap_close.3pcap
+++ b/pcap_close.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_close.3pcap,v 1.3 2008-04-06 02:53:21 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_compile.3pcap.in b/pcap_compile.3pcap.in
index 7dbdad5..e3adb29 100644
--- a/pcap_compile.3pcap.in
+++ b/pcap_compile.3pcap.in
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_compile.3pcap.in,v 1.1 2008-10-21 07:33:02 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_create.3pcap b/pcap_create.3pcap
index 153f9fd..5c537fc 100644
--- a/pcap_create.3pcap
+++ b/pcap_create.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_create.3pcap,v 1.1 2008-04-06 02:53:21 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_datalink.3pcap.in b/pcap_datalink.3pcap.in
index 51d5d66..82f4651 100644
--- a/pcap_datalink.3pcap.in
+++ b/pcap_datalink.3pcap.in
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_datalink.3pcap.in,v 1.1 2008-10-21 07:33:02 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_datalink_name_to_val.3pcap b/pcap_datalink_name_to_val.3pcap
index 9c8e18a..c61e91e 100644
--- a/pcap_datalink_name_to_val.3pcap
+++ b/pcap_datalink_name_to_val.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_datalink_name_to_val.3pcap,v 1.3 2008-04-06 02:53:21 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_datalink_val_to_name.3pcap b/pcap_datalink_val_to_name.3pcap
index 5acba77..0b17825 100644
--- a/pcap_datalink_val_to_name.3pcap
+++ b/pcap_datalink_val_to_name.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_datalink_val_to_name.3pcap,v 1.3 2008-12-24 21:45:25 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_dump.3pcap b/pcap_dump.3pcap
index 1ccd82a..c7d29f5 100644
--- a/pcap_dump.3pcap
+++ b/pcap_dump.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump.3pcap,v 1.3 2008-04-06 02:53:21 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_dump_close.3pcap b/pcap_dump_close.3pcap
index 4ed820b..afd00cb 100644
--- a/pcap_dump_close.3pcap
+++ b/pcap_dump_close.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_close.3pcap,v 1.3 2008-04-06 02:53:21 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_dump_file.3pcap b/pcap_dump_file.3pcap
index 9e51a2a..982b0dc 100644
--- a/pcap_dump_file.3pcap
+++ b/pcap_dump_file.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_file.3pcap,v 1.3 2008-04-06 02:53:21 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_dump_flush.3pcap b/pcap_dump_flush.3pcap
index b553883..ba98dee 100644
--- a/pcap_dump_flush.3pcap
+++ b/pcap_dump_flush.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_flush.3pcap,v 1.3 2008-04-06 02:53:21 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_dump_ftell.3pcap b/pcap_dump_ftell.3pcap
index 1d0f96f..6d5c828 100644
--- a/pcap_dump_ftell.3pcap
+++ b/pcap_dump_ftell.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_ftell.3pcap,v 1.3 2008-04-06 02:53:21 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_dump_open.3pcap.in b/pcap_dump_open.3pcap.in
index b4d5872..47ea321 100644
--- a/pcap_dump_open.3pcap.in
+++ b/pcap_dump_open.3pcap.in
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_open.3pcap.in,v 1.1 2008-10-23 05:56:59 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_file.3pcap b/pcap_file.3pcap
index 1471ab6..7b18c81 100644
--- a/pcap_file.3pcap
+++ b/pcap_file.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_file.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_fileno.3pcap b/pcap_fileno.3pcap
index 723733e..e9e7eb7 100644
--- a/pcap_fileno.3pcap
+++ b/pcap_fileno.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_fileno.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_findalldevs.3pcap b/pcap_findalldevs.3pcap
index 2e56d09..a9dc937 100644
--- a/pcap_findalldevs.3pcap
+++ b/pcap_findalldevs.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_findalldevs.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_freecode.3pcap b/pcap_freecode.3pcap
index 31b4f89..c3c3ea6 100644
--- a/pcap_freecode.3pcap
+++ b/pcap_freecode.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_freecode.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_get_selectable_fd.3pcap b/pcap_get_selectable_fd.3pcap
index ae33dbb..8b5a2da 100644
--- a/pcap_get_selectable_fd.3pcap
+++ b/pcap_get_selectable_fd.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_get_selectable_fd.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_geterr.3pcap b/pcap_geterr.3pcap
index 1a4ea34..fcabec3 100644
--- a/pcap_geterr.3pcap
+++ b/pcap_geterr.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_geterr.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_inject.3pcap b/pcap_inject.3pcap
index 79a3eea..7ccdf2c 100644
--- a/pcap_inject.3pcap
+++ b/pcap_inject.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_inject.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_is_swapped.3pcap b/pcap_is_swapped.3pcap
index 29646d1..2eb68b4 100644
--- a/pcap_is_swapped.3pcap
+++ b/pcap_is_swapped.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_is_swapped.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_lib_version.3pcap b/pcap_lib_version.3pcap
index 7b39be1..3ec2e32 100644
--- a/pcap_lib_version.3pcap
+++ b/pcap_lib_version.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_lib_version.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_list_datalinks.3pcap.in b/pcap_list_datalinks.3pcap.in
index 9dfb342..aca0b64 100644
--- a/pcap_list_datalinks.3pcap.in
+++ b/pcap_list_datalinks.3pcap.in
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_list_datalinks.3pcap.in,v 1.1 2008-10-21 07:33:02 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_lookupdev.3pcap b/pcap_lookupdev.3pcap
index 8b23cb8..79dda42 100644
--- a/pcap_lookupdev.3pcap
+++ b/pcap_lookupdev.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_lookupdev.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_lookupnet.3pcap b/pcap_lookupnet.3pcap
index 75c82cf..a3d14ae 100644
--- a/pcap_lookupnet.3pcap
+++ b/pcap_lookupnet.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_lookupnet.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_loop.3pcap b/pcap_loop.3pcap
index c2ba33c..a644e55 100644
--- a/pcap_loop.3pcap
+++ b/pcap_loop.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_loop.3pcap,v 1.4 2008-12-25 02:01:32 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_major_version.3pcap b/pcap_major_version.3pcap
index 31903dc..bf8643f 100644
--- a/pcap_major_version.3pcap
+++ b/pcap_major_version.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_major_version.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_next_ex.3pcap b/pcap_next_ex.3pcap
index c1de33b..02efe63 100644
--- a/pcap_next_ex.3pcap
+++ b/pcap_next_ex.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_next_ex.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_offline_filter.3pcap b/pcap_offline_filter.3pcap
index 3f11022..3c379b8 100644
--- a/pcap_offline_filter.3pcap
+++ b/pcap_offline_filter.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_offline_filter.3pcap,v 1.1 2008-05-13 15:19:56 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_open_dead.3pcap.in b/pcap_open_dead.3pcap.in
index 812946b..2d1b48c 100644
--- a/pcap_open_dead.3pcap.in
+++ b/pcap_open_dead.3pcap.in
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_open_dead.3pcap.in,v 1.1 2008-10-21 07:33:02 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_open_live.3pcap b/pcap_open_live.3pcap
index 0889a2a..715994b 100644
--- a/pcap_open_live.3pcap
+++ b/pcap_open_live.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_open_live.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_open_offline.3pcap.in b/pcap_open_offline.3pcap.in
index 23b4d76..7239729 100644
--- a/pcap_open_offline.3pcap.in
+++ b/pcap_open_offline.3pcap.in
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_open_offline.3pcap.in,v 1.1 2008-10-23 05:56:59 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_set_buffer_size.3pcap b/pcap_set_buffer_size.3pcap
index 060e923..fea1df7 100644
--- a/pcap_set_buffer_size.3pcap
+++ b/pcap_set_buffer_size.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_set_buffer_size.3pcap,v 1.1 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_set_datalink.3pcap b/pcap_set_datalink.3pcap
index 9af32d0..60a7bfc 100644
--- a/pcap_set_datalink.3pcap
+++ b/pcap_set_datalink.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_set_datalink.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_set_promisc.3pcap b/pcap_set_promisc.3pcap
index 382260c..5d17572 100644
--- a/pcap_set_promisc.3pcap
+++ b/pcap_set_promisc.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_set_promisc.3pcap,v 1.1 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_set_rfmon.3pcap b/pcap_set_rfmon.3pcap
index ee73556..a386e8b 100644
--- a/pcap_set_rfmon.3pcap
+++ b/pcap_set_rfmon.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_set_rfmon.3pcap,v 1.1 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_set_snaplen.3pcap b/pcap_set_snaplen.3pcap
index 74195d9..8080ea1 100644
--- a/pcap_set_snaplen.3pcap
+++ b/pcap_set_snaplen.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_set_snaplen.3pcap,v 1.1 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_set_timeout.3pcap b/pcap_set_timeout.3pcap
index 0b66f21..2b78df0 100644
--- a/pcap_set_timeout.3pcap
+++ b/pcap_set_timeout.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_set_timeout.3pcap,v 1.1 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_setdirection.3pcap b/pcap_setdirection.3pcap
index bd0fb25..70920b1 100644
--- a/pcap_setdirection.3pcap
+++ b/pcap_setdirection.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_setdirection.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_setfilter.3pcap b/pcap_setfilter.3pcap
index 89d5da7..58044c5 100644
--- a/pcap_setfilter.3pcap
+++ b/pcap_setfilter.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_setfilter.3pcap,v 1.4 2008-05-13 15:19:56 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_setnonblock.3pcap b/pcap_setnonblock.3pcap
index b00fce1..37b2203 100644
--- a/pcap_setnonblock.3pcap
+++ b/pcap_setnonblock.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_setnonblock.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_snapshot.3pcap b/pcap_snapshot.3pcap
index f8e4097..a7040f0 100644
--- a/pcap_snapshot.3pcap
+++ b/pcap_snapshot.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_snapshot.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_stats.3pcap b/pcap_stats.3pcap
index a953e21..159054e 100644
--- a/pcap_stats.3pcap
+++ b/pcap_stats.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_stats.3pcap,v 1.3 2008-04-06 02:53:22 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_statustostr.3pcap b/pcap_statustostr.3pcap
index da18f69..77b8c5f 100644
--- a/pcap_statustostr.3pcap
+++ b/pcap_statustostr.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_statustostr.3pcap,v 1.1 2008-04-09 21:39:21 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/pcap_strerror.3pcap b/pcap_strerror.3pcap
index 8e6319b..7185162 100644
--- a/pcap_strerror.3pcap
+++ b/pcap_strerror.3pcap
@@ -1,5 +1,3 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_strerror.3pcap,v 1.2 2008-04-05 20:26:56 guy Exp $
-.\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/ppp.h b/ppp.h
index 4e1d08d..d6e70c1 100644
--- a/ppp.h
+++ b/ppp.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/libpcap/ppp.h,v 1.12 2005-02-08 19:52:19 guy Exp $ (LBL) */
 /*
  * Point to Point Protocol (PPP) RFC1331
  *
diff --git a/runlex.sh b/runlex.sh
index 74f2161..24c3c2e 100755
--- a/runlex.sh
+++ b/runlex.sh
@@ -7,8 +7,6 @@
 # means that neither Flex nor Lex was found, so we report an error and
 # quit.
 #
-# @(#) $Header: /tcpdump/master/libpcap/runlex.sh,v 1.4 2007-12-31 03:38:39 guy Exp $
-#
 
 #
 # Get the name of the command to run, and then shift to get the arguments.
diff --git a/savefile.c b/savefile.c
index 73e3ea9..0ab2fde 100644
--- a/savefile.c
+++ b/savefile.c
@@ -28,11 +28,6 @@
  * dependent values so we can print the dump file on any architecture.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.183 2008-12-23 20:13:29 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/scanner.l b/scanner.l
index daa5eae..73f426b 100644
--- a/scanner.l
+++ b/scanner.l
@@ -20,11 +20,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.112 2008-02-06 10:21:30 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/sunatmpos.h b/sunatmpos.h
index 916017f..787de85 100644
--- a/sunatmpos.h
+++ b/sunatmpos.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/libpcap/sunatmpos.h,v 1.1 2002-07-11 09:06:47 guy Exp $ (LBL)
  */
 
 /* SunATM header for ATM packet */
diff --git a/tests/filtertest.c b/tests/filtertest.c
index a56d1e4..94773ad 100644
--- a/tests/filtertest.c
+++ b/tests/filtertest.c
@@ -23,8 +23,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/libpcap/filtertest.c,v 1.2 2005-08-08 17:50:13 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/tests/valgrindtest.c b/tests/valgrindtest.c
index 0d454d1..1d88377 100644
--- a/tests/valgrindtest.c
+++ b/tests/valgrindtest.c
@@ -23,8 +23,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/libpcap/filtertest.c,v 1.2 2005-08-08 17:50:13 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H