diff --git a/racket/src/Makefile.in b/racket/src/Makefile.in
index 4f45ff0b21..1b51aec806 100644
--- a/racket/src/Makefile.in
+++ b/racket/src/Makefile.in
@@ -79,12 +79,6 @@ both:
 INST_CONFIG = -X @DIRCVTPRE@"$(DESTDIR)$(collectsdir)"@DIRCVTPOST@ -G @DIRCVTPRE@"$(DESTDIR)$(configdir)"@DIRCVTPOST@
 SETUP_ARGS = $(INST_CONFIG) $(SELF_RACKET_FLAGS) -N "raco" -l- setup @INSTALL_SETUP_FLAGS@ $(PLT_SETUP_OPTIONS) $(PLT_ISO)
 
-# Pass compile and link flags to `make install' for use by any
-#  collection-setup actions that compile and link C code:
-CFLAGS = @CFLAGS@ @COMPFLAGS@ @PREFLAGS@
-LDFLAGS = @LDFLAGS@
-WITH_ENV_VARS = env CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" 
-
 install:
 	$(MAKE) install-@MAIN_VARIANT@
 
@@ -154,7 +148,7 @@ install-3m-common:
 
 install-3m:
 	$(MAKE) install-3m-common
-	$(WITH_ENV_VARS) @RUN_RACKET_MMM@ $(SETUP_ARGS)
+	@RUN_RACKET_MMM@ $(SETUP_ARGS)
 	$(MAKE) install-common-last
 
 plain-install-3m:
@@ -177,7 +171,7 @@ install-cgc-common:
 
 install-cgc:
 	$(MAKE) install-cgc-common
-	$(WITH_ENV_VARS) @RUN_RACKET_CGC@ $(SETUP_ARGS)
+	@RUN_RACKET_CGC@ $(SETUP_ARGS)
 	$(MAKE) install-common-last
 
 plain-install-cgc:
@@ -200,7 +194,7 @@ install-both-common:
 
 install-both:
 	$(MAKE) install-both-common
-	$(WITH_ENV_VARS) @RUN_RACKET_MAIN_VARIANT@ $(SETUP_ARGS)
+	@RUN_RACKET_MAIN_VARIANT@ $(SETUP_ARGS)
 	$(MAKE) install-common-last
 
 plain-install-both:
diff --git a/racket/src/gracket/Makefile.in b/racket/src/gracket/Makefile.in
index aa7dcfa2db..1230fab65f 100644
--- a/racket/src/gracket/Makefile.in
+++ b/racket/src/gracket/Makefile.in
@@ -49,7 +49,9 @@ WXVARIANT =  @WXVARIANT@
 
 NOGCINC = $(WXINC) -I$(PLTBUILDDIR)/racket/ -I$(PLTSRCDIR)/racket/include/
 INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC)
-CFLAGS = $(INC) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@
+CFLAGS = @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@
+CPPFLAGS = @PREFLAGS@
+ALL_CFLAGS = $(INC) $(OPTIONS) -D$(WXVARIANT) $(CFLAGS) $(CPPFLAGS)
 LDFLAGS = @LDFLAGS@
 ARLIBFLAGS = $(LDFLAGS) $(LDLIBS)
 ###########################
@@ -140,10 +142,10 @@ DEF_C_DIRS = $(DEF_COLLECTS_DIR) $(DEF_CONFIG_DIR)
 grmain.@LTO@ :  $(srcdir)/grmain.c $(srcdir)/../racket/main.c \
             $(srcdir)/../racket/cmdline.inc $(srcdir)/../racket/src/stypes.h \
             $(srcdir)/../racket/include/scheme.h
-	$(CC) $(LOCALFLAGS) $(CFLAGS) $(DEF_C_DIRS) -c $(srcdir)/grmain.c -o grmain.@LTO@
+	$(CC) $(LOCALFLAGS) $(ALL_CFLAGS) $(DEF_C_DIRS) -c $(srcdir)/grmain.c -o grmain.@LTO@
 
 grmain_ee.@LTO@ : gracket.@LTO@
-	$(CC) $(LOCALFLAGS) $(CFLAGS) -DSTANDALONE_WITH_EMBEDDED_EXTENSION $(DEF_C_DIRS) -c $(srcdir)/grmain.cxx -o grmain_ee.@LTO@
+	$(CC) $(LOCALFLAGS) $(ALL_CFLAGS) -DSTANDALONE_WITH_EMBEDDED_EXTENSION $(DEF_C_DIRS) -c $(srcdir)/grmain.cxx -o grmain_ee.@LTO@
 
 ee-main:
 	$(MAKE) grmain_ee.@LTO@
diff --git a/racket/src/gracket/gc2/Makefile.in b/racket/src/gracket/gc2/Makefile.in
index 9f352770e1..b45c8de160 100644
--- a/racket/src/gracket/gc2/Makefile.in
+++ b/racket/src/gracket/gc2/Makefile.in
@@ -36,7 +36,9 @@ WXVARIANT =  @WXVARIANT@
 
 NOGCINC = -I$(PLTBUILDDIR)/racket/ -I$(PLTSRCDIR)/racket/include/
 INC = -I$(PLTSRCDIR)/racket/$(GCDIRECTORY) $(NOGCINC)
-CFLAGS = $(INC) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@
+CFLAGS = @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@
+CPPFLAGS = @PREFLAGS@
+ALL_CFLAGS = $(INC) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ $(CFLAGS) $(CPPFLAGS)
 LDFLAGS = @LDFLAGS@
 ARLIBFLAGS = $(LDFLAGS) $(LDLIBS)
 ###########################
@@ -72,14 +74,14 @@ xsrc/grmain.c: $(srcdir)/../grmain.c $(XFORMDEP)
 	$(XFORMWP) xsrc/grmain.c $(DEF_C_DIRS) $(srcdir)/../grmain.c
 
 GCPREINC = -include $(srcdir)/../../racket/gc2/gc2.h
-POSTFLAGS = $(OPTIONS) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@
+POSTFLAGS = $(OPTIONS)
 
 wx_xt_EXTRAFLAGS =
 wx_mac_EXTRAFLAGS =
 EXTRAFLAGS = $(@WXVARIANT@_EXTRAFLAGS)
 
 grmain.@LTO@: xsrc/grmain.c
