diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index ed21d6961..257709215 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-28  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* test_headers.c: Don't include varargs.h.
+	* Makefile.in (test_headers): Don't use -std=xx
+	with -xc++.
+
 2002-08-21  Earnie Boyd  <earnie@users.sf.net>
 
 	* include/sys/param.h: New File.
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index 169556ae6..ae3392a8d 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -260,7 +260,7 @@ crt1.o dllcrt1.o:
 crt2.o dllcrt2.o:
 	$(CC) -c -D__MSVCRT__ -U__CRTDLL__ $(ALL_CFLAGS) $< -o $@
 
-TEST_H_OPTIONS = $(ALL_CFLAGS) -Wall  -Wsystem-headers -c \
+TEST_H_OPTIONS = $(ALL_CFLAGS) -Wall -W -Wsystem-headers -c \
 	$(srcdir)/test_headers.c -o test_headers.o
 
 .PHONY: test_headers
@@ -268,12 +268,16 @@ test_headers:
 	@echo "Testing runtime headers..."
 	@for lang in c c++ objective-c ; do \
 		echo "$$lang ..."; \
-		$(CC) -x$$lang -std=c89 $(TEST_H_OPTIONS) ; \
-		echo "$$lang c89 ..."; \
-		$(CC) -x$$lang -std=c89 $(TEST_H_OPTIONS) ; \
-		echo "$$lang c99..."; \
-		$(CC) -x$$lang -std=c99  $(TEST_H_OPTIONS) ; \
+		$(CC) -x$$lang  $(TEST_H_OPTIONS) ; \
+		echo "$$lang -ansi"; \
+		$(CC) -x$$lang -ansi $(TEST_H_OPTIONS) ; \
 	done
+# specify -std=xx only for C
+	@for std in gnu89 gnu99 c89 c99 ; do \
+		echo "std = $$std"; \
+		$(CC) -std=$$std  $(TEST_H_OPTIONS) ; \
+	done
+
 	@rm -f test_headers.o
 
 clean:
diff --git a/winsup/mingw/test_headers.c b/winsup/mingw/test_headers.c
index 4955fdcf1..1052868cc 100644
--- a/winsup/mingw/test_headers.c
+++ b/winsup/mingw/test_headers.c
@@ -36,7 +36,6 @@
 #include <time.h>
 #include <unistd.h>
 #include <values.h>
-#include <varargs.h>
 #include <wchar.h>
 #include <wctype.h>
 #include <sys/fcntl.h>