diff --git a/aux/binpac b/aux/binpac
index 4fc13f7c69..bfbf641adc 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 4fc13f7c6987b4163609e3df7a31f38501411cb7
+Subproject commit bfbf641adc99c3f7632d8189931edf88b86ddead
diff --git a/aux/bro-aux b/aux/bro-aux
index 86990f1640..e10456f923 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 86990f1640d986e39d5bb1287dbeb03b59a464f0
+Subproject commit e10456f923b0c1a3f437eb295c63b845665e99aa
diff --git a/aux/broccoli b/aux/broccoli
index 2455dbebc1..b053c34e0a 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 2455dbebc15f06b3cc5eccb701727baf5472cf24
+Subproject commit b053c34e0a807b85cce3f99a9842210ddf349c62
diff --git a/aux/broctl b/aux/broctl
index 2ad87692db..0921765fd9 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 2ad87692db1cb5b104937bdde8cd6e0447f8ad94
+Subproject commit 0921765fd943f7d2723ebc04a4e22afb1298979f
diff --git a/src/ARP.cc b/src/ARP.cc
index cdf0baa170..3606ed66d5 100644
--- a/src/ARP.cc
+++ b/src/ARP.cc
@@ -1,5 +1,3 @@
-// $Id: ARP.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 
diff --git a/src/ARP.h b/src/ARP.h
index c7765eb9a9..6b84dbd587 100644
--- a/src/ARP.h
+++ b/src/ARP.h
@@ -1,5 +1,3 @@
-// $Id: ARP.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef arp_h
diff --git a/src/Analyzer.cc b/src/Analyzer.cc
index b995c2f74b..9e7407e8b9 100644
--- a/src/Analyzer.cc
+++ b/src/Analyzer.cc
@@ -1,5 +1,3 @@
-// $Id: Analyzer.cc,v 1.1.4.28 2006/06/01 17:18:10 sommer Exp $
-
 #include <algorithm>
 
 #include "Analyzer.h"
diff --git a/src/Analyzer.h b/src/Analyzer.h
index 4a3ead5844..9eec49c233 100644
--- a/src/Analyzer.h
+++ b/src/Analyzer.h
@@ -1,5 +1,3 @@
-// $Id:$
-//
 // Main analyzer interface.
 
 #ifndef ANALYZER_H
diff --git a/src/AnalyzerTags.h b/src/AnalyzerTags.h
index e64a4ec76e..fd31773120 100644
--- a/src/AnalyzerTags.h
+++ b/src/AnalyzerTags.h
@@ -1,5 +1,3 @@
-// $Id: AnalyzerTags.h,v 1.1.2.5 2006/06/01 01:55:42 sommer Exp $
-
 #ifndef ANALYZERTAGS_H
 #define ANALYZERTAGS_H
 
diff --git a/src/Anon.cc b/src/Anon.cc
index bd29b3cfe9..440f8600d5 100644
--- a/src/Anon.cc
+++ b/src/Anon.cc
@@ -1,5 +1,3 @@
-// $Id: Anon.cc 7075 2010-09-13 02:39:38Z vern $
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <assert.h>
diff --git a/src/Anon.h b/src/Anon.h
index 2f138c36d7..ce234f4680 100644
--- a/src/Anon.h
+++ b/src/Anon.h
@@ -1,5 +1,3 @@
-// $Id: Anon.h 416 2004-09-17 03:52:28Z vern $
-
 // The prefix-preserving IP address anonymization code is largely
 // based on (and sometimes directly copied from) Eddie Kohler's
 // ipsumdump-1.20 code, per:
diff --git a/src/Attr.cc b/src/Attr.cc
index 22b4337405..a5a350f452 100644
--- a/src/Attr.cc
+++ b/src/Attr.cc
@@ -1,5 +1,3 @@
-// $Id: Attr.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Attr.h b/src/Attr.h
index 89a81428e5..6c835dc61c 100644
--- a/src/Attr.h
+++ b/src/Attr.h
@@ -1,5 +1,3 @@
-// $Id: Attr.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef attr_h
diff --git a/src/BPF_Program.cc b/src/BPF_Program.cc
index 7796ccce81..a6d3d80c05 100644
--- a/src/BPF_Program.cc
+++ b/src/BPF_Program.cc
@@ -1,5 +1,3 @@
-// $Id: BPF_Program.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/BPF_Program.h b/src/BPF_Program.h
index 4c6e090cda..88ed669da2 100644
--- a/src/BPF_Program.h
+++ b/src/BPF_Program.h
@@ -1,5 +1,3 @@
-// $Id: BPF_Program.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef bpf_program_h
diff --git a/src/BackDoor.cc b/src/BackDoor.cc
index 493fd9ae00..c218a98ce2 100644
--- a/src/BackDoor.cc
+++ b/src/BackDoor.cc
@@ -1,5 +1,3 @@
-// $Id: BackDoor.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/BackDoor.h b/src/BackDoor.h
index 50d97514ef..40ea3bbaa3 100644
--- a/src/BackDoor.h
+++ b/src/BackDoor.h
@@ -1,5 +1,3 @@
-// $Id: BackDoor.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef backdoor_h
diff --git a/src/Base64.cc b/src/Base64.cc
index 2585debf5e..9008837f35 100644
--- a/src/Base64.cc
+++ b/src/Base64.cc
@@ -1,5 +1,3 @@
-// $Id: Base64.cc 6024 2008-07-26 19:20:47Z vern $
-
 #include "config.h"
 #include "Base64.h"
 
diff --git a/src/Base64.h b/src/Base64.h
index 5bf5d4e2bc..0fe7e04910 100644
--- a/src/Base64.h
+++ b/src/Base64.h
@@ -1,5 +1,3 @@
-// $Id: Base64.h 3526 2006-09-12 07:32:21Z vern $
-
 #ifndef base64_h
 #define base64_h
 
diff --git a/src/BitTorrent.cc b/src/BitTorrent.cc
index e99047beb1..c58eb4cf65 100644
--- a/src/BitTorrent.cc
+++ b/src/BitTorrent.cc
@@ -1,5 +1,3 @@
-// $Id:$
-//
 // This code contributed by Nadi Sarrar.
 
 #include "BitTorrent.h"
diff --git a/src/BitTorrent.h b/src/BitTorrent.h
index 7f745d48c8..191b4c50d7 100644
--- a/src/BitTorrent.h
+++ b/src/BitTorrent.h
@@ -1,5 +1,3 @@
-// $Id:$
-//
 // This code contributed by Nadi Sarrar.
 
 #ifndef bittorrent_h
diff --git a/src/BitTorrentTracker.cc b/src/BitTorrentTracker.cc
index f0b290751d..995a01dd63 100644
--- a/src/BitTorrentTracker.cc
+++ b/src/BitTorrentTracker.cc
@@ -1,5 +1,3 @@
-// $Id:$
-//
 // This code contributed by Nadi Sarrar.
 
 #include "BitTorrentTracker.h"
diff --git a/src/BitTorrentTracker.h b/src/BitTorrentTracker.h
index 167c9d0d10..d57665d104 100644
--- a/src/BitTorrentTracker.h
+++ b/src/BitTorrentTracker.h
@@ -1,5 +1,3 @@
-// $Id:$
-//
 // This code contributed by Nadi Sarrar.
 
 #ifndef bittorrenttracker_h
diff --git a/src/BroList.h b/src/BroList.h
index b71615a18a..6168bf7bda 100644
--- a/src/BroList.h
+++ b/src/BroList.h
@@ -1,5 +1,3 @@
-// $Id: BroList.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef brolist_h
diff --git a/src/BroString.cc b/src/BroString.cc
index 8677cd9533..e05995b156 100644
--- a/src/BroString.cc
+++ b/src/BroString.cc
@@ -1,5 +1,3 @@
-// $Id: BroString.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/BroString.h b/src/BroString.h
index 48471cb99e..58991d78af 100644
--- a/src/BroString.h
+++ b/src/BroString.h
@@ -1,5 +1,3 @@
-// $Id: BroString.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef brostring_h
diff --git a/src/CCL.cc b/src/CCL.cc
index 326dcc7320..6c4ec5ea2e 100644
--- a/src/CCL.cc
+++ b/src/CCL.cc
@@ -1,5 +1,3 @@
-// $Id: CCL.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/CCL.h b/src/CCL.h
index 760e64b6f9..2870acf53a 100644
--- a/src/CCL.h
+++ b/src/CCL.h
@@ -1,5 +1,3 @@
-// $Id: CCL.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef ccl_h
diff --git a/src/ChunkedIO.cc b/src/ChunkedIO.cc
index d54b4eb70b..ff84a343c7 100644
--- a/src/ChunkedIO.cc
+++ b/src/ChunkedIO.cc
@@ -1,5 +1,3 @@
-// $Id: ChunkedIO.cc 6888 2009-08-20 18:23:11Z vern $
-
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/src/ChunkedIO.h b/src/ChunkedIO.h
index 1f946c18ba..ca95f4b40b 100644
--- a/src/ChunkedIO.h
+++ b/src/ChunkedIO.h
@@ -1,5 +1,3 @@
-// $Id: ChunkedIO.h 6888 2009-08-20 18:23:11Z vern $
-//
 // Implements non-blocking chunk-wise I/O.
 
 #ifndef CHUNKEDIO_H
diff --git a/src/CompHash.cc b/src/CompHash.cc
index 605949b81c..ef1daebbc1 100644
--- a/src/CompHash.cc
+++ b/src/CompHash.cc
@@ -1,5 +1,3 @@
-// $Id: CompHash.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/CompHash.h b/src/CompHash.h
index e2f87d240b..0ebbe72fd9 100644
--- a/src/CompHash.h
+++ b/src/CompHash.h
@@ -1,5 +1,3 @@
-// $Id: CompHash.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef comphash_h
diff --git a/src/Conn.cc b/src/Conn.cc
index bab032cbd0..df59b1037a 100644
--- a/src/Conn.cc
+++ b/src/Conn.cc
@@ -1,5 +1,3 @@
-// $Id: Conn.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Conn.h b/src/Conn.h
index 8f817fd003..8e90d6a9c3 100644
--- a/src/Conn.h
+++ b/src/Conn.h
@@ -1,5 +1,3 @@
-// $Id: Conn.h 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef conn_h
diff --git a/src/ConnCompressor.cc b/src/ConnCompressor.cc
index e173463205..caedc66fe3 100644
--- a/src/ConnCompressor.cc
+++ b/src/ConnCompressor.cc
@@ -1,5 +1,3 @@
-// $Id: ConnCompressor.cc 7008 2010-03-25 02:42:20Z vern $
-
 #include <arpa/inet.h>
 
 #include "ConnCompressor.h"
diff --git a/src/ConnCompressor.h b/src/ConnCompressor.h
index e2140526d0..36959b615c 100644
--- a/src/ConnCompressor.h
+++ b/src/ConnCompressor.h
@@ -1,5 +1,3 @@
-// $Id: ConnCompressor.h 6008 2008-07-23 00:24:22Z vern $
-//
 // The ConnCompressor keeps track of the first packet seen for a conn_id using
 // only a minimal amount of memory. This helps us to avoid instantiating
 // full Connection objects for never-established sessions.
diff --git a/src/ConnSizeAnalyzer.cc b/src/ConnSizeAnalyzer.cc
index c98a9f6827..a1b892f4db 100644
--- a/src/ConnSizeAnalyzer.cc
+++ b/src/ConnSizeAnalyzer.cc
@@ -1,5 +1,3 @@
-// $Id$
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 //
 // See ConnSize.h for more extensive comments.
diff --git a/src/ConnSizeAnalyzer.h b/src/ConnSizeAnalyzer.h
index 38446b0763..1fdd57bb15 100644
--- a/src/ConnSizeAnalyzer.h
+++ b/src/ConnSizeAnalyzer.h
@@ -1,5 +1,3 @@
-// $Id$
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 //
 
diff --git a/src/ContentLine.cc b/src/ContentLine.cc
index e9f0856462..5601694e1d 100644
--- a/src/ContentLine.cc
+++ b/src/ContentLine.cc
@@ -1,5 +1,3 @@
-// $Id: ContentLine.cc,v 1.1.2.8 2006/06/01 01:55:42 sommer Exp $
-
 #include <algorithm>
 
 #include "ContentLine.h"
diff --git a/src/ContentLine.h b/src/ContentLine.h
index 25482ecc2f..5e9f01945f 100644
--- a/src/ContentLine.h
+++ b/src/ContentLine.h
@@ -1,5 +1,3 @@
-// $Id: ContentLine.h,v 1.1.2.9 2006/06/01 01:55:42 sommer Exp $
-//
 // Support-analyzer to split a reassembled stream into lines.
 
 #ifndef CONTENTLINE_H
