diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 78777aebd..99b9a07e3 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,7 +1,26 @@
+2003-05-06  Earnie Boyd  <earnie@users.sf.net>
+
+	* configure.in (CFLAGS): Remove -D__USE_CRTIMP=1 due to possibilites
+	of multiply defined symbols if the symbols is defined locally.  E.G.:
+	A local definition of malloc causes this problem.
+	* configure: Regenerate.
+	* profile/Makefile.in (W32API_INCLUDE): New variable.
+	(ALL_CFLAGS): Use W32API_INCLUDE value.
+	(ALL_CXXFLAGS): Ditto.
+	(gcrt0.o gcrt1.o gcrt2.o): Use ALL_CFLAGS instead of CFLAGS.
+	Thanks to Jeff Bonggren <jbon@users.sf.net>.
+	* profile/configure.in (W32API_INCLUDE): Set default value.
+	* profile/configure: Regenerate.
+	* mingwex/Makefile.in (W32API_INCLUDE): New variable.
+	(ALL_CFLAGS): Use W32API-INCLUDE value.
+	(ALL_CXXFLAGS): Ditto.
+	* mingwex/configure.in (W32API_INCLUDE): Set default value.
+	* mingwex/configure: Regenerate.
+
 2003-05-05  Earnie Boyd  <earnie@users.sf.net>
 
 	* Makefile.in (W32API_INCLUDE): New variable.
-	(ALL_CFLAGS): Include W32API_INCLUDE value.
+	(ALL_CFLAGS): Use W32API_INCLUDE value.
 	(ALL_CXXFLAGS): Ditto.
 	* configure.in (CFLAGS): Add -D__USE_CRTIMP=1 to default values.
 	(W32API_INCLUDE): Set default value.
diff --git a/winsup/mingw/configure b/winsup/mingw/configure
index 3a2f7e373..3f98db70f 100755
--- a/winsup/mingw/configure
+++ b/winsup/mingw/configure
@@ -757,9 +757,9 @@ echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
   if test "$ac_test_CFLAGS" = set; then
     CFLAGS="$ac_save_CFLAGS"
   elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2 -D__USE_CRTIMP"
+    CFLAGS="-g -O2
   else
-    CFLAGS="-O2 -D__USE_CRTIMP"
+    CFLAGS="-O2
   fi
   if test "$ac_test_CXXFLAGS" != set; then
     CXXFLAGS='$(CFLAGS)'
diff --git a/winsup/mingw/configure.in b/winsup/mingw/configure.in
index aba480771..2579316e0 100644
--- a/winsup/mingw/configure.in
+++ b/winsup/mingw/configure.in
@@ -47,9 +47,9 @@ dnl normal versions of a library), tasteless as that idea is.
   if test "$ac_test_CFLAGS" = set; then
     CFLAGS="$ac_save_CFLAGS"
   elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2 -D__USE_CRTIMP=1"
+    CFLAGS="-g -O2
   else
-    CFLAGS="-O2 -D__USE_CRTIMP=1"
+    CFLAGS="-O2
   fi
   if test "$ac_test_CXXFLAGS" != set; then
     CXXFLAGS='$(CFLAGS)'
diff --git a/winsup/mingw/mingwex/Makefile.in b/winsup/mingw/mingwex/Makefile.in
index f4164d6f8..dcd46c70f 100644
--- a/winsup/mingw/mingwex/Makefile.in
+++ b/winsup/mingw/mingwex/Makefile.in
@@ -76,13 +76,12 @@ OPTFLAGS= -fomit-frame-pointer
 # compiling with Cygwin?
 MNO_CYGWIN = @MNO_CYGWIN@
 
-
+W32API_INCLUDE = @W32API_INCLUDE@
 INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
-  -I$(srcdir)/../../w32api/include \
   -nostdinc -nostdinc++ \
   -iwithprefixbefore include
