Index: test/Makefile.win
===================================================================
--- test/Makefile.win	(revision 394002)
+++ test/Makefile.win	(working copy)
@@ -25,7 +25,7 @@
 
 CL = cl.exe
 
-CFLAGS = /nologo /c /MDd /W3 /Gm /GX /Zi /Od /D _DEBUG /D WIN32 /D APR_DECLARE_STATIC /FD 
+CFLAGS = /nologo /c /MDd /W3 /Gm /EHsc /Zi /Od /D _DEBUG /D WIN32 /D APR_DECLARE_STATIC /FD 
 
 .c.obj::
 	$(CL) -c $< $(CFLAGS) $(INCLUDES)
Index: apr-iconv/build/modules.mk.win
===================================================================
--- apr-iconv/build/modules.mk.win	(revision 393997)
+++ apr-iconv/build/modules.mk.win	(working copy)
@@ -75,7 +75,7 @@
 OUTPUT_DIR   = $(API_SOURCE)\$(CFG_OUTPUT)
 OBJ_DIR   = $(OUTPUT_DIR)\objs
 
-INT_CFLAGS   = /nologo $(CFG_CFLAGS) /Fp"$(OUTPUT_DIR)\iconv.pch" /YX"iconv.h"
+INT_CFLAGS   = /nologo $(CFG_CFLAGS) /Fp"$(OUTPUT_DIR)\iconv.pch" /Yc"iconv.h" /Yu"iconv.h"
 INT_INCLUDES = /I "$(API_SOURCE)\include" /I "$(API_SOURCE)\lib" \
 		/I "$(APR_SOURCE)\include"
 INT_DEFINES  = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $(CFG_DEFINES)
Index: apr-util/test/Makefile.win
===================================================================
--- apr-util/test/Makefile.win	(revision 393996)
+++ apr-util/test/Makefile.win	(working copy)
@@ -81,7 +81,7 @@
 API_SOURCE   = ..\..\apr-iconv
 OUTPUT_DIR   = .\$(CFG_OUTPUT)
 
-INT_CFLAGS   = /nologo $(CFG_CFLAGS) /Fp"$(OUTPUT_DIR)\iconv.pch" /YX"iconv.h"
+INT_CFLAGS   = /nologo $(CFG_CFLAGS) /Fp"$(OUTPUT_DIR)\iconv.pch" /Yc"iconv.h" /Yu"iconv.h"
 INT_INCLUDES = /I "$(APU_SOURCE)\include" /I "$(APR_SOURCE)\include"
 #		/I "$(API_SOURCE)\include"
 INT_DEFINES  = /D "WIN32" /D "_CONSOLE" /D "_MBCS" $(CFG_DEFINES)