Index: bin/cat/cat.c
===================================================================
--- bin/cat/cat.c
+++ bin/cat/cat.c
@@ -74,7 +74,9 @@
 
 static void usage(void) __dead2;
 static void scanfiles(char *argv[], int cooked);
+#ifndef BOOTSTRAP_CAT
 static void cook_cat(FILE *);
+#endif
 static void raw_cat(int);
 
 #ifndef NO_UDOM_SUPPORT
@@ -178,11 +180,13 @@
 }
 
 static void
-scanfiles(char *argv[], int cooked)
+scanfiles(char *argv[], int cooked __unused)
 {
 	int fd, i;
 	char *path;
+#ifndef BOOTSTRAP_CAT
 	FILE *fp;
+#endif
 
 	i = 0;
 	fd = -1;
Index: share/syscons/scrnmaps/armscii8-2haik8
===================================================================
--- share/syscons/scrnmaps/armscii8-2haik8
+++ share/syscons/scrnmaps/armscii8-2haik8
@@ -27,7 +27,7 @@
  * $FreeBSD$
  */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
Index: share/syscons/scrnmaps/iso-8859-1_to_cp437
===================================================================
--- share/syscons/scrnmaps/iso-8859-1_to_cp437
+++ share/syscons/scrnmaps/iso-8859-1_to_cp437
@@ -25,7 +25,7 @@
  * $FreeBSD$
  */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
Index: share/syscons/scrnmaps/iso-8859-4_for_vga9
===================================================================
--- share/syscons/scrnmaps/iso-8859-4_for_vga9
+++ share/syscons/scrnmaps/iso-8859-4_for_vga9
@@ -31,7 +31,7 @@
  * only at 0xC0-0xDF area.
 */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
Index: share/syscons/scrnmaps/iso-8859-7_to_cp437
===================================================================
--- share/syscons/scrnmaps/iso-8859-7_to_cp437
+++ share/syscons/scrnmaps/iso-8859-7_to_cp437
@@ -2,7 +2,7 @@
  * $FreeBSD$
  */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
Index: share/syscons/scrnmaps/koi8-r2cp866
===================================================================
--- share/syscons/scrnmaps/koi8-r2cp866
+++ share/syscons/scrnmaps/koi8-r2cp866
@@ -26,7 +26,7 @@
  * $FreeBSD$
  */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
Index: share/syscons/scrnmaps/koi8-u2cp866u
===================================================================
--- share/syscons/scrnmaps/koi8-u2cp866u
+++ share/syscons/scrnmaps/koi8-u2cp866u
@@ -28,7 +28,7 @@
  * $FreeBSD$
  */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
Index: share/syscons/scrnmaps/us-ascii_to_cp437
===================================================================
--- share/syscons/scrnmaps/us-ascii_to_cp437
+++ share/syscons/scrnmaps/us-ascii_to_cp437
@@ -2,7 +2,7 @@
  * $FreeBSD$
  */
 
-scrmap_t scrmap = {
+static scrmap_t scrmap = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
Index: tools/build/Makefile
===================================================================
--- tools/build/Makefile
+++ tools/build/Makefile
@@ -105,9 +105,6 @@
 # not match.
 RPCINCS+=	${SRCTOP}/sys/rpc/types.h
 
-.if ${.MAKE.OS} != "FreeBSD"
-.PATH: ${.CURDIR}/cross-build
-
 INCS+=	${SRCTOP}/include/mpool.h
 INCS+=	${SRCTOP}/include/ndbm.h
 INCS+=	${SRCTOP}/include/err.h
@@ -143,6 +140,9 @@
 SYSINCS+=	${SRCTOP}/sys/sys/imgact_aout.h
 SYSINCS+=	${SRCTOP}/sys/sys/nlist_aout.h
 
+
+.if ${.MAKE.OS} != "FreeBSD"
+.PATH: ${.CURDIR}/cross-build
 # dbopen() behaves differently on Linux and FreeBSD so we ensure that we
 # bootstrap the FreeBSD db code. The cross-build headers #define dbopen() to
 # __freebsd_dbopen() so that we don't ever use the host version