diff --git a/libtiff/mkg3states.c b/libtiff/mkg3states.c
index 36e4e8a7..16bd29dc 100644
--- a/libtiff/mkg3states.c
+++ b/libtiff/mkg3states.c
@@ -1,4 +1,4 @@
-/* "$Id: mkg3states.c,v 1.6 2004-09-02 13:43:28 dron Exp $ */
+/* "$Id: mkg3states.c,v 1.7 2004-09-02 14:27:49 dron Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
@@ -35,6 +35,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 #include "tif_fax3.h"
 
 #define	streq(a,b)	(strcmp(a,b) == 0)
diff --git a/tools/fax2tiff.c b/tools/fax2tiff.c
index 05bb26ed..940bc323 100644
--- a/tools/fax2tiff.c
+++ b/tools/fax2tiff.c
@@ -1,4 +1,4 @@
-/* $Id: fax2tiff.c,v 1.12 2004-09-01 18:43:33 dron Exp $ */
+/* $Id: fax2tiff.c,v 1.13 2004-09-02 14:31:26 dron Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
@@ -32,6 +32,10 @@
 #include <stdio.h>
 #include <stdlib.h>		/* should have atof & getopt */
 
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 #if HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
diff --git a/tools/gif2tiff.c b/tools/gif2tiff.c
index ee7c9ddc..53f6136e 100644
--- a/tools/gif2tiff.c
+++ b/tools/gif2tiff.c
@@ -1,4 +1,4 @@
-/* $Id: gif2tiff.c,v 1.6 2004-07-24 19:04:37 dron Exp $ */
+/* $Id: gif2tiff.c,v 1.7 2004-09-02 14:33:55 dron Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
@@ -38,6 +38,10 @@
 #include <string.h>
 #include <math.h>
 
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 #include "tiffio.h"
 
 #define	GIFGAMMA	(1.5)		/* smaller makes output img brighter */
@@ -284,7 +288,7 @@ readgifimage(char* mode)
     } else if (global) {
         initcolors(globalmap, 1<<globalbits);
     }
-    if (status = readraster())
+    if ((status = readraster()))
 	rasterize(interleaved, mode);
     _TIFFfree(raster);
     return status;
@@ -302,7 +306,7 @@ readextension(void)
     char buf[255];
 
     (void) getc(infile);
-    while (count = getc(infile))
+    while ((count = getc(infile)))
         fread(buf, 1, count, infile);
 }
 
@@ -504,4 +508,6 @@ rasterize(int interleaved, char* mode)
     TIFFClose(tif);
 
     _TIFFfree(newras);
-} 
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */