diff --git a/contrib/iptcutil/iptcutil.c b/contrib/iptcutil/iptcutil.c
index 94375e50..ce5d2bc9 100644
--- a/contrib/iptcutil/iptcutil.c
+++ b/contrib/iptcutil/iptcutil.c
@@ -1,15 +1,25 @@
-/* $Id: iptcutil.c,v 1.2 2004-05-03 18:39:24 dron Exp $ */
+/* $Id: iptcutil.c,v 1.3 2004-09-03 08:56:06 dron Exp $ */
+
+#include "tif_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <fcntl.h>
-#ifdef  WIN32
-#include <io.h>
-#endif
 #include <string.h>
 #include <memory.h>
 #include <ctype.h>
 
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#ifdef HAVE_IO_H
+# include <io.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
 #ifdef WIN32
 #define STRNICMP strnicmp
 #else 
@@ -456,8 +466,8 @@ int main(int argc, char *argv[])
         next;
 
       unsigned char
-        recnum,
-        dataset;
+        recnum = 0,
+        dataset = 0;
 
       int
         inputlen = BUFFER_SZ;