diff --git a/aclocal-fallback/libgcrypt.m4 b/aclocal-fallback/libgcrypt.m4
index 018b9294d6f..20bd105561c 100644
--- a/aclocal-fallback/libgcrypt.m4
+++ b/aclocal-fallback/libgcrypt.m4
@@ -1,6 +1,5 @@
 dnl Autoconf macros for libgcrypt
 dnl       Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-dnl $Id$
 dnl
 dnl This file is free software; as a special exception the author gives
 dnl unlimited permission to copy and/or distribute it, with or without
diff --git a/epan/compress/Makefile.am b/epan/compress/Makefile.am
index 9f86830c5e3..7ccf292a00e 100644
--- a/epan/compress/Makefile.am
+++ b/epan/compress/Makefile.am
@@ -1,8 +1,6 @@
 # Makefile.am
 # Automake file for the compress for Wireshark
 #
-# $Id$
-#
 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
diff --git a/epan/compress/Makefile.common b/epan/compress/Makefile.common
index 0dd8673e875..a9cc4bb0282 100644
--- a/epan/compress/Makefile.common
+++ b/epan/compress/Makefile.common
@@ -3,8 +3,6 @@
 #     a) common to both files and
 #     b) portable between both files
 #
-# $Id$
-#
 # Wireshark - Network traffic analyzer
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
diff --git a/epan/compress/Makefile.nmake b/epan/compress/Makefile.nmake
index cdb7fda62f7..b4af1f03f1d 100644
--- a/epan/compress/Makefile.nmake
+++ b/epan/compress/Makefile.nmake
@@ -1,7 +1,5 @@
 ## Makefile for building lzxpress.lib with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
-#
-# $Id$
 
 include ..\..\config.nmake
 include Makefile.common
diff --git a/epan/crypt/Custom.common b/epan/crypt/Custom.common
index e52bae703f8..88f4487c053 100644
--- a/epan/crypt/Custom.common
+++ b/epan/crypt/Custom.common
@@ -1,6 +1,5 @@
-##
-## $Id$
-## Here you can add custom crypto files
+#
+# Here you can add custom crypto files
 #
 
-CUSTOM_CRYPTO_SRC = 
\ No newline at end of file
+CUSTOM_CRYPTO_SRC = 
diff --git a/packaging/nsis/custom_diameter_xmls.txt b/packaging/nsis/custom_diameter_xmls.txt
index 002cf171644..b89ce665e9c 100644
--- a/packaging/nsis/custom_diameter_xmls.txt
+++ b/packaging/nsis/custom_diameter_xmls.txt
@@ -1,4 +1,3 @@
-; $Id$
 ;Add your custom diameter dictionary here
 ; Example:
 ;File "${STAGING_DIR}\diameter\foo.xml"
diff --git a/packaging/nsis/custom_mibs.txt b/packaging/nsis/custom_mibs.txt
index bca7084aee6..5b863a9b2a0 100644
--- a/packaging/nsis/custom_mibs.txt
+++ b/packaging/nsis/custom_mibs.txt
@@ -1,4 +1,3 @@
-; $Id$
 ; Add your custom SNMP MIBS directives here
 ; Example:
 ; Point to the dir of the MIBS
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi
index a7081411d14..7dcb8d4d749 100755
--- a/packaging/nsis/uninstall.nsi
+++ b/packaging/nsis/uninstall.nsi
@@ -1,7 +1,6 @@
 ;
 ; uninstall.nsi
 ;
-; $Id$
 
 ; Create an installer that only writes an uninstaller.
 ; http://nsis.sourceforge.net/Signing_an_Uninstaller
diff --git a/plugins/mate/mate_parser.l b/plugins/mate/mate_parser.l
index 855637aebf1..a3f609e5057 100644
--- a/plugins/mate/mate_parser.l
+++ b/plugins/mate/mate_parser.l
@@ -26,8 +26,6 @@
 	*
 	* Copyright 2004, Luis E. Garcia Ontanon <luis@ontanon.org>
 	*
-	* $Id$
-	*
 	* Wireshark - Network traffic analyzer
 	* By Gerald Combs <gerald@wireshark.org>
 	* Copyright 1998 Gerald Combs
diff --git a/plugins/wimaxasncp/wimaxasncp_dict.l b/plugins/wimaxasncp/wimaxasncp_dict.l
index 47547d493d1..2c889b3a619 100644
--- a/plugins/wimaxasncp/wimaxasncp_dict.l
+++ b/plugins/wimaxasncp/wimaxasncp_dict.l
@@ -36,8 +36,6 @@
 	 ** wimaxasncp_dict.h
 	 ** WIMAXASNCP Dictionary Import Routines
 	 **
-	 ** $Id$
-	 **
 	 ** (c) 2007, Luis E. Garcia Ontanon <luis@ontanon.org>
 	 ** (c) 2007, Stephen Croll <stephen.d.croll@gmail.com>
 	 **
diff --git a/wimaxasncp/dictionary.dtd b/wimaxasncp/dictionary.dtd
index 08dc3c7910b..9cb556e09b5 100644
--- a/wimaxasncp/dictionary.dtd
+++ b/wimaxasncp/dictionary.dtd
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- $Id$ -->
-
 <!ELEMENT dictionary (tlv+)>
 
 <!ELEMENT tlv (enum*)>