diff --git a/pcap.3pcap b/pcap.3pcap
index bbfad91..45e0f8b 100644
--- a/pcap.3pcap
+++ b/pcap.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap.3pcap,v 1.1 2008-04-05 20:19:41 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap.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.
@@ -25,7 +25,7 @@ pcap \- Packet Capture library
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .LP
 .ft B
 .ft
diff --git a/pcap_breakloop.3pcap b/pcap_breakloop.3pcap
index f5a07a5..d344ee8 100644
--- a/pcap_breakloop.3pcap
+++ b/pcap_breakloop.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_breakloop.3pcap,v 1.1 2008-04-05 20:19:41 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_breakloop.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.
@@ -25,7 +25,7 @@ pcap_breakloop \- force a pcap_dispatch() or pcap_loop() call to return
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_close.3pcap b/pcap_close.3pcap
index b41af5f..e3feca1 100644
--- a/pcap_close.3pcap
+++ b/pcap_close.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_close.3pcap,v 1.1 2008-04-05 20:19:41 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_close.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.
@@ -25,7 +25,7 @@ pcap_close \- close a capture device or savefile
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_compile.3pcap b/pcap_compile.3pcap
index 0eb06d8..b11daa5 100644
--- a/pcap_compile.3pcap
+++ b/pcap_compile.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap_compile.3pcap,v 1.1 2008-04-05 20:19:41 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap_compile.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.
@@ -25,7 +25,7 @@ pcap_compile \- compile a filter expression
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_datalink.3pcap b/pcap_datalink.3pcap
index 1c9c4e0..1bef624 100644
--- a/pcap_datalink.3pcap
+++ b/pcap_datalink.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap_datalink.3pcap,v 1.1 2008-04-05 20:19:41 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap_datalink.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.
@@ -25,7 +25,7 @@ pcap_datalink \- get the link-layer header type
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_datalink_name_to_val.3pcap b/pcap_datalink_name_to_val.3pcap
index 461fc08..868456e 100644
--- a/pcap_datalink_name_to_val.3pcap
+++ b/pcap_datalink_name_to_val.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_datalink_name_to_val.3pcap,v 1.1 2008-04-05 20:19:41 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_datalink_name_to_val.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.
@@ -26,7 +26,7 @@ corresponding to a header type name
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_dump.3pcap b/pcap_dump.3pcap
index c6dd97c..5451db4 100644
--- a/pcap_dump.3pcap
+++ b/pcap_dump.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump.3pcap,v 1.1 2008-04-05 20:19:41 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump.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.
@@ -25,7 +25,7 @@ pcap_dump \- write a packet to a capture file
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_dump_close.3pcap b/pcap_dump_close.3pcap
index 500fdc8..d3edb9a 100644
--- a/pcap_dump_close.3pcap
+++ b/pcap_dump_close.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_close.3pcap,v 1.1 2008-04-05 20:19:41 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_close.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.
@@ -25,7 +25,7 @@ pcap_dump_close \- close a savefile being written to
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_dump_file.3pcap b/pcap_dump_file.3pcap
index c2b3ff3..900db12 100644
--- a/pcap_dump_file.3pcap
+++ b/pcap_dump_file.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_file.3pcap,v 1.1 2008-04-05 20:19:41 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_file.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.
@@ -25,7 +25,7 @@ pcap_dump_file \- get the standard I/O stream for a savefile being written
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_dump_flush.3pcap b/pcap_dump_flush.3pcap
index f8692b7..09182e6 100644
--- a/pcap_dump_flush.3pcap
+++ b/pcap_dump_flush.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_flush.3pcap,v 1.1 2008-04-05 20:19:41 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_flush.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.
@@ -25,7 +25,7 @@ pcap_dump_flush \- flush to a savefile packets dumped
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_dump_ftell.3pcap b/pcap_dump_ftell.3pcap
index 577f3a7..2d53b4d 100644
--- a/pcap_dump_ftell.3pcap
+++ b/pcap_dump_ftell.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_ftell.3pcap,v 1.1 2008-04-05 20:19:41 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_dump_ftell.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.
@@ -25,7 +25,7 @@ pcap_dump_ftell \- get the current file offset for a savefile being written
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_dump_open.3pcap b/pcap_dump_open.3pcap
index d10ace7..58c77f0 100644
--- a/pcap_dump_open.3pcap
+++ b/pcap_dump_open.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap_dump_open.3pcap,v 1.1 2008-04-05 20:19:41 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap_dump_open.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.
@@ -25,7 +25,7 @@ pcap_dump_open, pcap_dump_fopen \- open a file to which to write packets
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .nf
 .LP
