diff -ruN boost_1_58_0-orig/tools/build/src/engine/execcmd.c boost_1_58_0/tools/build/src/engine/execcmd.c
--- boost_1_58_0-orig/tools/build/src/engine/execcmd.c	2015-04-04 12:25:07.000000000 -0500
+++ boost_1_58_0/tools/build/src/engine/execcmd.c	2021-01-05 18:28:13.000000000 -0600
@@ -10,6 +10,7 @@
 
 #include "jam.h"
 #include "execcmd.h"
+#include "output.h"
 
 #include <assert.h>
 #include <stdio.h>
diff -ruN boost_1_58_0-orig/tools/build/src/engine/execnt.c boost_1_58_0/tools/build/src/engine/execnt.c
--- boost_1_58_0-orig/tools/build/src/engine/execnt.c	2015-04-04 12:25:07.000000000 -0500
+++ boost_1_58_0/tools/build/src/engine/execnt.c	2021-01-05 18:32:07.000000000 -0600
@@ -520,7 +520,7 @@
 
 static int maxline()
 {
-    static result;
+    static int result;
     if ( !result ) result = raw_maxline();
     return result;
 }
diff -ruN boost_1_58_0-orig/tools/build/src/engine/filent.c boost_1_58_0/tools/build/src/engine/filent.c
--- boost_1_58_0-orig/tools/build/src/engine/filent.c	2015-04-04 12:25:07.000000000 -0500
+++ boost_1_58_0/tools/build/src/engine/filent.c	2021-01-05 18:32:34.000000000 -0600
@@ -46,6 +46,7 @@
 #include <direct.h>
 #include <io.h>
 
+int file_collect_archive_content_( file_archive_info_t * const archive );
 
 /*
  * file_collect_dir_content_() - collects directory content information
diff -ruN boost_1_58_0-orig/tools/build/src/engine/hash.c boost_1_58_0/tools/build/src/engine/hash.c
--- boost_1_58_0-orig/tools/build/src/engine/hash.c	2015-04-04 12:25:07.000000000 -0500
+++ boost_1_58_0/tools/build/src/engine/hash.c	2021-01-05 18:39:48.000000000 -0600
@@ -23,9 +23,9 @@
 
 #include <assert.h>
 
-/* */
+/*
 #define HASH_DEBUG_PROFILE 1
-/* */
+*/
 
 /* Header attached to all hash table data items. */
 
diff -ruN boost_1_58_0-orig/tools/build/src/engine/jam.c boost_1_58_0/tools/build/src/engine/jam.c
--- boost_1_58_0-orig/tools/build/src/engine/jam.c	2015-04-04 12:25:07.000000000 -0500
+++ boost_1_58_0/tools/build/src/engine/jam.c	2021-01-05 18:42:50.000000000 -0600
@@ -120,6 +120,7 @@
 #include "strings.h"
 #include "timestamp.h"
 #include "variable.h"
+#include "execcmd.h"
 
 /* Macintosh is "special" */
 #ifdef OS_MAC
diff -ruN boost_1_58_0-orig/tools/build/src/engine/make.c boost_1_58_0/tools/build/src/engine/make.c
--- boost_1_58_0-orig/tools/build/src/engine/make.c	2015-04-04 12:25:07.000000000 -0500
+++ boost_1_58_0/tools/build/src/engine/make.c	2021-01-05 18:43:43.000000000 -0600
@@ -44,6 +44,8 @@
 #include "search.h"
 #include "timestamp.h"
 #include "variable.h"
+#include "execcmd.h"
+#include "output.h"
 
 #include <assert.h>
 
@@ -82,7 +84,7 @@
     "exists",
 };
 
-#define spaces(x) ( "                    " + ( x > 20 ? 0 : 20-x ) )
+#define spaces(x) ( ((const char *)"                    ") + ( x > 20 ? 0 : 20-x ) )
 
 
 /*
diff -ruN boost_1_58_0-orig/tools/build/src/engine/modules/path.c boost_1_58_0/tools/build/src/engine/modules/path.c
--- boost_1_58_0-orig/tools/build/src/engine/modules/path.c	2015-04-04 12:25:07.000000000 -0500
+++ boost_1_58_0/tools/build/src/engine/modules/path.c	2021-01-05 18:49:43.000000000 -0600
@@ -8,7 +8,7 @@
 #include "../frames.h"
 #include "../lists.h"
 #include "../native.h"
-#include "../timestamp.h"
+#include "../filesys.h"
 
 
 LIST * path_exists( FRAME * frame, int flags )