diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index 298600c2d..94ee13911 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -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
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 1af5fe4b7..5c5109ce3 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -214,6 +214,8 @@ int havechd = 0;
  *	parser
  */
 
+char *chdname;
+
 void
 options(int argc, char **argv)
 {
diff --git a/external/bsd/llvm/dist/llvm/include/llvm/IR/ValueMap.h b/external/bsd/llvm/dist/llvm/include/llvm/IR/ValueMap.h
index f2ea405f1..45ae7e784 100644
--- a/external/bsd/llvm/dist/llvm/include/llvm/IR/ValueMap.h
+++ b/external/bsd/llvm/dist/llvm/include/llvm/IR/ValueMap.h
@@ -101,7 +101,7 @@ public:
 
   ~ValueMap() {}
 
-  bool hasMD() const { return MDMap; }
+  bool hasMD() const { return (bool)MDMap; }
   MDMapT &MD() {
     if (!MDMap)
       MDMap.reset(new MDMapT);
diff --git a/external/gpl3/binutils/fetch.sh b/external/gpl3/binutils/fetch.sh
index 89100de5c..298ff1b38 100755
--- a/external/gpl3/binutils/fetch.sh
+++ b/external/gpl3/binutils/fetch.sh
@@ -5,8 +5,11 @@ echo $0
 cd `dirname $0`
 
 # Configure fetch method
-URL="http://www.minix3.org/pkgsrc/distfiles/minix/3.4.0/binutils-2.23.2.tar.bz2"
-BACKUP_URL="http://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2"
+
+# URL="http://www.minix3.org/pkgsrc/distfiles/minix/3.4.0/binutils-2.23.2.tar.bz2"
+# BACKUP_URL="http://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2"
+URL="https://ftpmirror.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2"
+BACKUP_URL="http://www.minix3.org/pkgsrc/distfiles/minix/3.4.0/binutils-2.23.2.tar.bz2"
 FETCH=ftp
 which curl >/dev/null
 if [ $? -eq 0 ]; then
diff --git a/external/gpl3/gcc/fetch.sh b/external/gpl3/gcc/fetch.sh
index d3d7eec39..59571e99f 100755
--- a/external/gpl3/gcc/fetch.sh
+++ b/external/gpl3/gcc/fetch.sh
@@ -9,13 +9,15 @@ cd `dirname $0`
 : ${SED=sed}
 
 # Configure fetch method
-URL="http://www.minix3.org/pkgsrc/distfiles/minix/3.4.0/gcc-4.8.5.tar.bz2"
-BACKUP_URL="ftp://ftp.gwdg.de/pub/misc/gcc/releases/gcc-4.8.5/gcc-4.8.5.tar.bz2"
+# URL="http://www.minix3.org/pkgsrc/distfiles/minix/3.4.0/gcc-4.8.5.tar.bz2"
+# BACKUP_URL="ftp://ftp.gwdg.de/pub/misc/gcc/releases/gcc-4.8.5/gcc-4.8.5.tar.bz2"
+URL="https://ftpmirror.gnu.org/gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2"
+BACKUP_URL="http://www.minix3.org/pkgsrc/distfiles/minix/3.4.0/gcc-4.8.5.tar.bz2"
 FETCH=ftp
-if which curl >/dev/null
-then
-	FETCH="curl -O -f"
-fi
+# if which curl >/dev/null
+# then
+# 	FETCH="curl -O -f"
+# fi
 
 # Remove a few directories from the start, so we do not end up with a 165MB patch...
 DELETEDIRS="
diff --git a/releasetools/arm_sdimage.sh b/releasetools/arm_sdimage.sh
index 94d107695..5340bb8a7 100755
--- a/releasetools/arm_sdimage.sh
+++ b/releasetools/arm_sdimage.sh
@@ -23,6 +23,8 @@ fi
 : ${OBJ=../obj.${ARCH}}
 : ${TOOLCHAIN_TRIPLET=arm-elf32-minix-}
 : ${BUILDSH=build.sh}
+# Set the number of parallel build jobs the same number of CPU cores.
+: ${JOBS=$(nproc)}
 
 : ${SETS="minix-base minix-comp minix-games minix-man minix-tests tests"}
 : ${IMG=minix_arm_sd.img}
diff --git a/sbin/newfs_udf/newfs_udf.h b/sbin/newfs_udf/newfs_udf.h
index 1c21a0b48..e9ff149a5 100644
--- a/sbin/newfs_udf/newfs_udf.h
+++ b/sbin/newfs_udf/newfs_udf.h
@@ -53,8 +53,8 @@ extern float	 meta_fract;
 
 
 /* shared structure between udf_create.c users */
-struct udf_create_context context;
-struct udf_disclayout     layout;
+extern struct udf_create_context context;
+extern struct udf_disclayout     layout;
 
 /* prototypes */
 int udf_write_sector(void *sector, uint64_t location);
diff --git a/sbin/newfs_udf/udf_create.c b/sbin/newfs_udf/udf_create.c
index ef92874af..6d95a2bf8 100644
--- a/sbin/newfs_udf/udf_create.c
+++ b/sbin/newfs_udf/udf_create.c
@@ -52,6 +52,10 @@ __RCSID("$NetBSD: udf_create.c,v 1.25 2015/06/16 23:18:55 christos Exp $");
 #  endif
 #endif
 
+/* shared structure between udf_create.c users */
+struct udf_create_context context;
+struct udf_disclayout     layout;
+
 /*
  * NOTE that there is some overlap between this code and the udf kernel fs.
  * This is intentially though it might better be factored out one day.
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 73f4aaa9c..72a71f722 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -192,6 +192,8 @@ char *makeDependfile;
 pid_t myPid;
 int makelevel;
 
+FILE *debug_file;
+
 Boolean forceJobs = FALSE;
 
 extern Lst parseIncPath;
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index f162ef670..e07bba3cc 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -440,7 +440,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
diff --git a/usr.sbin/installboot/machines.c b/usr.sbin/installboot/machines.c
index 357652b83..18ab832d3 100644
--- a/usr.sbin/installboot/machines.c
+++ b/usr.sbin/installboot/machines.c
@@ -48,13 +48,11 @@ __RCSID("$NetBSD: machines.c,v 1.39 2014/02/24 07:23:44 skrll Exp $");
  */
 struct ib_mach
     ib_mach_alpha,
-    ib_mach_amd64,
     ib_mach_amiga,
     ib_mach_emips,
     ib_mach_ews4800mips,
     ib_mach_hp300,
     ib_mach_hppa,
-    ib_mach_i386,
     ib_mach_landisk,
     ib_mach_macppc,
     ib_mach_news68k,