diff --git a/src/Continuation.h b/src/Continuation.h
index bde07203a9..009d2a87f3 100644
--- a/src/Continuation.h
+++ b/src/Continuation.h
@@ -1,5 +1,3 @@
-// $Id: Continuation.h 2698 2006-04-03 05:50:52Z vern $
-//
 // Helper class to implement continuation-like mechanisms for
 // suspending/resuming tasks for incremental operation.
 //
diff --git a/src/DCE_RPC.cc b/src/DCE_RPC.cc
index 4e21ecd545..1d9acaf1fa 100644
--- a/src/DCE_RPC.cc
+++ b/src/DCE_RPC.cc
@@ -1,5 +1,3 @@
-// $Id: DCE_RPC.cc 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/DCE_RPC.h b/src/DCE_RPC.h
index a856599b19..63237a151b 100644
--- a/src/DCE_RPC.h
+++ b/src/DCE_RPC.h
@@ -1,5 +1,3 @@
-// $Id: DCE_RPC.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef dce_rpc_h
diff --git a/src/DFA.cc b/src/DFA.cc
index 43e719f24a..e58ea260e5 100644
--- a/src/DFA.cc
+++ b/src/DFA.cc
@@ -1,5 +1,3 @@
-// $Id: DFA.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/DFA.h b/src/DFA.h
index 6fa4d85f0d..0f6c7d2f25 100644
--- a/src/DFA.h
+++ b/src/DFA.h
@@ -1,5 +1,3 @@
-// $Id: DFA.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 
diff --git a/src/DHCP-binpac.cc b/src/DHCP-binpac.cc
index 23149b7837..2aec6e6e9f 100644
--- a/src/DHCP-binpac.cc
+++ b/src/DHCP-binpac.cc
@@ -1,5 +1,3 @@
-// $Id:$
-
 #include "DHCP-binpac.h"
 
 DHCP_Analyzer_binpac::DHCP_Analyzer_binpac(Connection* conn)
diff --git a/src/DHCP-binpac.h b/src/DHCP-binpac.h
index d0e93dcfc2..06ddff3bb6 100644
--- a/src/DHCP-binpac.h
+++ b/src/DHCP-binpac.h
@@ -1,5 +1,3 @@
-// $Id:$
-
 #ifndef dhcp_binpac_h
 #define dhcp_binpac_h
 
diff --git a/src/DNS-binpac.cc b/src/DNS-binpac.cc
index e06ef1ab19..eb95ac2e1c 100644
--- a/src/DNS-binpac.cc
+++ b/src/DNS-binpac.cc
@@ -1,5 +1,3 @@
-// $Id:$
-
 #include "DNS-binpac.h"
 #include "TCP_Reassembler.h"
 
diff --git a/src/DNS-binpac.h b/src/DNS-binpac.h
index b43e3b6aae..9e8cb16f69 100644
--- a/src/DNS-binpac.h
+++ b/src/DNS-binpac.h
@@ -1,5 +1,3 @@
-// $Id:$
-
 #ifndef dns_binpac_h
 #define dns_binpac_h
 
diff --git a/src/DNS.cc b/src/DNS.cc
index d13f184ca5..8259a547bb 100644
--- a/src/DNS.cc
+++ b/src/DNS.cc
@@ -1,5 +1,3 @@
-// $Id: DNS.cc 6885 2009-08-20 04:37:55Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/DNS.h b/src/DNS.h
index ca9261c008..83ca80911e 100644
--- a/src/DNS.h
+++ b/src/DNS.h
@@ -1,5 +1,3 @@
-// $Id: DNS.h 6885 2009-08-20 04:37:55Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef dns_h
diff --git a/src/DNS_Mgr.cc b/src/DNS_Mgr.cc
index 8776f69d55..88f7b83013 100644
--- a/src/DNS_Mgr.cc
+++ b/src/DNS_Mgr.cc
@@ -1,5 +1,3 @@
-// $Id: DNS_Mgr.cc 7073 2010-09-13 00:45:02Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/DNS_Mgr.h b/src/DNS_Mgr.h
index 580eae92f1..62df2ede40 100644
--- a/src/DNS_Mgr.h
+++ b/src/DNS_Mgr.h
@@ -1,5 +1,3 @@
-// $Id: DNS_Mgr.h 6915 2009-09-22 05:04:17Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef dnsmgr_h
diff --git a/src/DPM.cc b/src/DPM.cc
index 69b859a9e1..345741dfc8 100644
--- a/src/DPM.cc
+++ b/src/DPM.cc
@@ -1,5 +1,3 @@
-// $Id: DPM.cc,v 1.1.4.14 2006/06/01 17:18:10 sommer Exp $
-
 #include "DPM.h"
 #include "PIA.h"
 #include "Hash.h"
diff --git a/src/DPM.h b/src/DPM.h
index 056f6b25cc..4bacbfbeea 100644
--- a/src/DPM.h
+++ b/src/DPM.h
@@ -1,5 +1,3 @@
-// $Id:$
-//
 // The central management unit for dynamic analyzer selection.
 
 #ifndef DPM_H
diff --git a/src/DbgBreakpoint.cc b/src/DbgBreakpoint.cc
index 7205a78521..11847fc4dc 100644
--- a/src/DbgBreakpoint.cc
+++ b/src/DbgBreakpoint.cc
@@ -1,5 +1,3 @@
-// $Id: DbgBreakpoint.cc 1345 2005-09-08 07:42:11Z vern $
-
 // Implementation of breakpoints.
 
 #include "config.h"
diff --git a/src/DbgBreakpoint.h b/src/DbgBreakpoint.h
index 505d1389a4..5fadfe0474 100644
--- a/src/DbgBreakpoint.h
+++ b/src/DbgBreakpoint.h
@@ -1,5 +1,3 @@
-// $Id: DbgBreakpoint.h 80 2004-07-14 20:15:50Z jason $
-
 // Structures and methods for implementing breakpoints in the Bro debugger.
 
 #ifndef DbgBreakpoint_h
diff --git a/src/DbgDisplay.h b/src/DbgDisplay.h
index 033dac79e9..1c83d84ec4 100644
--- a/src/DbgDisplay.h
+++ b/src/DbgDisplay.h
@@ -1,5 +1,3 @@
-// $Id: DbgDisplay.h 80 2004-07-14 20:15:50Z jason $
-
 // Structures and methods for implementing watches in the Bro debugger.
 
 #ifndef dbg_display_h
diff --git a/src/DbgWatch.h b/src/DbgWatch.h
index ed85e88748..e3359f53ad 100644
--- a/src/DbgWatch.h
+++ b/src/DbgWatch.h
@@ -1,5 +1,3 @@
-// $Id: DbgWatch.h 80 2004-07-14 20:15:50Z jason $
-
 // Structures and methods for implementing watches in the Bro debugger.
 
 #ifndef dbgwatch_h
diff --git a/src/Debug.h b/src/Debug.h
index ad82337b12..a83e05c224 100644
--- a/src/Debug.h
+++ b/src/Debug.h
@@ -1,5 +1,3 @@
-// $Id: Debug.h 80 2004-07-14 20:15:50Z jason $
-
 // Debugging support for Bro policy files.
 
 #ifndef debug_h
diff --git a/src/DebugCmds.h b/src/DebugCmds.h
index a14990b918..e7b9c6a4c1 100644
--- a/src/DebugCmds.h
+++ b/src/DebugCmds.h
@@ -1,5 +1,3 @@
-// $Id: DebugCmds.h 80 2004-07-14 20:15:50Z jason $
-//
 // Support routines to help deal with Bro debugging commands and
 // implementation of most commands.
 
diff --git a/src/DebugLogger.cc b/src/DebugLogger.cc
index adf06b7d67..6d189a3303 100644
--- a/src/DebugLogger.cc
+++ b/src/DebugLogger.cc
@@ -1,5 +1,3 @@
-// $Id: DebugLogger.cc 4771 2007-08-11 05:50:24Z vern $
-
 #ifdef DEBUG
 
 #include <stdlib.h>
diff --git a/src/DebugLogger.h b/src/DebugLogger.h
index 49c875a5c4..a2dece5b3c 100644
--- a/src/DebugLogger.h
+++ b/src/DebugLogger.h
@@ -1,5 +1,3 @@
-// $Id: DebugLogger.h 4771 2007-08-11 05:50:24Z vern $
-//
 // A logger for (selective) debugging output. Only compiled in if DEBUG is
 // defined.
 
diff --git a/src/Desc.cc b/src/Desc.cc
index 454de549ef..9e9b2bdd58 100644
--- a/src/Desc.cc
+++ b/src/Desc.cc
@@ -1,5 +1,3 @@
-// $Id: Desc.cc 6245 2008-10-07 00:56:59Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Desc.h b/src/Desc.h
index a9758d764b..5849736cbf 100644
--- a/src/Desc.h
+++ b/src/Desc.h
@@ -1,5 +1,3 @@
-// $Id: Desc.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef descriptor_h
diff --git a/src/Dict.cc b/src/Dict.cc
index 6bef17ad3e..c0e2d0e4d2 100644
--- a/src/Dict.cc
+++ b/src/Dict.cc
@@ -1,5 +1,3 @@
-// $Id: Dict.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Dict.h b/src/Dict.h
index 75ac82c827..c7b3a21eac 100644
--- a/src/Dict.h
+++ b/src/Dict.h
@@ -1,5 +1,3 @@
-// $Id: Dict.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef dict_h
diff --git a/src/Discard.cc b/src/Discard.cc
index fcee23e5e0..2705aa55be 100644
--- a/src/Discard.cc
+++ b/src/Discard.cc
@@ -1,5 +1,3 @@
-// $Id: Discard.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include <algorithm>
diff --git a/src/Discard.h b/src/Discard.h
index 4ffcab39d1..16f7a58e6e 100644
--- a/src/Discard.h
+++ b/src/Discard.h
@@ -1,5 +1,3 @@
-// $Id: Discard.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef discard_h
diff --git a/src/EquivClass.cc b/src/EquivClass.cc
index ff5dc88603..6ab667b146 100644
--- a/src/EquivClass.cc
+++ b/src/EquivClass.cc
@@ -1,5 +1,3 @@
-// $Id: EquivClass.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/EquivClass.h b/src/EquivClass.h
index 9b35a9bb64..e5193cde47 100644
--- a/src/EquivClass.h
+++ b/src/EquivClass.h
@@ -1,5 +1,3 @@
-// $Id: EquivClass.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef equiv_class_h
diff --git a/src/Event.cc b/src/Event.cc
index 0ba5b68a21..97f29000d6 100644
--- a/src/Event.cc
+++ b/src/Event.cc
@@ -1,5 +1,3 @@
-// $Id: Event.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Event.h b/src/Event.h
index ce498ae9cc..805396a488 100644
--- a/src/Event.h
+++ b/src/Event.h
@@ -1,5 +1,3 @@
-// $Id: Event.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef event_h
diff --git a/src/EventHandler.cc b/src/EventHandler.cc
index 9a06763bc0..55f9902079 100644
--- a/src/EventHandler.cc
+++ b/src/EventHandler.cc
@@ -1,5 +1,3 @@
-// $Id: EventHandler.cc 5911 2008-07-03 22:59:01Z vern $
-
 #include "Event.h"
 #include "EventHandler.h"
 #include "Func.h"
diff --git a/src/EventHandler.h b/src/EventHandler.h
index 6a9438fd4c..2aebe87584 100644
--- a/src/EventHandler.h
+++ b/src/EventHandler.h
@@ -1,5 +1,3 @@
-// $Id: EventHandler.h 5911 2008-07-03 22:59:01Z vern $
-//
 // Capsulates local and remote event handlers.
 
 #ifndef EVENTHANDLER
diff --git a/src/EventLauncher.cc b/src/EventLauncher.cc
index 1982d78c11..246c9dc8aa 100644
--- a/src/EventLauncher.cc
+++ b/src/EventLauncher.cc
@@ -1,5 +1,3 @@
-// $Id:$
-
 #include "Val.h"
 #include "Analyzer.h"
 #include "EventLauncher.h"
diff --git a/src/EventLauncher.h b/src/EventLauncher.h
index 276f28ef75..6a57c59391 100644
--- a/src/EventLauncher.h
+++ b/src/EventLauncher.h
@@ -1,5 +1,3 @@
-// $Id:$
-
 #ifndef event_launcher_h
 #define event_launcher_h
 
diff --git a/src/EventRegistry.cc b/src/EventRegistry.cc
index f5691ab448..4d29c5d95f 100644
--- a/src/EventRegistry.cc
+++ b/src/EventRegistry.cc
@@ -1,5 +1,3 @@
-// $Id: EventRegistry.cc 6829 2009-07-09 09:12:59Z vern $
-
 #include "EventRegistry.h"
 #include "RE.h"
 #include "RemoteSerializer.h"
