diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index af07e93be..31af68aac 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-14  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* Makefile.in (INCLUDES): Designate $(srcdir)/../include as a
+	system dir.
+	* mingwex/Makefile,in (INCLUDES): Ditto.
+	* profile/Makefile,in (INCLUDES): Ditto.
+
+	* mingwex/Makefile,in: Add carg.o to libmingwex.a.
 2004-07-13  Earnie Boyd  <earnie@users.sourcefourge.net>
 
 	* Makefile.in: Move use of --nostdinc++ as GCC3.4 warns to use it
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index 66b6c3aac..cf399e22c 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -99,7 +99,7 @@ LIBM_A=@LIBM_A@
 
 W32API_INCLUDE = @W32API_INCLUDE@
 INCLUDES+= -I$(srcdir)/include \
-  -I$(srcdir)/../include \
+  -isystem$(srcdir)/../include \
   -nostdinc \
   -iwithprefixbefore include
 ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
diff --git a/winsup/mingw/mingwex/Makefile.in b/winsup/mingw/mingwex/Makefile.in
index 6612c1d41..b74755220 100644
--- a/winsup/mingw/mingwex/Makefile.in
+++ b/winsup/mingw/mingwex/Makefile.in
@@ -67,7 +67,7 @@ STDIO_DISTFILES = \
 	vfscanf.c vfwscanf.c vscanf.c vsscanf.c vswscanf.c vwscanf.c
 
 COMPLEX_DISTFILES = \
-	cabs.c cacos.c cacosh.c casin.c casinh.c catan.c catanh.c \
+	cabs.c cacos.c cacosh.c casin.c casinh.c carg.c catan.c catanh.c \
 	ccos.c ccosh.c cexp.c cimag.c clog.c cpow.c cproj.c creal.c \
 	csin.c csinh.c csqrt.c ctan.c ctanh.c
 
@@ -83,7 +83,7 @@ OPTFLAGS= -fomit-frame-pointer
 MNO_CYGWIN = @MNO_CYGWIN@
 
 W32API_INCLUDE = @W32API_INCLUDE@
-INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
+INCLUDES = -I$(srcdir) -isystem$(srcdir)/../include \
   -nostdinc \
   -iwithprefixbefore include
 ALL_CFLAGS = $(CFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
@@ -151,9 +151,9 @@ POSIX_OBJS = \
 REPLACE_OBJS = \
 	mingw-fseek.o
 COMPLEX_OBJS = \
-	cabs.o cacos.o cacosh.o casin.o casinh.o catan.o catanh.o \
+	cabs.o cacos.o cacosh.o casin.o casinh.o carg.o catan.o catanh.o \
 	ccos.o ccosh.o cexp.o cimag.o clog.o cpow.o cproj.o creal.o \
-	csin.o csinh.o csqrt.o ctan.o ctanh.o
+	csin.o csinh.o csqrt.o ctan.o ctanh.o 
 
 LIB_OBJS = $(Q8_OBJS) $(STDLIB_OBJS) $(STDLIB_STUB_OBJS) \
 	$(STDIO_OBJS) $(MATH_OBJS)  $(FENV_OBJS) \
diff --git a/winsup/mingw/profile/Makefile.in b/winsup/mingw/profile/Makefile.in
index 4786fdd16..5d36b1590 100644
--- a/winsup/mingw/profile/Makefile.in
+++ b/winsup/mingw/profile/Makefile.in
@@ -48,7 +48,7 @@ THREAD_DLL_VERSION = 10
 THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
 
 W32API_INCLUDE = @W32API_INCLUDE@
-INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
+INCLUDES = -I$(srcdir) -isystem$(srcdir)/../include \
   -nostdinc \
   -iwithprefixbefore include
 ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)