-	$(CC) $(CFLAGS) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(POSTFLAGS) -o grmain.@LTO@ xsrc/grmain.c
+	$(CC) $(ALL_CFLAGS) $(EXTRAFLAGS) -DGC2_JUST_MACROS $(GCPREINC) -c $(POSTFLAGS) -o grmain.@LTO@ xsrc/grmain.c
 
 XSRCS = xsrc/grmain.c
 
diff --git a/racket/src/racket/Makefile.in b/racket/src/racket/Makefile.in
index de813c70b4..0417f2f6d9 100644
--- a/racket/src/racket/Makefile.in
+++ b/racket/src/racket/Makefile.in
@@ -26,6 +26,11 @@ NOOP = :
 CC = @CC@
 CPP = @CPP@
 
+# Although CFLAGS is defined via configure, the intent is that
+# CFLAGS and CPPFLAGS can be adjusted at `make' time.
+CFLAGS = @CFLAGS@ @COMPFLAGS@ @PROFFLAGS@ 
+CPPFLAGS =  @PREFLAGS@
+
 NICEAR = $(mainsrcdir)/utils/nicear
 AR = @AR@
 ARFLAGS = @ARFLAGS@
@@ -226,10 +231,10 @@ DEF_CONFIG_DIR = -DINITIAL_CONFIG_DIRECTORY='"'"`cd $(srcdir)/../..; @PWD@`/etc"
 DEF_C_DIRS = $(DEF_COLLECTS_DIR) $(DEF_CONFIG_DIR)
 
 main.@LTO@: $(srcdir)/main.c $(srcdir)/include/scheme.h $(srcdir)/sconfig.h $(srcdir)/src/stypes.h $(srcdir)/cmdline.inc $(srcdir)/parse_cmdl.inc $(srcdir)/oskglue.inc
-	$(CC) -I$(builddir) -I$(srcdir)/include @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ $(DEF_C_DIRS) -c $(srcdir)/main.c -o main.@LTO@
+	$(CC) -I$(builddir) -I$(srcdir)/include $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ $(DEF_C_DIRS) -c $(srcdir)/main.c -o main.@LTO@
 
 main_ee.@LTO@: main.@LTO@
-	$(CC) -I$(builddir) -I$(srcdir)/include @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ $(DEF_C_DIRS) -DSTANDALONE_WITH_EMBEDDED_EXTENSION -c $(srcdir)/main.c -o main_ee.@LTO@
+	$(CC) -I$(builddir) -I$(srcdir)/include $(CFLAGS) $(CPPFLAGS) @OPTIONS@ @MZOPTIONS@ $(DEF_C_DIRS) -DSTANDALONE_WITH_EMBEDDED_EXTENSION -c $(srcdir)/main.c -o main_ee.@LTO@
 
 ee-main:
 	$(MAKE) main_ee.@LTO@
@@ -238,7 +243,7 @@ ee-app: $(RACKET) main_ee.@LTO@
 	if [ "$(EEAPP)" = '' ] ; then echo "ERROR: You must specify EEAPP" ; else $(CC) $(MAIN_CFLAGS_NODBG) -o $(EEAPP) main_ee.@LTO@ $(EEOBJECTS) $(SPECIALIZINGOBJECTS) libracket.@LIBSFX@ libmzgc.@LIBSFX@ @LIBS@ ; fi
 
 mzstart.exe: $(srcdir)/dynsrc/start.c
-	$(CC) @CFLAGS@ -o mzstart.exe $(srcdir)/dynsrc/start.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o mzstart.exe $(srcdir)/dynsrc/start.c
 
 starter: mzstart.exe
 
@@ -340,7 +345,7 @@ unix-install:
 	cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libpltdir)/starter@EXE_SUFFIX@"
 	@RUN_RACKET_CGC@ -cu "$(srcdir)/collects-path.rkt" "$(DESTDIR)$(libpltdir)/starter@EXE_SUFFIX@" @COLLECTS_PATH@ @CONFIG_PATH@
 	cd ..; echo 'CC=@CC@' > "$(BUILDINFO)"
-	cd ..; echo 'CFLAGS=@CFLAGS@ @PREFLAGS@ @COMPFLAGS@' >> "$(BUILDINFO)"
+	cd ..; echo 'CFLAGS=$(CFLAGS) $(CPPFLAGS)' >> "$(BUILDINFO)"
 	cd ..; echo 'OPTIONS=@OPTIONS@' >> "$(BUILDINFO)"
 	cd ..; echo 'MZOPTIONS=@MZOPTIONS@' >> "$(BUILDINFO)"
 	cd ..; echo "LDFLAGS=@LDFLAGS@" >> "$(BUILDINFO)"
diff --git a/racket/src/racket/dynsrc/Makefile.in b/racket/src/racket/dynsrc/Makefile.in
index b3a2586274..dbbf396cd4 100644
--- a/racket/src/racket/dynsrc/Makefile.in
+++ b/racket/src/racket/dynsrc/Makefile.in
@@ -19,7 +19,9 @@ MZSRC = $(srcdir)/../src
 
 CC = @CC@
 PLAIN_CC = @PLAIN_CC@
-CFLAGS = @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ -I$(builddir)/.. -I$(srcdir)/../include -I$(srcdir)/../src @MZOPTIONS@
+CFLAGS = @CFLAGS@ @COMPFLAGS@
+CPPFLAGS = @PREFLAGS@
+ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -I$(builddir)/.. -I$(srcdir)/../include -I$(srcdir)/../src @MZOPTIONS@
 
 dynlib:
 	$(MAKE) ../mzdyn.o
@@ -40,23 +42,23 @@ HEADERS = $(builddir)/../mzconfig.h \
 MZDYNDEP = ../mzdyn.o $(srcdir)/../include/ext.exp $(srcdir)/../include/racket.exp
 
 ../mzdyn.o: $(srcdir)/mzdyn.c $(srcdir)/../src/schvers.h  $(HEADERS)
