diff -uNr xtiff.ORIG/help.c xtiff/help.c
--- xtiff.ORIG/help.c	1994-09-07 19:58:04.000000000 +0900
+++ xtiff/help.c	2006-10-06 23:09:34.000000000 +0900
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
-#define _GCC_WCHAR_T		/* emergency compile-me kludge */
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
diff -uNr xtiff.ORIG/makefile xtiff/makefile
--- xtiff.ORIG/makefile	2006-10-06 23:09:34.000000000 +0900
+++ xtiff/makefile	2006-10-06 23:10:06.000000000 +0900
@@ -21,9 +21,8 @@
 
 X11INCDIR = 	/usr/X11R6/include
 X11LIBDIR =	/usr/X11R6/lib
-LIBTIFFDIR = 	$(X11LIBDIR)
-# LIBTIFFINCDIR = $(LIBTIFFDIR)
-LIBTIFFINCDIR = $(X11INCDIR)/tiff
+LIBTIFFDIR = 	/usr/local/lib
+LIBTIFFINCDIR = $(LIBTIFFDIR)/../include
 
 #need all these libraries
 
@@ -59,10 +58,7 @@
 CC = gcc
 
 #these are for gcc
-CFLAGS = 	 -DNOSTDHDRS \
-		-fstrength-reduce \
-		-fpcc-struct-return \
-		-fwritable-strings \
+CFLAGS = 	-fstrength-reduce \
 		-c \
 	 	$(DEBUG_OR_OPTIMISE) \
 		$(INCLUDES)