diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index e86ac02ef..b80d14952 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-12  Christopher Faylor  <cgf@redhat.com>
+
+	* Makefile.in: Add -nostdinc to CXXFLAGS.
+
 2001-10-12  Christopher Faylor  <cgf@redhat.com>
 
 	* Makefile.common: Perform more include file testing trickery.
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index 49c515991..74e17e3d3 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -111,7 +111,7 @@ ifeq (,${findstring $(gcc_libdir),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
 GCC_INCLUDE:=-I$(gcc_libdir)/include
 endif
 
-COMPILE_CXX:=$(CXX) $c -nostdinc++ $(ALL_CXXFLAGS) $(GCC_INCLUDE) \
+COMPILE_CXX:=$(CXX) $c -nostdinc++ -nostdinc $(ALL_CXXFLAGS) $(GCC_INCLUDE) \
 	     -fno-rtti -fno-exceptions
 COMPILE_CC:=$(CC) $c -nostdinc $(ALL_CFLAGS) $(GCC_INCLUDE)