-	$(PLAIN_CC) @DYN_CFLAGS@ $(CFLAGS) -c $(srcdir)/mzdyn.c -o ../mzdyn.o
+	$(PLAIN_CC) @DYN_CFLAGS@ $(ALL_CFLAGS) -c $(srcdir)/mzdyn.c -o ../mzdyn.o
 
 ../mzdyn3m.o: $(srcdir)/mzdyn.c $(srcdir)/../src/schvers.h  $(HEADERS)
-	$(PLAIN_CC) @DYN_CFLAGS@ $(CFLAGS) -DMZ_PRECISE_GC -c $(srcdir)/mzdyn.c -o ../mzdyn3m.o
+	$(PLAIN_CC) @DYN_CFLAGS@ $(ALL_CFLAGS) -DMZ_PRECISE_GC -c $(srcdir)/mzdyn.c -o ../mzdyn3m.o
 
 ../dynexmpl.so: dynexmpl.o $(MZDYNDEP)
 	$(DYNLINK) ../dynexmpl.so dynexmpl.o
 dynexmpl.o: $(srcdir)/dynexmpl.c  $(HEADERS)
-	$(PLAIN_CC) $(CFLAGS) -c $(srcdir)/dynexmpl.c -o dynexmpl.o
+	$(PLAIN_CC) $(ALL_CFLAGS) -c $(srcdir)/dynexmpl.c -o dynexmpl.o
 
 ../starter@NOT_MINGW@: $(srcdir)/ustart.c
-	$(PLAIN_CC) $(CFLAGS) -o ../starter $(srcdir)/ustart.c
+	$(PLAIN_CC) $(ALL_CFLAGS) -o ../starter $(srcdir)/ustart.c
 
 ../starter@MINGW@: $(srcdir)/start.c ../mrstarter@EXE_SUFFIX@ sres.o
-	$(PLAIN_CC) $(CFLAGS) -o ../starter $(srcdir)/start.c sres.o
+	$(PLAIN_CC) $(ALL_CFLAGS) -o ../starter $(srcdir)/start.c sres.o
 ../mrstarter@EXE_SUFFIX@:  sres.o
-	$(PLAIN_CC) $(CFLAGS) -mwindows -DMRSTART -o ../mrstarter $(srcdir)/start.c sres.o
+	$(PLAIN_CC) $(ALL_CFLAGS) -mwindows -DMRSTART -o ../mrstarter $(srcdir)/start.c sres.o
 
 sres.o:
 	@WINDRES@ -i $(srcdir)/../../worksp/starters/start.rc -o sres.o
diff --git a/racket/src/racket/gc/Makefile.in b/racket/src/racket/gc/Makefile.in
index 7422e6540b..50e11e9f93 100644
--- a/racket/src/racket/gc/Makefile.in
+++ b/racket/src/racket/gc/Makefile.in
@@ -49,8 +49,10 @@ mainsrcdir = @srcdir@/../..
 # compiler options; mainly used to allow importing options
 OPTIONS=@OPTIONS@ @CGCOPTIONS@
 
-BASEFLAGS= -I$(srcdir)/include -I$(AO_INSTALL_DIR)/src @CFLAGS@ @COMPFLAGS@ @PREFLAGS@
-CFLAGS= $(BASEFLAGS) @PROFFLAGS@ $(OPTIONS) -DNO_EXECUTE_PERMISSION -DSILENT -DNO_GETENV -DLARGE_CONFIG -DATOMIC_UNCOLLECTABLE -DINITIAL_MARK_STACK_SIZE=8192
+CFLAGS = @CFLAGS@ @COMPFLAGS@ @PROFFLAGS@
+CPPFLAGS = @PREFLAGS@
+BASEFLAGS= -I$(srcdir)/include -I$(AO_INSTALL_DIR)/src $(CFLAGS) $(CPPFLAGS)
+ALL_CFLAGS= $(BASEFLAGS) $(OPTIONS) -DNO_EXECUTE_PERMISSION -DSILENT -DNO_GETENV -DLARGE_CONFIG -DATOMIC_UNCOLLECTABLE -DINITIAL_MARK_STACK_SIZE=8192
 
 # To build the parallel collector on Linux, add to the above:
 # -DGC_LINUX_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC
@@ -336,7 +338,7 @@ HOSTCFLAGS=$(BASEFLAGS)
 #   /proc/self/stat.
 #
 
-CXXFLAGS= $(CFLAGS) 
+CXXFLAGS= $(ALL_CFLAGS) 
 NICEAR = $(mainsrcdir)/utils/nicear
 AR= @AR@
 ARFLAGS= @ARFLAGS@
@@ -436,7 +438,7 @@ CURSES= -lcurses -ltermlib
 # the SHELL environment variable.
 SHELL= /bin/sh
 
-SPECIALCFLAGS = -I$(srcdir)/include -I$(AO_INSTALL_DIR)/include @CFLAGS@ @COMPFLAGS@ @PREFLAGS@
+SPECIALCFLAGS = -I$(srcdir)/include -I$(AO_INSTALL_DIR)/include $(CFLAGS) $(CPPFLAGS)
 # Alternative flags to the C compiler for mach_dep.c.
 # Mach_dep.c often doesn't like optimization, and it's
 # not time-critical anyway.
@@ -449,12 +451,12 @@ all: gc.a gctest
 libatomic_ops/libatomic_ops.a: 
 	cd libatomic_ops; $(MAKE)
 
-LEAKFLAGS=$(CFLAGS) -DFIND_LEAK
+LEAKFLAGS=$(ALL_CFLAGS) -DFIND_LEAK
 
 BSD-pkg-all: bsd-libgc.a bsd-libleak.a
 
 bsd-libgc.a:
-	$(MAKE) CFLAGS="$(CFLAGS)" clean c++-t
+	$(MAKE) CFLAGS="$(ALL_CFLAGS)" clean c++-t
 	mv gc.a bsd-libgc.a
 
 bsd-libleak.a:
@@ -493,7 +495,7 @@ specific.@LTO@ pthread_support.@LTO@ thread_local_alloc.@LTO@ win32_threads.@LTO
 dbg_mlc.@LTO@ gcj_mlc.@LTO@: $(srcdir)/include/private/dbg_mlc.h
 
 tests/test.@LTO@: tests $(srcdir)/tests/test.c
