diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 779c47104..5675e3be9 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-17  Christopher Faylor  <cgf@timesys.com>
+
+	* Makefile.in (CC): Strip inappropriate include file settings from any
+	passed-in CC.
+
 2004-07-15  "dgun"  <dgun@umpire.com>
 
 	* include/complex.h (conj): Correct typo in prototype.
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index 66b6c3aac..610e4e414 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -70,7 +70,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 mkinstalldirs = $(SHELL) @MKINSTALLDIRS@
 
-CC = @CC@
+CC := @CC@
+override CC := ${filter-out -L% -B%,${shell echo $(CC) | sed -e 's%\(-isystem\|-iwithprefixbefore\)  *[^ ]*\( \|$$\)% %g'}}
 # FIXME: Which is it, CC or CC_FOR_TARGET?
 CC_FOR_TARGET = $(CC)
 AS_FOR_TARGET = $(AS)