diff --git a/Makefile.vc b/Makefile.vc
index 0a5fcaa1..6e66c730 100644
--- a/Makefile.vc
+++ b/Makefile.vc
@@ -1,4 +1,3 @@
-# $Id: Makefile.vc,v 1.7 2008-01-01 15:53:10 fwarmerdam Exp $
 #
 # Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
 #
diff --git a/SConstruct b/SConstruct
index 984b09d5..ee87fedf 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,5 +1,3 @@
-# $Id: SConstruct,v 1.4 2007-02-24 15:03:47 dron Exp $
-
 # Tag Image File Format (TIFF) Software
 #
 # Copyright (C) 2005, Andrey Kiselev <dron@ak4719.spb.edu>
diff --git a/TODO b/TODO
index 121d93d5..ea266aad 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-#	$Header: /cvs/maptools/cvsroot/libtiff/TODO,v 1.6 2002-10-10 05:28:43 warmerda Exp $
-
 o gif2tiff segaulting on selected images
 o tiffcmp read data by strip/tile instead of scanline
 o YCbCr sampling support
diff --git a/archive/man/bmp2tiff.1 b/archive/man/bmp2tiff.1
index a4a6c08c..cd0280ee 100644
--- a/archive/man/bmp2tiff.1
+++ b/archive/man/bmp2tiff.1
@@ -1,4 +1,3 @@
-.\" $Id: bmp2tiff.1,v 1.1 2016-06-05 19:53:59 bfriesen Exp $
 .\"
 .\" Copyright (c) 2004, Andrey Kiselev <dron@ak4719.spb.edu> 
 .\"
diff --git a/archive/man/gif2tiff.1 b/archive/man/gif2tiff.1
index e57285eb..27b222d5 100644
--- a/archive/man/gif2tiff.1
+++ b/archive/man/gif2tiff.1
@@ -1,4 +1,3 @@
-.\" $Id: gif2tiff.1,v 1.1 2016-06-05 19:53:59 bfriesen Exp $
 .\"
 .\" Copyright (c) 1991-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/archive/man/ras2tiff.1 b/archive/man/ras2tiff.1
index ed5a4a2c..7c662888 100644
--- a/archive/man/ras2tiff.1
+++ b/archive/man/ras2tiff.1
@@ -1,4 +1,3 @@
-.\" $Id: ras2tiff.1,v 1.1 2016-06-05 19:53:59 bfriesen Exp $
 .\"
 .\" Copyright (c) 1990-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/archive/man/sgi2tiff.1 b/archive/man/sgi2tiff.1
index c2564db4..35616d06 100644
--- a/archive/man/sgi2tiff.1
+++ b/archive/man/sgi2tiff.1
@@ -1,4 +1,3 @@
-.\" $Id: sgi2tiff.1,v 1.1 2016-06-05 19:53:59 bfriesen Exp $
 .\"
 .\" Copyright (c) 1991-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/archive/man/tiffsv.1 b/archive/man/tiffsv.1
index 7e349cb6..80617898 100644
--- a/archive/man/tiffsv.1
+++ b/archive/man/tiffsv.1
@@ -1,4 +1,3 @@
-.\" $Id: tiffsv.1,v 1.1 2016-06-05 19:53:59 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/archive/tools/bmp2tiff.c b/archive/tools/bmp2tiff.c
index ca903f97..d541e203 100644
--- a/archive/tools/bmp2tiff.c
+++ b/archive/tools/bmp2tiff.c
@@ -1,5 +1,4 @@
-/* $Id: bmp2tiff.c,v 1.1 2016-06-05 19:53:59 bfriesen Exp $
- *
+/*
  * Project:  libtiff tools
  * Purpose:  Convert Windows BMP files in TIFF.
  * Author:   Andrey Kiselev, dron@ak4719.spb.edu
diff --git a/archive/tools/gif2tiff.c b/archive/tools/gif2tiff.c
index 55eedef5..394d0794 100644
--- a/archive/tools/gif2tiff.c
+++ b/archive/tools/gif2tiff.c
@@ -1,5 +1,3 @@
-/* $Id: gif2tiff.c,v 1.1 2016-06-05 19:53:59 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1990-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/archive/tools/ras2tiff.c b/archive/tools/ras2tiff.c
index b45f725d..ff116c61 100644
--- a/archive/tools/ras2tiff.c
+++ b/archive/tools/ras2tiff.c
@@ -1,5 +1,3 @@
-/* $Id: ras2tiff.c,v 1.1 2016-06-05 19:54:00 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/archive/tools/rasterfile.h b/archive/tools/rasterfile.h
index 1bd69341..e7d9680b 100644
--- a/archive/tools/rasterfile.h
+++ b/archive/tools/rasterfile.h
@@ -1,5 +1,3 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/archive/tools/rasterfile.h,v 1.1 2016-06-05 19:54:00 bfriesen Exp $ */
-
 #include "tiff.h"
 
 /*
diff --git a/archive/tools/sgi2tiff.c b/archive/tools/sgi2tiff.c
index 985915e5..36ee0cf0 100644
--- a/archive/tools/sgi2tiff.c
+++ b/archive/tools/sgi2tiff.c
@@ -1,5 +1,3 @@
-/* $Id: sgi2tiff.c,v 1.1 2016-06-05 19:54:00 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1991-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/archive/tools/sgisv.c b/archive/tools/sgisv.c
index 13aa2932..42818bba 100644
--- a/archive/tools/sgisv.c
+++ b/archive/tools/sgisv.c
@@ -1,5 +1,3 @@
-/* $Id: sgisv.c,v 1.1 2016-06-05 19:54:00 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1990-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/configure.com b/configure.com
index 22675172..a3064425 100644
--- a/configure.com
+++ b/configure.com
@@ -1,4 +1,3 @@
-$! $Id: configure.com,v 1.3 2012-07-29 15:45:29 tgl Exp $
 $!
 $! OpenVMS configure procedure for libtiff
 $! (c) Alexey Chupahin  22-NOV-2007
diff --git a/contrib/addtiffo/addtiffo.c b/contrib/addtiffo/addtiffo.c
index 7bc3f444..e1d70623 100644
--- a/contrib/addtiffo/addtiffo.c
+++ b/contrib/addtiffo/addtiffo.c
@@ -1,6 +1,4 @@
 /******************************************************************************
- * $Id: addtiffo.c,v 1.8 2015-05-30 20:30:27 bfriesen Exp $
- *
  * Project:  GeoTIFF Overview Builder
  * Purpose:  Mainline for building overviews in a TIFF file.
  * Author:   Frank Warmerdam, warmerdam@pobox.com
diff --git a/contrib/addtiffo/tif_ovrcache.c b/contrib/addtiffo/tif_ovrcache.c
index 171527b5..67a88120 100644
--- a/contrib/addtiffo/tif_ovrcache.c
+++ b/contrib/addtiffo/tif_ovrcache.c
@@ -1,6 +1,4 @@
 /******************************************************************************
- * $Id: tif_ovrcache.c,v 1.11 2015-05-29 03:08:19 bfriesen Exp $
- *
  * Project:  TIFF Overview Builder
  * Purpose:  Library functions to maintain two rows of tiles or two strips
  *           of data for output overviews as an output cache. 
diff --git a/contrib/dbs/tiff-bi.c b/contrib/dbs/tiff-bi.c
index 33f05c7d..db0e8c89 100644
--- a/contrib/dbs/tiff-bi.c
+++ b/contrib/dbs/tiff-bi.c
@@ -1,5 +1,3 @@
-/* $Id: tiff-bi.c,v 1.3 2010-06-08 18:55:15 bfriesen Exp $ */
-
 /*
  * tiff-bi.c -- create a Class B (bilevel) TIFF file
  *
diff --git a/contrib/dbs/tiff-grayscale.c b/contrib/dbs/tiff-grayscale.c
index 00b229f3..92c7b904 100644
--- a/contrib/dbs/tiff-grayscale.c
+++ b/contrib/dbs/tiff-grayscale.c
@@ -1,5 +1,3 @@
-/* $Id: tiff-grayscale.c,v 1.6 2010-06-08 18:55:15 bfriesen Exp $ */
-
 /*
  * tiff-grayscale.c -- create a Class G (grayscale) TIFF file
  *      with a gray response curve in linear optical density
diff --git a/contrib/dbs/tiff-palette.c b/contrib/dbs/tiff-palette.c
index 3d9e862b..7b3d433f 100644
--- a/contrib/dbs/tiff-palette.c
+++ b/contrib/dbs/tiff-palette.c
@@ -1,5 +1,3 @@
-/* $Id: tiff-palette.c,v 1.5 2010-06-08 18:55:15 bfriesen Exp $ */
-
 /*
  * tiff-palette.c -- create a Class P (palette) TIFF file
  *
diff --git a/contrib/dbs/tiff-rgb.c b/contrib/dbs/tiff-rgb.c
index bf904990..d14ed005 100644
--- a/contrib/dbs/tiff-rgb.c
+++ b/contrib/dbs/tiff-rgb.c
@@ -1,5 +1,3 @@
-/* $Id: tiff-rgb.c,v 1.4 2010-06-08 18:55:15 bfriesen Exp $ */
-
 /*
  * tiff-rgb.c -- create a 24-bit Class R (rgb) TIFF file
  *
diff --git a/contrib/dbs/xtiff/xtiff.c b/contrib/dbs/xtiff/xtiff.c
index 97e4ffe2..bc10b670 100644
--- a/contrib/dbs/xtiff/xtiff.c
+++ b/contrib/dbs/xtiff/xtiff.c
@@ -1,6 +1,4 @@
 /*
- * $Id: xtiff.c,v 1.4 2013-05-02 14:44:29 tgl Exp $
- *
  * xtiff - view a TIFF file in an X window
  *
  * Dan Sears
diff --git a/contrib/iptcutil/iptcutil.c b/contrib/iptcutil/iptcutil.c
index c359df87..b5b774ff 100644
--- a/contrib/iptcutil/iptcutil.c
+++ b/contrib/iptcutil/iptcutil.c
@@ -1,5 +1,3 @@
-/* $Id: iptcutil.c,v 1.11 2015-06-21 01:09:09 bfriesen Exp $ */
-
 #include "tif_config.h"
 
 #include <stdio.h>
