Index: bin/pax/extern.h
===================================================================
RCS file: /cvsroot/src/bin/pax/extern.h,v
retrieving revision 1.59
diff -p -u -r1.59 extern.h
--- bin/pax/extern.h	9 Aug 2012 08:09:21 -0000	1.59
+++ bin/pax/extern.h	28 Apr 2021 20:43:30 -0000
@@ -204,7 +204,6 @@ void options(int, char **);
 OPLIST * opt_next(void);
 int bad_opt(void);
 int mkpath(char *);
-char *chdname;
 #if !HAVE_NBTOOL_CONFIG_H
 int do_chroot;
 #endif
Index: bin/pax/options.c
===================================================================
RCS file: /cvsroot/src/bin/pax/options.c,v
retrieving revision 1.118
diff -p -u -r1.118 options.c
--- bin/pax/options.c	19 Dec 2015 18:45:52 -0000	1.118
+++ bin/pax/options.c	28 Apr 2021 20:43:30 -0000
@@ -102,6 +102,8 @@ static void cpio_options(int, char **);
 __dead static void cpio_usage(void);
 #endif
 
+char *chdname;
+
 /* errors from get_line */
 #define GETLINE_FILE_CORRUPT 1
 #define GETLINE_OUT_OF_MEM 2
Index: usr.bin/make/main.c
===================================================================
RCS file: /cvsroot/src/usr.bin/make/main.c,v
retrieving revision 1.273
diff -p -u -r1.273 main.c
--- usr.bin/make/main.c	28 Oct 2017 21:54:54 -0000	1.273
+++ usr.bin/make/main.c	28 Apr 2021 20:43:30 -0000
@@ -163,6 +163,7 @@ int			maxJobs;	/* -j argument */
 static int		maxJobTokens;	/* -j argument */
 Boolean			compatMake;	/* -B argument */
 int			debug;		/* -d argument */
+FILE *			debug_file;	/* debug log output */
 Boolean			debugVflag;	/* -dV */
 Boolean			noExecute;	/* -n flag */
 Boolean			noRecursiveExecute;	/* -N flag */
Index: usr.bin/make/make.h
===================================================================
RCS file: /cvsroot/src/usr.bin/make/make.h,v
retrieving revision 1.104
diff -p -u -r1.104 make.h
--- usr.bin/make/make.h	12 Feb 2018 21:38:09 -0000	1.104
+++ usr.bin/make/make.h	28 Apr 2021 20:43:30 -0000
@@ -448,7 +448,7 @@ extern pid_t	myPid;
  *	There is one bit per module.  It is up to the module what debug
  *	information to print.
  */
-FILE *debug_file;		/* Output written here - default stdout */
+extern FILE *debug_file;	/* Output written here - default stdout */
 extern int debug;
 #define	DEBUG_ARCH	0x00001
 #define	DEBUG_COND	0x00002