diff --git a/MicroBenchmarks/XRay/FDRMode/fdrmode-bench.cc b/MicroBenchmarks/XRay/FDRMode/fdrmode-bench.cc
index 7de72632c4..2dbd7783df 100644
--- a/MicroBenchmarks/XRay/FDRMode/fdrmode-bench.cc
+++ b/MicroBenchmarks/XRay/FDRMode/fdrmode-bench.cc
@@ -14,6 +14,9 @@
 #include <assert.h>
 #include <fcntl.h>
 #include <unistd.h>
+
+#include <cstdlib>
+
 #include "benchmark/benchmark.h"
 #include "xray/xray_interface.h"
 #include "xray/xray_log_interface.h"
diff --git a/MultiSource/Benchmarks/MallocBench/make/make.h b/MultiSource/Benchmarks/MallocBench/make/make.h
index 33a7bcbbb3..e729049d3b 100644
--- a/MultiSource/Benchmarks/MallocBench/make/make.h
+++ b/MultiSource/Benchmarks/MallocBench/make/make.h
@@ -167,8 +167,11 @@ extern char *alloca ();
 #endif
 
 extern void die ();
-extern void message (), fatal (), error ();
-extern void makefile_error (), makefile_fatal ();
+extern void message(const char* format, ...);
+extern void fatal(const char* format, ...);
+extern void error (const char* format, ...);
+extern void makefile_error(const char* file, unsigned int lineno, const char* format, ...);
+extern void makefile_fatal(const char* file, unsigned int lineno, const char* format, ...);
 extern void pfatal_with_name (), perror_with_name ();
 extern char *savestring (), *concat ();
 extern char *xmalloc (), *xrealloc ();
diff --git a/MultiSource/Benchmarks/MallocBench/make/misc.c b/MultiSource/Benchmarks/MallocBench/make/misc.c
index 906d3f80f4..f11e9d0145 100644
--- a/MultiSource/Benchmarks/MallocBench/make/misc.c
+++ b/MultiSource/Benchmarks/MallocBench/make/misc.c
@@ -18,7 +18,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "make.h"
 #include "dep.h"
 #include <errno.h>
-
+#include <stdarg.h>
+#include <stdio.h>
 
 /* Compare strings *S1 and *S2.
    Return negative if the first is less, positive if it is greater,
@@ -196,15 +197,18 @@ concat (s1, s2, s3)
 
 /* Print a message on stdout.  */
 
+/* VARARGS1 */
 void
-message (s1, s2, s3, s4, s5, s6)
-     char *s1, *s2, *s3, *s4, *s5, *s6;
+message (const char* format, ...)
 {
   if (makelevel == 0)
     printf ("%s: ", program);
   else
     printf ("%s[%u]: ", program, makelevel);
-  printf (s1, s2, s3, s4, s5, s6);
+  va_list args;
+  va_start(args, format);
+  vprintf (format, args);
+  va_end(args);
   putchar ('\n');
   fflush (stdout);
 }
@@ -213,14 +217,16 @@ message (s1, s2, s3, s4, s5, s6)
 
 /* VARARGS1 */
 void
-fatal (s1, s2, s3, s4, s5, s6)
-     char *s1, *s2, *s3, *s4, *s5, *s6;
+fatal (const char* format, ...)
 {
   if (makelevel == 0)
     fprintf (stderr, "%s: ", program);
   else
     fprintf (stderr, "%s[%u]: ", program, makelevel);
-  fprintf (stderr, s1, s2, s3, s4, s5, s6);
+  va_list args;
+  va_start(args, format);
+  vfprintf (stderr, format, args);
+  va_end(args);
   fputs (".  Stop.\n", stderr);
 
   die (1);
@@ -229,40 +235,41 @@ fatal (s1, s2, s3, s4, s5, s6)
 /* Print error message.  `s1' is printf control string, `s2' is arg for it. */
 
 /* VARARGS1 */
-
-void
-error (s1, s2, s3, s4, s5, s6)
-     char *s1, *s2, *s3, *s4, *s5, *s6;
+void error (const char* format, ...)
 {
   if (makelevel == 0)
     fprintf (stderr, "%s: ", program);
   else
-    fprintf (stderr, "%s[%u]: ", program, makelevel);
-  fprintf (stderr, s1, s2, s3, s4, s5, s6);
+    fprintf(stderr, "%s[%u]: ", program, makelevel);
+  va_list args;
+  va_start(args, format);
+  vfprintf (stderr, format, args);
+  va_end(args);
   putc ('\n', stderr);
   fflush (stderr);
 }
 
-void
-makefile_error (file, lineno, s1, s2, s3, s4, s5, s6)
-     char *file;
-     unsigned int lineno;
-     char *s1, *s2, *s3, *s4, *s5, *s6;
+void makefile_error(const char* file, unsigned int lineno, const char* format,
+                    ...)
 {
-  fprintf (stderr, "%s:%u: ", file, lineno);
-  fprintf (stderr, s1, s2, s3, s4, s5, s6);
+  fprintf(stderr, "%s:%u: ", file, lineno);
+  va_list args;
+  va_start(args, format);
+  vfprintf(stderr, format, args);
+  va_end(args);
   putc ('\n', stderr);
   fflush (stderr);
 }
 
+/* VARARGS3 */
 void
-makefile_fatal (file, lineno, s1, s2, s3, s4, s5, s6)
-     char *file;
-     unsigned int lineno;
-     char *s1, *s2, *s3, *s4, *s5, *s6;
+makefile_fatal (const char* file, unsigned int lineno, const char* format, ...)
 {
   fprintf (stderr, "%s:%u: ", file, lineno);
-  fprintf (stderr, s1, s2, s3, s4, s5, s6);
+  va_list args;
+  va_start(args, format);
+  vfprintf (stderr, format, args);
+  va_end(args);
   fputs (".  Stop.\n", stderr);
 
   die (1);