diff --git a/src/EventRegistry.h b/src/EventRegistry.h
index bd9e0cd185..6ee5e3bcbd 100644
--- a/src/EventRegistry.h
+++ b/src/EventRegistry.h
@@ -1,5 +1,3 @@
-// $Id: EventRegistry.h 6829 2009-07-09 09:12:59Z vern $
-//
 // Each event raised/handled by Bro is registered in the EventRegistry.
 
 #ifndef EVENT_REGISTRY
diff --git a/src/Expr.cc b/src/Expr.cc
index c142026123..58c9ab7c8d 100644
--- a/src/Expr.cc
+++ b/src/Expr.cc
@@ -1,5 +1,3 @@
-// $Id: Expr.cc 6864 2009-08-16 23:30:39Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Expr.h b/src/Expr.h
index 0f6ee67106..bf4bcb955a 100644
--- a/src/Expr.h
+++ b/src/Expr.h
@@ -1,5 +1,3 @@
-// $Id: Expr.h 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef expr_h
diff --git a/src/FTP.cc b/src/FTP.cc
index 3dcf5722d8..588348ea8d 100644
--- a/src/FTP.cc
+++ b/src/FTP.cc
@@ -1,5 +1,3 @@
-// $Id: FTP.cc 6782 2009-06-28 02:19:03Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/FTP.h b/src/FTP.h
index c50d463b65..4ef6c44d83 100644
--- a/src/FTP.h
+++ b/src/FTP.h
@@ -1,5 +1,3 @@
-// $Id: FTP.h 6782 2009-06-28 02:19:03Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef ftp_h
diff --git a/src/File.cc b/src/File.cc
index c8390c9bb5..437370205a 100644
--- a/src/File.cc
+++ b/src/File.cc
@@ -1,5 +1,3 @@
-// $Id: File.cc 6942 2009-11-16 03:54:08Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/File.h b/src/File.h
index dad0d6da8b..444d6209e2 100644
--- a/src/File.h
+++ b/src/File.h
@@ -1,5 +1,3 @@
-// $Id: File.h 6888 2009-08-20 18:23:11Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef file_h
diff --git a/src/FileAnalyzer.cc b/src/FileAnalyzer.cc
index 16bf003775..1abe88caec 100644
--- a/src/FileAnalyzer.cc
+++ b/src/FileAnalyzer.cc
@@ -1,5 +1,3 @@
-// $Id: FileAnalyzer.cc,v 1.1.4.2 2006/06/01 17:18:10 sommer Exp $
-
 #include <algorithm>
 
 #include "FileAnalyzer.h"
diff --git a/src/FileAnalyzer.h b/src/FileAnalyzer.h
index f343547210..8c1890bb85 100644
--- a/src/FileAnalyzer.h
+++ b/src/FileAnalyzer.h
@@ -1,5 +1,3 @@
-// $Id:$
-//
 // Analyzer for connections that transfer binary data.
 
 #ifndef FILEANALYZER_H
diff --git a/src/Finger.cc b/src/Finger.cc
index 9a0fda8985..be0f3754b5 100644
--- a/src/Finger.cc
+++ b/src/Finger.cc
@@ -1,5 +1,3 @@
-// $Id: Finger.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Finger.h b/src/Finger.h
index 98738765a3..3c61c4ad2a 100644
--- a/src/Finger.h
+++ b/src/Finger.h
@@ -1,5 +1,3 @@
-// $Id: Finger.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef finger_h
diff --git a/src/FlowSrc.cc b/src/FlowSrc.cc
index 6f31cf2c3e..fe6998ea79 100644
--- a/src/FlowSrc.cc
+++ b/src/FlowSrc.cc
@@ -1,5 +1,3 @@
-/// $Id: FlowSrc.cc 4621 2007-07-10 13:37:13Z bager $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 //
 // Written by Bernhard Ager, TU Berlin (2006/2007).
diff --git a/src/FlowSrc.h b/src/FlowSrc.h
index 3173badf66..7b0b14ad15 100644
--- a/src/FlowSrc.h
+++ b/src/FlowSrc.h
@@ -1,5 +1,3 @@
-// $Id: FlowSrc.h 4618 2007-07-09 18:12:32Z bager $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 //
 // Written by Bernhard Ager, TU Berlin (2006/2007).
diff --git a/src/Frag.cc b/src/Frag.cc
index abf68baa14..b72fac4b16 100644
--- a/src/Frag.cc
+++ b/src/Frag.cc
@@ -1,5 +1,3 @@
-// $Id: Frag.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Frag.h b/src/Frag.h
index ddd5f73144..92bf1b3bbd 100644
--- a/src/Frag.h
+++ b/src/Frag.h
@@ -1,5 +1,3 @@
-// $Id: Frag.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef frag_h
diff --git a/src/Frame.cc b/src/Frame.cc
index 4eeb7e1fcc..f86fa32805 100644
--- a/src/Frame.cc
+++ b/src/Frame.cc
@@ -1,5 +1,3 @@
-// $Id: Frame.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Frame.h b/src/Frame.h
index 34a4f63f89..85e1dbec2e 100644
--- a/src/Frame.h
+++ b/src/Frame.h
@@ -1,5 +1,3 @@
-// $Id: Frame.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef frame_h
diff --git a/src/Func.cc b/src/Func.cc
index 4a495904bd..8e927155f2 100644
--- a/src/Func.cc
+++ b/src/Func.cc
@@ -1,5 +1,3 @@
-// $Id: Func.cc 6703 2009-05-13 22:27:44Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Func.h b/src/Func.h
index 6e1ea8597c..b9f6ffe808 100644
--- a/src/Func.h
+++ b/src/Func.h
@@ -1,5 +1,3 @@
-// $Id: Func.h 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef func_h
diff --git a/src/Gnutella.cc b/src/Gnutella.cc
index 9787147400..448c8dcb3b 100644
--- a/src/Gnutella.cc
+++ b/src/Gnutella.cc
@@ -1,5 +1,3 @@
-// $Id: Gnutella.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Gnutella.h b/src/Gnutella.h
index c390f418f4..f06c816c90 100644
--- a/src/Gnutella.h
+++ b/src/Gnutella.h
@@ -1,5 +1,3 @@
-// $Id: Gnutella.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef gnutella_h
diff --git a/src/H3.h b/src/H3.h
index 2a5368a93d..cb54e0840b 100644
--- a/src/H3.h
+++ b/src/H3.h
@@ -1,5 +1,3 @@
-// $Id: H3.h 3230 2006-06-08 02:19:25Z vern $
-
 // Copyright 2004, 2005
 // The Regents of the University of California
 // All Rights Reserved
diff --git a/src/HTTP-binpac.cc b/src/HTTP-binpac.cc
index 003d74d8e2..70cf37457b 100644
--- a/src/HTTP-binpac.cc
+++ b/src/HTTP-binpac.cc
@@ -1,5 +1,3 @@
-// $Id:$
-
 #include "HTTP-binpac.h"
 #include "TCP_Reassembler.h"
 
diff --git a/src/HTTP-binpac.h b/src/HTTP-binpac.h
index 9352515dc8..62b6fd0db3 100644
--- a/src/HTTP-binpac.h
+++ b/src/HTTP-binpac.h
@@ -1,5 +1,3 @@
-// $Id:$
-
 #ifndef http_binpac_h
 #define http_binpac_h
 
diff --git a/src/HTTP.cc b/src/HTTP.cc
index 54613bb9e1..0d154f1873 100644
--- a/src/HTTP.cc
+++ b/src/HTTP.cc
@@ -1,5 +1,3 @@
-// $Id: HTTP.cc 7073 2010-09-13 00:45:02Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/HTTP.h b/src/HTTP.h
index 4d621fa526..6fb80a7477 100644
--- a/src/HTTP.h
+++ b/src/HTTP.h
@@ -1,5 +1,3 @@
-// $Id: HTTP.h 6942 2009-11-16 03:54:08Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef http_h
diff --git a/src/Hash.cc b/src/Hash.cc
index ffabe36f83..618d4fbe8a 100644
--- a/src/Hash.cc
+++ b/src/Hash.cc
@@ -1,5 +1,3 @@
-// $Id: Hash.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 // The hash function works as follows:
diff --git a/src/Hash.h b/src/Hash.h
index d9659b442a..3a1b42084c 100644
--- a/src/Hash.h
+++ b/src/Hash.h
@@ -1,5 +1,3 @@
-// $Id: Hash.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef hash_h
diff --git a/src/ICMP.cc b/src/ICMP.cc
index 4e11583651..bc081ace51 100644
--- a/src/ICMP.cc
+++ b/src/ICMP.cc
@@ -1,5 +1,3 @@
-// $Id: ICMP.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include <algorithm>
diff --git a/src/ICMP.h b/src/ICMP.h
index 62b859beba..ad43d7b948 100644
--- a/src/ICMP.h
+++ b/src/ICMP.h
@@ -1,5 +1,3 @@
-// $Id: ICMP.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef icmp_h
diff --git a/src/ID.cc b/src/ID.cc
index 2decef725f..3f5c76ca1d 100644
--- a/src/ID.cc
+++ b/src/ID.cc
@@ -1,5 +1,3 @@
-// $Id: ID.cc 6724 2009-06-07 09:23:03Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/ID.h b/src/ID.h
index 49d844ebc3..9c1f56e80f 100644
--- a/src/ID.h
+++ b/src/ID.h
@@ -1,5 +1,3 @@
-// $Id: ID.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef id_h
diff --git a/src/IOSource.cc b/src/IOSource.cc
index 83f4ef15f2..d47007caad 100644
--- a/src/IOSource.cc
+++ b/src/IOSource.cc
@@ -1,5 +1,3 @@
-// $Id: IOSource.cc 4771 2007-08-11 05:50:24Z vern $
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/src/IOSource.h b/src/IOSource.h
index 53057f3583..db50bbd2a9 100644
--- a/src/IOSource.h
+++ b/src/IOSource.h
@@ -1,5 +1,3 @@
-// $Id: IOSource.h 6888 2009-08-20 18:23:11Z vern $
-//
 // Interface for classes providing/consuming data during Bro's main loop.
 
 #ifndef iosource_h
diff --git a/src/IP.h b/src/IP.h
index 4f76ef50ed..73ac4ee5c7 100644
--- a/src/IP.h
+++ b/src/IP.h
@@ -1,5 +1,3 @@
-// $Id: IP.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef ip_h
diff --git a/src/IRC.cc b/src/IRC.cc
index 0e3705a97d..caf7c492b6 100644
--- a/src/IRC.cc
+++ b/src/IRC.cc
@@ -1,5 +1,3 @@
-// $Id: IRC.cc 4582 2007-07-04 01:14:09Z vern $
-
 // An IRC analyzer contributed by Roland Gruber.
 
 #include <iostream>
diff --git a/src/IRC.h b/src/IRC.h
index fb6e9869ae..0fe36957de 100644
--- a/src/IRC.h
+++ b/src/IRC.h
@@ -1,5 +1,3 @@
-// $Id: IRC.h 4582 2007-07-04 01:14:09Z vern $
-
 // An IRC analyzer contributed by Roland Gruber.
 
 #ifndef irc_h
diff --git a/src/Ident.cc b/src/Ident.cc
index 2231c50ae8..b2e82e5f12 100644
--- a/src/Ident.cc
+++ b/src/Ident.cc
@@ -1,5 +1,3 @@
-// $Id: Ident.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Ident.h b/src/Ident.h
index c87e98c6d4..a848d233e1 100644
--- a/src/Ident.h
+++ b/src/Ident.h
@@ -1,5 +1,3 @@
-// $Id: Ident.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef ident_h
diff --git a/src/IntSet.cc b/src/IntSet.cc
index a6c176f829..fb198f0e25 100644
--- a/src/IntSet.cc
+++ b/src/IntSet.cc
@@ -1,5 +1,3 @@
-// $Id: IntSet.cc 80 2004-07-14 20:15:50Z jason $
-
 #include "config.h"
 
 #ifdef HAVE_MEMORY_H
diff --git a/src/IntSet.h b/src/IntSet.h
index 412b06d418..ef58e8b12f 100644
--- a/src/IntSet.h
+++ b/src/IntSet.h
@@ -1,5 +1,3 @@
-// $Id: IntSet.h 80 2004-07-14 20:15:50Z jason $
-
 // A simple but fast data structure for sets of integers.
 // Only supported operations are insert, remove and membership test.
 //
