diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
index 64c39fc7..0390fc27 100644
--- a/libtiff/tif_dirread.c
+++ b/libtiff/tif_dirread.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dirread.c,v 1.157 2010-05-08 18:33:07 olivier Exp $ */
+/* $Id: tif_dirread.c,v 1.158 2010-06-21 19:09:26 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -2792,7 +2792,7 @@ static void TIFFReadDirEntryCheckedSbyte(TIFF* tif, TIFFDirEntry* direntry, int8
 static void TIFFReadDirEntryCheckedShort(TIFF* tif, TIFFDirEntry* direntry, uint16* value)
 {
 	*value = direntry->tdir_offset.toff_short;
-	//*value=*(uint16*)(&direntry->tdir_offset);
+	/* *value=*(uint16*)(&direntry->tdir_offset); */
 	if (tif->tif_flags&TIFF_SWAB)
 		TIFFSwabShort(value);
 }
diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
index 8f4425d1..febf4298 100644
--- a/libtiff/tif_jpeg.c
+++ b/libtiff/tif_jpeg.c
@@ -1,4 +1,4 @@
-/* $Id: tif_jpeg.c,v 1.91 2010-05-07 18:38:46 fwarmerdam Exp $ */
+/* $Id: tif_jpeg.c,v 1.92 2010-06-21 19:09:26 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1994-1997 Sam Leffler
@@ -1401,7 +1401,7 @@ JPEGDecodeRaw(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s)
 					}
 				}
 				else
-				{         // 12-bit
+					{         /* 12-bit */
 					int value_pairs = (sp->cinfo.d.output_width
 					    * sp->cinfo.d.num_components) / 2;
 					int iPair;
diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c
index 766be15f..07528a11 100644
--- a/libtiff/tif_win32.c
+++ b/libtiff/tif_win32.c
@@ -1,4 +1,4 @@
-/* $Id: tif_win32.c,v 1.36 2010-03-10 18:56:49 bfriesen Exp $ */
+/* $Id: tif_win32.c,v 1.37 2010-06-21 19:09:26 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -165,8 +165,8 @@ _tiffMapProc(thandle_t fd, void** pbase, toff_t* psize)
 	if ((uint64)sizem!=size)
 		return (0);
 
-	// By passing in 0 for the maximum file size, it specifies that we
-	// create a file mapping object for the full file size.
+	/* By passing in 0 for the maximum file size, it specifies that we
+	   create a file mapping object for the full file size. */
 	hMapFile = CreateFileMapping(fd, NULL, PAGE_READONLY, 0, 0, NULL);
 	if (hMapFile == NULL)
 		return (0);
diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
index cc888e9d..fdb00f48 100644
--- a/tools/tiff2pdf.c
+++ b/tools/tiff2pdf.c
@@ -1,4 +1,4 @@
-/* $Id: tiff2pdf.c,v 1.53 2010-06-13 19:25:55 fwarmerdam Exp $
+/* $Id: tiff2pdf.c,v 1.54 2010-06-21 19:09:26 bfriesen Exp $
  *
  * tiff2pdf - converts a TIFF image to a PDF document
  *
@@ -4803,7 +4803,7 @@ tsize_t t2p_write_pdf_transfer_dict(T2P* t2p, TIFF* output, uint16 i){
 	tsize_t written=0;
 	char buffer[32];
 	int buflen=0;
-	(void)i; // XXX
+	(void)i; /* XXX */
 
 	written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17);
 	written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19);
diff --git a/tools/tiffdump.c b/tools/tiffdump.c
index 3011fad2..1797113e 100644
--- a/tools/tiffdump.c
+++ b/tools/tiffdump.c
@@ -1,4 +1,4 @@
-/* $Id: tiffdump.c,v 1.22 2010-03-10 18:56:50 bfriesen Exp $ */
+/* $Id: tiffdump.c,v 1.23 2010-06-21 19:09:26 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -169,7 +169,7 @@ dump(int fd, uint64 diroff)
 		ReadError("TIFF header");
 	if (hdr.common.tiff_magic != TIFF_BIGENDIAN && hdr.common.tiff_magic != TIFF_LITTLEENDIAN &&
 #if HOST_BIGENDIAN
-	    // MDI is sensitive to the host byte order, unlike TIFF
+	    /* MDI is sensitive to the host byte order, unlike TIFF */
 	    MDI_BIGENDIAN != hdr.common.tiff_magic )
 #else
 	    MDI_LITTLEENDIAN != hdr.common.tiff_magic )