--- a/Instant/tptregexp/regexp.c.orig	2020-08-10 11:41:27.370308334 +0000
+++ b/Instant/tptregexp/regexp.c	2020-08-10 11:41:42.700144045 +0000
@@ -23,6 +23,7 @@
  * regular-expression syntax might require a total rethink.
  */
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <tptregexp.h>
 #include "regmagic.h"
--- a/Instant/tables.c.orig	2020-08-10 14:22:02.514144808 +0200
+++ b/Instant/tables.c	2020-08-10 14:22:30.143846770 +0200
@@ -380,7 +380,7 @@
 		av[1], av[2]);
 	}
 	else	{
-		fprintf(stderr, "Incomplete %s table instruction\n");
+		fprintf(stderr, "Incomplete table instruction\n");
 	}
     }
 
--- a/Instant/tptregexp/regsub.c.orig	2020-08-10 14:25:22.611985971 +0200
+++ b/Instant/tptregexp/regsub.c	2020-08-10 14:25:33.861864567 +0200
@@ -19,6 +19,7 @@
  *		be misrepresented as being the original software.
  */
 #include <stdio.h>
+#include <string.h>
 #include <tptregexp.h>
 #include "regmagic.h"
 
--- a/Instant/tptregexp/regerror.c.orig	2020-08-10 14:26:24.151321844 +0200
+++ b/Instant/tptregexp/regerror.c	2020-08-10 14:26:34.611208956 +0200
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 
 void
 tpt_regerror(s)
--- a/Instant/main.c.orig	2020-08-10 14:24:33.962510928 +0200
+++ b/Instant/main.c	2020-08-10 14:28:21.330059364 +0200
@@ -88,6 +88,7 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <time.h>
+#include <getopt.h>
 
 #define STORAGE
 #include "general.h"
--- a/Instant/traninit.c.orig	2020-08-10 16:35:11.308509164 +0200
+++ b/Instant/traninit.c	2020-08-10 16:37:34.247005501 +0200
@@ -82,6 +82,7 @@
 
 /* forward references */
 void	RememberTransSpec(Trans_t *, int);
+extern void ExpandVariables(char    *, char *, Element_t *);
 
 /* ______________________________________________________________________ */
 /*  Read the translation specs from the input file, storing in memory.
--- a/Instant/tranvar.c.orig	2020-08-10 16:38:14.996576699 +0200
+++ b/Instant/tranvar.c	2020-08-10 16:39:20.165890813 +0200
@@ -79,6 +79,7 @@
 void	ChaseIDRefs(Element_t *, char *, char *, FILE *);
 void	Find(Element_t *, int, char **, FILE *);
 void	GetIDREFnames();
+extern void CALStable(Element_t *, FILE *, char **, int);
 
 /* ______________________________________________________________________ */
 /*  Handle "special" variable - read file, run command, do action, etc.
--- a/Instant/main.c.orig	2020-08-10 16:48:48.569901878 +0200
+++ b/Instant/main.c	2020-08-10 16:49:14.689626254 +0200
@@ -92,6 +92,8 @@
 
 #define STORAGE
 #include "general.h"
+/*  Needed as we include translate.h below */
+#undef STORAGE
 
 /* [ANS-db3l] Included for character mapping in ReadESIS */
 #include <tptregexp.h>