diff --git a/src/InterConn.cc b/src/InterConn.cc
index 664982fd02..403081181a 100644
--- a/src/InterConn.cc
+++ b/src/InterConn.cc
@@ -1,5 +1,3 @@
-// $Id: InterConn.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/InterConn.h b/src/InterConn.h
index 1f9ee12f62..d9cd10de27 100644
--- a/src/InterConn.h
+++ b/src/InterConn.h
@@ -1,5 +1,3 @@
-// $Id: InterConn.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef interconn_h
diff --git a/src/List.cc b/src/List.cc
index 2a28d4ae00..9a1af3fe4f 100644
--- a/src/List.cc
+++ b/src/List.cc
@@ -1,5 +1,3 @@
-// $Id: List.cc 1905 2005-12-14 03:27:33Z vern $
-
 #include "config.h"
 
 #include <stdio.h>
diff --git a/src/List.h b/src/List.h
index 38afad35c9..bf87ade67d 100644
--- a/src/List.h
+++ b/src/List.h
@@ -1,5 +1,3 @@
-// $Id: List.h 463 2004-09-26 21:04:20Z vern $
-
 #ifndef list_h
 #define list_h
 
diff --git a/src/Login.cc b/src/Login.cc
index 0a3849ccd0..56efd12f53 100644
--- a/src/Login.cc
+++ b/src/Login.cc
@@ -1,5 +1,3 @@
-// $Id: Login.cc 6724 2009-06-07 09:23:03Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/MIME.cc b/src/MIME.cc
index 3fe652d4cc..109b897b88 100644
--- a/src/MIME.cc
+++ b/src/MIME.cc
@@ -1,5 +1,3 @@
-// $Id: MIME.cc 5906 2008-07-03 19:52:50Z vern $
-
 #include "config.h"
 
 #include "NetVar.h"
diff --git a/src/MIME.h b/src/MIME.h
index b5cdf556ac..c8c70cf65b 100644
--- a/src/MIME.h
+++ b/src/MIME.h
@@ -1,5 +1,3 @@
-// $Id: MIME.h 3526 2006-09-12 07:32:21Z vern $
-
 #ifndef mime_h
 #define mime_h
 