diff --git a/contrib/pds/tif_imageiter.c b/contrib/pds/tif_imageiter.c
index e025dc52..9e7bd44a 100644
--- a/contrib/pds/tif_imageiter.c
+++ b/contrib/pds/tif_imageiter.c
@@ -1,5 +1,3 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/contrib/pds/tif_imageiter.c,v 1.4 2010-06-08 18:55:15 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1991-1996 Sam Leffler
  * Copyright (c) 1991-1996 Silicon Graphics, Inc.
diff --git a/contrib/pds/tif_pdsdirread.c b/contrib/pds/tif_pdsdirread.c
index 37e513ae..567600c5 100644
--- a/contrib/pds/tif_pdsdirread.c
+++ b/contrib/pds/tif_pdsdirread.c
@@ -1,5 +1,3 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/contrib/pds/tif_pdsdirread.c,v 1.4 2010-06-08 18:55:15 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1996 Sam Leffler
  * Copyright (c) 1991-1996 Silicon Graphics, Inc.
diff --git a/contrib/pds/tif_pdsdirwrite.c b/contrib/pds/tif_pdsdirwrite.c
index 3c632da6..a670bda1 100644
--- a/contrib/pds/tif_pdsdirwrite.c
+++ b/contrib/pds/tif_pdsdirwrite.c
@@ -1,5 +1,3 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/contrib/pds/tif_pdsdirwrite.c,v 1.4 2010-06-08 18:55:15 bfriesen Exp $ */
-
 /* When writing data to TIFF files, it is often useful to store application-
    specific data in a private TIFF directory so that the tags don't need to
    be registered and won't conflict with other people's user-defined tags.
diff --git a/contrib/ras/tif2ras.c b/contrib/ras/tif2ras.c
index e1c321df..79db104e 100644
--- a/contrib/ras/tif2ras.c
+++ b/contrib/ras/tif2ras.c
@@ -1,6 +1,3 @@
-#ifndef lint
-static char id[] = "$Id: tif2ras.c,v 1.3 2010-06-08 18:55:15 bfriesen Exp $"; 
-#endif
 /*-
  * tif2ras.c - Converts from a Tagged Image File Format image to a Sun Raster.
  *
diff --git a/contrib/win_dib/Makefile.w95 b/contrib/win_dib/Makefile.w95
index 3f461ef5..3f15e832 100644
--- a/contrib/win_dib/Makefile.w95
+++ b/contrib/win_dib/Makefile.w95
@@ -1,5 +1,3 @@
-#	$Header: /usr/people/sam/tiff/libtiff/RCS/Makefile.w95,v 1.2 1994/11/28
-06:13:31 sam Exp $
 #
 # Tag Image File Format Library
 #
diff --git a/libtiff/Makefile.lcc b/libtiff/Makefile.lcc
index 3ed735ba..fa7abb5d 100644
--- a/libtiff/Makefile.lcc
+++ b/libtiff/Makefile.lcc
@@ -1,4 +1,3 @@
-# $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Makefile.lcc,v 1.1 1999-07-27 21:50:27 mike Exp $
 #
 # Tag Image File Format Library
 #
diff --git a/libtiff/Makefile.vc b/libtiff/Makefile.vc
index b7309154..5aac3310 100644
--- a/libtiff/Makefile.vc
+++ b/libtiff/Makefile.vc
@@ -1,5 +1,3 @@
-# $Id: Makefile.vc,v 1.23 2015-08-19 02:31:04 bfriesen Exp $
-#
 # Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
 #
 # Permission to use, copy, modify, distribute, and sell this software and 
diff --git a/libtiff/SConstruct b/libtiff/SConstruct
index dc00c8cb..af3daace 100644
--- a/libtiff/SConstruct
+++ b/libtiff/SConstruct
@@ -1,5 +1,3 @@
-# $Id: SConstruct,v 1.4 2007-02-24 15:03:50 dron Exp $
-
 # Tag Image File Format (TIFF) Software
 #
 # Copyright (C) 2005, Andrey Kiselev <dron@ak4719.spb.edu>
diff --git a/libtiff/mkg3states.c b/libtiff/mkg3states.c
index 16ad3c23..54fc0599 100644
--- a/libtiff/mkg3states.c
+++ b/libtiff/mkg3states.c
@@ -1,5 +1,3 @@
-/* "$Id: mkg3states.c,v 1.12 2015-06-21 01:09:09 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1991-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/mkspans.c b/libtiff/mkspans.c
index cc07c863..c7c5bdd0 100644
--- a/libtiff/mkspans.c
+++ b/libtiff/mkspans.c
@@ -1,5 +1,3 @@
-/* $Id: mkspans.c,v 1.4 2010-03-10 18:56:48 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1991-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/t4.h b/libtiff/t4.h
index b908f54f..fb0951a1 100644
--- a/libtiff/t4.h
+++ b/libtiff/t4.h
@@ -1,5 +1,3 @@
-/* $Id: t4.h,v 1.3 2010-03-10 18:56:48 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_aux.c b/libtiff/tif_aux.c
index 10b8d00c..4ece162f 100644
--- a/libtiff/tif_aux.c
+++ b/libtiff/tif_aux.c
@@ -1,5 +1,3 @@
-/* $Id: tif_aux.c,v 1.31 2017-11-17 20:21:00 erouault Exp $ */
-
 /*
  * Copyright (c) 1991-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_close.c b/libtiff/tif_close.c
index a0cb6613..e4228df9 100644
--- a/libtiff/tif_close.c
+++ b/libtiff/tif_close.c
@@ -1,5 +1,3 @@
-/* $Id: tif_close.c,v 1.21 2016-01-23 21:20:34 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_codec.c b/libtiff/tif_codec.c
index 7cb46f63..e0aaacff 100644
--- a/libtiff/tif_codec.c
+++ b/libtiff/tif_codec.c
@@ -1,5 +1,3 @@
-/* $Id: tif_codec.c,v 1.17 2015-08-19 02:31:04 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_color.c b/libtiff/tif_color.c
index 71cafcde..40ca36f6 100644
--- a/libtiff/tif_color.c
+++ b/libtiff/tif_color.c
@@ -1,5 +1,3 @@
-/* $Id: tif_color.c,v 1.24 2017-05-29 10:12:54 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_compress.c b/libtiff/tif_compress.c
index b571d195..8130ef08 100644
--- a/libtiff/tif_compress.c
+++ b/libtiff/tif_compress.c
@@ -1,5 +1,3 @@
-/* $Id: tif_compress.c,v 1.25 2016-10-25 20:04:22 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_config.wince.h b/libtiff/tif_config.wince.h
index 94e92bbf..e85e2e62 100644
--- a/libtiff/tif_config.wince.h
+++ b/libtiff/tif_config.wince.h
@@ -1,5 +1,3 @@
-/* $Id: tif_config.wince.h,v 1.3 2010-03-10 18:56:48 bfriesen Exp $ */
-
 /*
  * TIFF library configuration header for Windows CE platform.
  */
diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
index f00f8080..2ccaf448 100644
--- a/libtiff/tif_dir.c
+++ b/libtiff/tif_dir.c
@@ -1,5 +1,3 @@
-/* $Id: tif_dir.c,v 1.131 2017-07-11 21:38:04 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_dir.h b/libtiff/tif_dir.h
index 5a380767..bb508add 100644
--- a/libtiff/tif_dir.h
+++ b/libtiff/tif_dir.h
@@ -1,5 +1,3 @@
-/* $Id: tif_dir.h,v 1.55 2017-06-01 12:44:04 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c
index 4904f540..d26fd120 100644
--- a/libtiff/tif_dirinfo.c
+++ b/libtiff/tif_dirinfo.c
@@ -1,5 +1,3 @@
-/* $Id: tif_dirinfo.c,v 1.127 2017-06-01 12:44:04 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
index 5e62e813..de688a31 100644
--- a/libtiff/tif_dirread.c
+++ b/libtiff/tif_dirread.c
@@ -1,5 +1,3 @@
-/* $Id: tif_dirread.c,v 1.218 2017-09-09 21:44:42 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
index c68d6d21..2430de6d 100644
--- a/libtiff/tif_dirwrite.c
+++ b/libtiff/tif_dirwrite.c
@@ -1,5 +1,3 @@
-/* $Id: tif_dirwrite.c,v 1.89 2017-08-23 13:33:42 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_dumpmode.c b/libtiff/tif_dumpmode.c
index a6a94c04..4a0b07f5 100644
--- a/libtiff/tif_dumpmode.c
+++ b/libtiff/tif_dumpmode.c
@@ -1,5 +1,3 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dumpmode.c,v 1.15 2015-12-12 18:04:26 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_error.c b/libtiff/tif_error.c
index 47516b4f..651168f7 100644
--- a/libtiff/tif_error.c
+++ b/libtiff/tif_error.c
@@ -1,5 +1,3 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_error.c,v 1.6 2017-07-04 12:54:42 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_extension.c b/libtiff/tif_extension.c
index 39fab4c7..87d3cfcb 100644
--- a/libtiff/tif_extension.c
+++ b/libtiff/tif_extension.c
@@ -1,5 +1,3 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_extension.c,v 1.8 2015-12-06 11:13:43 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_fax3.c b/libtiff/tif_fax3.c
index 5fd51411..d11c9684 100644
--- a/libtiff/tif_fax3.c
+++ b/libtiff/tif_fax3.c
@@ -1,5 +1,3 @@
-/* $Id: tif_fax3.c,v 1.81 2017-06-18 10:31:50 erouault Exp $ */
-
 /*
  * Copyright (c) 1990-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h
index 8a435059..abadcd97 100644
--- a/libtiff/tif_fax3.h
+++ b/libtiff/tif_fax3.h
@@ -1,5 +1,3 @@
-/* $Id: tif_fax3.h,v 1.13 2016-12-14 18:36:27 faxguy Exp $ */
-
 /*
  * Copyright (c) 1990-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_flush.c b/libtiff/tif_flush.c
index fd14e4cd..881fac51 100644
--- a/libtiff/tif_flush.c
+++ b/libtiff/tif_flush.c
@@ -1,5 +1,3 @@
-/* $Id: tif_flush.c,v 1.9 2010-03-31 06:40:10 fwarmerdam Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
index fc554cca..6a9d5a7c 100644
--- a/libtiff/tif_getimage.c
+++ b/libtiff/tif_getimage.c
@@ -1,5 +1,3 @@
-/* $Id: tif_getimage.c,v 1.114 2017-11-17 20:21:00 erouault Exp $ */
-
 /*
  * Copyright (c) 1991-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_jbig.c b/libtiff/tif_jbig.c
index 7a14dd9a..0befdf32 100644
--- a/libtiff/tif_jbig.c
+++ b/libtiff/tif_jbig.c
@@ -1,5 +1,3 @@
-/* $Id: tif_jbig.c,v 1.16 2017-06-26 15:20:00 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
index 0fbdb354..c885de9f 100644
--- a/libtiff/tif_jpeg.c
+++ b/libtiff/tif_jpeg.c
@@ -1,5 +1,3 @@
-/* $Id: tif_jpeg.c,v 1.134 2017-10-17 19:04:47 erouault Exp $ */
-
 /*
  * Copyright (c) 1994-1997 Sam Leffler
  * Copyright (c) 1994-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c
index 4b25244b..266bb399 100644
--- a/libtiff/tif_luv.c
+++ b/libtiff/tif_luv.c
@@ -1,5 +1,3 @@
-/* $Id: tif_luv.c,v 1.49 2017-07-24 12:47:30 erouault Exp $ */
-
 /*
  * Copyright (c) 1997 Greg Ward Larson
  * Copyright (c) 1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_lzma.c b/libtiff/tif_lzma.c
index 80fc3942..b395de07 100644
--- a/libtiff/tif_lzma.c
+++ b/libtiff/tif_lzma.c
@@ -1,5 +1,3 @@
-/* $Id: tif_lzma.c,v 1.6 2016-09-17 09:18:59 erouault Exp $ */
-
 /*
  * Copyright (c) 2010, Andrey Kiselev <dron@ak4719.spb.edu>
  *
diff --git a/libtiff/tif_lzw.c b/libtiff/tif_lzw.c
index bc8f9c84..4ccb443c 100644
--- a/libtiff/tif_lzw.c
+++ b/libtiff/tif_lzw.c
@@ -1,5 +1,3 @@
-/* $Id: tif_lzw.c,v 1.57 2017-07-11 10:54:29 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_next.c b/libtiff/tif_next.c
index 08211788..0ba61aed 100644
--- a/libtiff/tif_next.c
+++ b/libtiff/tif_next.c
@@ -1,5 +1,3 @@
-/* $Id: tif_next.c,v 1.19 2016-09-04 21:32:56 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c
index 92ed1fa1..27385d8c 100644
--- a/libtiff/tif_ojpeg.c
+++ b/libtiff/tif_ojpeg.c
@@ -1,5 +1,3 @@
-/* $Id: tif_ojpeg.c,v 1.69 2017-04-27 17:29:26 erouault Exp $ */
-
 /* WARNING: The type of JPEG encapsulation defined by the TIFF Version 6.0
    specification is now totally obsolete and deprecated for new applications and
    images. This file was was created solely in order to read unconverted images
diff --git a/libtiff/tif_open.c b/libtiff/tif_open.c
index a7279e1e..c574c452 100644
--- a/libtiff/tif_open.c
+++ b/libtiff/tif_open.c
@@ -1,5 +1,3 @@
-/* $Id: tif_open.c,v 1.48 2016-11-20 22:29:47 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_packbits.c b/libtiff/tif_packbits.c
index 18904b01..a8f29e87 100644
--- a/libtiff/tif_packbits.c
+++ b/libtiff/tif_packbits.c
@@ -1,5 +1,3 @@
-/* $Id: tif_packbits.c,v 1.26 2017-05-14 02:26:07 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c
index 979858da..7438d692 100644
--- a/libtiff/tif_pixarlog.c
+++ b/libtiff/tif_pixarlog.c
@@ -1,5 +1,3 @@
-/* $Id: tif_pixarlog.c,v 1.54 2017-07-10 10:40:28 erouault Exp $ */
-
 /*
  * Copyright (c) 1996-1997 Sam Leffler
  * Copyright (c) 1996 Pixar
diff --git a/libtiff/tif_predict.c b/libtiff/tif_predict.c
index 9ae1f57a..b775663a 100644
--- a/libtiff/tif_predict.c
+++ b/libtiff/tif_predict.c
@@ -1,5 +1,3 @@
-/* $Id: tif_predict.c,v 1.44 2017-06-18 10:31:50 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_predict.h b/libtiff/tif_predict.h
index 6c68e21a..ee64d80c 100644
--- a/libtiff/tif_predict.h
+++ b/libtiff/tif_predict.h
@@ -1,5 +1,3 @@
-/* $Id: tif_predict.h,v 1.9 2016-10-31 17:24:26 erouault Exp $ */
-
 /*
  * Copyright (c) 1995-1997 Sam Leffler
  * Copyright (c) 1995-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c
index 24d4b98a..9959d353 100644
--- a/libtiff/tif_print.c
+++ b/libtiff/tif_print.c
@@ -1,5 +1,3 @@
-/* $Id: tif_print.c,v 1.65 2016-11-20 22:31:22 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
index 2ba985a7..47ff7559 100644
--- a/libtiff/tif_read.c
+++ b/libtiff/tif_read.c
@@ -1,5 +1,3 @@
-/* $Id: tif_read.c,v 1.66 2017-11-17 20:21:00 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_stream.cxx b/libtiff/tif_stream.cxx
index ecca1fd5..83c6bb05 100644
--- a/libtiff/tif_stream.cxx
+++ b/libtiff/tif_stream.cxx
@@ -1,5 +1,3 @@
-/* $Id: tif_stream.cxx,v 1.13 2015-05-28 01:50:22 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1996 Sam Leffler
  * Copyright (c) 1991-1996 Silicon Graphics, Inc.
diff --git a/libtiff/tif_strip.c b/libtiff/tif_strip.c
index 6e9f2ef6..5b76fba5 100644
--- a/libtiff/tif_strip.c
+++ b/libtiff/tif_strip.c
@@ -1,5 +1,3 @@
-/* $Id: tif_strip.c,v 1.38 2016-12-03 11:02:15 erouault Exp $ */
-
 /*
  * Copyright (c) 1991-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_swab.c b/libtiff/tif_swab.c
index 4b2e5f16..b174ba69 100644
--- a/libtiff/tif_swab.c
+++ b/libtiff/tif_swab.c
@@ -1,5 +1,3 @@
-/* $Id: tif_swab.c,v 1.15 2017-06-08 16:39:50 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_thunder.c b/libtiff/tif_thunder.c
index 183199de..2388dbb6 100644
--- a/libtiff/tif_thunder.c
+++ b/libtiff/tif_thunder.c
@@ -1,5 +1,3 @@
-/* $Id: tif_thunder.c,v 1.13 2016-09-04 21:32:56 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_tile.c b/libtiff/tif_tile.c
index 388e168a..58fe9354 100644
--- a/libtiff/tif_tile.c
+++ b/libtiff/tif_tile.c
@@ -1,5 +1,3 @@
-/* $Id: tif_tile.c,v 1.24 2015-06-07 22:35:40 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1991-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c
index 80c437cf..874f1feb 100644
--- a/libtiff/tif_unix.c
+++ b/libtiff/tif_unix.c
@@ -1,5 +1,3 @@
-/* $Id: tif_unix.c,v 1.28 2017-01-11 19:02:49 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_version.c b/libtiff/tif_version.c
index f92c843d..60875bbf 100644
--- a/libtiff/tif_version.c
+++ b/libtiff/tif_version.c
@@ -1,4 +1,3 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_version.c,v 1.3 2010-03-10 18:56:49 bfriesen Exp $ */
 /*
  * Copyright (c) 1992-1997 Sam Leffler
  * Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_vms.c b/libtiff/tif_vms.c
index 31b0fd3f..bda9d859 100644
--- a/libtiff/tif_vms.c
+++ b/libtiff/tif_vms.c
@@ -1,5 +1,3 @@
-/* $Id: tif_vms.c,v 1.14 2017-01-11 19:02:49 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_warning.c b/libtiff/tif_warning.c
index dc79f144..c482785c 100644
--- a/libtiff/tif_warning.c
+++ b/libtiff/tif_warning.c
@@ -1,5 +1,3 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_warning.c,v 1.4 2017-07-04 12:54:42 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c
index 090baed8..cde4f6dc 100644
--- a/libtiff/tif_win32.c
+++ b/libtiff/tif_win32.c
@@ -1,5 +1,3 @@
-/* $Id: tif_win32.c,v 1.42 2017-01-11 19:02:49 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_wince.c b/libtiff/tif_wince.c
index 26eef487..5bd7daf5 100644
--- a/libtiff/tif_wince.c
+++ b/libtiff/tif_wince.c
@@ -1,5 +1,3 @@
-/* $Id: tif_wince.c,v 1.3 2010-03-10 18:56:49 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_write.c b/libtiff/tif_write.c
index 4c216ec2..586f6fdf 100644
--- a/libtiff/tif_write.c
+++ b/libtiff/tif_write.c
@@ -1,5 +1,3 @@
-/* $Id: tif_write.c,v 1.46 2016-12-03 21:57:44 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tif_zip.c b/libtiff/tif_zip.c
index 42943fbb..9d4bceb1 100644
--- a/libtiff/tif_zip.c
+++ b/libtiff/tif_zip.c
@@ -1,5 +1,3 @@
-/* $Id: tif_zip.c,v 1.37 2017-05-10 15:21:16 erouault Exp $ */
-
 /*
  * Copyright (c) 1995-1997 Sam Leffler
  * Copyright (c) 1995-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tiff.h b/libtiff/tiff.h
index fb39634c..51c0a44c 100644
--- a/libtiff/tiff.h
+++ b/libtiff/tiff.h
@@ -1,5 +1,3 @@
-/* $Id: tiff.h,v 1.70 2016-01-23 21:20:34 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tiffconf.wince.h b/libtiff/tiffconf.wince.h
index 2ef3958a..30ff2d7a 100644
--- a/libtiff/tiffconf.wince.h
+++ b/libtiff/tiffconf.wince.h
@@ -1,5 +1,3 @@
-/* $Id: tiffconf.wince.h,v 1.3 2010-03-10 18:56:49 bfriesen Exp $ */
-
 /*
  * Windows CE platform tiffconf.wince.h
  * Created by Mateusz Loskot (mateusz@loskot.net)
diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h
index ef61b5c0..670cd426 100644
--- a/libtiff/tiffio.h
+++ b/libtiff/tiffio.h
@@ -1,5 +1,3 @@
-/* $Id: tiffio.h,v 1.94 2017-01-11 19:02:49 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tiffio.hxx b/libtiff/tiffio.hxx
index ed994f11..6cd72730 100644
--- a/libtiff/tiffio.hxx
+++ b/libtiff/tiffio.hxx
@@ -1,5 +1,3 @@
-/* $Id: tiffio.hxx,v 1.3 2010-06-08 18:55:15 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
index daa291c0..58ef7164 100644
--- a/libtiff/tiffiop.h
+++ b/libtiff/tiffiop.h
@@ -1,5 +1,3 @@
-/* $Id: tiffiop.h,v 1.95 2017-09-07 14:02:52 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/m4/ice_find_athena.m4 b/m4/ice_find_athena.m4
index f13b920e..95df002e 100644
--- a/m4/ice_find_athena.m4
+++ b/m4/ice_find_athena.m4
@@ -1,4 +1,3 @@
-dnl $Id: ice_find_athena.m4,v 1.1 2006-10-13 10:13:31 dron Exp $
 dnl 
 dnl ice_find_athena.m4
 dnl 
diff --git a/man/TIFFClose.3tiff b/man/TIFFClose.3tiff
index a6a7d82a..fc64ccc3 100644
--- a/man/TIFFClose.3tiff
+++ b/man/TIFFClose.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFClose.3tiff,v 1.4 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFDataWidth.3tiff b/man/TIFFDataWidth.3tiff
index af67777d..efcd39d7 100644
--- a/man/TIFFDataWidth.3tiff
+++ b/man/TIFFDataWidth.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFDataWidth.3tiff,v 1.4 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 2002, Andrey Kiselev <dron@ak4719.spb.edu>
 .\"
diff --git a/man/TIFFError.3tiff b/man/TIFFError.3tiff
index 6924c7f4..5d0c2196 100644
--- a/man/TIFFError.3tiff
+++ b/man/TIFFError.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFError.3tiff,v 1.3 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFFieldDataType.3tiff b/man/TIFFFieldDataType.3tiff
index 4fb1e2cf..6049f591 100644
--- a/man/TIFFFieldDataType.3tiff
+++ b/man/TIFFFieldDataType.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFFieldDataType.3tiff,v 1.2 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 2012, Tom Lane <tgl@sss.pgh.pa.us>
 .\"
diff --git a/man/TIFFFieldName.3tiff b/man/TIFFFieldName.3tiff
index 0f49c337..47d9ad84 100644
--- a/man/TIFFFieldName.3tiff
+++ b/man/TIFFFieldName.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFFieldName.3tiff,v 1.2 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 2012, Tom Lane <tgl@sss.pgh.pa.us>
 .\"
diff --git a/man/TIFFFieldPassCount.3tiff b/man/TIFFFieldPassCount.3tiff
index 07324f80..ff14c520 100644
--- a/man/TIFFFieldPassCount.3tiff
+++ b/man/TIFFFieldPassCount.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFFieldPassCount.3tiff,v 1.2 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 2012, Tom Lane <tgl@sss.pgh.pa.us>
 .\"
diff --git a/man/TIFFFieldReadCount.3tiff b/man/TIFFFieldReadCount.3tiff
index 88d67fd1..b6a4546c 100644
--- a/man/TIFFFieldReadCount.3tiff
+++ b/man/TIFFFieldReadCount.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFFieldReadCount.3tiff,v 1.2 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 2012, Tom Lane <tgl@sss.pgh.pa.us>
 .\"
diff --git a/man/TIFFFieldTag.3tiff b/man/TIFFFieldTag.3tiff
index f94f1be9..3d1e83d0 100644
--- a/man/TIFFFieldTag.3tiff
+++ b/man/TIFFFieldTag.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFFieldTag.3tiff,v 1.2 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 2012, Tom Lane <tgl@sss.pgh.pa.us>
 .\"
diff --git a/man/TIFFFieldWriteCount.3tiff b/man/TIFFFieldWriteCount.3tiff
index 68a3b043..f80290fe 100644
--- a/man/TIFFFieldWriteCount.3tiff
+++ b/man/TIFFFieldWriteCount.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFFieldWriteCount.3tiff,v 1.2 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 2012, Tom Lane <tgl@sss.pgh.pa.us>
 .\"
diff --git a/man/TIFFFlush.3tiff b/man/TIFFFlush.3tiff
index 27520da3..c46a2a3f 100644
--- a/man/TIFFFlush.3tiff
+++ b/man/TIFFFlush.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFFlush.3tiff,v 1.3 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFGetField.3tiff b/man/TIFFGetField.3tiff
index 528019e1..c2fd025f 100644
--- a/man/TIFFGetField.3tiff
+++ b/man/TIFFGetField.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFGetField.3tiff,v 1.8 2017-06-30 17:40:02 erouault Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFOpen.3tiff b/man/TIFFOpen.3tiff
index f4209313..5a6e96b8 100644
--- a/man/TIFFOpen.3tiff
+++ b/man/TIFFOpen.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFOpen.3tiff,v 1.2 2005-07-01 12:36:22 dron Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFPrintDirectory.3tiff b/man/TIFFPrintDirectory.3tiff
index 437b09e2..c208f044 100644
--- a/man/TIFFPrintDirectory.3tiff
+++ b/man/TIFFPrintDirectory.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFPrintDirectory.3tiff,v 1.1 2004-11-11 14:39:16 dron Exp $
 .\"
 .\" Copyright (c) 1991-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFRGBAImage.3tiff b/man/TIFFRGBAImage.3tiff
index 86c93680..fe6064fc 100644
--- a/man/TIFFRGBAImage.3tiff
+++ b/man/TIFFRGBAImage.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFRGBAImage.3tiff,v 1.3 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 1991-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFReadDirectory.3tiff b/man/TIFFReadDirectory.3tiff
index e13586fd..c178c42b 100644
--- a/man/TIFFReadDirectory.3tiff
+++ b/man/TIFFReadDirectory.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFReadDirectory.3tiff,v 1.4 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFReadEncodedStrip.3tiff b/man/TIFFReadEncodedStrip.3tiff
index afde8e74..7122946a 100644
--- a/man/TIFFReadEncodedStrip.3tiff
+++ b/man/TIFFReadEncodedStrip.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFReadEncodedStrip.3tiff,v 1.3 2016-09-25 20:05:49 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFReadEncodedTile.3tiff b/man/TIFFReadEncodedTile.3tiff
index 99d3e459..6f8d6496 100644
--- a/man/TIFFReadEncodedTile.3tiff
+++ b/man/TIFFReadEncodedTile.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFReadEncodedTile.3tiff,v 1.4 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFReadRGBAImage.3tiff b/man/TIFFReadRGBAImage.3tiff
index 7373e2ae..920fc370 100644
--- a/man/TIFFReadRGBAImage.3tiff
+++ b/man/TIFFReadRGBAImage.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFReadRGBAImage.3tiff,v 1.5 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1991-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFReadRGBAStrip.3tiff b/man/TIFFReadRGBAStrip.3tiff
index db889a0a..31604124 100644
--- a/man/TIFFReadRGBAStrip.3tiff
+++ b/man/TIFFReadRGBAStrip.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFReadRGBAStrip.3tiff,v 1.4 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1991-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFReadRGBATile.3tiff b/man/TIFFReadRGBATile.3tiff
index 5cb76553..5b9b4bf2 100644
--- a/man/TIFFReadRGBATile.3tiff
+++ b/man/TIFFReadRGBATile.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFReadRGBATile.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1991-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFReadRawStrip.3tiff b/man/TIFFReadRawStrip.3tiff
index 6fe326b7..6d411df4 100644
--- a/man/TIFFReadRawStrip.3tiff
+++ b/man/TIFFReadRawStrip.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFReadRawStrip.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFReadRawTile.3tiff b/man/TIFFReadRawTile.3tiff
index 2844573e..9c60888a 100644
--- a/man/TIFFReadRawTile.3tiff
+++ b/man/TIFFReadRawTile.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFReadRawTile.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFReadScanline.3tiff b/man/TIFFReadScanline.3tiff
index 2d9c85a3..ca4b8368 100644
--- a/man/TIFFReadScanline.3tiff
+++ b/man/TIFFReadScanline.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFReadScanline.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFReadTile.3tiff b/man/TIFFReadTile.3tiff
index f1107dc3..cf0f21dc 100644
--- a/man/TIFFReadTile.3tiff
+++ b/man/TIFFReadTile.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFReadTile.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFSetDirectory.3tiff b/man/TIFFSetDirectory.3tiff
index 0f109f66..734c0155 100644
--- a/man/TIFFSetDirectory.3tiff
+++ b/man/TIFFSetDirectory.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFSetDirectory.3tiff,v 1.4 2017-06-30 17:40:02 erouault Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFSetField.3tiff b/man/TIFFSetField.3tiff
index 695a199e..df2a5ea2 100644
--- a/man/TIFFSetField.3tiff
+++ b/man/TIFFSetField.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFSetField.3tiff,v 1.7 2017-06-30 17:40:02 erouault Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFWarning.3tiff b/man/TIFFWarning.3tiff
index 0d302ed8..9a4d9096 100644
--- a/man/TIFFWarning.3tiff
+++ b/man/TIFFWarning.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFWarning.3tiff,v 1.4 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFWriteDirectory.3tiff b/man/TIFFWriteDirectory.3tiff
index 9f0d2492..e7b84b6d 100644
--- a/man/TIFFWriteDirectory.3tiff
+++ b/man/TIFFWriteDirectory.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFWriteDirectory.3tiff,v 1.4 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFWriteEncodedStrip.3tiff b/man/TIFFWriteEncodedStrip.3tiff
index a31f6e00..dc410e41 100644
--- a/man/TIFFWriteEncodedStrip.3tiff
+++ b/man/TIFFWriteEncodedStrip.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFWriteEncodedStrip.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFWriteEncodedTile.3tiff b/man/TIFFWriteEncodedTile.3tiff
index 476cbbb4..d94f4d0e 100644
--- a/man/TIFFWriteEncodedTile.3tiff
+++ b/man/TIFFWriteEncodedTile.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFWriteEncodedTile.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFWriteRawStrip.3tiff b/man/TIFFWriteRawStrip.3tiff
index 8d145a07..784a6e03 100644
--- a/man/TIFFWriteRawStrip.3tiff
+++ b/man/TIFFWriteRawStrip.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFWriteRawStrip.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFWriteRawTile.3tiff b/man/TIFFWriteRawTile.3tiff
index 78b23ed7..f3334b85 100644
--- a/man/TIFFWriteRawTile.3tiff
+++ b/man/TIFFWriteRawTile.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFWriteRawTile.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFWriteScanline.3tiff b/man/TIFFWriteScanline.3tiff
index a2691b55..a51cec52 100644
--- a/man/TIFFWriteScanline.3tiff
+++ b/man/TIFFWriteScanline.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFWriteScanline.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFWriteTile.3tiff b/man/TIFFWriteTile.3tiff
index 3755fc78..a6700258 100644
--- a/man/TIFFWriteTile.3tiff
+++ b/man/TIFFWriteTile.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFWriteTile.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFbuffer.3tiff b/man/TIFFbuffer.3tiff
index edda2dbc..20111701 100644
--- a/man/TIFFbuffer.3tiff
+++ b/man/TIFFbuffer.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFbuffer.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1995 Sam Leffler
 .\" Copyright (c) 1995 Silicon Graphics, Inc.
diff --git a/man/TIFFcodec.3tiff b/man/TIFFcodec.3tiff
index 6c480c49..aa3a8c63 100644
--- a/man/TIFFcodec.3tiff
+++ b/man/TIFFcodec.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFcodec.3tiff,v 1.4 2016-09-25 20:05:50 bfriesen Exp $
 .\"
 .\" Copyright (c) 1995 Sam Leffler
 .\" Copyright (c) 1995 Silicon Graphics, Inc.
diff --git a/man/TIFFcolor.3tiff b/man/TIFFcolor.3tiff
index 987ac9d6..1d2bb2b8 100644
--- a/man/TIFFcolor.3tiff
+++ b/man/TIFFcolor.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFcolor.3tiff,v 1.5 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 2003, Andrey Kiselev <dron@ak4719.spb.edu>
 .\"
diff --git a/man/TIFFmemory.3tiff b/man/TIFFmemory.3tiff
index 6c4412dd..3947c86e 100644
--- a/man/TIFFmemory.3tiff
+++ b/man/TIFFmemory.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFmemory.3tiff,v 1.3 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1995 Sam Leffler
 .\" Copyright (c) 1995 Silicon Graphics, Inc.
diff --git a/man/TIFFquery.3tiff b/man/TIFFquery.3tiff
index 8bddc889..6ca2dc54 100644
--- a/man/TIFFquery.3tiff
+++ b/man/TIFFquery.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFquery.3tiff,v 1.1 2004-11-11 14:39:16 dron Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFsize.3tiff b/man/TIFFsize.3tiff
index 4b90a59b..5fbc6bc9 100644
--- a/man/TIFFsize.3tiff
+++ b/man/TIFFsize.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFsize.3tiff,v 1.3 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFstrip.3tiff b/man/TIFFstrip.3tiff
index da59b0ef..eb38318f 100644
--- a/man/TIFFstrip.3tiff
+++ b/man/TIFFstrip.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFstrip.3tiff,v 1.3 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1992-1997 Sam Leffler
 .\" Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFswab.3tiff b/man/TIFFswab.3tiff
index 2294156f..3d7a47bc 100644
--- a/man/TIFFswab.3tiff
+++ b/man/TIFFswab.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFswab.3tiff,v 1.3 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/TIFFtile.3tiff b/man/TIFFtile.3tiff
index 5bdbe551..10310a06 100644
--- a/man/TIFFtile.3tiff
+++ b/man/TIFFtile.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: TIFFtile.3tiff,v 1.3 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/fax2ps.1 b/man/fax2ps.1
index f82e252b..7aeea4f9 100644
--- a/man/fax2ps.1
+++ b/man/fax2ps.1
@@ -1,4 +1,3 @@
-.\"	$Id: fax2ps.1,v 1.5 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1991-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/fax2tiff.1 b/man/fax2tiff.1
index 7ce4ffe3..97144c9f 100644
--- a/man/fax2tiff.1
+++ b/man/fax2tiff.1
@@ -1,4 +1,3 @@
-.\" $Id: fax2tiff.1,v 1.8 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1990-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/libtiff.3tiff b/man/libtiff.3tiff
index 924d17a8..3efe162e 100644
--- a/man/libtiff.3tiff
+++ b/man/libtiff.3tiff
@@ -1,4 +1,3 @@
-.\" $Id: libtiff.3tiff,v 1.5 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/pal2rgb.1 b/man/pal2rgb.1
index 428f93a8..772b4a7b 100644
--- a/man/pal2rgb.1
+++ b/man/pal2rgb.1
@@ -1,4 +1,3 @@
-.\" $Id: pal2rgb.1,v 1.4 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1990-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/ppm2tiff.1 b/man/ppm2tiff.1
index 2c940fb3..12e58e2c 100644
--- a/man/ppm2tiff.1
+++ b/man/ppm2tiff.1
@@ -1,4 +1,3 @@
-.\" $Id: ppm2tiff.1,v 1.6 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1991-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/raw2tiff.1 b/man/raw2tiff.1
index 184a5d10..f45569d4 100644
--- a/man/raw2tiff.1
+++ b/man/raw2tiff.1
@@ -1,4 +1,3 @@
-.\" $Id: raw2tiff.1,v 1.8 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1990-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/rgb2ycbcr.1 b/man/rgb2ycbcr.1
index e3be491e..908b49ae 100644
--- a/man/rgb2ycbcr.1
+++ b/man/rgb2ycbcr.1
@@ -1,4 +1,3 @@
-.\"	$Header: /cvs/maptools/cvsroot/libtiff/man/rgb2ycbcr.1,v 1.5 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1991-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/thumbnail.1 b/man/thumbnail.1
index 5ae87eda..f5563ea3 100644
--- a/man/thumbnail.1
+++ b/man/thumbnail.1
@@ -1,4 +1,3 @@
-.\"	$Id: thumbnail.1,v 1.3 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1994-1997 Sam Leffler
 .\" Copyright (c) 1994-1997 Silicon Graphics, Inc.
diff --git a/man/tiff2bw.1 b/man/tiff2bw.1
index 182ebbec..4fe9942f 100644
--- a/man/tiff2bw.1
+++ b/man/tiff2bw.1
@@ -1,4 +1,3 @@
-.\"	$Id: tiff2bw.1,v 1.4 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/tiff2pdf.1 b/man/tiff2pdf.1
index de80599e..93011332 100644
--- a/man/tiff2pdf.1
+++ b/man/tiff2pdf.1
@@ -1,4 +1,3 @@
-.\" $Id: tiff2pdf.1,v 1.8 2016-09-25 20:05:51 bfriesen Exp $
 .\" 
 .\"  Copyright (c) 2003 Ross Finlayson
 .\" 
diff --git a/man/tiff2ps.1 b/man/tiff2ps.1
index e3b57ec5..5e2b9a85 100644
--- a/man/tiff2ps.1
+++ b/man/tiff2ps.1
@@ -1,4 +1,3 @@
-.\" $Id: tiff2ps.1,v 1.12 2016-09-25 20:05:51 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/tiff2rgba.1 b/man/tiff2rgba.1
index f0af0a1c..d9c9baae 100644
--- a/man/tiff2rgba.1
+++ b/man/tiff2rgba.1
@@ -1,4 +1,3 @@
-.\" $Id: tiff2rgba.1,v 1.5 2016-09-25 20:05:52 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/tiffcmp.1 b/man/tiffcmp.1
index 3d111a4d..ee83a742 100644
--- a/man/tiffcmp.1
+++ b/man/tiffcmp.1
@@ -1,4 +1,3 @@
-.\" $Id: tiffcmp.1,v 1.7 2016-09-25 20:05:52 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/tiffcp.1 b/man/tiffcp.1
index fee46395..0545686c 100644
--- a/man/tiffcp.1
+++ b/man/tiffcp.1
@@ -1,4 +1,3 @@
-.\" $Id: tiffcp.1,v 1.14 2016-09-25 20:05:52 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/tiffcrop.1 b/man/tiffcrop.1
index 3fa6bb67..5bd00976 100644
--- a/man/tiffcrop.1
+++ b/man/tiffcrop.1
@@ -1,4 +1,3 @@
-.\" $Id: tiffcrop.1,v 1.8 2016-09-25 20:05:52 bfriesen Exp $
 .\" tiffcrop -- a port of tiffcp.c extended to include extended processing of images
 .\" 
 .\" Original code:
diff --git a/man/tiffdither.1 b/man/tiffdither.1
index d5214cee..56725b2b 100644
--- a/man/tiffdither.1
+++ b/man/tiffdither.1
@@ -1,4 +1,3 @@
-.\" $Id: tiffdither.1,v 1.6 2016-09-25 20:05:52 bfriesen Exp $
 .\"
 .\" Copyright (c) 1990-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/tiffdump.1 b/man/tiffdump.1
index a5eeccda..07b08e3c 100644
--- a/man/tiffdump.1
+++ b/man/tiffdump.1
@@ -1,4 +1,3 @@
-.\" $Id: tiffdump.1,v 1.6 2016-09-25 20:05:52 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/tiffgt.1 b/man/tiffgt.1
index 53031018..6ef6209f 100644
--- a/man/tiffgt.1
+++ b/man/tiffgt.1
@@ -1,4 +1,3 @@
-.\" $Id: tiffgt.1,v 1.5 2016-09-25 20:05:52 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/tiffinfo.1 b/man/tiffinfo.1
index 89637bb2..64958a6c 100644
--- a/man/tiffinfo.1
+++ b/man/tiffinfo.1
@@ -1,4 +1,3 @@
-.\" $Id: tiffinfo.1,v 1.3 2016-09-25 20:05:52 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/tiffmedian.1 b/man/tiffmedian.1
index 428ca9ad..b10ba798 100644
--- a/man/tiffmedian.1
+++ b/man/tiffmedian.1
@@ -1,4 +1,3 @@
-.\" $Id: tiffmedian.1,v 1.4 2016-09-25 20:05:52 bfriesen Exp $
 .\"
 .\" Copyright (c) 1990-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/tiffset.1 b/man/tiffset.1
index d7c48fa5..513c7567 100644
--- a/man/tiffset.1
+++ b/man/tiffset.1
@@ -1,4 +1,3 @@
-.\" $Id: tiffset.1,v 1.7 2016-09-25 20:05:52 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/man/tiffsplit.1 b/man/tiffsplit.1
index f01b3f46..fe309f42 100644
--- a/man/tiffsplit.1
+++ b/man/tiffsplit.1
@@ -1,4 +1,3 @@
-.\" $Id: tiffsplit.1,v 1.7 2016-09-25 20:05:52 bfriesen Exp $
 .\"
 .\" Copyright (c) 1992-1997 Sam Leffler
 .\" Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff --git a/nmake.opt b/nmake.opt
index ec45e779..c354bdfc 100644
--- a/nmake.opt
+++ b/nmake.opt
@@ -1,4 +1,3 @@
-# $Id: nmake.opt,v 1.20 2017-10-10 14:39:43 erouault Exp $
 #
 # Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
 #
diff --git a/port/Makefile.vc b/port/Makefile.vc
index bde48048..992d2696 100644
--- a/port/Makefile.vc
+++ b/port/Makefile.vc
@@ -1,4 +1,3 @@
-# $Id: Makefile.vc,v 1.5 2015-08-19 02:31:04 bfriesen Exp $
 #
 # Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
 #
diff --git a/port/dummy.c b/port/dummy.c
index 923ee7b1..346a07ee 100644
--- a/port/dummy.c
+++ b/port/dummy.c
@@ -1,5 +1,3 @@
-/* $Id: dummy.c,v 1.3 2007-03-21 14:54:16 dron Exp $ */
-
 /*
  * Dummy function, just to be ensure that the library always will be created.
  */