-	$(CC) $(CFLAGS) -c $(srcdir)/tests/test.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/tests/test.c
 	mv test.@LTO@ tests/test.@LTO@
 
 tests:
@@ -541,7 +543,7 @@ c++: gc_cpp.@LTO@ $(srcdir)/include/gc_cpp.h test_cpp
 
 # PLTSCHEME: need $(srcdir):
 dyn_load_sunos53.@LTO@: $(srcdir)/dyn_load.c
-	$(CC) $(CFLAGS) -DSUNOS53_SHARED_LIB -c $(srcdir)/dyn_load.c -o $@
+	$(CC) $(ALL_CFLAGS) -DSUNOS53_SHARED_LIB -c $(srcdir)/dyn_load.c -o $@
 
 # SunOS5 shared library version of the collector
 sunos5gc.so: $(OBJS) dyn_load_sunos53.@LTO@
@@ -565,7 +567,7 @@ liblinuxgc.so: $(OBJS) dyn_load.@LTO@
 
 # Build gctest with dynamic library
 dyn_test:
-	$(CC) $(CFLAGS) -o gctest tests/test.c libgc.so `./threadlibs`
+	$(CC) $(ALL_CFLAGS) -o gctest tests/test.c libgc.so `./threadlibs`
 	./gctest
 
 # Alternative Linux rule.  This is preferable, but is likely to break the
@@ -575,7 +577,7 @@ dyn_test:
 #.SUFFIXES: .lo $(SUFFIXES)
 #
 #.c.lo:
-#	$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c $< -o $@
+#	$(CC) $(ALL_CFLAGS) $(CPPFLAGS) -fPIC -c $< -o $@
 #
 # liblinuxgc.so: $(LIBOBJS) dyn_load.lo
 # 	gcc -shared -Wl,-soname=libgc.so.0 -o libgc.so.0 $(LIBOBJS) dyn_load.lo