diff --git a/src/NCP.cc b/src/NCP.cc
index c065e48e87..83378a09a7 100644
--- a/src/NCP.cc
+++ b/src/NCP.cc
@@ -1,5 +1,3 @@
-// $Id: NCP.cc 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/NCP.h b/src/NCP.h
index 714d1879f8..1e783ee3ab 100644
--- a/src/NCP.h
+++ b/src/NCP.h
@@ -1,5 +1,3 @@
-// $Id: NCP.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef ncp_h
diff --git a/src/NFA.cc b/src/NFA.cc
index 74958823dc..4849755941 100644
--- a/src/NFA.cc
+++ b/src/NFA.cc
@@ -1,5 +1,3 @@
-// $Id: NFA.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/NFA.h b/src/NFA.h
index 9dcb435d61..9877b8787c 100644
--- a/src/NFA.h
+++ b/src/NFA.h
@@ -1,5 +1,3 @@
-// $Id: NFA.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef nfa_h
diff --git a/src/NFS.cc b/src/NFS.cc
index 2951361baf..2911ee7f59 100644
--- a/src/NFS.cc
+++ b/src/NFS.cc
@@ -1,5 +1,3 @@
-// $Id: NFS.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include <algorithm>
diff --git a/src/NFS.h b/src/NFS.h
index 28a1d5c4ac..6a65143808 100644
--- a/src/NFS.h
+++ b/src/NFS.h
@@ -1,5 +1,3 @@
-// $Id: NFS.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef nfs_h
diff --git a/src/NTP.cc b/src/NTP.cc
index ac7d12fb6d..60b7e6202d 100644
--- a/src/NTP.cc
+++ b/src/NTP.cc
@@ -1,5 +1,3 @@
-// $Id: NTP.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/NTP.h b/src/NTP.h
index c4ccdd644a..a22a7b231b 100644
--- a/src/NTP.h
+++ b/src/NTP.h
@@ -1,5 +1,3 @@
-// $Id: NTP.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef ntp_h
diff --git a/src/NVT.cc b/src/NVT.cc
index ad5e321595..5ba12ac32a 100644
--- a/src/NVT.cc
+++ b/src/NVT.cc
@@ -1,5 +1,3 @@
-// $Id: NVT.cc 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/NVT.h b/src/NVT.h
index 63c0cc6620..61aa1ef740 100644
--- a/src/NVT.h
+++ b/src/NVT.h
@@ -1,5 +1,3 @@
-// $Id: NVT.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef nvt_h
diff --git a/src/Net.cc b/src/Net.cc
index df91521eee..2d8ee85353 100644
--- a/src/Net.cc
+++ b/src/Net.cc
@@ -1,5 +1,3 @@
-// $Id: Net.cc 6915 2009-09-22 05:04:17Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Net.h b/src/Net.h
index 337e50720f..1f59b80e03 100644
--- a/src/Net.h
+++ b/src/Net.h
@@ -1,5 +1,3 @@
-// $Id: Net.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef net_h
diff --git a/src/NetVar.cc b/src/NetVar.cc
index cc40681494..25e4f7a0bc 100644
--- a/src/NetVar.cc
+++ b/src/NetVar.cc
@@ -1,5 +1,3 @@
-// $Id: NetVar.cc 6887 2009-08-20 05:17:33Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/NetVar.h b/src/NetVar.h
index b9667a19c9..f8def230c0 100644
--- a/src/NetVar.h
+++ b/src/NetVar.h
@@ -1,5 +1,3 @@
-// $Id: NetVar.h 6887 2009-08-20 05:17:33Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef netvar_h
diff --git a/src/NetbiosSSN.cc b/src/NetbiosSSN.cc
index 0bb135f59d..274e76f137 100644
--- a/src/NetbiosSSN.cc
+++ b/src/NetbiosSSN.cc
@@ -1,5 +1,3 @@
-// $Id: NetbiosSSN.cc 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/NetbiosSSN.h b/src/NetbiosSSN.h
index ba724fa2fb..7c4dd91b90 100644
--- a/src/NetbiosSSN.h
+++ b/src/NetbiosSSN.h
@@ -1,5 +1,3 @@
-// $Id: NetbiosSSN.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef netbios_ssn_h
diff --git a/src/OSFinger.cc b/src/OSFinger.cc
index e8fd929885..70504e8422 100644
--- a/src/OSFinger.cc
+++ b/src/OSFinger.cc
@@ -1,5 +1,3 @@
-// $Id: OSFinger.cc 5857 2008-06-26 23:00:03Z vern $
-
 /*
   Taken with permission from:
 
diff --git a/src/OSFinger.h b/src/OSFinger.h
index f1f9e492f2..1e745505eb 100644
--- a/src/OSFinger.h
+++ b/src/OSFinger.h
@@ -1,5 +1,3 @@
-// $Id: OSFinger.h 5857 2008-06-26 23:00:03Z vern $
-
 // Taken with permission from:
 //
 // p0f - passive OS fingerprinting (GNU LESSER GENERAL PUBLIC LICENSE)
diff --git a/src/Obj.cc b/src/Obj.cc
index 666a57ac93..2233ae8611 100644
--- a/src/Obj.cc
+++ b/src/Obj.cc
@@ -1,5 +1,3 @@
-// $Id: Obj.cc 6752 2009-06-14 04:24:52Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Obj.h b/src/Obj.h
index d5a60aa972..be0d91b398 100644
--- a/src/Obj.h
+++ b/src/Obj.h
@@ -1,5 +1,3 @@
-// $Id: Obj.h 6781 2009-06-28 00:50:04Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef obj_h
diff --git a/src/Op.h b/src/Op.h
index 7c8d4afe38..a628a6bb68 100644
--- a/src/Op.h
+++ b/src/Op.h
@@ -1,5 +1,3 @@
-// $Id: Op.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef op_h
diff --git a/src/PIA.cc b/src/PIA.cc
index 32c0b40fc5..6a00e7e1d0 100644
--- a/src/PIA.cc
+++ b/src/PIA.cc
@@ -1,5 +1,3 @@
-// $Id: PIA.cc,v 1.1.2.14 2006/05/31 23:19:07 sommer Exp $
-
 #include "PIA.h"
 #include "RuleMatcher.h"
 #include "TCP_Reassembler.h"
diff --git a/src/PIA.h b/src/PIA.h
index 8a1079f617..907350bbdf 100644
--- a/src/PIA.h
+++ b/src/PIA.h
@@ -1,5 +1,3 @@
-// $Id:$
-//
 // An analyzer for application-layer protocol-detection.
 
 #ifndef PIA_H
diff --git a/src/POP3.cc b/src/POP3.cc
index b364541be1..4ffe67ef48 100644
--- a/src/POP3.cc
+++ b/src/POP3.cc
@@ -1,5 +1,3 @@
-// $Id: POP3.cc 6782 2009-06-28 02:19:03Z vern $
-
 // This code contributed to Bro by Florian Schimandl, Hugh Dollman and
 // Robin Sommer.
 
diff --git a/src/POP3.h b/src/POP3.h
index 6ad0a7e755..8d09d5e686 100644
--- a/src/POP3.h
+++ b/src/POP3.h
@@ -1,5 +1,3 @@
-// $Id: POP3.h 3526 2006-09-12 07:32:21Z vern $
-
 // This code contributed to Bro by Florian Schimandl and Hugh Dollman.
 //
 // An analyser for the POP3 protocol.
diff --git a/src/PacketDumper.cc b/src/PacketDumper.cc
index d401cd63cb..84b22ff17c 100644
--- a/src/PacketDumper.cc
+++ b/src/PacketDumper.cc
@@ -1,5 +1,3 @@
-// $Id:$
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 
diff --git a/src/PacketDumper.h b/src/PacketDumper.h
index b0d5943b36..baace47876 100644
--- a/src/PacketDumper.h
+++ b/src/PacketDumper.h
@@ -1,5 +1,3 @@
-// $Id:$
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef packetdumper_h
diff --git a/src/PacketFilter.cc b/src/PacketFilter.cc
index fa88350713..9b6b881ce5 100644
--- a/src/PacketFilter.cc
+++ b/src/PacketFilter.cc
@@ -1,5 +1,3 @@
-// $Id: PacketFilter.cc 967 2005-01-03 07:19:06Z vern $
-
 #include "PacketFilter.h"
 
 void PacketFilter::AddSrc(addr_type src, uint32 tcp_flags, double probability)
diff --git a/src/PacketFilter.h b/src/PacketFilter.h
index 6a70504280..ed8000f40f 100644
--- a/src/PacketFilter.h
+++ b/src/PacketFilter.h
@@ -1,5 +1,3 @@
-// $Id: PacketFilter.h 80 2004-07-14 20:15:50Z jason $
-//
 // Provides some very limited but fast packet filter mechanisms
 
 #ifndef PACKETFILTER_H
diff --git a/src/PacketSort.cc b/src/PacketSort.cc
index 8beaa51474..0ff08b3280 100644
--- a/src/PacketSort.cc
+++ b/src/PacketSort.cc
@@ -1,5 +1,3 @@
-// $Id: PacketSort.cc 3228 2006-06-08 02:12:03Z vern $
-
 #include "IP.h"
 #include "PacketSort.h"
 
diff --git a/src/PacketSort.h b/src/PacketSort.h
index 6c6a4f4994..199da0732f 100644
--- a/src/PacketSort.h
+++ b/src/PacketSort.h
@@ -1,5 +1,3 @@
-// $Id: PacketSort.h 3228 2006-06-08 02:12:03Z vern $
-
 #ifndef packetsort_h
 #define packetsort_h
 
diff --git a/src/PersistenceSerializer.cc b/src/PersistenceSerializer.cc
index 60247c7519..c72f59c0dd 100644
--- a/src/PersistenceSerializer.cc
+++ b/src/PersistenceSerializer.cc
@@ -1,5 +1,3 @@
-// $Id: PersistenceSerializer.cc 6752 2009-06-14 04:24:52Z vern $
-
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/src/PersistenceSerializer.h b/src/PersistenceSerializer.h
index 572ab0238e..dcd712bf84 100644
--- a/src/PersistenceSerializer.h
+++ b/src/PersistenceSerializer.h
@@ -1,5 +1,3 @@
-// $Id: PersistenceSerializer.h 2698 2006-04-03 05:50:52Z vern $
-//
 // Implements persistance for Bro's data structures.
 
 #ifndef persistence_serializer_h
diff --git a/src/PktSrc.cc b/src/PktSrc.cc
index 23391c1ffa..767cd9109a 100644
--- a/src/PktSrc.cc
+++ b/src/PktSrc.cc
@@ -1,5 +1,3 @@
-// $Id: PktSrc.cc 6951 2009-12-04 22:23:28Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include <errno.h>
diff --git a/src/PktSrc.h b/src/PktSrc.h
index 04524ec405..70eef4dd00 100644
--- a/src/PktSrc.h
+++ b/src/PktSrc.h
@@ -1,5 +1,3 @@
-// $Id: PktSrc.h 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef pktsrc_h
diff --git a/src/PolicyFile.cc b/src/PolicyFile.cc
index 22a6a96cb6..53b115048a 100644
--- a/src/PolicyFile.cc
+++ b/src/PolicyFile.cc
@@ -1,5 +1,3 @@
-// $Id: PolicyFile.cc 1473 2005-10-06 21:32:45Z vern $
-
 #include "config.h"
 
 #include <sys/types.h>
diff --git a/src/PolicyFile.h b/src/PolicyFile.h
index ac040d5584..62c475a98b 100644
--- a/src/PolicyFile.h
+++ b/src/PolicyFile.h
@@ -1,5 +1,3 @@
-// $Id: PolicyFile.h 80 2004-07-14 20:15:50Z jason $
-
 // Functions for displaying the contents of policy files.
 // Mostly useful for debugging code that wants to show context.
 //
diff --git a/src/Portmap.cc b/src/Portmap.cc
index e806acdc7a..dd1049a361 100644
--- a/src/Portmap.cc
+++ b/src/Portmap.cc
@@ -1,5 +1,3 @@
-// $Id: Portmap.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Portmap.h b/src/Portmap.h
index cb2cb1293c..62e954bc80 100644
--- a/src/Portmap.h
+++ b/src/Portmap.h
@@ -1,5 +1,3 @@
-// $Id: Portmap.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef portmap_h
diff --git a/src/PrefixTable.cc b/src/PrefixTable.cc
index 03e1495957..e04c3f9294 100644
--- a/src/PrefixTable.cc
+++ b/src/PrefixTable.cc
@@ -1,5 +1,3 @@
-// $Id: PrefixTable.cc 1016 2005-01-31 21:23:50Z vern $
-
 #include "PrefixTable.h"
 #include "Reporter.h"
 
diff --git a/src/PrefixTable.h b/src/PrefixTable.h
index b718b3c561..78596c7f35 100644
--- a/src/PrefixTable.h
+++ b/src/PrefixTable.h
@@ -1,5 +1,3 @@
-// $Id: PrefixTable.h 969 2005-01-04 06:36:21Z vern $
-
 #ifndef PREFIXTABLE_H
 #define PREFIXTABLE_H
 
diff --git a/src/PriorityQueue.cc b/src/PriorityQueue.cc
index d94ccba7d6..8db161b10a 100644
--- a/src/PriorityQueue.cc
+++ b/src/PriorityQueue.cc
@@ -1,5 +1,3 @@
-// $Id: PriorityQueue.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/PriorityQueue.h b/src/PriorityQueue.h
index 45028553ce..87e10aa7ac 100644
--- a/src/PriorityQueue.h
+++ b/src/PriorityQueue.h
@@ -1,5 +1,3 @@
-// $Id: PriorityQueue.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef __PriorityQueue__
diff --git a/src/Queue.cc b/src/Queue.cc
index a0de35777b..28bcb92405 100644
--- a/src/Queue.cc
+++ b/src/Queue.cc
@@ -1,5 +1,3 @@
-// $Id: Queue.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Queue.h b/src/Queue.h
index 293d74ba7a..c9a69ad926 100644
--- a/src/Queue.h
+++ b/src/Queue.h
@@ -1,5 +1,3 @@
-// $Id: Queue.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef queue_h
diff --git a/src/RE.cc b/src/RE.cc
index af72d84519..b6f1a1361f 100644
--- a/src/RE.cc
+++ b/src/RE.cc
@@ -1,5 +1,3 @@
-// $Id: RE.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/RE.h b/src/RE.h
index f46f835649..a2fc709c88 100644
--- a/src/RE.h
+++ b/src/RE.h
@@ -1,5 +1,3 @@
-// $Id: RE.h 6781 2009-06-28 00:50:04Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef re_h
diff --git a/src/RPC.cc b/src/RPC.cc
index 02fb20a436..81fd6709b1 100644
--- a/src/RPC.cc
+++ b/src/RPC.cc
@@ -1,5 +1,3 @@
-// $Id: RPC.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include <stdlib.h>
diff --git a/src/RPC.h b/src/RPC.h
index 1b75b6cc48..0eee423460 100644
--- a/src/RPC.h
+++ b/src/RPC.h
@@ -1,5 +1,3 @@
-// $Id: RPC.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef rpc_h
diff --git a/src/RSH.cc b/src/RSH.cc
index 0b833697fd..8caf313e75 100644
--- a/src/RSH.cc
+++ b/src/RSH.cc
@@ -1,5 +1,3 @@
-// $Id: RSH.cc 6219 2008-10-01 05:39:07Z vern $
-
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/RSH.h b/src/RSH.h
index 8a6c5fde6f..136d0b07f1 100644
--- a/src/RSH.h
+++ b/src/RSH.h
@@ -1,5 +1,3 @@
-// $Id: RSH.h 6219 2008-10-01 05:39:07Z vern $
-
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef rsh_h
diff --git a/src/Reassem.cc b/src/Reassem.cc
index 319fcbff3b..89fe29e7d4 100644
--- a/src/Reassem.cc
+++ b/src/Reassem.cc
@@ -1,5 +1,3 @@
-// $Id: Reassem.cc 6703 2009-05-13 22:27:44Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include <algorithm>
diff --git a/src/Reassem.h b/src/Reassem.h
index 1563732180..06d1e28f40 100644
--- a/src/Reassem.h
+++ b/src/Reassem.h
@@ -1,5 +1,3 @@
-// $Id: Reassem.h 6703 2009-05-13 22:27:44Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef reassem_h
diff --git a/src/RemoteSerializer.cc b/src/RemoteSerializer.cc
index a80157767f..ef2de4a357 100644
--- a/src/RemoteSerializer.cc
+++ b/src/RemoteSerializer.cc
@@ -1,5 +1,3 @@
-// $Id: RemoteSerializer.cc 6951 2009-12-04 22:23:28Z vern $
-//
 // Processes involved in the communication:
 //
 //	 (Local-Parent) <-> (Local-Child) <-> (Remote-Child) <-> (Remote-Parent)
diff --git a/src/RemoteSerializer.h b/src/RemoteSerializer.h
index 18284463a1..eac1896533 100644
--- a/src/RemoteSerializer.h
+++ b/src/RemoteSerializer.h
@@ -1,5 +1,3 @@
-// $Id: RemoteSerializer.h 6951 2009-12-04 22:23:28Z vern $
-//
 // Communication between two Bro's.
 
 #ifndef REMOTE_SERIALIZER
diff --git a/src/Rlogin.cc b/src/Rlogin.cc
index 8404eacca7..524033c533 100644
--- a/src/Rlogin.cc
+++ b/src/Rlogin.cc
@@ -1,5 +1,3 @@
-// $Id: Rlogin.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Rlogin.h b/src/Rlogin.h
index ae1946369c..f8ad480630 100644
--- a/src/Rlogin.h
+++ b/src/Rlogin.h
@@ -1,5 +1,3 @@
-// $Id: Rlogin.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef rlogin_h
diff --git a/src/Rule.cc b/src/Rule.cc
index f54a725320..e9847c1721 100644
--- a/src/Rule.cc
+++ b/src/Rule.cc
@@ -1,5 +1,3 @@
-// $Id: Rule.cc 6914 2009-09-22 00:35:24Z vern $
-
 #include "config.h"
 
 #include "Rule.h"
diff --git a/src/Rule.h b/src/Rule.h
index e95dadc074..959008fbf9 100644
--- a/src/Rule.h
+++ b/src/Rule.h
@@ -1,5 +1,3 @@
-// $Id: Rule.h 6914 2009-09-22 00:35:24Z vern $
-
 #ifndef rule_h
 #define rule_h
 
diff --git a/src/RuleAction.cc b/src/RuleAction.cc
index 9fe807ffb2..bf90c0681e 100644
--- a/src/RuleAction.cc
+++ b/src/RuleAction.cc
@@ -1,5 +1,3 @@
-// $Id: RuleAction.cc 5906 2008-07-03 19:52:50Z vern $
-
 #include <string>
 using std::string;
 
diff --git a/src/RuleAction.h b/src/RuleAction.h
index 33d37bc6e2..a9feb0c314 100644
--- a/src/RuleAction.h
+++ b/src/RuleAction.h
@@ -1,5 +1,3 @@
-// $Id: RuleAction.h 5880 2008-06-30 17:42:45Z vern $
-
 #ifndef ruleaction_h
 #define ruleaction_h
 
diff --git a/src/RuleCondition.cc b/src/RuleCondition.cc
index 78dbee39cd..1b94fcffe6 100644
--- a/src/RuleCondition.cc
+++ b/src/RuleCondition.cc
@@ -1,5 +1,3 @@
-// $Id: RuleCondition.cc 6008 2008-07-23 00:24:22Z vern $
-
 #include "config.h"
 
 #include "RuleCondition.h"
diff --git a/src/RuleCondition.h b/src/RuleCondition.h
index a092543d62..b859930581 100644
--- a/src/RuleCondition.h
+++ b/src/RuleCondition.h
@@ -1,5 +1,3 @@
-// $Id: RuleCondition.h 80 2004-07-14 20:15:50Z jason $
-
 #ifndef rulecondition_h
 #define rulecondition_h
 
diff --git a/src/RuleMatcher.cc b/src/RuleMatcher.cc
index 1ca891883d..311d9814f3 100644
--- a/src/RuleMatcher.cc
+++ b/src/RuleMatcher.cc
@@ -1,5 +1,3 @@
-// $Id: RuleMatcher.cc 6724 2009-06-07 09:23:03Z vern $
-
 #include <algorithm>
 
 #include "config.h"
diff --git a/src/RuleMatcher.h b/src/RuleMatcher.h
index 085253c16e..5bba69e130 100644
--- a/src/RuleMatcher.h
+++ b/src/RuleMatcher.h
@@ -1,5 +1,3 @@
-// $Id: RuleMatcher.h 3526 2006-09-12 07:32:21Z vern $
-
 #ifndef sigs_h
 #define sigs_h
 
diff --git a/src/SMB.cc b/src/SMB.cc
index 5b3db68db9..edce2a69b8 100644
--- a/src/SMB.cc
+++ b/src/SMB.cc
@@ -1,5 +1,3 @@
-// $Id: SMB.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "NetVar.h"
diff --git a/src/SMB.h b/src/SMB.h
index 408fa91068..f7287efb79 100644
--- a/src/SMB.h
+++ b/src/SMB.h
@@ -1,5 +1,3 @@
-// $Id: SMB.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef smb_h
diff --git a/src/SMTP.cc b/src/SMTP.cc
index 5822d9d75f..3af8af3b7b 100644
--- a/src/SMTP.cc
+++ b/src/SMTP.cc
@@ -1,5 +1,3 @@
-// $Id: SMTP.cc 6782 2009-06-28 02:19:03Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/SMTP.h b/src/SMTP.h
index 69a5bc3e24..5b15dc44c0 100644
--- a/src/SMTP.h
+++ b/src/SMTP.h
@@ -1,5 +1,3 @@
-// $Id: SMTP.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef smtp_h
diff --git a/src/SMTP_cmd.def b/src/SMTP_cmd.def
index 79667ba7bd..545136048d 100644
--- a/src/SMTP_cmd.def
+++ b/src/SMTP_cmd.def
@@ -1,5 +1,3 @@
-// $Id: SMTP_cmd.def 80 2004-07-14 20:15:50Z jason $
-//
 // Definitions of SMTP commands.
 
 SMTP_CMD_DEF(EHLO)
diff --git a/src/SSH.cc b/src/SSH.cc
index b4ca9aa153..c07aad3dd1 100644
--- a/src/SSH.cc
+++ b/src/SSH.cc
@@ -1,5 +1,3 @@
-// $Id: SSH.cc 6782 2009-06-28 02:19:03Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/SSH.h b/src/SSH.h
index 503b1abcbe..ccdcd76929 100644
--- a/src/SSH.h
+++ b/src/SSH.h
@@ -1,5 +1,3 @@
-// $Id: SSH.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef ssh_h
diff --git a/src/SSLv2.cc b/src/SSLv2.cc
index f699b7bfdb..9fa654048d 100644
--- a/src/SSLv2.cc
+++ b/src/SSLv2.cc
@@ -1,5 +1,3 @@
-// $Id: SSLv2.cc 5988 2008-07-19 07:02:12Z vern $
-
 #include "SSLv2.h"
 #include "SSLv3.h"
 
diff --git a/src/Scope.cc b/src/Scope.cc
index 196937d984..cd47b325c1 100644
--- a/src/Scope.cc
+++ b/src/Scope.cc
@@ -1,5 +1,3 @@
-// $Id: Scope.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Scope.h b/src/Scope.h
index 1ed8d6da42..1ef58d871c 100644
--- a/src/Scope.h
+++ b/src/Scope.h
@@ -1,5 +1,3 @@
-// $Id: Scope.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef scope_h
diff --git a/src/ScriptAnaly.cc b/src/ScriptAnaly.cc
index 700c0ed4e8..bca75cc800 100644
--- a/src/ScriptAnaly.cc
+++ b/src/ScriptAnaly.cc
@@ -1,5 +1,3 @@
-// $Id: ScriptAnaly.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "Dict.h"
diff --git a/src/ScriptAnaly.h b/src/ScriptAnaly.h
index 180971e769..0561ecd389 100644
--- a/src/ScriptAnaly.h
+++ b/src/ScriptAnaly.h
@@ -1,5 +1,3 @@
-// $Id: ScriptAnaly.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef scriptanaly_h
diff --git a/src/SerialInfo.h b/src/SerialInfo.h
index 3ed2e91d26..d322aa4b37 100644
--- a/src/SerialInfo.h
+++ b/src/SerialInfo.h
@@ -1,5 +1,3 @@
-// $Id: SerialInfo.h 6752 2009-06-14 04:24:52Z vern $
-//
 // Helper classes to pass data between serialization methods.
 
 #ifndef serialinfo_h
diff --git a/src/SerialObj.cc b/src/SerialObj.cc
index cddb0b0963..6921115c56 100644
--- a/src/SerialObj.cc
+++ b/src/SerialObj.cc
@@ -1,5 +1,3 @@
-// $Id: SerialObj.cc 7075 2010-09-13 02:39:38Z vern $
-
 #include "SerialObj.h"
 #include "Serializer.h"
 
diff --git a/src/SerialObj.h b/src/SerialObj.h
index 4a12d53fe6..c3dc65684c 100644
--- a/src/SerialObj.h
+++ b/src/SerialObj.h
@@ -1,5 +1,3 @@
-// $Id: SerialObj.h 6752 2009-06-14 04:24:52Z vern $
-//
 // Infrastructure for serializable objects.
 //
 // How to make objects of class Foo serializable:
diff --git a/src/SerialTypes.h b/src/SerialTypes.h
index c2c4123a57..1ae070beee 100644
--- a/src/SerialTypes.h
+++ b/src/SerialTypes.h
@@ -1,5 +1,3 @@
-// $Id: SerialTypes.h 6752 2009-06-14 04:24:52Z vern $
-
 #ifndef serialtypes_h
 #define serialtypes_h
 
diff --git a/src/SerializationFormat.cc b/src/SerializationFormat.cc
index b229cbbc87..5e3a68a42e 100644
--- a/src/SerializationFormat.cc
+++ b/src/SerializationFormat.cc
@@ -1,5 +1,3 @@
-// $Id: SerializationFormat.cc 5873 2008-06-28 19:25:03Z vern $
-
 #include <ctype.h>
 
 #include "net_util.h"
diff --git a/src/SerializationFormat.h b/src/SerializationFormat.h
index b9c7ec1549..2067456bf1 100644
--- a/src/SerializationFormat.h
+++ b/src/SerializationFormat.h
@@ -1,5 +1,3 @@
-// $Id: SerializationFormat.h 5873 2008-06-28 19:25:03Z vern $
-//
 // Implements different data formats for serialization.
 
 #ifndef SERIALIZATION_FORMAT
diff --git a/src/Serializer.cc b/src/Serializer.cc
index 96821408a5..a29cb93b77 100644
--- a/src/Serializer.cc
+++ b/src/Serializer.cc
@@ -1,5 +1,3 @@
-// $Id: Serializer.cc 6752 2009-06-14 04:24:52Z vern $
-
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/src/Serializer.h b/src/Serializer.h
index 6bdac10f83..bf4d74ba48 100644
--- a/src/Serializer.h
+++ b/src/Serializer.h
@@ -1,5 +1,3 @@
-// $Id: Serializer.h 6752 2009-06-14 04:24:52Z vern $
-
 #ifndef SERIALIZER_H
 #define SERIALIZER_H
 
diff --git a/src/Sessions.cc b/src/Sessions.cc
index 1678f6798f..3825f35f62 100644
--- a/src/Sessions.cc
+++ b/src/Sessions.cc
@@ -1,5 +1,3 @@
-// $Id: Sessions.cc 7075 2010-09-13 02:39:38Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 
diff --git a/src/Sessions.h b/src/Sessions.h
index 6adc333282..452de874db 100644
--- a/src/Sessions.h
+++ b/src/Sessions.h
@@ -1,5 +1,3 @@
-// $Id: Sessions.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef sessions_h
diff --git a/src/SmithWaterman.cc b/src/SmithWaterman.cc
index 3f27018550..ef329e49a5 100644
--- a/src/SmithWaterman.cc
+++ b/src/SmithWaterman.cc
@@ -1,5 +1,3 @@
-// $Id: SmithWaterman.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/SmithWaterman.h b/src/SmithWaterman.h
index c8c80d09af..6ea191f5d9 100644
--- a/src/SmithWaterman.h
+++ b/src/SmithWaterman.h
@@ -1,5 +1,3 @@
-// $Id: SmithWaterman.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef smith_waterman_h
diff --git a/src/StateAccess.cc b/src/StateAccess.cc
index ef4c257f6b..e62904469c 100644
--- a/src/StateAccess.cc
+++ b/src/StateAccess.cc
@@ -1,5 +1,3 @@
-// $Id: StateAccess.cc 6888 2009-08-20 18:23:11Z vern $
-
 #include "Val.h"
 #include "StateAccess.h"
 #include "Serializer.h"
diff --git a/src/StateAccess.h b/src/StateAccess.h
index 1154756c83..bc5064602b 100644
--- a/src/StateAccess.h
+++ b/src/StateAccess.h
@@ -1,5 +1,3 @@
-// $Id: StateAccess.h 6781 2009-06-28 00:50:04Z vern $
-//
 // A class describing a state-modyfing access to a Value or an ID.
 
 #ifndef STATEACESSS_H
diff --git a/src/Stats.cc b/src/Stats.cc
index 28c0b38c22..4798a789a7 100644
--- a/src/Stats.cc
+++ b/src/Stats.cc
@@ -1,5 +1,3 @@
-// $Id: Stats.cc 7008 2010-03-25 02:42:20Z vern $
-
 #include "Conn.h"
 #include "File.h"
 #include "Event.h"
diff --git a/src/Stats.h b/src/Stats.h
index 8acb7ef190..eeebfe2213 100644
--- a/src/Stats.h
+++ b/src/Stats.h
@@ -1,5 +1,3 @@
-// $Id: Stats.h 6703 2009-05-13 22:27:44Z vern $
-//
 // Classes that collect and report statistics.
 
 #ifndef STATS_H
diff --git a/src/SteppingStone.cc b/src/SteppingStone.cc
index 96652456bf..32850d82c6 100644
--- a/src/SteppingStone.cc
+++ b/src/SteppingStone.cc
@@ -1,5 +1,3 @@
-// $Id: SteppingStone.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/SteppingStone.h b/src/SteppingStone.h
index 15165387f9..a47b268c83 100644
--- a/src/SteppingStone.h
+++ b/src/SteppingStone.h
@@ -1,5 +1,3 @@
-// $Id: SteppingStone.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef steppingstone_h
diff --git a/src/Stmt.cc b/src/Stmt.cc
index 80603a717b..6a83940b3b 100644
--- a/src/Stmt.cc
+++ b/src/Stmt.cc
@@ -1,5 +1,3 @@
-// $Id: Stmt.cc 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Stmt.h b/src/Stmt.h
index bbfdd98bfd..8e3a4b4118 100644
--- a/src/Stmt.h
+++ b/src/Stmt.h
@@ -1,5 +1,3 @@
-// $Id: Stmt.h 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef stmt_h
diff --git a/src/StmtEnums.h b/src/StmtEnums.h
index c00b16112f..f431e3fea1 100644
--- a/src/StmtEnums.h
+++ b/src/StmtEnums.h
@@ -1,5 +1,3 @@
-// $Id: StmtEnums.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 
diff --git a/src/TCP.cc b/src/TCP.cc
index 4c56eb7ff9..0fae07a24d 100644
--- a/src/TCP.cc
+++ b/src/TCP.cc
@@ -1,5 +1,3 @@
-// $Id: TCP.cc 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include <algorithm>
diff --git a/src/TCP.h b/src/TCP.h
index 1db8c1ed68..65f437856a 100644
--- a/src/TCP.h
+++ b/src/TCP.h
@@ -1,5 +1,3 @@
-// $Id: TCP.h 6782 2009-06-28 02:19:03Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef TCP_H
diff --git a/src/TCP_Endpoint.cc b/src/TCP_Endpoint.cc
index 6d74a1d818..5a65a18d7c 100644
--- a/src/TCP_Endpoint.cc
+++ b/src/TCP_Endpoint.cc
@@ -1,5 +1,3 @@
-// $Id: TCP_Endpoint.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "Net.h"
diff --git a/src/TCP_Endpoint.h b/src/TCP_Endpoint.h
index baae2037c4..758a504ff5 100644
--- a/src/TCP_Endpoint.h
+++ b/src/TCP_Endpoint.h
@@ -1,5 +1,3 @@
-// $Id: TCP_Endpoint.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef tcpendpoint_h
diff --git a/src/TCP_Reassembler.cc b/src/TCP_Reassembler.cc
index bbde905320..ba31ab68d0 100644
--- a/src/TCP_Reassembler.cc
+++ b/src/TCP_Reassembler.cc
@@ -1,5 +1,3 @@
-// $Id: TCP_Reassembler.cc,v 1.1.2.8 2006/05/31 01:52:02 sommer Exp $
-
 #include <algorithm>
 
 #include "Analyzer.h"
diff --git a/src/TCP_Reassembler.h b/src/TCP_Reassembler.h
index 772c5f6f9c..cb1750e2a2 100644
--- a/src/TCP_Reassembler.h
+++ b/src/TCP_Reassembler.h
@@ -1,5 +1,3 @@
-// $Id: TCP_Reassembler.h,v 1.1.2.8 2006/05/31 01:52:02 sommer Exp $
-
 #ifndef TCP_REASSEMBLER_H
 #define TCP_REASSEMBLER_H
 
diff --git a/src/Telnet.cc b/src/Telnet.cc
index 91151fe735..62c7d7b500 100644
--- a/src/Telnet.cc
+++ b/src/Telnet.cc
@@ -1,5 +1,3 @@
-// $Id: Telnet.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Telnet.h b/src/Telnet.h
index 89150bcbc7..5675775789 100644
--- a/src/Telnet.h
+++ b/src/Telnet.h
@@ -1,5 +1,3 @@
-// $Id: Telnet.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef telnet_h
diff --git a/src/Timer.cc b/src/Timer.cc
index c7feb0bbd8..2e2fb09c6b 100644
--- a/src/Timer.cc
+++ b/src/Timer.cc
@@ -1,5 +1,3 @@
-// $Id: Timer.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Timer.h b/src/Timer.h
index c98aeefc22..bb6b8d56ae 100644
--- a/src/Timer.h
+++ b/src/Timer.h
@@ -1,5 +1,3 @@
-// $Id: Timer.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef timer_h
diff --git a/src/Traverse.cc b/src/Traverse.cc
index 733ceb450c..78eed27800 100644
--- a/src/Traverse.cc
+++ b/src/Traverse.cc
@@ -1,5 +1,3 @@
-// $Id: Traverse.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "Scope.h"
diff --git a/src/Traverse.h b/src/Traverse.h
index ea300fad18..3791a9bbdc 100644
--- a/src/Traverse.h
+++ b/src/Traverse.h
@@ -1,5 +1,3 @@
-// $Id: Traverse.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef traverse_h
diff --git a/src/TraverseTypes.h b/src/TraverseTypes.h
index 0cba17a5a9..b0528f34be 100644
--- a/src/TraverseTypes.h
+++ b/src/TraverseTypes.h
@@ -1,5 +1,3 @@
-// $Id: TraverseTypes.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef statictypes_h
diff --git a/src/Trigger.cc b/src/Trigger.cc
index 45d1959ee7..272d03a859 100644
--- a/src/Trigger.cc
+++ b/src/Trigger.cc
@@ -1,5 +1,3 @@
-// $Id: Trigger.cc 2359 2005-12-21 23:55:32Z vern $
-
 #include <algorithm>
 
 #include "Trigger.h"
diff --git a/src/Trigger.h b/src/Trigger.h
index 7f9931b033..8001308bce 100644
--- a/src/Trigger.h
+++ b/src/Trigger.h
@@ -1,5 +1,3 @@
-// $Id: Trigger.h 2359 2005-12-21 23:55:32Z vern $
-
 #ifndef TRIGGER_H
 #define TRIGGER_H
 
diff --git a/src/Type.cc b/src/Type.cc
index 521db20ebf..446660989b 100644
--- a/src/Type.cc
+++ b/src/Type.cc
@@ -1,5 +1,3 @@
-// $Id: Type.cc 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Type.h b/src/Type.h
index 6ab8c65e03..652adb2a12 100644
--- a/src/Type.h
+++ b/src/Type.h
@@ -1,5 +1,3 @@
-// $Id: Type.h 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef type_h
diff --git a/src/UDP.cc b/src/UDP.cc
index 5331560eff..35e9f58388 100644
--- a/src/UDP.cc
+++ b/src/UDP.cc
@@ -1,5 +1,3 @@
-// $Id: UDP.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include <algorithm>
diff --git a/src/UDP.h b/src/UDP.h
index b04c5e3ef0..5124adf4cd 100644
--- a/src/UDP.h
+++ b/src/UDP.h
@@ -1,5 +1,3 @@
-// $Id: UDP.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef udp_h
diff --git a/src/Val.cc b/src/Val.cc
index ddec9b616d..d956f60a56 100644
--- a/src/Val.cc
+++ b/src/Val.cc
@@ -1,5 +1,3 @@
-// $Id: Val.cc 6945 2009-11-27 19:25:10Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Val.h b/src/Val.h
index 76edea5429..9ea61eb873 100644
--- a/src/Val.h
+++ b/src/Val.h
@@ -1,5 +1,3 @@
-// $Id: Val.h 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef val_h
diff --git a/src/Var.cc b/src/Var.cc
index 390b6b3684..897a454670 100644
--- a/src/Var.cc
+++ b/src/Var.cc
@@ -1,5 +1,3 @@
-// $Id: Var.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/Var.h b/src/Var.h
index 6b4ddaece2..8b9866ed2d 100644
--- a/src/Var.h
+++ b/src/Var.h
@@ -1,5 +1,3 @@
-// $Id: Var.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef var_h
diff --git a/src/X509.cc b/src/X509.cc
index 783bccdad1..55b6b78f04 100644
--- a/src/X509.cc
+++ b/src/X509.cc
@@ -1,5 +1,3 @@
-// $Id: X509.cc 6724 2009-06-07 09:23:03Z vern $
-
 #include <openssl/err.h>
 
 #include "X509.h"
diff --git a/src/XDR.cc b/src/XDR.cc
index 53e9a4b2dd..96d855ddbd 100644
--- a/src/XDR.cc
+++ b/src/XDR.cc
@@ -1,5 +1,3 @@
-// $Id: XDR.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include <algorithm>
diff --git a/src/XDR.h b/src/XDR.h
index 2c6e1d69ac..65192d6067 100644
--- a/src/XDR.h
+++ b/src/XDR.h
@@ -1,5 +1,3 @@
-// $Id: XDR.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef xdr_h
diff --git a/src/ZIP.cc b/src/ZIP.cc
index 84643c2874..26095d1f11 100644
--- a/src/ZIP.cc
+++ b/src/ZIP.cc
@@ -1,5 +1,3 @@
-// $Id: ZIP.cc,v 1.1.4.2 2006/05/31 21:49:29 sommer Exp $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "ZIP.h"
diff --git a/src/ZIP.h b/src/ZIP.h
index 3debb6c3c8..ab5d2ce68b 100644
--- a/src/ZIP.h
+++ b/src/ZIP.h
@@ -1,5 +1,3 @@
-// $Id: ZIP.h,v 1.1.4.2 2006/05/31 21:49:29 sommer Exp $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef zip_h
diff --git a/src/bif_arg.cc b/src/bif_arg.cc
index 5900c117eb..a4772e4d73 100644
--- a/src/bif_arg.cc
+++ b/src/bif_arg.cc
@@ -1,5 +1,3 @@
-// $Id: bif_arg.cc 3234 2006-06-08 02:38:11Z vern $
-
 #include "config.h"
 
 #include <set>
diff --git a/src/bif_arg.h b/src/bif_arg.h
index 0462f6e173..4ba6fa0c4f 100644
--- a/src/bif_arg.h
+++ b/src/bif_arg.h
@@ -1,5 +1,3 @@
-// $Id: bif_arg.h 3234 2006-06-08 02:38:11Z vern $
-
 #ifndef bif_arg_h
 #define bif_arg_h
 
diff --git a/src/bif_type.def b/src/bif_type.def
index 84179be1c3..f766e334cf 100644
--- a/src/bif_type.def
+++ b/src/bif_type.def
@@ -1,5 +1,3 @@
-// $Id: bif_type.def 5083 2007-11-28 17:42:58Z vern $
-
 // DEFINE_BIF_TYPE(id, bif_type, bro_type, c_type, accessor, constructor)
 
 DEFINE_BIF_TYPE(TYPE_ADDR, 	"addr", "addr", "addr_type", 		"%s->AsAddr()", 	"new AddrVal(%s)")
diff --git a/src/binpac-lib.pac b/src/binpac-lib.pac
index 4e95a1a3db..2c501d90a4 100644
--- a/src/binpac-lib.pac
+++ b/src/binpac-lib.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 %extern{
 #include <string.h>
 
diff --git a/src/binpac.pac b/src/binpac.pac
index 8704fb5a61..ae601ce6b9 100644
--- a/src/binpac.pac
+++ b/src/binpac.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 # Prototypes for functions implemented in binpac-lib.pac.
 
 function bytestring_to_int(s: const_bytestring, base: int): int;
diff --git a/src/binpac_bro-lib.pac b/src/binpac_bro-lib.pac
index 20648e2d4f..c7cee6dc98 100644
--- a/src/binpac_bro-lib.pac
+++ b/src/binpac_bro-lib.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 %extern{
 #include "util.h"
 %}
diff --git a/src/binpac_bro.h b/src/binpac_bro.h
index ffeb4ff28d..dcdbe94f57 100644
--- a/src/binpac_bro.h
+++ b/src/binpac_bro.h
@@ -1,5 +1,3 @@
-// $Id:$
-
 #ifndef binpac_bro_h
 #define binpac_bro_h
 
diff --git a/src/bittorrent-analyzer.pac b/src/bittorrent-analyzer.pac
index 7e8678b7de..ee7a70ea21 100644
--- a/src/bittorrent-analyzer.pac
+++ b/src/bittorrent-analyzer.pac
@@ -1,5 +1,3 @@
-# $Id:$
-#
 # This code contributed by Nadi Sarrar.
 
 connection BitTorrent_Conn(bro_analyzer: BroAnalyzer) {
diff --git a/src/bittorrent-protocol.pac b/src/bittorrent-protocol.pac
index 8bd1652cfa..d3a147f157 100644
--- a/src/bittorrent-protocol.pac
+++ b/src/bittorrent-protocol.pac
@@ -1,5 +1,3 @@
-# $Id:$
-#
 # This code contributed by Nadi Sarrar.
 
 enum BitTorrent_peer_msg_type {
diff --git a/src/bro.bif b/src/bro.bif
index 66e6a51e17..61786792f8 100644
--- a/src/bro.bif
+++ b/src/bro.bif
@@ -1,5 +1,3 @@
-# $Id: bro.bif 7075 2010-09-13 02:39:38Z vern $
-#
 # Definitions of Bro built-in functions.
 
 %%{ // C segment
diff --git a/src/bro.pac b/src/bro.pac
index 169f7c27ef..b622041c12 100644
--- a/src/bro.pac
+++ b/src/bro.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 %extern{
 #include "binpac_bro.h"
 %}
diff --git a/src/bsd-getopt-long.c b/src/bsd-getopt-long.c
index 5b3cc093b0..7ecb064fc8 100644
--- a/src/bsd-getopt-long.c
+++ b/src/bsd-getopt-long.c
@@ -1,5 +1,3 @@
-/* $Id: bsd-getopt-long.c 1362 2005-09-12 19:49:08Z vern $ */
-
 /*    $OpenBSD: getopt_long.c,v 1.17 2004/06/03 18:46:52 millert Exp $    */
 /*    $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $    */
 
