diff --git a/make.h b/make.h
index 01eeb7af..786fc6cc 100644
--- a/make.h
+++ b/make.h
@@ -387,21 +387,6 @@ struct floc
 #define STRING_SIZE_TUPLE(_s) (_s), (sizeof (_s)-1)
 
 
-/* Fancy processing for variadic functions in both ANSI and pre-ANSI
-   compilers.  */
-#if HAVE_STDARG_H
-#  include <stdarg.h>
-#  define VA_START(a, f)        va_start(a, f)
-#else
-#  if HAVE_VARARGS_H
-#    include <varargs.h>
-#    define VA_START(a, f)      va_start(a)
-#  endif
-#endif
-#ifndef VA_START
-  error no variadic api
-#endif
-
 /* We have to have both stdarg.h or varargs.h AND v*printf or doprnt to use
    variadic versions of these functions.  */
 
diff --git a/tests/scripts/functions/origin b/tests/scripts/functions/origin
index c45a3593..d5116cd7 100644
--- a/tests/scripts/functions/origin
+++ b/tests/scripts/functions/origin
@@ -22,7 +22,7 @@ open(MAKEFILE,"> $makefile");
 
 print MAKEFILE <<EOF;
 foo := bletch garf
-auto_var = udef CC $homevar MAKE foo CFLAGS WHITE \@
+auto_var = udef CC MAKETEST MAKE foo CFLAGS WHITE \@
 av = \$(foreach var, \$(auto_var), \$(origin \$(var)) )
 override WHITE := BLACK
 all: auto