Index: args.c
--- args.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ args.c	2021-08-29 09:13:56.095303000 +0200
@@ -29,8 +29,8 @@
 #include <stddef.h>
 #include <signal.h>
 #include <string.h>
+#include <stdlib.h>
 #include "config.h"
-#include "alloca.h"
 #include "lib.h"
 #include "signal.h"
 #include "unwind.h"
Index: arith.c
--- arith.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ arith.c	2021-08-29 09:13:56.095739000 +0200
@@ -40,7 +40,6 @@
 #if HAVE_ROUNDING_CTL_H
 #include <fenv.h>
 #endif
-#include "alloca.h"
 #include "lib.h"
 #include "signal.h"
 #include "unwind.h"
Index: combi.c
--- combi.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ combi.c	2021-08-29 09:13:56.095879000 +0200
@@ -26,6 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <stdlib.h>
 #include <wctype.h>
 #include <wchar.h>
 #include <signal.h>
Index: configure
--- configure.orig	2021-08-28 19:15:28.000000000 +0200
+++ configure	2021-08-29 09:13:56.096218000 +0200
@@ -1058,16 +1058,7 @@
 
 output=$($make conftest.ccver)
 set -- $output
-if [ "$1" = "gcc" ] ; then
-  gcc_version=$3
-  save_ifs=$IFS ; IFS=. ; set -- $gcc_version ; IFS=$save_ifs
-  if [ $1 -lt 4 ] || [ $1 -eq 4 -a $2 -le 3 ] ; then
-    broken128=y
-  fi
-  [ $1 -lt 5 ] && do_nopie=
-elif [ "$1" = "clang" -o "$2" = "clang" ] ; then
-  do_nopie=
-fi
+do_nopie=
 
 printf "done\n"
 
@@ -1134,6 +1125,7 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <wchar.h>
 #include <wctype.h>
 
@@ -2692,6 +2684,7 @@
 cat > conftest.c <<!
 #include "config.h"
 #include <process.h>
+#include <stdlib.h>
 #include <wchar.h>
 
 int main(int argc, char **argv)
Index: eval.c
--- eval.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ eval.c	2021-08-29 09:13:56.096850000 +0200
@@ -35,7 +35,6 @@
 #include <time.h>
 #include <assert.h>
 #include "config.h"
-#include "alloca.h"
 #include "lib.h"
 #include "gc.h"
 #include "args.h"
Index: ffi.c
--- ffi.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ ffi.c	2021-08-29 09:13:56.097546000 +0200
@@ -49,7 +49,6 @@
 #include <unistd.h>
 #include <errno.h>
 #endif
-#include "alloca.h"
 #include "lib.h"
 #include "stream.h"
 #include "gc.h"
Index: ftw.c
--- ftw.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ ftw.c	2021-08-29 09:13:56.097650000 +0200
@@ -34,7 +34,6 @@
 #include <errno.h>
 #include <ftw.h>
 #include "config.h"
-#include "alloca.h"
 #include "lib.h"
 #include "gc.h"
 #include "args.h"
Index: hash.c
--- hash.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ hash.c	2021-08-29 09:13:56.097861000 +0200
@@ -34,7 +34,6 @@
 #include <limits.h>
 #include <signal.h>
 #include "config.h"
-#include "alloca.h"
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
Index: lib.c
--- lib.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ lib.c	2021-08-29 09:13:56.098860000 +0200
@@ -40,7 +40,6 @@
 #include <assert.h>
 #include <locale.h>
 #include "config.h"
-#include "alloca.h"
 #if HAVE_GETENVIRONMENTSTRINGS
 #define NOMINMAX
 #include <windows.h>
Index: match.c
--- match.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ match.c	2021-08-29 09:13:56.099295000 +0200
@@ -33,7 +33,6 @@
 #include <wchar.h>
 #include <signal.h>
 #include "config.h"
-#include "alloca.h"
 #include "lib.h"
 #include "gc.h"
 #include "args.h"
Index: parser.c
--- parser.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ parser.c	2021-08-29 09:13:56.099501000 +0200
@@ -37,7 +37,6 @@
 #include <wctype.h>
 #include <errno.h>
 #include "config.h"
-#include "alloca.h"
 #ifdef __CYGWIN__
 #include <sys/utsname.h>
 #endif
Index: parser.y
--- parser.y.orig	2021-08-28 19:15:28.000000000 +0200
+++ parser.y	2021-08-29 09:13:56.099755000 +0200
@@ -35,8 +35,8 @@
 #include <stdlib.h>
 #include <wchar.h>
 #include <signal.h>
