diff --git a/v2/engine/builtins.c b/v2/engine/builtins.c
index 67c90077c..b1c16dc87 100644
--- a/v2/engine/builtins.c
+++ b/v2/engine/builtins.c
@@ -1373,14 +1373,14 @@ LIST * builtin_update_now( FRAME * frame, int flags )
     LIST * force = lol_get( frame->args, 2 );
     LIST * continue_ = lol_get( frame->args, 3 );
     int status = 0;
-    int original_stdout;
-    int original_stderr;
+    int original_stdout = 0;
+    int original_stderr = 0;
     int n;
     int targets_count;
     OBJECT * * targets2;
     int i;
-    int original_noexec;
-    int original_quitquick;
+    int original_noexec = 0;
+    int original_quitquick = 0;
 	
 
     if ( log )
diff --git a/v2/engine/function.c b/v2/engine/function.c
index fc8db6925..918dae4f5 100644
--- a/v2/engine/function.c
+++ b/v2/engine/function.c
@@ -26,6 +26,10 @@
 #  include <windows.h>
 # endif
 
+int glob( const char * s, const char * c );
+void backtrace( FRAME * frame );
+void backtrace_line( FRAME * frame );
+
 #define INSTR_PUSH_EMPTY                    0
 #define INSTR_PUSH_CONSTANT                 1
 #define INSTR_PUSH_ARG                      2
@@ -2034,7 +2038,7 @@ static void compile_parse( PARSE * parse, compiler * c, int result_location )
         }
         else
         {
-            printf( "%s:%d: Conditional used as list (check operator precedence).\n", object_str(parse->file), parse->line, parse->num );
+            printf( "%s:%d: Conditional used as list (check operator precedence).\n", object_str(parse->file), parse->line );
             exit( 1 );
         }
     }
diff --git a/v2/engine/jam.c b/v2/engine/jam.c
index d6e9faa8c..e8b416eae 100644
--- a/v2/engine/jam.c
+++ b/v2/engine/jam.c
@@ -127,6 +127,8 @@
 #include "execcmd.h"
 #include "constants.h"
 #include "function.h"
+#include "pwd.h"
+#include "hcache.h"
 
 /* Macintosh is "special" */
 #ifdef OS_MAC