diff --git a/libtiff/tif_close.c b/libtiff/tif_close.c
index fa7273f2..9fd838ff 100644
--- a/libtiff/tif_close.c
+++ b/libtiff/tif_close.c
@@ -1,4 +1,4 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_close.c,v 1.7 2004-01-29 08:47:36 dron Exp $ */
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_close.c,v 1.8 2004-01-30 20:22:18 dron Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -30,7 +30,7 @@
 #include "tiffiop.h"
 
 /************************************************************************/
-/*                            _TIFFCleanup()                            */
+/*                            TIFFCleanup()                             */
 /************************************************************************/
 
 /**
@@ -43,7 +43,7 @@
  */
 
 void
-_TIFFCleanup(TIFF* tif)
+TIFFCleanup(TIFF* tif)
 {
 	if (tif->tif_mode != O_RDONLY)
 	    /*
@@ -113,7 +113,7 @@ TIFFClose(TIFF* tif)
 	TIFFCloseProc closeproc = tif->tif_closeproc;
 	thandle_t fd = tif->tif_clientdata;
 
-	_TIFFCleanup(tif);
+	TIFFCleanup(tif);
 	(void) (*closeproc)(fd);
 }
 
diff --git a/libtiff/tif_open.c b/libtiff/tif_open.c
index 08c1d5f5..3b5d9728 100644
--- a/libtiff/tif_open.c
+++ b/libtiff/tif_open.c
@@ -1,4 +1,4 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_open.c,v 1.14 2004-01-29 15:34:01 dron Exp $ */
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_open.c,v 1.15 2004-01-30 20:22:18 dron Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -382,7 +382,7 @@ TIFFClientOpen(
 	}
 bad:
 	tif->tif_mode = O_RDONLY;	/* XXX avoid flush */
-        _TIFFCleanup(tif);
+        TIFFCleanup(tif);
 bad2:
 	return ((TIFF*)0);
 	(void) (*closeproc)(clientdata);
diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h
index 81359027..de2c5682 100644
--- a/libtiff/tiffio.h
+++ b/libtiff/tiffio.h
@@ -1,4 +1,4 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiffio.h,v 1.29 2004-01-29 08:47:36 dron Exp $ */
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiffio.h,v 1.30 2004-01-30 20:22:18 dron Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -289,6 +289,7 @@ extern	void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t);
 extern	int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t);
 extern	void _TIFFfree(tdata_t);
 
+extern	void TIFFCleanup(TIFF*);
 extern	void TIFFClose(TIFF*);
 extern	int TIFFFlush(TIFF*);
 extern	int TIFFFlushData(TIFF*);
diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
index 852d3a37..ef58264d 100644
--- a/libtiff/tiffiop.h
+++ b/libtiff/tiffiop.h
@@ -1,4 +1,4 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiffiop.h,v 1.10 2004-01-29 08:47:36 dron Exp $ */
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tiffiop.h,v 1.11 2004-01-30 20:22:18 dron Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -207,7 +207,6 @@ struct tiff {
 #if defined(__cplusplus)
 extern "C" {
 #endif
-extern	void _TIFFCleanup(TIFF*);
 extern	int _TIFFgetMode(const char*, const char*);
 extern	int _TIFFNoRowEncode(TIFF*, tidata_t, tsize_t, tsample_t);
 extern	int _TIFFNoStripEncode(TIFF*, tidata_t, tsize_t, tsample_t);