diff --git a/src/configure.in b/src/configure.in
index e50753dcad2b30e6fb5d3312ab3d5a5cfd171a21..04eca91e80f3a22d4ad0bc6240c2fe7734a9eca7 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.172 1998/04/04 16:00:05 grubba Exp $")
+AC_REVISION("$Id: configure.in,v 1.173 1998/04/04 16:07:50 grubba Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -372,7 +372,11 @@ if test x$pike_cv_sys_os != xWindows_NT ; then
 
 echo Searching for include-file directories...
 if test $cppflags_is_set = no -a x${C_INCLUDE_PATH-} = x ; then
-  for d in `echo ${with_include_path} | sed 's/:/ /g'` `echo $prefix | sed "s@^NONE@$ac_default_prefix@g"`/include /usr/local/include /sw/local/include /usr/gnu/include /opt/gnu/include /sw/gnu/include /sw/include /usr/freeware/include
+  for d in `echo ${with_include_path} | sed 's/:/ /g'` \
+    `echo $prefix | sed "s@^NONE@$ac_default_prefix@g"`/include \
+    /usr/local/include /sw/local/include /usr/gnu/include /opt/gnu/include \
+    /sw/gnu/include /sw/include /usr/freeware/include \
+    `echo /usr/X11*/include | sort -r`
   do
     AC_MSG_CHECKING($d)
     if test -d "$d/." ; then
@@ -407,7 +411,9 @@ else
 fi
 
 echo Searching for binary directories...
-for d in `echo $exec_prefix | sed "s@^NONE@$prefix@g" | sed "s@^NONE@$ac_default_prefix@g"` "" /usr /usr/ccs /usr/local /sw/local /usr/gnu /opt/gnu /sw/gnu /sw /usr/freeware
+for d in `echo $exec_prefix | sed "s@^NONE@$prefix@g" | sed "s@^NONE@$ac_default_prefix@g"` \
+    "" /usr /usr/ccs /usr/local /sw/local /usr/gnu /opt/gnu /sw/gnu \
+    /sw /usr/freeware
 do
   AC_MSG_CHECKING($d/bin)
   if test -d "$d/bin/." ; then