+#include <string.h>
 #include "config.h"
-#include "alloca.h"
 #include "lib.h"
 #include "signal.h"
 #include "unwind.h"
Index: regex.c
--- regex.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ regex.c	2021-08-29 09:13:56.100054000 +0200
@@ -35,7 +35,6 @@
 #include <signal.h>
 #include <stdarg.h>
 #include "config.h"
-#include "alloca.h"
 #include "lib.h"
 #include "parser.h"
 #include "signal.h"
Index: socket.c
--- socket.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ socket.c	2021-08-29 09:13:56.100221000 +0200
@@ -39,8 +39,10 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netdb.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include "config.h"
-#include "alloca.h"
 #if HAVE_POLL
 #include <poll.h>
 #elif HAVE_SELECT
Index: stream.c
--- stream.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ stream.c	2021-08-29 09:13:56.100676000 +0200
@@ -37,8 +37,13 @@
 #include <ctype.h>
 #include <wchar.h>
 #include <wctype.h>
+#include <sys/types.h>
 #include <signal.h>
 #include "config.h"
+#ifdef __FreeBSD__
+#undef  __XSI_VISIBLE
+#define __XSI_VISIBLE 1
+#endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -58,7 +63,6 @@
 #if HAVE_WSPAWN || HAVE_SPAWN
 #include <process.h>
 #endif
-#include "alloca.h"
 #include "lib.h"
 #include "gc.h"
 #include "signal.h"
Index: struct.c
--- struct.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ struct.c	2021-08-29 09:13:56.100893000 +0200
@@ -35,7 +35,6 @@
 #include <signal.h>
 #include <assert.h>
 #include "config.h"
-#include "alloca.h"
 #include "lib.h"
 #include "hash.h"
 #include "eval.h"
Index: sysif.c
--- sysif.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ sysif.c	2021-08-29 09:13:56.101231000 +0200
@@ -31,6 +31,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
 #include <dirent.h>
 #include <wchar.h>
@@ -92,7 +93,6 @@
 #if HAVE_RLIMIT
 #include <sys/resource.h>
 #endif
-#include "alloca.h"
 #include "lib.h"
 #include "stream.h"
 #include "hash.h"
@@ -2660,7 +2660,9 @@
 #endif
   reg_varl(intern(lit("enotsock"), user_package), num_fast(ENOTSOCK));
   reg_varl(intern(lit("enotsup"), user_package), num_fast(ENOTSUP));
+#ifdef ENOTTY
   reg_varl(intern(lit("enotty"), user_package), num_fast(ENOTTY));
+#endif
   reg_varl(intern(lit("enxio"), user_package), num_fast(ENXIO));
   reg_varl(intern(lit("eopnotsupp"), user_package), num_fast(EOPNOTSUPP));
   reg_varl(intern(lit("eoverflow"), user_package), num_fast(EOVERFLOW));
Index: syslog.c
--- syslog.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ syslog.c	2021-08-29 09:13:56.101337000 +0200
@@ -33,7 +33,6 @@
 #include <wchar.h>
 #include <syslog.h>
 #include "config.h"
-#include "alloca.h"
 #include "lib.h"
 #include "stream.h"
 #include "gc.h"
Index: termios.c
--- termios.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ termios.c	2021-08-29 09:13:56.101494000 +0200
@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <termios.h>
 #include "config.h"
-#include "alloca.h"
 #include "lib.h"
 #include "gc.h"
 #include "args.h"
Index: txr.c
--- txr.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ txr.c	2021-08-29 09:13:56.101699000 +0200
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <wchar.h>
 #include <signal.h>
 #include "config.h"
@@ -277,6 +278,10 @@
   if (progname_u8 && realpath(progname_u8, self))
     return string_utf8(self);
 
+  char *p = getenv("TXR_INST_PATH");
+  if (p != NULL)
+      return string_utf8(p);
+
   return lit(TXR_INST_PATH);
 }
 #endif
Index: unwind.c
--- unwind.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ unwind.c	2021-08-29 09:13:56.101870000 +0200
@@ -46,7 +46,6 @@
 #include "eval.h"
 #include "struct.h"
 #include "cadr.h"
-#include "alloca.h"
 #include "unwind.h"
 #include "debug.h"
 
Index: vm.c
--- vm.c.orig	2021-08-28 19:15:28.000000000 +0200
+++ vm.c	2021-08-29 09:13:56.102035000 +0200
@@ -33,7 +33,6 @@
 #include <signal.h>
 #include <assert.h>
 #include "config.h"
-#include "alloca.h"
 #include "lib.h"
 #include "eval.h"
 #include "signal.h"