diff --git a/pcap_file.3pcap b/pcap_file.3pcap
index e4a027b..87fd7d5 100644
--- a/pcap_file.3pcap
+++ b/pcap_file.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_file.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_file.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.
@@ -25,7 +25,7 @@ pcap_file \- get the standard I/O stream for a savefile being read
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_fileno.3pcap b/pcap_fileno.3pcap
index 7119690..c668030 100644
--- a/pcap_fileno.3pcap
+++ b/pcap_fileno.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_fileno.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_fileno.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.
@@ -25,7 +25,7 @@ pcap_fileno \- get the file descriptor for a live capture
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_findalldevs.3pcap b/pcap_findalldevs.3pcap
index 510fe87..6d14ea4 100644
--- a/pcap_findalldevs.3pcap
+++ b/pcap_findalldevs.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_findalldevs.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_findalldevs.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.
@@ -25,7 +25,7 @@ pcap_findalldevs \- get a list of capture devices
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .nf
diff --git a/pcap_freealldevs.3pcap b/pcap_freealldevs.3pcap
index 0ba2319..1491e48 100644
--- a/pcap_freealldevs.3pcap
+++ b/pcap_freealldevs.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_freealldevs.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_freealldevs.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.
@@ -25,7 +25,7 @@ pcap_freealldevs \- free a list of capture devices
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_freecode.3pcap b/pcap_freecode.3pcap
index 0c0eacd..5ac81a9 100644
--- a/pcap_freecode.3pcap
+++ b/pcap_freecode.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_freecode.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_freecode.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.
@@ -25,7 +25,7 @@ pcap_freecode \- free a BPF program
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_get_selectable_fd.3pcap b/pcap_get_selectable_fd.3pcap
index 4e286b9..38e841e 100644
--- a/pcap_get_selectable_fd.3pcap
+++ b/pcap_get_selectable_fd.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_get_selectable_fd.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_get_selectable_fd.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.
@@ -26,7 +26,7 @@ be done for a live capture
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_geterr.3pcap b/pcap_geterr.3pcap
index 9c17fd6..a5c047b 100644
--- a/pcap_geterr.3pcap
+++ b/pcap_geterr.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_geterr.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_geterr.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.
@@ -25,7 +25,7 @@ pcap_geterr, pcap_perror \- get or print libpcap error message text
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_inject.3pcap b/pcap_inject.3pcap
index fab6b0f..2633a87 100644
--- a/pcap_inject.3pcap
+++ b/pcap_inject.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_inject.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_inject.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.
@@ -25,7 +25,7 @@ pcap_inject, pcap_sendpacket \- transmit a packet
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_is_swapped.3pcap b/pcap_is_swapped.3pcap
index f18da4d..b0bcfd3 100644
--- a/pcap_is_swapped.3pcap
+++ b/pcap_is_swapped.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_is_swapped.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_is_swapped.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.
@@ -25,7 +25,7 @@ pcap_is_swapped \- find out whether a savefile has the native byte order
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_lib_version.3pcap b/pcap_lib_version.3pcap
index a2ec2e8..9b8d0cd 100644
--- a/pcap_lib_version.3pcap
+++ b/pcap_lib_version.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_lib_version.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_lib_version.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.
@@ -25,7 +25,7 @@ pcap_lib_version \- get the version information for libpcap
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_list_datalinks.3pcap b/pcap_list_datalinks.3pcap
index cde6f1d..bd34999 100644
--- a/pcap_list_datalinks.3pcap
+++ b/pcap_list_datalinks.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap_list_datalinks.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap_list_datalinks.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.
@@ -26,7 +26,7 @@ by a capture device
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_lookupdev.3pcap b/pcap_lookupdev.3pcap
index 376de33..03e7132 100644
--- a/pcap_lookupdev.3pcap
+++ b/pcap_lookupdev.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_lookupdev.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_lookupdev.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.
@@ -25,7 +25,7 @@ pcap_lookupdev \- find the default device on which to capture
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .nf
diff --git a/pcap_lookupnet.3pcap b/pcap_lookupnet.3pcap
index 8bcd770..28e28a5 100644
--- a/pcap_lookupnet.3pcap
+++ b/pcap_lookupnet.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_lookupnet.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_lookupnet.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.
@@ -25,7 +25,7 @@ pcap_lookupnet \- find the IPv4 network number and netmask for a device
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .nf
diff --git a/pcap_loop.3pcap b/pcap_loop.3pcap
index 0a4ed3d..b352197 100644
--- a/pcap_loop.3pcap
+++ b/pcap_loop.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_loop.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_loop.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.
@@ -25,7 +25,7 @@ pcap_loop, pcap_dispatch \- process packets from a live capture or savefile
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_major_version.3pcap b/pcap_major_version.3pcap
index 685592f..f8b7bf9 100644
--- a/pcap_major_version.3pcap
+++ b/pcap_major_version.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_major_version.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_major_version.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.
@@ -25,7 +25,7 @@ pcap_major_version, pcap_minor_version \- get the version number of a savefile
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_next_ex.3pcap b/pcap_next_ex.3pcap
index ba1ae21..3d9c64f 100644
--- a/pcap_next_ex.3pcap
+++ b/pcap_next_ex.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_next_ex.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_next_ex.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.
@@ -25,7 +25,7 @@ pcap_next_ex, pcap_next \- read the next packet from a pcap_t
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_open_dead.3pcap b/pcap_open_dead.3pcap
index b50cd87..88f45af 100644
--- a/pcap_open_dead.3pcap
+++ b/pcap_open_dead.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap_open_dead.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap_open_dead.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.
@@ -26,7 +26,7 @@ capture for output
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_open_live.3pcap b/pcap_open_live.3pcap
index 4f1685d..a4d0b76 100644
--- a/pcap_open_live.3pcap
+++ b/pcap_open_live.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_open_live.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_open_live.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.
@@ -25,7 +25,7 @@ pcap_open_live \- open a device for capturing
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .nf
diff --git a/pcap_open_offline.3pcap b/pcap_open_offline.3pcap
index 77260d2..b608c0a 100644
--- a/pcap_open_offline.3pcap
+++ b/pcap_open_offline.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap_open_offline.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap_open_offline.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.
@@ -25,7 +25,7 @@ pcap_open_offline, pcap_fopen_offline \- open a saved capture file for reading
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .nf
diff --git a/pcap_set_datalink.3pcap b/pcap_set_datalink.3pcap
index f728734..ee5373c 100644
--- a/pcap_set_datalink.3pcap
+++ b/pcap_set_datalink.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_set_datalink.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_set_datalink.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.
@@ -26,7 +26,7 @@ capture device
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_setdirection.3pcap b/pcap_setdirection.3pcap
index f7e0fdf..5689bd1 100644
--- a/pcap_setdirection.3pcap
+++ b/pcap_setdirection.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_setdirection.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_setdirection.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.
@@ -25,7 +25,7 @@ pcap_setdirection \- set the direction for which packets will be captured
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_setfilter.3pcap b/pcap_setfilter.3pcap
index 31df80c..12ce6b7 100644
--- a/pcap_setfilter.3pcap
+++ b/pcap_setfilter.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_setfilter.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_setfilter.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.
@@ -25,7 +25,7 @@ pcap_setfilter \- set the filter
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_setnonblock.3pcap b/pcap_setnonblock.3pcap
index 752277e..64e32c0 100644
--- a/pcap_setnonblock.3pcap
+++ b/pcap_setnonblock.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_setnonblock.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_setnonblock.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.
@@ -26,7 +26,7 @@ non-blocking mode on a capture device
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .nf
diff --git a/pcap_snapshot.3pcap b/pcap_snapshot.3pcap
index c319240..452016c 100644
--- a/pcap_snapshot.3pcap
+++ b/pcap_snapshot.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_snapshot.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_snapshot.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.
@@ -25,7 +25,7 @@ pcap_snapshot \- get the snapshot length
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_stats.3pcap b/pcap_stats.3pcap
index 5aa198d..df661cc 100644
--- a/pcap_stats.3pcap
+++ b/pcap_stats.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_stats.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/pcap_stats.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.
@@ -25,7 +25,7 @@ pcap_stats \- get capture statistics
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B
diff --git a/pcap_strerror.3pcap b/pcap_strerror.3pcap
index 8481145..8e6319b 100644
--- a/pcap_strerror.3pcap
+++ b/pcap_strerror.3pcap
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/pcap_strerror.3pcap,v 1.1 2008-04-05 20:19:42 guy Exp $
+.\" @(#) $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.
@@ -25,7 +25,7 @@ pcap_strerror \- convert an errno value to a string
 .SH SYNOPSIS
 .nf
 .ft B
-#include <pcap.h>
+#include <pcap/pcap.h>
 .ft
 .LP
 .ft B