diff --git a/src/bsd-getopt-long.h b/src/bsd-getopt-long.h
index e2c381f3b7..c94589afaa 100644
--- a/src/bsd-getopt-long.h
+++ b/src/bsd-getopt-long.h
@@ -1,5 +1,3 @@
-/* $Id: bsd-getopt-long.h 1361 2005-09-12 19:48:26Z vern $ */
-
 /*    $OpenBSD: getopt_long.c,v 1.13 2003/06/03 01:52:40 millert Exp $    */
 /*    $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $    */
 
diff --git a/src/builtin-func.l b/src/builtin-func.l
index 9e69adc69d..1d61f31734 100644
--- a/src/builtin-func.l
+++ b/src/builtin-func.l
@@ -1,6 +1,4 @@
 %{
-// $Id: builtin-func.l 6015 2008-07-23 05:42:37Z vern $
-
 #include <string.h>
 #include <unistd.h>
 #include "bif_arg.h"
diff --git a/src/const.bif b/src/const.bif
index 825c21e7a5..96630e300b 100644
--- a/src/const.bif
+++ b/src/const.bif
@@ -1,5 +1,3 @@
-# $Id: const.bif 3929 2007-01-14 00:37:59Z vern $
-
 # Documentation and default values for these are located in policy/bro.init.
 
 const ignore_keep_alive_rexmit: bool;
diff --git a/src/cq.c b/src/cq.c
index b669dabd35..c5405e526a 100644
--- a/src/cq.c
+++ b/src/cq.c
@@ -2,11 +2,6 @@
  * See the file "COPYING" in the main distribution directory for copyright.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Id: cq.c 6219 2008-10-01 05:39:07Z vern $ (LBL)";
-#endif
-
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/src/cq.h b/src/cq.h
index 38c5204f0c..540cccde74 100644
--- a/src/cq.h
+++ b/src/cq.h
@@ -1,5 +1,3 @@
-/* @(#) $Id: cq.h 80 2004-07-14 20:15:50Z jason $ (LBL) */
-
 struct cq_handle *cq_init(double, double);
 void cq_destroy(struct cq_handle *);
 int cq_enqueue(struct cq_handle *, double, void *);
diff --git a/src/dce_rpc-analyzer.pac b/src/dce_rpc-analyzer.pac
index 353c9f3795..ddc99abd8e 100644
--- a/src/dce_rpc-analyzer.pac
+++ b/src/dce_rpc-analyzer.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 # DCE/RPC protocol data unit.
 
 type DCE_RPC_PDU = record {
diff --git a/src/dce_rpc-protocol.pac b/src/dce_rpc-protocol.pac
index 77c7aaff62..a7bfcb5368 100644
--- a/src/dce_rpc-protocol.pac
+++ b/src/dce_rpc-protocol.pac
@@ -1,5 +1,3 @@
-# $Id: dce_rpc-protocol.pac,v 1.1.4.2 2006/06/02 15:13:09 rpang Exp $
-#
 # Definitions for DCE RPC.
 
 enum dce_rpc_ptype {
diff --git a/src/dce_rpc.pac b/src/dce_rpc.pac
index 58c2250c26..cbcd0cbdc4 100644
--- a/src/dce_rpc.pac
+++ b/src/dce_rpc.pac
@@ -1,5 +1,3 @@
-# $Id: dce_rpc.pac 4608 2007-07-05 18:23:58Z vern $
-
 %include binpac.pac
 %include bro.pac
 
diff --git a/src/dce_rpc_simple.pac b/src/dce_rpc_simple.pac
index ff495a2e2b..f31c2a078b 100644
--- a/src/dce_rpc_simple.pac
+++ b/src/dce_rpc_simple.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 %include bro.pac
 
 analyzer DCE_RPC_Simple withcontext {};
diff --git a/src/dhcp-analyzer.pac b/src/dhcp-analyzer.pac
index ef8b888330..a9f1c6bab0 100644
--- a/src/dhcp-analyzer.pac
+++ b/src/dhcp-analyzer.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 connection DHCP_Conn(bro_analyzer: BroAnalyzer) {
 	upflow = DHCP_Flow(true);
 	downflow = DHCP_Flow(false);
diff --git a/src/dhcp-protocol.pac b/src/dhcp-protocol.pac
index 46cceb56c6..d77780b1b3 100644
--- a/src/dhcp-protocol.pac
+++ b/src/dhcp-protocol.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 # DHCP Message Type according to RFC 1533.
 
 # Refer to RFC 2131 for op types.
diff --git a/src/dhcp.pac b/src/dhcp.pac
index 852433a410..9e9d7755a4 100644
--- a/src/dhcp.pac
+++ b/src/dhcp.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 %include bro.pac
 
 analyzer DHCP withcontext {
diff --git a/src/dns-analyzer.pac b/src/dns-analyzer.pac
index 72bda3165f..0c2dc1b491 100644
--- a/src/dns-analyzer.pac
+++ b/src/dns-analyzer.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 %extern{
 #include <set>
 %}
diff --git a/src/dns-protocol.pac b/src/dns-protocol.pac
index d5b8036e11..fbeb9d0fa3 100644
--- a/src/dns-protocol.pac
+++ b/src/dns-protocol.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 enum DNS_answer_type {
 	DNS_QUESTION,
 	DNS_ANSWER,
diff --git a/src/dns.pac b/src/dns.pac
index dc5ca586f8..aeffdf0bc7 100644
--- a/src/dns.pac
+++ b/src/dns.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 %include bro.pac
 
 analyzer DNS withcontext {
diff --git a/src/dns_tcp.pac b/src/dns_tcp.pac
index f2c7f5f523..d31ff58c6e 100644
--- a/src/dns_tcp.pac
+++ b/src/dns_tcp.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 %extern{
 #include "dns_pac.h"	// for DNS_Conn
 %}
diff --git a/src/epmapper.pac b/src/epmapper.pac
index c9eea3c139..7fbaf47418 100644
--- a/src/epmapper.pac
+++ b/src/epmapper.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 type epmapper_lookup_req = record {
 	inquiry_type	: uint32;
 	# object	: uuid_p_t;
diff --git a/src/event.bif b/src/event.bif
index c3c11b6a7e..d953ac78fe 100644
--- a/src/event.bif
+++ b/src/event.bif
@@ -1,5 +1,3 @@
-# $Id: event.bif 6942 2009-11-16 03:54:08Z vern $
-
 event bro_init%(%);
 event bro_done%(%);
 
diff --git a/src/http-analyzer.pac b/src/http-analyzer.pac
index c1a4dd7b26..e12be59438 100644
--- a/src/http-analyzer.pac
+++ b/src/http-analyzer.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 %extern{
 #include <ctype.h>
 
diff --git a/src/http-protocol.pac b/src/http-protocol.pac
index 1c9f4b4c17..e4487a75e3 100644
--- a/src/http-protocol.pac
+++ b/src/http-protocol.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 enum ExpectBody {
 	BODY_EXPECTED,
 	BODY_NOT_EXPECTED,
diff --git a/src/http.pac b/src/http.pac
index 217215e998..38e6ad0b5e 100644
--- a/src/http.pac
+++ b/src/http.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 %include binpac.pac
 %include bro.pac
 
diff --git a/src/input.h b/src/input.h
index 8af7a35445..8fcceb256b 100644
--- a/src/input.h
+++ b/src/input.h
@@ -1,5 +1,3 @@
-// $Id: input.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef input_h
diff --git a/src/main.cc b/src/main.cc
index d3d3c446f5..dc7e12060a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,5 +1,3 @@
-// $Id: main.cc 6829 2009-07-09 09:12:59Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/make_dbg_constants.pl b/src/make_dbg_constants.pl
index d4781dccf6..29efac8050 100644
--- a/src/make_dbg_constants.pl
+++ b/src/make_dbg_constants.pl
@@ -1,5 +1,3 @@
-# $Id: make_dbg_constants.pl 80 2004-07-14 20:15:50Z jason $
-#
 # Build the DebugCmdConstants.h and DebugCmdInfoConstants.h files from the
 # DebugCmdInfoConstants.in file.
 #
diff --git a/src/md5.c b/src/md5.c
index 941c0d37e5..888993b9c4 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -21,7 +21,6 @@
   ghost@aladdin.com
 
  */
-/* $Id: md5.c 80 2004-07-14 20:15:50Z jason $ */
 /*
   Independent implementation of MD5 (RFC 1321).
 
diff --git a/src/md5.h b/src/md5.h
index 8cff20d0af..2806b5b9b5 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -21,7 +21,6 @@
   ghost@aladdin.com
 
  */
-/* $Id: md5.h 80 2004-07-14 20:15:50Z jason $ */
 /*
   Independent implementation of MD5 (RFC 1321).
 
diff --git a/src/nb_dns.c b/src/nb_dns.c
index 225eb984cf..6f42004dd0 100644
--- a/src/nb_dns.c
+++ b/src/nb_dns.c
@@ -1,10 +1,6 @@
 /*
  * See the file "COPYING" in the main distribution directory for copyright.
  */
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Id: nb_dns.c 6219 2008-10-01 05:39:07Z vern $ (LBL)";
-#endif
 /*
  * nb_dns - non-blocking dns routines
  *
diff --git a/src/nb_dns.h b/src/nb_dns.h
index 5787a3fdb0..d458f61716 100644
--- a/src/nb_dns.h
+++ b/src/nb_dns.h
@@ -1,5 +1,4 @@
-/* @(#) $Id: nb_dns.h 6219 2008-10-01 05:39:07Z vern $ (LBL)
- *
+/*
  * See the file "COPYING" in the main distribution directory for copyright.
  */
 
diff --git a/src/ncp.pac b/src/ncp.pac
index 8a3fcf1478..86b8bca5da 100644
--- a/src/ncp.pac
+++ b/src/ncp.pac
@@ -1,5 +1,3 @@
-# $Id: ncp.pac 4608 2007-07-05 18:23:58Z vern $
-#
 # Netware Core Protocol
 
 %include bro.pac
diff --git a/src/net_util.cc b/src/net_util.cc
index d7dc3f4add..f1cb760f64 100644
--- a/src/net_util.cc
+++ b/src/net_util.cc
@@ -1,5 +1,3 @@
-// $Id: net_util.cc 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/net_util.h b/src/net_util.h
index 25b6b293fc..28abf4dbcb 100644
--- a/src/net_util.h
+++ b/src/net_util.h
@@ -1,5 +1,3 @@
-// $Id: net_util.h 6219 2008-10-01 05:39:07Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef netutil_h
diff --git a/src/netflow-analyzer.pac b/src/netflow-analyzer.pac
index 68de4d4a4e..e89a0181a2 100644
--- a/src/netflow-analyzer.pac
+++ b/src/netflow-analyzer.pac
@@ -1,4 +1,3 @@
-# $Id:$
 # Code written by Bernhard Ager (2007).
 
 analyzer NetFlow withcontext {
diff --git a/src/netflow-protocol.pac b/src/netflow-protocol.pac
index 7d106aed34..6b97b7cee6 100644
--- a/src/netflow-protocol.pac
+++ b/src/netflow-protocol.pac
@@ -1,4 +1,3 @@
-# $Id:$
 # Code written by Bernhard Ager (2007).
 
 type NetFlowPacket = record {
diff --git a/src/netflow.pac b/src/netflow.pac
index 8484d5fd11..91040aadeb 100644
--- a/src/netflow.pac
+++ b/src/netflow.pac
@@ -1,4 +1,3 @@
-# $Id:$
 # Code written by Bernhard Ager (2007).
 
 %extern{
diff --git a/src/parse.y b/src/parse.y
index c3624bfd2d..f360374d0b 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1,5 +1,4 @@
 %{
-// $Id: parse.in 6688 2009-04-16 22:44:55Z vern $
 // See the file "COPYING" in the main distribution directory for copyright.
 %}
 
diff --git a/src/patricia.c b/src/patricia.c
index 8e40cb5ef6..ef9c008f4b 100644
--- a/src/patricia.c
+++ b/src/patricia.c
@@ -1,5 +1,4 @@
 /*
- * $Id: patricia.c 80 2004-07-14 20:15:50Z jason $
  * Dave Plonka <plonka@doit.wisc.edu>
  *
  * This product includes software developed by the University of Michigan,
diff --git a/src/patricia.h b/src/patricia.h
index 0118679331..4bc2f9b81f 100644
--- a/src/patricia.h
+++ b/src/patricia.h
@@ -1,5 +1,4 @@
 /*
- * $Id: patricia.h 967 2005-01-03 07:19:06Z vern $
  * Dave Plonka <plonka@doit.wisc.edu>
  *
  * This product includes software developed by the University of Michigan,
diff --git a/src/re-parse.y b/src/re-parse.y
index 26c8ab6716..3847c06f29 100644
--- a/src/re-parse.y
+++ b/src/re-parse.y
@@ -1,8 +1,6 @@
 // parse.y - parser for flex input
 
 %{
-// $Id: re-parse.y 5857 2008-06-26 23:00:03Z vern $
-
 #include <stdlib.h>
 
 #include "CCL.h"
diff --git a/src/re-scan.l b/src/re-scan.l
index fbd85899a4..0d737f08a6 100644
--- a/src/re-scan.l
+++ b/src/re-scan.l
@@ -5,8 +5,6 @@
  */
 
 %{
-// $Id: re-scan.l 6219 2008-10-01 05:39:07Z vern $
-
 #include "CCL.h"
 #include "NFA.h"
 #include "util.h"
diff --git a/src/rule-parse.y b/src/rule-parse.y
index 73c04a72ab..c8770c3e22 100644
--- a/src/rule-parse.y
+++ b/src/rule-parse.y
@@ -1,6 +1,4 @@
 %{
-/* $Id: rule-parse.y 5988 2008-07-19 07:02:12Z vern $ */
-
 #include <stdio.h>
 #include "RuleMatcher.h"
 #include "Reporter.h"
diff --git a/src/rule-scan.l b/src/rule-scan.l
index 0c444543b2..1ba9bed1de 100644
--- a/src/rule-scan.l
+++ b/src/rule-scan.l
@@ -1,5 +1,3 @@
-/* $Id: rule-scan.l 6914 2009-09-22 00:35:24Z vern $ */
-
 %{
 typedef unsigned int uint32;
 
diff --git a/src/scan.l b/src/scan.l
index bbac148a10..4383561a89 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -1,4 +1,3 @@
-/* $Id: scan.l 6510 2009-01-08 14:51:04Z vern $ */
 %{
 // See the file "COPYING" in the main distribution directory for copyright.
 
diff --git a/src/setsignal.c b/src/setsignal.c
index f5263bb06d..b49f0784e9 100644
--- a/src/setsignal.c
+++ b/src/setsignal.c
@@ -2,11 +2,6 @@
  * See the file "COPYING" in the main distribution directory for copyright.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Id: setsignal.c 6219 2008-10-01 05:39:07Z vern $ (LBL)";
-#endif
-
 #include "config.h"			/* must appear before first ifdef */
 
 #include <sys/types.h>
diff --git a/src/setsignal.h b/src/setsignal.h
index 8bacdca8db..b768ed031f 100644
--- a/src/setsignal.h
+++ b/src/setsignal.h
@@ -1,7 +1,6 @@
 /*
  * See the file "COPYING" in the main distribution directory for copyright.
  *
- * @(#) $Id: setsignal.h 6219 2008-10-01 05:39:07Z vern $ (LBL)
  */
 #ifndef setsignal_h
 #define setsignal_h
diff --git a/src/smb-protocol.pac b/src/smb-protocol.pac
index b00613f16c..585edfacd6 100644
--- a/src/smb-protocol.pac
+++ b/src/smb-protocol.pac
@@ -1,5 +1,3 @@
-# $Id$
-#
 # CIFS/SMB
 
 # TODO:
diff --git a/src/smb.pac b/src/smb.pac
index 4bd2c34bc5..740ad47991 100644
--- a/src/smb.pac
+++ b/src/smb.pac
@@ -1,5 +1,3 @@
-# $Id: smb.pac 3929 2007-01-14 00:37:59Z vern $
-
 %include binpac.pac
 %include bro.pac
 
diff --git a/src/ssl-defs.pac b/src/ssl-defs.pac
index 6a4a91bb36..31d90338f5 100644
--- a/src/ssl-defs.pac
+++ b/src/ssl-defs.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 # Some common definitions for the SSL and SSL record-layer analyzers.
 
 %extern{
diff --git a/src/ssl.pac b/src/ssl.pac
index 82dd0246c4..25aed7a66f 100644
--- a/src/ssl.pac
+++ b/src/ssl.pac
@@ -1,5 +1,3 @@
-# $Id:$
-
 # binpac file for SSL analyzer
 
 # split in three parts:
diff --git a/src/strings.bif b/src/strings.bif
index d13de8accb..3945569f15 100644
--- a/src/strings.bif
+++ b/src/strings.bif
@@ -1,5 +1,3 @@
-# $Id: strings.bif 6920 2009-10-03 20:47:25Z vern $
-#
 # Definitions of Bro built-in functions related to strings.
 
 
diff --git a/src/util.cc b/src/util.cc
index c8e26f1bab..b10fae925b 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -1,5 +1,3 @@
-// $Id: util.cc 6916 2009-09-24 20:48:36Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "config.h"
diff --git a/src/util.h b/src/util.h
index 82c86da950..195b4b7748 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,5 +1,3 @@
-// $Id: util.h 6782 2009-06-28 02:19:03Z vern $
-//
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #ifndef util_h