--- we_prog.c.orig	Mon Dec 27 08:11:38 1999
+++ we_prog.c	Sat Feb 26 07:48:25 2000
@@ -16,6 +16,9 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <signal.h>
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
 
 int e_run_sh(FENSTER *f);
 int e_make_library(char *library, char *ofile, FENSTER *f);
@@ -924,7 +927,11 @@
  e_prog.exedir = WpeStrdup(".");
  if (e_prog.sys_include) FREE(e_prog.sys_include);
  e_prog.sys_include =
-   WpeStrdup("/usr/include:/usr/local/include:/usr/include/X11");
+   WpeStrdup("/usr/include:%%LOCALBASE%%/include"
+#if !defined(NO_XWINDOWS)
+			 ":"X_INC
+#endif
+			);
  if (e_prog.comp == NULL)
   e_prog.comp = MALLOC(e_prog.num * sizeof(struct e_s_prog *));
  else