@@ -609,8 +611,8 @@ mach_dep1.@LTO@: $(srcdir)/mach_dep1.c $(srcdir)/ia64_save_regs_in_stack.s $(UTI
 
 mark_rts.@LTO@: $(srcdir)/mark_rts.c $(UTILS)
 	rm -f mark_rts.@LTO@
-	-./if_mach ALPHA OSF1 $(CC) -c $(CFLAGS) -Wo,-notail $(srcdir)/mark_rts.c
-	./if_not_there mark_rts.@LTO@ $(CC) -c $(CFLAGS) $(srcdir)/mark_rts.c
+	-./if_mach ALPHA OSF1 $(CC) -c $(ALL_CFLAGS) -Wo,-notail $(srcdir)/mark_rts.c
+	./if_not_there mark_rts.@LTO@ $(CC) -c $(ALL_CFLAGS) $(srcdir)/mark_rts.c
 #	Work-around for DEC optimizer tail recursion elimination bug.
 #  The ALPHA-specific line should be removed if gcc is used.
 
@@ -620,36 +622,36 @@ cord:
 	mkdir cord
 
 cord/cordbscs.@LTO@: cord $(srcdir)/cord/cordbscs.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordbscs.c
+	$(CC) $(ALL_CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordbscs.c
 	mv cordbscs.@LTO@ cord/cordbscs.@LTO@
 #  not all compilers understand -o filename
 
 cord/cordxtra.@LTO@: cord $(srcdir)/cord/cordxtra.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordxtra.c
+	$(CC) $(ALL_CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordxtra.c
 	mv cordxtra.@LTO@ cord/cordxtra.@LTO@
 
 cord/cordprnt.@LTO@: cord $(srcdir)/cord/cordprnt.c $(CORD_INCLUDE_FILES)
-	$(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordprnt.c
+	$(CC) $(ALL_CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordprnt.c
 	mv cordprnt.@LTO@ cord/cordprnt.@LTO@
 
 cord/cordtest: $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a $(UTILS)
 	rm -f cord/cordtest
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -lucb
-	./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -ldld `./threadlibs`
-	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a `./threadlibs`
-	./if_not_there cord/cordtest $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a `./threadlibs`
+	./if_mach SPARC DRSNX $(CC) $(ALL_CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -lucb
+	./if_mach HP_PA HPUX $(CC) $(ALL_CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -ldld `./threadlibs`
+	./if_mach M68K AMIGA $(CC) $(ALL_CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a `./threadlibs`
+	./if_not_there cord/cordtest $(CC) $(ALL_CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a `./threadlibs`
 
 cord/de: $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a $(UTILS)
 	rm -f cord/de
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a $(CURSES) -lucb `./threadlibs`
-	./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a $(CURSES) -ldld `./threadlibs`
-	./if_mach POWERPC AIX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a -lcurses
-	./if_mach POWERPC DARWIN $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a
-	./if_mach I386 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a -lcurses `./threadlibs`
-	./if_mach ALPHA LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a -lcurses `./threadlibs`
-	./if_mach IA64 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a -lcurses `./threadlibs`
-	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a -lcurses
-	./if_not_there cord/de $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a $(CURSES) `./threadlibs`
+	./if_mach SPARC DRSNX $(CC) $(ALL_CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a $(CURSES) -lucb `./threadlibs`
+	./if_mach HP_PA HPUX $(CC) $(ALL_CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a $(CURSES) -ldld `./threadlibs`
+	./if_mach POWERPC AIX $(CC) $(ALL_CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a -lcurses
+	./if_mach POWERPC DARWIN $(CC) $(ALL_CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a
+	./if_mach I386 LINUX $(CC) $(ALL_CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a -lcurses `./threadlibs`
+	./if_mach ALPHA LINUX $(CC) $(ALL_CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a -lcurses `./threadlibs`
+	./if_mach IA64 LINUX $(CC) $(ALL_CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a -lcurses `./threadlibs`
+	./if_mach M68K AMIGA $(CC) $(ALL_CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a -lcurses
+	./if_not_there cord/de $(CC) $(ALL_CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.@LTO@ cord/cordxtra.@LTO@ gc.a $(CURSES) `./threadlibs`
 
 if_mach: $(srcdir)/if_mach.c $(srcdir)/include/private/gcconfig.h
 	$(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/if_mach.c
@@ -668,16 +670,16 @@ clean:
 
 gctest: tests/test.@LTO@ gc.a $(UTILS)
 	rm -f gctest
-	./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o gctest  tests/test.@LTO@ gc.a -lucb
-	./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o gctest  tests/test.@LTO@ gc.a -ldld `./threadlibs`
-	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o gctest  tests/test.@LTO@ gc.a `./threadlibs`
-	./if_not_there gctest $(CC) $(CFLAGS) -o gctest tests/test.@LTO@ gc.a `./threadlibs`
+	./if_mach SPARC DRSNX $(CC) $(ALL_CFLAGS) -o gctest  tests/test.@LTO@ gc.a -lucb
+	./if_mach HP_PA HPUX $(CC) $(ALL_CFLAGS) -o gctest  tests/test.@LTO@ gc.a -ldld `./threadlibs`
+	./if_mach M68K AMIGA $(CC) $(ALL_CFLAGS) -UGC_AMIGA_MAKINGLIB -o gctest  tests/test.@LTO@ gc.a `./threadlibs`
+	./if_not_there gctest $(CC) $(ALL_CFLAGS) -o gctest tests/test.@LTO@ gc.a `./threadlibs`
 
 # If an optimized setjmp_test generates a segmentation fault,
 # odds are your compiler is broken.  Gctest may still work.
 # Try compiling setjmp_t.c unoptimized.
 setjmp_test: $(srcdir)/setjmp_t.c $(srcdir)/include/gc.h $(UTILS) $(AO_INSTALL_DIR)
-	$(CC) $(CFLAGS) -o setjmp_test $(srcdir)/setjmp_t.c
+	$(CC) $(ALL_CFLAGS) -o setjmp_test $(srcdir)/setjmp_t.c
 
 test:  KandRtest cord/cordtest
 	cord/cordtest
@@ -736,7 +738,7 @@ gctest_irix_dyn_link: tests/test.@LTO@ libirixgc.so
 # The following appear to be dead, especially since libgc_globals.h
 # is apparently lost.
 test_dll.@LTO@: tests/test.c libgc_globals.h
-	$(CC) $(CFLAGS) -DGC_USE_DLL -c tests/test.c -o test_dll.@LTO@
+	$(CC) $(ALL_CFLAGS) -DGC_USE_DLL -c tests/test.c -o test_dll.@LTO@
 
 test_dll: test_dll.@LTO@ libgc_dll.a libgc.dll
 	$(CC) test_dll.@LTO@ -L$(ABSDIR) -lgc_dll -o test_dll
@@ -760,94 +762,94 @@ user_namespace: $(SRCS)
 
 # PLTSCHEME: explicit targets to get $(srcdir) in place for non-gmake
 alloc.@LTO@: $(srcdir)/alloc.c
-	$(CC) $(CFLAGS) -c $(srcdir)/alloc.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/alloc.c
 
 reclaim.@LTO@: $(srcdir)/reclaim.c
-	$(CC) $(CFLAGS) -c $(srcdir)/reclaim.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/reclaim.c
 
 allchblk.@LTO@: $(srcdir)/allchblk.c
-	$(CC) $(CFLAGS) -c $(srcdir)/allchblk.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/allchblk.c
 
 misc.@LTO@: $(srcdir)/misc.c
-	$(CC) $(CFLAGS) -c $(srcdir)/misc.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/misc.c
 
 os_dep.@LTO@: $(srcdir)/os_dep.c
-	$(CC) $(CFLAGS) -c $(srcdir)/os_dep.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/os_dep.c
 
 headers.@LTO@: $(srcdir)/headers.c
-	$(CC) $(CFLAGS) -c $(srcdir)/headers.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/headers.c
 
 mark.@LTO@: $(srcdir)/mark.c
-	$(CC) $(CFLAGS) -c $(srcdir)/mark.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/mark.c
 
 obj_map.@LTO@: $(srcdir)/obj_map.c
-	$(CC) $(CFLAGS) -c $(srcdir)/obj_map.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/obj_map.c
 
 blacklst.@LTO@: $(srcdir)/blacklst.c
-	$(CC) $(CFLAGS) -c $(srcdir)/blacklst.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/blacklst.c
 
 finalize.@LTO@: $(srcdir)/finalize.c
-	$(CC) $(CFLAGS) -c $(srcdir)/finalize.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/finalize.c
 
 new_hblk.@LTO@: $(srcdir)/new_hblk.c
-	$(CC) $(CFLAGS) -c $(srcdir)/new_hblk.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/new_hblk.c
 
 dbg_mlc.@LTO@: $(srcdir)/dbg_mlc.c
-	$(CC) $(CFLAGS) -c $(srcdir)/dbg_mlc.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/dbg_mlc.c
 
 malloc.@LTO@: $(srcdir)/malloc.c
-	$(CC) $(CFLAGS) -c $(srcdir)/malloc.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/malloc.c
 
 stubborn.@LTO@: $(srcdir)/stubborn.c
-	$(CC) $(CFLAGS) -c $(srcdir)/stubborn.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/stubborn.c
 
 checksums.@LTO@: $(srcdir)/checksums.c
-	$(CC) $(CFLAGS) -c $(srcdir)/checksums.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/checksums.c
 
 solaris_threads.@LTO@: $(srcdir)/solaris_threads.c
-	$(CC) $(CFLAGS) -c $(srcdir)/solaris_threads.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/solaris_threads.c
 
 win32_threads.@LTO@: $(srcdir)/win32_threads.c
-	$(CC) $(CFLAGS) -c $(srcdir)/win32_threads.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/win32_threads.c
 
 pthread_support.@LTO@: $(srcdir)/pthread_support.c
-	$(CC) $(CFLAGS) -c $(srcdir)/pthread_support.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/pthread_support.c
 
 pthread_stop_world.@LTO@: $(srcdir)/pthread_stop_world.c
-	$(CC) $(CFLAGS) -c $(srcdir)/pthread_stop_world.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/pthread_stop_world.c
 
 darwin_stop_world.@LTO@: $(srcdir)/darwin_stop_world.c
-	$(CC) $(CFLAGS) -c $(srcdir)/darwin_stop_world.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/darwin_stop_world.c
 
 openbsd_stop_world.@LTO@: $(srcdir)/openbsd_stop_world.c
-	$(CC) $(CFLAGS) -c $(srcdir)/openbsd_stop_world.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/openbsd_stop_world.c
 
 backgraph.@LTO@: $(srcdir)/backgraph.c
-	$(CC) $(CFLAGS) -c $(srcdir)/backgraph.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/backgraph.c
 
 typd_mlc.@LTO@: $(srcdir)/typd_mlc.c
-	$(CC) $(CFLAGS) -c $(srcdir)/typd_mlc.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/typd_mlc.c
 
 ptr_chck.@LTO@: $(srcdir)/ptr_chck.c
-	$(CC) $(CFLAGS) -c $(srcdir)/ptr_chck.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/ptr_chck.c
 
 mallocx.@LTO@: $(srcdir)/mallocx.c
-	$(CC) $(CFLAGS) -c $(srcdir)/mallocx.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/mallocx.c
 
 solaris_pthreads.@LTO@: $(srcdir)/solaris_pthreads.c
-	$(CC) $(CFLAGS) -c $(srcdir)/solaris_pthreads.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/solaris_pthreads.c
 
 gcj_mlc.@LTO@: $(srcdir)/gcj_mlc.c
-	$(CC) $(CFLAGS) -c $(srcdir)/gcj_mlc.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/gcj_mlc.c
 
 specific.@LTO@: $(srcdir)/specific.c
-	$(CC) $(CFLAGS) -c $(srcdir)/specific.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/specific.c
 
 gc_dlopen.@LTO@: $(srcdir)/gc_dlopen.c
-	$(CC) $(CFLAGS) -c $(srcdir)/gc_dlopen.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/gc_dlopen.c
 
 dyn_load.@LTO@: $(srcdir)/dyn_load.c
-	$(CC) $(CFLAGS) -c $(srcdir)/dyn_load.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/dyn_load.c
 
 thread_local_alloc.@LTO@: $(srcdir)/thread_local_alloc.c
-	$(CC) $(CFLAGS) -c $(srcdir)/thread_local_alloc.c
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/thread_local_alloc.c
diff --git a/racket/src/racket/gc2/Makefile.in b/racket/src/racket/gc2/Makefile.in
index 84a90534d2..62121303fa 100644
--- a/racket/src/racket/gc2/Makefile.in
+++ b/racket/src/racket/gc2/Makefile.in
@@ -23,9 +23,10 @@ AR = @AR@
 ARFLAGS = @ARFLAGS@
 RANLIB = @RANLIB@
 
-MOST_CPPFLAGS = @PREFLAGS@ @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@ 
-CPPFLAGS = -I$(builddir)/.. -I$(srcdir)/../include $(MOST_CPPFLAGS)
-CFLAGS = -I$(builddir)/.. -I$(srcdir)/../include @CFLAGS@ $(MOST_CPPFLAGS) @COMPFLAGS@ @PROFFLAGS@
+CFLAGS = @CFLAGS@ @COMPFLAGS@ @PROFFLAGS@
+CPPFLAGS = @PREFLAGS@
+ALL_CPPFLAGS = -I$(builddir)/.. -I$(srcdir)/../include $(CPPFLAGS) @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@ 
+ALL_CFLAGS = $(CFLAGS) $(ALL_CPPFLAGS)
 LIBS = @LIBS@
 
 LIBFFI_INCLUDE_ON = -I../../foreign/libffi/include
@@ -42,7 +43,7 @@ DEF_C_DIRS = $(DEF_COLLECTS_DIR) $(DEF_CONFIG_DIR)
 RUN_THIS_RACKET_CGC = ../racket@CGC@
 
 XFORM_SETUP = @RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) -cqu $(srcdir)/xform.rkt --setup .
-XFORM_NOPRECOMP = $(XFORM_SETUP) --cpp "$(CPP) $(CPPFLAGS)" @XFORMFLAGS@ -o
+XFORM_NOPRECOMP = $(XFORM_SETUP) --cpp "$(CPP) $(ALL_CPPFLAGS)" @XFORMFLAGS@ -o
 XSRCDIR = xsrc
 XFORM = env XFORM_USE_PRECOMP=$(XSRCDIR)/precomp.h $(XFORM_NOPRECOMP)
 SRCDIR = $(srcdir)/../src
@@ -289,7 +290,7 @@ $(XSRCDIR)/setjmpup.c: ../src/setjmpup.@LTO@ $(XFORMDEP)
 $(XSRCDIR)/sfs.c: ../src/sfs.@LTO@ $(XFORMDEP)
 	$(XFORM) $(XSRCDIR)/sfs.c $(SRCDIR)/sfs.c
 $(XSRCDIR)/string.c: ../src/string.@LTO@ $(XFORMDEP)
-	$(XFORM_SETUP) --cpp "$(CPP) -I../src $(CPPFLAGS)" @XFORMFLAGS@ -o $(XSRCDIR)/string.c $(SRCDIR)/string.c
+	$(XFORM_SETUP) --cpp "$(CPP) -I../src $(ALL_CPPFLAGS)" @XFORMFLAGS@ -o $(XSRCDIR)/string.c $(SRCDIR)/string.c
 $(XSRCDIR)/struct.c: ../src/struct.@LTO@ $(XFORMDEP)
 	$(XFORM) $(XSRCDIR)/struct.c $(SRCDIR)/struct.c
 $(XSRCDIR)/symbol.c: ../src/symbol.@LTO@ $(XFORMDEP) $(SRCDIR)/mzrt.h
@@ -305,122 +306,122 @@ $(XSRCDIR)/validate.c: ../src/validate.@LTO@ $(XFORMDEP)
 $(XSRCDIR)/vector.c: ../src/vector.@LTO@ $(XFORMDEP)
 	$(XFORM) $(XSRCDIR)/vector.c $(SRCDIR)/vector.c
 $(XSRCDIR)/foreign.c: ../../foreign/foreign.@LTO@ $(XFORMDEP)
-	$(XFORM_SETUP) --cpp "$(CPP) $(CPPFLAGS) $(LIBFFI_INCLUDE_@OWN_LIBFFI@) -I${SRCDIR}/../../racket/src" @XFORMFLAGS@ -o $(XSRCDIR)/foreign.c $(SRCDIR)/../../foreign/foreign.c
+	$(XFORM_SETUP) --cpp "$(CPP) $(ALL_CPPFLAGS) $(LIBFFI_INCLUDE_@OWN_LIBFFI@) -I${SRCDIR}/../../racket/src" @XFORMFLAGS@ -o $(XSRCDIR)/foreign.c $(SRCDIR)/../../foreign/foreign.c
 $(XSRCDIR)/main.c: ../main.@LTO@ $(XFORMDEP)
 	$(XFORM_NOPRECOMP) $(XSRCDIR)/main.c $(DEF_C_DIRS) $(srcdir)/../main.c
 
 salloc.@LTO@: $(XSRCDIR)/salloc.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/salloc.c -o salloc.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/salloc.c -o salloc.@LTO@
 bignum.@LTO@: $(XSRCDIR)/bignum.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/bignum.c -o bignum.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/bignum.c -o bignum.@LTO@
 bool.@LTO@: $(XSRCDIR)/bool.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/bool.c -o bool.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/bool.c -o bool.@LTO@
 builtin.@LTO@: $(XSRCDIR)/builtin.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/builtin.c -o builtin.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/builtin.c -o builtin.@LTO@
 char.@LTO@: $(XSRCDIR)/char.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/char.c -o char.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/char.c -o char.@LTO@
 compenv.@LTO@: $(XSRCDIR)/compenv.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/compenv.c -o compenv.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/compenv.c -o compenv.@LTO@
 compile.@LTO@: $(XSRCDIR)/compile.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/compile.c -o compile.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/compile.c -o compile.@LTO@
 complex.@LTO@: $(XSRCDIR)/complex.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/complex.c -o complex.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/complex.c -o complex.@LTO@
 dynext.@LTO@: $(XSRCDIR)/dynext.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/dynext.c -o dynext.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/dynext.c -o dynext.@LTO@
 env.@LTO@: $(XSRCDIR)/env.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/env.c -o env.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/env.c -o env.@LTO@
 error.@LTO@: $(XSRCDIR)/error.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/error.c -o error.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/error.c -o error.@LTO@
 eval.@LTO@: $(XSRCDIR)/eval.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/eval.c -o eval.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/eval.c -o eval.@LTO@
 file.@LTO@: $(XSRCDIR)/file.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/file.c -o file.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/file.c -o file.@LTO@
 fun.@LTO@: $(XSRCDIR)/fun.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/fun.c -o fun.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/fun.c -o fun.@LTO@
 future.@LTO@: $(XSRCDIR)/future.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/future.c -o future.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/future.c -o future.@LTO@
 hash.@LTO@: $(XSRCDIR)/hash.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/hash.c -o hash.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/hash.c -o hash.@LTO@
 jit.@LTO@: $(XSRCDIR)/jit.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/jit.c -o jit.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/jit.c -o jit.@LTO@
 jitalloc.@LTO@: $(XSRCDIR)/jitalloc.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/jitalloc.c -o jitalloc.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/jitalloc.c -o jitalloc.@LTO@
 jitarith.@LTO@: $(XSRCDIR)/jitarith.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/jitarith.c -o jitarith.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/jitarith.c -o jitarith.@LTO@
 jitcall.@LTO@: $(XSRCDIR)/jitcall.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/jitcall.c -o jitcall.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/jitcall.c -o jitcall.@LTO@
 jitcommon.@LTO@: $(XSRCDIR)/jitcommon.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/jitcommon.c -o jitcommon.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/jitcommon.c -o jitcommon.@LTO@
 jitinline.@LTO@: $(XSRCDIR)/jitinline.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/jitinline.c -o jitinline.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/jitinline.c -o jitinline.@LTO@
 jitprep.@LTO@: $(XSRCDIR)/jitprep.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/jitprep.c -o jitprep.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/jitprep.c -o jitprep.@LTO@
 jitstack.@LTO@: $(XSRCDIR)/jitstack.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/jitstack.c -o jitstack.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/jitstack.c -o jitstack.@LTO@
 jitstate.@LTO@: $(XSRCDIR)/jitstate.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/jitstate.c -o jitstate.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/jitstate.c -o jitstate.@LTO@
 list.@LTO@: $(XSRCDIR)/list.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/list.c -o list.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/list.c -o list.@LTO@
 marshal.@LTO@: $(XSRCDIR)/marshal.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/marshal.c -o marshal.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/marshal.c -o marshal.@LTO@
 module.@LTO@: $(XSRCDIR)/module.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/module.c -o module.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/module.c -o module.@LTO@
 mzrt.@LTO@: $(SRCDIR)/mzrt.c $(SRCDIR)/mzrt.h $(XFORMDEP)
-	$(CC) $(CFLAGS) -DMZ_PRECISE_GC -c $(SRCDIR)/mzrt.c -o mzrt.@LTO@
+	$(CC) $(ALL_CFLAGS) -DMZ_PRECISE_GC -c $(SRCDIR)/mzrt.c -o mzrt.@LTO@
 network.@LTO@: $(XSRCDIR)/network.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/network.c -o network.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/network.c -o network.@LTO@
 numarith.@LTO@: $(XSRCDIR)/numarith.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/numarith.c -o numarith.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/numarith.c -o numarith.@LTO@
 number.@LTO@: $(XSRCDIR)/number.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/number.c -o number.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/number.c -o number.@LTO@
 numcomp.@LTO@: $(XSRCDIR)/numcomp.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/numcomp.c -o numcomp.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/numcomp.c -o numcomp.@LTO@
 numstr.@LTO@: $(XSRCDIR)/numstr.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/numstr.c -o numstr.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/numstr.c -o numstr.@LTO@
 optimize.@LTO@: $(XSRCDIR)/optimize.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/optimize.c -o optimize.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/optimize.c -o optimize.@LTO@
 place.@LTO@: $(XSRCDIR)/place.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/place.c -o place.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/place.c -o place.@LTO@
 port.@LTO@: $(XSRCDIR)/port.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/port.c -o port.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/port.c -o port.@LTO@
 portfun.@LTO@: $(XSRCDIR)/portfun.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/portfun.c -o portfun.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/portfun.c -o portfun.@LTO@
 print.@LTO@: $(XSRCDIR)/print.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/print.c -o print.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/print.c -o print.@LTO@
 rational.@LTO@: $(XSRCDIR)/rational.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/rational.c -o rational.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/rational.c -o rational.@LTO@
 read.@LTO@: $(XSRCDIR)/read.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/read.c -o read.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/read.c -o read.@LTO@
 regexp.@LTO@: $(XSRCDIR)/regexp.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/regexp.c -o regexp.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/regexp.c -o regexp.@LTO@
 resolve.@LTO@: $(XSRCDIR)/resolve.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/resolve.c -o resolve.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/resolve.c -o resolve.@LTO@
 sema.@LTO@: $(XSRCDIR)/sema.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/sema.c -o sema.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/sema.c -o sema.@LTO@
 setjmpup.@LTO@: $(XSRCDIR)/setjmpup.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/setjmpup.c -o setjmpup.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/setjmpup.c -o setjmpup.@LTO@
 sfs.@LTO@: $(XSRCDIR)/sfs.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/sfs.c -o sfs.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/sfs.c -o sfs.@LTO@
 string.@LTO@: $(XSRCDIR)/string.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/string.c -o string.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/string.c -o string.@LTO@
 struct.@LTO@: $(XSRCDIR)/struct.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/struct.c -o struct.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/struct.c -o struct.@LTO@
 symbol.@LTO@: $(XSRCDIR)/symbol.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/symbol.c -o symbol.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/symbol.c -o symbol.@LTO@
 syntax.@LTO@: $(XSRCDIR)/syntax.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/syntax.c -o syntax.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/syntax.c -o syntax.@LTO@
 thread.@LTO@: $(XSRCDIR)/thread.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/thread.c -o thread.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/thread.c -o thread.@LTO@
 type.@LTO@: $(XSRCDIR)/type.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/type.c -o type.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/type.c -o type.@LTO@
 validate.@LTO@: $(XSRCDIR)/validate.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/validate.c -o validate.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/validate.c -o validate.@LTO@
 vector.@LTO@: $(XSRCDIR)/vector.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/vector.c -o vector.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/vector.c -o vector.@LTO@
 foreign.@LTO@: $(XSRCDIR)/foreign.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/foreign.c -o foreign.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/foreign.c -o foreign.@LTO@
 main.@LTO@: $(XSRCDIR)/main.c
-	$(CC) $(CFLAGS) -c $(XSRCDIR)/main.c -o main.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(XSRCDIR)/main.c -o main.@LTO@
 
 gc2.@LTO@: \
 		$(srcdir)/alloc_cache.c \
@@ -464,7 +465,7 @@ gc2.@LTO@: \
 		$(srcdir)/vm_osk.c \
 		$(srcdir)/vm_osx.c \
 		$(srcdir)/weak.c
-	$(CC) $(CFLAGS) -I$(builddir)/.. -c $(srcdir)/gc2.c -o gc2.@LTO@
+	$(CC) $(ALL_CFLAGS) -I$(builddir)/.. -c $(srcdir)/gc2.c -o gc2.@LTO@
 
 FOREIGN_OBJS_ON = ../../foreign/libffi/src/*.@LTO@ ../../foreign/libffi/src/*/*.@LTO@
 FOREIGN_LIB_ON = ../../foreign/libffi/libffi@FOREIGN_CONVENIENCE@.la
@@ -529,7 +530,7 @@ clean:
 #--------------------------------------------------
 
 test.@LTO@: $(srcdir)/test.c
-	$(CC) $(CFLAGS) -c $(srcdir)/test.c -o test.@LTO@
+	$(CC) $(ALL_CFLAGS) -c $(srcdir)/test.c -o test.@LTO@
 
 gct: test.@LTO@ gc2.@LTO@
 	$(CC) -o gct test.@LTO@ gc2.@LTO@
diff --git a/racket/src/racket/sgc/Makefile.in b/racket/src/racket/sgc/Makefile.in
index 98e74000fd..8697f882ab 100644
--- a/racket/src/racket/sgc/Makefile.in
+++ b/racket/src/racket/sgc/Makefile.in
@@ -13,7 +13,8 @@ RANLIB = @RANLIB@
 AR = @AR@
 ARFLAGS = @ARFLAGS@
 
-CFLAGS = @CFLAGS@ @PREFLAGS@ @COMPFLAGS@ @PROFFLAGS@ @OPTIONS@
+CFLAGS = @CFLAGS@ @COMPFLAGS@ @PROFFLAGS@
+CPPFLAGS = @PREFLAGS@
 
 OBJS =  sgc.@LTO@
 
@@ -30,10 +31,10 @@ test: $(OBJS) test.@LTO@
 gcobjects: $(OBJS)
 
 sgc.@LTO@: $(srcdir)/sgc.c $(srcdir)/autostat.inc $(srcdir)/collect.inc $(srcdir)/../utils/splay.c
-	$(CC) $(CFLAGS) -I.. -c $(srcdir)/sgc.c -o sgc.@LTO@
+	$(CC) $(CFLAGS) $(CPPFLAGS) @OPTIONS@ -I.. -c $(srcdir)/sgc.c -o sgc.@LTO@
 
 test.@LTO@: $(srcdir)/test.c
-	$(CC) $(CFLAGS) -c $(srcdir)/test.c -o test.@LTO@
+	$(CC) $(CFLAGS) $(CPPFLAGS) @OPTIONS@ -c $(srcdir)/test.c -o test.@LTO@
 
 clean:
 	/bin/rm -f $(OBJS) gc.@LIBSFX@ test