Index: Source/unix/Makefile.preamble
===================================================================
--- Source/unix/Makefile.preamble	(revision 31378)
+++ Source/unix/Makefile.preamble	(working copy)
@@ -39,7 +39,7 @@
 #
 
 # Additional flags to pass to the preprocessor
-ADDITIONAL_CPPFLAGS = $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS)
+ADDITIONAL_CPPFLAGS += $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS)
 
 # Additional flags to pass to the Objective-C compiler
 #ADDITIONAL_OBJCFLAGS = 
Index: Source/win32/Makefile.preamble
===================================================================
--- Source/win32/Makefile.preamble	(revision 31378)
+++ Source/win32/Makefile.preamble	(working copy)
@@ -39,7 +39,7 @@
 #
 
 # Additional flags to pass to the preprocessor
-ADDITIONAL_CPPFLAGS = $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS)
+ADDITIONAL_CPPFLAGS += $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS)
 
 # Additional flags to pass to the Objective-C compiler
 #ADDITIONAL_OBJCFLAGS = 
Index: Source/ObjectiveC2/Makefile.preamble
===================================================================
--- Source/ObjectiveC2/Makefile.preamble	(revision 31378)
+++ Source/ObjectiveC2/Makefile.preamble	(working copy)
@@ -39,7 +39,7 @@
 #
 
 # Additional flags to pass to the preprocessor
-ADDITIONAL_CPPFLAGS = $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS)
+ADDITIONAL_CPPFLAGS += $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS)
 
 # Additional flags to pass to the Objective-C compiler
 #ADDITIONAL_OBJCFLAGS = 
Index: Source/Additions/Makefile.preamble
===================================================================
--- Source/Additions/Makefile.preamble	(revision 31378)
+++ Source/Additions/Makefile.preamble	(working copy)
@@ -39,7 +39,7 @@
 #
 
 # Additional flags to pass to the preprocessor
-ADDITIONAL_CPPFLAGS = $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS) -DNO_GNUSTEP=1
+ADDITIONAL_CPPFLAGS += $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS) -DNO_GNUSTEP=1
 
 # Additional flags to pass to the Objective-C compiler
 #ADDITIONAL_OBJCFLAGS = 
Index: Source/Makefile.preamble
===================================================================
--- Source/Makefile.preamble	(revision 31378)
+++ Source/Makefile.preamble	(working copy)
@@ -39,7 +39,7 @@
 #
 
 # Additional flags to pass to the preprocessor
-ADDITIONAL_CPPFLAGS = $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS) \
+ADDITIONAL_CPPFLAGS += $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS) \
 -Wcast-align \
 #-Wstrict-prototypes \
 #-Wpointer-arith \
Index: SSL/Makefile.preamble
===================================================================
--- SSL/Makefile.preamble	(revision 31378)
+++ SSL/Makefile.preamble	(working copy)
@@ -39,7 +39,7 @@
 #
 
 # Additional flags to pass to the preprocessor
-ADDITIONAL_CPPFLAGS = $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS)
+ADDITIONAL_CPPFLAGS += $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS)
 
 # Additional flags to pass to the Objective-C compiler
 ADDITIONAL_OBJCFLAGS = $(SSLFLAGS)
Index: base.make.in
===================================================================
--- base.make.in	(revision 31378)
+++ base.make.in	(working copy)
@@ -50,6 +50,9 @@
   FND_LIBS = -lgnustep-baseadd -framework Foundation
 endif
 
+  
+  ADDITIONAL_CPPFLAGS += -DCF_EXCLUDE_CSTD_HEADERS
+
   address@hidden@
   address@hidden@
   address@hidden@
Index: Tools/GNUmakefile
===================================================================
--- Tools/GNUmakefile	(revision 31378)
+++ Tools/GNUmakefile	(working copy)
@@ -46,7 +46,7 @@
 -include ../Version
 -include ../config.mak
 
-ADDITIONAL_CPPFLAGS = -DGNUSTEP_BASE_INTERNAL=1
+ADDITIONAL_CPPFLAGS += -DGNUSTEP_BASE_INTERNAL=1
 
 
 # DTDs to install