diff -upk.orig xterm-209.orig/aclocal.m4 xterm-209/aclocal.m4
--- xterm-209.orig/aclocal.m4	2006-02-13 01:14:58 +0000
+++ xterm-209/aclocal.m4	2006-03-01 02:19:38 +0000
@@ -2590,6 +2590,13 @@ CPPFLAGS="$cf_cv_x_freetype_incs $CPPFLA
 
 AC_TRY_LINK([
 #include <X11/Xlib.h>
+#include <X11/Xdefs.h>
+#include <X11/X.h>
+#include <X11/IntrinsicP.h>
+#include <X11/Xmu/Misc.h>
+#include <X11/Xfuncs.h>
+#include <X11/Xosdefs.h>
+#include <X11/Xmu/Converters.h>
 #include <X11/extensions/Xrender.h>
 #include <X11/Xft/Xft.h>],[
 	XftPattern  *pat = XftNameParse ("name");],
diff -upk.orig xterm-209.orig/configure xterm-209/configure
--- xterm-209.orig/configure	2006-02-12 22:32:04 +0000
+++ xterm-209/configure	2006-03-01 02:20:34 +0000
@@ -10281,6 +10281,13 @@ cat >conftest.$ac_ext <<_ACEOF
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
+#include <X11/Xdefs.h>
+#include <X11/X.h>
+#include <X11/IntrinsicP.h>
+#include <X11/Xmu/Misc.h>
+#include <X11/Xfuncs.h>
+#include <X11/Xosdefs.h>
+#include <X11/Xmu/Converters.h>
 #include <X11/extensions/Xrender.h>
 #include <X11/Xft/Xft.h>
 int