diff --git a/config.h.win32 b/config.h.win32
index 3aef64d136..81c961bbd4 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* config.h.win32.  Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.ac by autoheader.  */
diff --git a/epan/crypt/airpdcap_tkip.c b/epan/crypt/airpdcap_tkip.c
index 0137a5e4c5..eb04adcbf3 100644
--- a/epan/crypt/airpdcap_tkip.c
+++ b/epan/crypt/airpdcap_tkip.c
@@ -30,8 +30,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id$ */
-
 /******************************************************************************/
 /*	File includes																					*/
 /*																										*/
diff --git a/epan/dfilter/grammar.lemon b/epan/dfilter/grammar.lemon
index 90d0f679ba..84803cd393 100644
--- a/epan/dfilter/grammar.lemon
+++ b/epan/dfilter/grammar.lemon
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 %include {
 #include "config.h"
diff --git a/epan/dissectors/x11-declarations.h b/epan/dissectors/x11-declarations.h
index 143126a803..71d8362da4 100644
--- a/epan/dissectors/x11-declarations.h
+++ b/epan/dissectors/x11-declarations.h
@@ -1,6 +1,5 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-fields.pl. */
-/* $Id$ */
 
 /*
  * Copyright 2000, Christophe Tronche <ch.tronche[AT]computer.org>
diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h
index 5bf5575ae3..77280cd70e 100644
--- a/epan/dissectors/x11-enum.h
+++ b/epan/dissectors/x11-enum.h
@@ -1,7 +1,6 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
    using xcbproto version xcb-proto-1.9-11-g2817903 */
-/* $Id$ */
 
 /*
  * Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h
index 69a596fef2..9b5ecbc0d3 100644
--- a/epan/dissectors/x11-extension-errors.h
+++ b/epan/dissectors/x11-extension-errors.h
@@ -1,7 +1,6 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
    using xcbproto version xcb-proto-1.9-11-g2817903 */
-/* $Id$ */
 
 /*
  * Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h
index f3b421dbce..f905b847f5 100644
--- a/epan/dissectors/x11-extension-implementation.h
+++ b/epan/dissectors/x11-extension-implementation.h
@@ -1,7 +1,6 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
    using xcbproto version xcb-proto-1.9-11-g2817903 */
-/* $Id$ */
 
 /*
  * Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h
index e390503203..8159895473 100644
--- a/epan/dissectors/x11-glx-render-enum.h
+++ b/epan/dissectors/x11-glx-render-enum.h
@@ -1,7 +1,6 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
    using mesa version snb-magic-19685-g149140e */
-/* $Id$ */
 
 /*
  * Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h
index 40d726434f..45b0486bab 100644
--- a/epan/dissectors/x11-register-info.h
+++ b/epan/dissectors/x11-register-info.h
@@ -1,6 +1,5 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-fields.pl. */
-/* $Id$ */
 
 /*
  * Copyright 2000, Christophe Tronche <ch.tronche[AT]computer.org>
diff --git a/packaging/macosx/native-gtk/config.h b/packaging/macosx/native-gtk/config.h
index 9edb79e274..b1e5e04bf3 100644
--- a/packaging/macosx/native-gtk/config.h
+++ b/packaging/macosx/native-gtk/config.h
@@ -1,8 +1,6 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
-/* $Id$ */
-
 /* poll doesn't work on devices */
 #define BROKEN_POLL 1
 
diff --git a/tools/lemon/cppmagic.h b/tools/lemon/cppmagic.h
index 7efd066acc..ea45018567 100644
--- a/tools/lemon/cppmagic.h
+++ b/tools/lemon/cppmagic.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /**************************************** CPP definitions ***************/
 
diff --git a/tools/lemon/lemonflex-head.inc b/tools/lemon/lemonflex-head.inc
index 194579ff26..e6350caae3 100644
--- a/tools/lemon/lemonflex-head.inc
+++ b/tools/lemon/lemonflex-head.inc
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /* This file is #include'd at the top of a Lex/Flex scanner
 for use with the Lemon parser. You must have #define'd:
diff --git a/tools/lemon/lemonflex-tail.inc b/tools/lemon/lemonflex-tail.inc
index 325f829cdd..805cd16c62 100644
--- a/tools/lemon/lemonflex-tail.inc
+++ b/tools/lemon/lemonflex-tail.inc
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /* This file is #include'd at the bottom of a Lex/Flex scanner
 for use with the Lemon parser. You must have #define'd:
diff --git a/wsutil/md5.c b/wsutil/md5.c
index 2cc2cb3568..54ab6533cd 100644
--- a/wsutil/md5.c
+++ b/wsutil/md5.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  * Copyright (C) 2003-2006 Benny Prijono <benny@prijono.org>
  * Copyright (C) 2012      C Elston, Katalix Systems Ltd <celston@katalix.com>
diff --git a/wsutil/md5.h b/wsutil/md5.h
index c9a3592233..229b0692d4 100644
--- a/wsutil/md5.h
+++ b/wsutil/md5.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  * Copyright (C) 2003-2005 Benny Prijono <benny@prijono.org>
  * Copyright (C) 2012      C Elston, Katalix Systems Ltd <celston@katalix.com>