diff --git a/port/getopt.c b/port/getopt.c
index 6eff8ee5..c7bdb116 100644
--- a/port/getopt.c
+++ b/port/getopt.c
@@ -1,5 +1,3 @@
-/* $Id: getopt.c,v 1.3 2009-01-22 20:53:07 fwarmerdam Exp $ */
-
 /*
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
diff --git a/port/lfind.c b/port/lfind.c
index 22d97980..00ab6495 100644
--- a/port/lfind.c
+++ b/port/lfind.c
@@ -1,5 +1,3 @@
-/* $Id: lfind.c,v 1.4 2007-01-15 18:40:39 mloskot Exp $ */
-
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/port/libport.h b/port/libport.h
index d9b04215..53ea3418 100644
--- a/port/libport.h
+++ b/port/libport.h
@@ -1,5 +1,3 @@
-/* $Id: libport.h,v 1.5 2015-08-19 02:31:04 bfriesen Exp $ */
-
 /*
  * Copyright (c) 2009 Frank Warmerdam
  *
diff --git a/port/strcasecmp.c b/port/strcasecmp.c
index de7e4232..65e2b411 100644
--- a/port/strcasecmp.c
+++ b/port/strcasecmp.c
@@ -1,5 +1,3 @@
-/* $Id: strcasecmp.c,v 1.4 2015-06-21 01:09:09 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/port/strtoul.c b/port/strtoul.c
index 84ab2155..4439de78 100644
--- a/port/strtoul.c
+++ b/port/strtoul.c
@@ -1,5 +1,3 @@
-/* $Id: strtoul.c,v 1.2 2005-07-07 16:34:06 dron Exp $ */
-
 /*
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/test/ascii_tag.c b/test/ascii_tag.c
index 6337900b..9a56d31d 100644
--- a/test/ascii_tag.c
+++ b/test/ascii_tag.c
@@ -1,5 +1,3 @@
-/* $Id: ascii_tag.c,v 1.8 2013-12-17 14:41:57 bfriesen Exp $ */
-
 /*
  * Copyright (c) 2004, Andrey Kiselev  <dron@ak4719.spb.edu>
  *
diff --git a/test/check_tag.c b/test/check_tag.c
index 6275ac01..5750d683 100644
--- a/test/check_tag.c
+++ b/test/check_tag.c
@@ -1,5 +1,3 @@
-/* $Id: check_tag.c,v 1.3 2008-04-15 14:19:37 dron Exp $ */
-
 /*
  * Copyright (c) 2004, Andrey Kiselev  <dron@ak4719.spb.edu>
  *
diff --git a/test/custom_dir.c b/test/custom_dir.c
index acf55ce5..3b3ad279 100644
--- a/test/custom_dir.c
+++ b/test/custom_dir.c
@@ -1,5 +1,3 @@
-/* $Id: custom_dir.c,v 1.3 2013-12-17 14:41:58 bfriesen Exp $ */
-
 /*
  * Copyright (c) 2012, Frank Warmerdam <warmerdam@pobox.com>
  *
diff --git a/test/long_tag.c b/test/long_tag.c
index ab1440af..4bfdf805 100644
--- a/test/long_tag.c
+++ b/test/long_tag.c
@@ -1,5 +1,3 @@
-/* $Id: long_tag.c,v 1.5 2013-12-17 14:41:58 bfriesen Exp $ */
-
 /*
  * Copyright (c) 2004, Andrey Kiselev  <dron@ak4719.spb.edu>
  *
diff --git a/test/raw_decode.c b/test/raw_decode.c
index f81aa059..a2fca03a 100644
--- a/test/raw_decode.c
+++ b/test/raw_decode.c
@@ -1,5 +1,3 @@
-/* $Id: raw_decode.c,v 1.7 2015-08-16 20:08:21 bfriesen Exp $ */
-
 /*
  * Copyright (c) 2012, Frank Warmerdam <warmerdam@pobox.com>
  *
diff --git a/test/rewrite_tag.c b/test/rewrite_tag.c
index 5db3e4ba..2a366f78 100644
--- a/test/rewrite_tag.c
+++ b/test/rewrite_tag.c
@@ -1,5 +1,3 @@
-/* $Id: rewrite_tag.c,v 1.9 2015-08-23 14:23:00 bfriesen Exp $ */
-
 /*
  * Copyright (c) 2007, Frank Warmerdam <warmerdam@pobox.com>
  *
diff --git a/test/short_tag.c b/test/short_tag.c
index efc7da5b..75e7f5d5 100644
--- a/test/short_tag.c
+++ b/test/short_tag.c
@@ -1,5 +1,3 @@
-/* $Id: short_tag.c,v 1.9 2013-12-17 14:41:58 bfriesen Exp $ */
-
 /*
  * Copyright (c) 2004, Andrey Kiselev  <dron@ak4719.spb.edu>
  *
diff --git a/test/strip.c b/test/strip.c
index 59422262..f2cb7735 100644
--- a/test/strip.c
+++ b/test/strip.c
@@ -1,5 +1,3 @@
-/* $Id: strip.c,v 1.5 2013-12-17 14:41:58 bfriesen Exp $ */
-
 /*
  * Copyright (c) 2004, Andrey Kiselev  <dron@ak4719.spb.edu>
  *
diff --git a/test/strip_rw.c b/test/strip_rw.c
index 9eeeb518..bcf7d735 100644
--- a/test/strip_rw.c
+++ b/test/strip_rw.c
@@ -1,5 +1,3 @@
-/* $Id: strip_rw.c,v 1.6 2008-03-28 01:42:07 bfriesen Exp $ */
-
 /*
  * Copyright (c) 2004, Andrey Kiselev  <dron@ak4719.spb.edu>
  *
diff --git a/test/test_arrays.c b/test/test_arrays.c
index 03580fb8..226e9d0c 100644
--- a/test/test_arrays.c
+++ b/test/test_arrays.c
@@ -1,5 +1,3 @@
-/* $Id: test_arrays.c,v 1.3 2006-03-23 14:54:02 dron Exp $ */
-
 /*
  * Copyright (c) 2004, Andrey Kiselev  <dron@ak4719.spb.edu>
  *
diff --git a/test/test_arrays.h b/test/test_arrays.h
index 2cdf9a99..62e1d33c 100644
--- a/test/test_arrays.h
+++ b/test/test_arrays.h
@@ -1,5 +1,3 @@
-/* $Id: test_arrays.h,v 1.3 2006-03-23 14:54:02 dron Exp $ */
-
 /*
  * Copyright (c) 2004, Andrey Kiselev  <dron@ak4719.spb.edu>
  *
diff --git a/test/tifftest.h b/test/tifftest.h
index 889c6447..391b0f64 100644
--- a/test/tifftest.h
+++ b/test/tifftest.h
@@ -1,5 +1,3 @@
-/* $Id: tifftest.h,v 1.1 2008-04-15 14:18:36 dron Exp $ */
-
 /*
  * Copyright (c) 2008, Andrey Kiselev  <dron@ak4719.spb.edu>
  *
diff --git a/tiff.spec b/tiff.spec
index e373a3fb..58ee3094 100644
--- a/tiff.spec
+++ b/tiff.spec
@@ -1,4 +1,3 @@
-# $Id: tiff.spec,v 1.1 2004-06-14 15:07:42 dron Exp $
 #
 # TIFF Software
 #
diff --git a/tools/Makefile.lcc b/tools/Makefile.lcc
index dc4fd503..a51432e5 100644
--- a/tools/Makefile.lcc
+++ b/tools/Makefile.lcc
@@ -1,4 +1,3 @@
-# $Header: /cvs/maptools/cvsroot/libtiff/tools/Makefile.lcc,v 1.5 2016-06-05 19:54:03 bfriesen Exp $
 #
 # TIFF Library Tools
 #
diff --git a/tools/Makefile.vc b/tools/Makefile.vc
index 646c7677..453db43e 100644
--- a/tools/Makefile.vc
+++ b/tools/Makefile.vc
@@ -1,4 +1,3 @@
-# $Id: Makefile.vc,v 1.16 2016-06-05 19:54:03 bfriesen Exp $
 #
 # Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
 #
diff --git a/tools/fax2ps.c b/tools/fax2ps.c
index c4953315..274b29e4 100644
--- a/tools/fax2ps.c
+++ b/tools/fax2ps.c
@@ -1,5 +1,3 @@
-/* $Id: fax2ps.c,v 1.31 2015-09-06 18:24:27 bfriesen Exp $" */
-
 /*
  * Copyright (c) 1991-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/fax2tiff.c b/tools/fax2tiff.c
index f23374e0..2098b2ab 100644
--- a/tools/fax2tiff.c
+++ b/tools/fax2tiff.c
@@ -1,5 +1,3 @@
-/* $Id: fax2tiff.c,v 1.28 2017-10-29 18:28:45 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1990-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c
index 7a578006..0423598f 100644
--- a/tools/pal2rgb.c
+++ b/tools/pal2rgb.c
@@ -1,5 +1,3 @@
-/* $Id: pal2rgb.c,v 1.15 2015-06-21 01:09:10 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/ppm2tiff.c b/tools/ppm2tiff.c
index 91415e96..af6e4124 100644
--- a/tools/ppm2tiff.c
+++ b/tools/ppm2tiff.c
@@ -1,5 +1,3 @@
-/* $Id: ppm2tiff.c,v 1.19 2015-06-21 01:09:10 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1991-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/raw2tiff.c b/tools/raw2tiff.c
index 083e9ee7..f502408e 100644
--- a/tools/raw2tiff.c
+++ b/tools/raw2tiff.c
@@ -1,5 +1,4 @@
-/* $Id: raw2tiff.c,v 1.29 2017-01-14 13:12:33 erouault Exp $
- *
+/*
  * Project:  libtiff tools
  * Purpose:  Convert raw byte sequences in TIFF images
  * Author:   Andrey Kiselev, dron@ak4719.spb.edu
diff --git a/tools/rgb2ycbcr.c b/tools/rgb2ycbcr.c
index 7a9d705e..cf5f956f 100644
--- a/tools/rgb2ycbcr.c
+++ b/tools/rgb2ycbcr.c
@@ -1,5 +1,3 @@
-/* $Id: rgb2ycbcr.c,v 1.17 2016-08-15 21:26:56 erouault Exp $ */
-
 /*
  * Copyright (c) 1991-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/thumbnail.c b/tools/thumbnail.c
index ab6a1d28..db9c0c08 100644
--- a/tools/thumbnail.c
+++ b/tools/thumbnail.c
@@ -1,5 +1,3 @@
-/* $Id: thumbnail.c,v 1.21 2015-06-21 01:09:10 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1994-1997 Sam Leffler
  * Copyright (c) 1994-1997 Silicon Graphics, Inc.
diff --git a/tools/tiff2bw.c b/tools/tiff2bw.c
index dad54afa..05faba87 100644
--- a/tools/tiff2bw.c
+++ b/tools/tiff2bw.c
@@ -1,5 +1,3 @@
-/* $Id: tiff2bw.c,v 1.21 2017-11-01 13:41:58 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
index 454befbd..d1a9b095 100644
--- a/tools/tiff2pdf.c
+++ b/tools/tiff2pdf.c
@@ -1,4 +1,4 @@
-/* $Id: tiff2pdf.c,v 1.103 2017-10-29 18:50:41 bfriesen Exp $
+/*
  *
  * tiff2pdf - converts a TIFF image to a PDF document
  *
diff --git a/tools/tiff2ps.c b/tools/tiff2ps.c
index f1f0b372..af62e4cc 100644
--- a/tools/tiff2ps.c
+++ b/tools/tiff2ps.c
@@ -1,5 +1,3 @@
-/* $Id: tiff2ps.c,v 1.56 2017-04-27 15:46:22 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/tiff2rgba.c b/tools/tiff2rgba.c
index 4de96aec..2eb6f6c4 100644
--- a/tools/tiff2rgba.c
+++ b/tools/tiff2rgba.c
@@ -1,5 +1,3 @@
-/* $Id: tiff2rgba.c,v 1.22 2016-08-15 20:06:41 erouault Exp $ */
-
 /*
  * Copyright (c) 1991-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/tiffcmp.c b/tools/tiffcmp.c
index 1a008a30..02a5e342 100644
--- a/tools/tiffcmp.c
+++ b/tools/tiffcmp.c
@@ -1,5 +1,3 @@
-/* $Id: tiffcmp.c,v 1.18 2015-06-21 01:09:10 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/tiffcp.c b/tools/tiffcp.c
index 489459a7..08df56d5 100644
--- a/tools/tiffcp.c
+++ b/tools/tiffcp.c
@@ -1,5 +1,3 @@
-/* $Id: tiffcp.c,v 1.61 2017-01-11 19:26:14 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
index c69177e0..d82a94c8 100644
--- a/tools/tiffcrop.c
+++ b/tools/tiffcrop.c
@@ -1,5 +1,3 @@
-/* $Id: tiffcrop.c,v 1.50 2017-01-11 12:51:59 erouault Exp $ */
-
 /* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of
  * the image data through additional options listed below
  *
diff --git a/tools/tiffdither.c b/tools/tiffdither.c
index 247553cd..3fd7f81a 100644
--- a/tools/tiffdither.c
+++ b/tools/tiffdither.c
@@ -1,5 +1,3 @@
-/* $Id: tiffdither.c,v 1.16 2015-06-21 01:09:11 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/tiffdump.c b/tools/tiffdump.c
index 3de0062b..ab48e52c 100644
--- a/tools/tiffdump.c
+++ b/tools/tiffdump.c
@@ -1,5 +1,3 @@
-/* $Id: tiffdump.c,v 1.35 2016-11-19 15:42:46 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/tiffgt.c b/tools/tiffgt.c
index 35a23ccf..245a2b45 100644
--- a/tools/tiffgt.c
+++ b/tools/tiffgt.c
@@ -1,5 +1,3 @@
-/* $Id: tiffgt.c,v 1.15 2015-09-06 20:42:20 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/tiffinfo.c b/tools/tiffinfo.c
index 4d58055d..aecbb91a 100644
--- a/tools/tiffinfo.c
+++ b/tools/tiffinfo.c
@@ -1,5 +1,3 @@
-/* $Id: tiffinfo.c,v 1.26 2016-12-03 14:18:49 erouault Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/tiffinfoce.c b/tools/tiffinfoce.c
index 5334790d..82ab330b 100644
--- a/tools/tiffinfoce.c
+++ b/tools/tiffinfoce.c
@@ -1,5 +1,3 @@
-/* $Id: tiffinfoce.c,v 1.4 2010-12-11 19:33:48 faxguy Exp $ */
-
 /*
  * Copyright (c) 1988-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
diff --git a/tools/tiffmedian.c b/tools/tiffmedian.c
index f0c892e4..bd0d1561 100644
--- a/tools/tiffmedian.c
+++ b/tools/tiffmedian.c
@@ -1,5 +1,3 @@
-/* $Id: tiffmedian.c,v 1.13 2015-06-21 01:09:11 bfriesen Exp $ */
-
 /*
  * Apply median cut on an image.
  *
diff --git a/tools/tiffset.c b/tools/tiffset.c
index 894c9f1f..e6e77cd7 100644
--- a/tools/tiffset.c
+++ b/tools/tiffset.c
@@ -1,6 +1,4 @@
 /******************************************************************************
- * $Id: tiffset.c,v 1.19 2017-10-01 17:38:12 erouault Exp $
- *
  * Project:  libtiff tools
  * Purpose:  Mainline for setting metadata in existing TIFF files.
  * Author:   Frank Warmerdam, warmerdam@pobox.com
diff --git a/tools/tiffsplit.c b/tools/tiffsplit.c
index c4fa2478..c9e3a787 100644
--- a/tools/tiffsplit.c
+++ b/tools/tiffsplit.c
@@ -1,5 +1,3 @@
-/* $Id: tiffsplit.c,v 1.23 2015-05-28 13:10:26 bfriesen Exp $ */
-
 /*
  * Copyright (c) 1992-1997 Sam Leffler
  * Copyright (c) 1992-1997 Silicon Graphics, Inc.