-ALL_CFLAGS = $(CFLAGS) $(OPTFLAGS) $(INCLUDES) $(MNO_CYGWIN)
-ALL_CXXFLAGS = $(CXXFLAGS) $(OPTFLAGS) $(INCLUDES) $(MNO_CYGWIN)
+ALL_CFLAGS = $(CFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
+ALL_CXXFLAGS = $(CXXFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
 
 AS = @AS@
 AR = @AR@
diff --git a/winsup/mingw/mingwex/configure b/winsup/mingw/mingwex/configure
index 746c6fedc..a3ba4cdc8 100755
--- a/winsup/mingw/mingwex/configure
+++ b/winsup/mingw/mingwex/configure
@@ -657,6 +657,9 @@ esac
 
 
 
+W32API_INCLUDE='$(subdir)/../w32api/include'
+
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -669,7 +672,7 @@ esac
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:673: checking for a BSD compatible install" >&5
+echo "configure:676: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -889,6 +892,7 @@ s%@build_cpu@%$build_cpu%g
 s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
 s%@MNO_CYGWIN@%$MNO_CYGWIN%g
+s%@W32API_INCLUDE@%$W32API_INCLUDE%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
diff --git a/winsup/mingw/mingwex/configure.in b/winsup/mingw/mingwex/configure.in
index 4c0ed4207..8bde20f2b 100644
--- a/winsup/mingw/mingwex/configure.in
+++ b/winsup/mingw/mingwex/configure.in
@@ -47,6 +47,9 @@ esac
 
 AC_SUBST(MNO_CYGWIN)
 
+W32API_INCLUDE='$(subdir)/../w32api/include'
+AC_SUBST(W32API_INCLUDE)
+
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
 
diff --git a/winsup/mingw/profile/Makefile.in b/winsup/mingw/profile/Makefile.in
index aca3a2950..d6038d591 100644
--- a/winsup/mingw/profile/Makefile.in
+++ b/winsup/mingw/profile/Makefile.in
@@ -47,12 +47,12 @@ THREAD_DLL = @THREAD_DLL@
 THREAD_DLL_VERSION = 10
 THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
 
+W32API_INCLUDE = @W32API_INCLUDE@
 INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
-  -I$(srcdir)/../../w32api/include \
   -nostdinc -nostdinc++ \
   -iwithprefixbefore include
-ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(MNO_CYGWIN)
-ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) $(MNO_CYGWIN)
+ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
+ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
 
 AS = @AS@
 AR = @AR@
@@ -81,13 +81,13 @@ $(LIBGMON_A): $(LIBGMON_OBJS) $(CRT0S)
 # FIXME: These are really the same, but gcc specs want different names.
 # The only CRT dependency is atexit.
 gcrt0.o: gcrt0.c
-	$(CC)  -c -o $@ $(CPPFLAGS) $(CFLAGS) $?
+	$(CC)  -c -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $?
 
 gcrt1.o: gcrt0.c
-	$(CC) -U__MSVCRT__ -c -o $@ $(CPPFLAGS) $(CFLAGS) $?
+	$(CC) -U__MSVCRT__ -c -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $?
 
 gcrt2.o: gcrt0.c
-	$(CC) -D__MSVCRT__ -c -o $@ $(CPPFLAGS) $(CFLAGS) $?
+	$(CC) -D__MSVCRT__ -c -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $?
 
 #
 # Dependancies
diff --git a/winsup/mingw/profile/configure b/winsup/mingw/profile/configure
index f9c64e084..fba24e678 100755
--- a/winsup/mingw/profile/configure
+++ b/winsup/mingw/profile/configure
@@ -671,6 +671,9 @@ case "$target_os" in
   ;;
 esac
 
+W32API_INCLUDE='$(subdir)/../w32api/include'
+
+
 
 
 
@@ -689,7 +692,7 @@ esac
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:693: checking for a BSD compatible install" >&5
+echo "configure:696: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -913,6 +916,7 @@ s%@RUNTIME@%$RUNTIME%g
 s%@MNO_CYGWIN@%$MNO_CYGWIN%g
 s%@LIBGMON_A@%$LIBGMON_A%g
 s%@CRT0S@%$CRT0S%g
+s%@W32API_INCLUDE@%$W32API_INCLUDE%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
diff --git a/winsup/mingw/profile/configure.in b/winsup/mingw/profile/configure.in
index e688a67c6..2496c282e 100644
--- a/winsup/mingw/profile/configure.in
+++ b/winsup/mingw/profile/configure.in
@@ -61,11 +61,14 @@ case "$target_os" in
   ;;
 esac
 
+W32API_INCLUDE='$(subdir)/../w32api/include'
+
 AC_SUBST(CRT_ID)
 AC_SUBST(RUNTIME)
 AC_SUBST(MNO_CYGWIN)
 AC_SUBST(LIBGMON_A)
 AC_SUBST(CRT0S)
+AC_SUBST(W32API_INCLUDE)
 
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)