--- configure.orig	2021-09-26 14:54:24.000000000 +1000
+++ configure	2021-09-26 15:02:14.000000000 +1000
@@ -2980,8 +2980,8 @@
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
         || toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return (2);
+  return (0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
@@ -3352,6 +3352,7 @@
   cat >conftest.$ac_ext <<_ACEOF
 #line 3349 "configure"
 #include "confdefs.h"
+#include <libgen.h>
 #include <sys/types.h>
 #include <string.h>
 int
@@ -3361,7 +3362,7 @@
 	char *p;
 	int len = strlen(name);
 	p = dirname(name);
-	exit(len != strlen(name));
+	return (len != strlen(name));
 }
 _ACEOF
 rm -f conftest$ac_exeext
--- file/configure.orig	2004-08-30 09:11:06.000000000 +1000
+++ file/configure	2021-09-26 15:11:23.000000000 +1000
@@ -2486,8 +2486,8 @@
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
         || toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return (2);
+  return (0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
@@ -3352,6 +3352,7 @@
   cat >conftest.$ac_ext <<_ACEOF
 #line 3353 "configure"
 #include "confdefs.h"
+#include <stdlib.h>
 #include <time.h>
 #ifndef tzname /* For SGI.  */
 extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
@@ -3448,6 +3449,7 @@
   cat >conftest.$ac_ext <<_ACEOF
 #line 3449 "configure"
 #include "confdefs.h"
+#include <stdlib.h>
 #include <time.h>
 #ifndef daylight /* In case IRIX #defines this, too  */
 extern int daylight;
@@ -3753,12 +3755,12 @@
 #endif
 
 #include <stdio.h>
-main()
+int main()
 {
   FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
+  if (!f) return (1);
   fprintf(f, "%d\n", sizeof(uint8_t));
-  exit(0);
+  return (0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
@@ -3805,12 +3807,12 @@
 #endif
 
 #include <stdio.h>
-main()
+int main()
 {
   FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
+  if (!f) return (1);
   fprintf(f, "%d\n", sizeof(uint16_t));
-  exit(0);
+  return (0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
@@ -3857,12 +3859,12 @@
 #endif
 
 #include <stdio.h>
-main()
+int main()
 {
   FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
+  if (!f) return (1);
   fprintf(f, "%d\n", sizeof(uint32_t));
-  exit(0);
+  return (0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
@@ -3909,12 +3911,12 @@
 #endif
 
 #include <stdio.h>
-main()
+int main()
 {
   FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
+  if (!f) return (1);
   fprintf(f, "%d\n", sizeof(uint64_t));
-  exit(0);
+  return (0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
--- jpeg-6b/configure.orig	2004-08-30 09:11:09.000000000 +1000
+++ jpeg-6b/configure	2021-09-26 15:17:45.000000000 +1000
@@ -623,7 +623,7 @@
 cat > conftest.$ac_ext <<EOF
 #line 625 "configure"
 #include "confdefs.h"
-main(){return(0);}
+int main(){return(0);}
 EOF
 if { (eval echo configure:629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
@@ -1280,6 +1280,7 @@
   cat > conftest.$ac_ext <<EOF
 #line 1282 "configure"
 #include "confdefs.h"
+#include <stdio.h>
 
 #ifdef HAVE_PROTOTYPES
 int is_char_signed (int arg)
@@ -1298,8 +1299,8 @@
   return 1;			/* assume char is signed otherwise */
 }
 char signed_char_check = (char) (-67);
-main() {
-  exit(is_char_signed((int) signed_char_check));
+int main() {
+  return (is_char_signed((int) signed_char_check));
 }
 EOF
 if { (eval echo configure:1306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
@@ -1326,6 +1327,7 @@
   cat > conftest.$ac_ext <<EOF
 #line 1328 "configure"
 #include "confdefs.h"
+#include <stdio.h>
 
 #ifdef HAVE_PROTOTYPES
 int is_shifting_signed (long arg)
@@ -1350,8 +1352,8 @@
   printf("I fear the JPEG software will not work at all.\n\n");
   return 0;			/* try it with unsigned anyway */
 }
-main() {
-  exit(is_shifting_signed(-0x7F7E80B1L));
+int main() {
+  return (is_shifting_signed(-0x7F7E80B1L));
 }
 EOF
 if { (eval echo configure:1358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
@@ -1380,10 +1382,10 @@
 #include "confdefs.h"
 
 #include <stdio.h>
-main() {
+int main() {
   if (fopen("conftestdata", "wb") != NULL)
-    exit(0);
-  exit(1);
+    return (0);
+  return (1);
 }
 EOF
 if { (eval echo configure:1390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
--- file/fsmagic.c.orig	2004-08-30 09:11:06.000000000 +1000
+++ file/fsmagic.c	2021-09-26 15:36:54.000000000 +1000
@@ -208,7 +208,7 @@ fsmagic(fn, sb)
 
 			/* Otherwise, handle it. */
 			if (lflag) {
-				process(buf, strlen(buf));
+				file_process(buf, strlen(buf));
 				return 1;
 			} else { /* just print what it points to */
 				ckfputs("symbolic link to ", stdout);
--- md5.c.orig	2004-08-30 10:16:47.000000000 +1000
+++ md5.c	2021-09-26 15:41:23.000000000 +1000
@@ -23,6 +23,7 @@
    copyright in any changes I have made; this code remains in the
    public domain.  */
 
+#include <string.h>
 #include <sys/types.h>
 
 #ifdef HAVE_CONFIG_H
--- arc4.c.orig	2004-08-30 09:11:00.000000000 +1000
+++ arc4.c	2021-09-26 15:43:46.000000000 +1000
@@ -28,6 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <string.h>
 #include <sys/types.h>
 
 #include "config.h"
--- jutil.c.orig	2004-08-30 09:41:48.000000000 +1000
+++ jutil.c	2021-09-26 15:45:56.000000000 +1000
@@ -37,6 +37,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <err.h>