diff --git a/ChangeLog b/ChangeLog
index 4d3cb2e56..d13d05acd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-27  Adam Fedor  <fedor@gnu.org>
+
+	* configure.ac (INCLUDE_FLAGS): New for holding flags needed for
+	compiling base.
+	* config.make.in (CONFIG_SYSTEM_INCL): Use it.
+	* base.make (CONFIG_SYSTEM_INCL): Remove CPPFLAGS
+	(CONFIG_SYSTEM_DEFS): Remove.
+	* Source/Additions/GNUmakefile: include config.mak
+
 2002-11-27  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/Additions/GSObjCRuntime.m: New file with GNUstep extensions
diff --git a/Source/Additions/GNUmakefile b/Source/Additions/GNUmakefile
index 009ceacd1..73fbd36fa 100644
--- a/Source/Additions/GNUmakefile
+++ b/Source/Additions/GNUmakefile
@@ -27,6 +27,7 @@ GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../base.make
 
 include $(GNUSTEP_MAKEFILES)/common.make
+include ../../config.mak
 
 SUBPROJECT_NAME=Additions
 
diff --git a/base.make.in b/base.make.in
index 8a9d01bc6..c1168a543 100644
--- a/base.make.in
+++ b/base.make.in
@@ -27,9 +27,8 @@ ifeq ($(FOUNDATION_LIB),gnu)
 #
 # FIXME - macro names
 #
-  CONFIG_SYSTEM_INCL += @CPPFLAGS@ @NX_CONST_STRING_CPPFLAGS@
+  CONFIG_SYSTEM_INCL += @NX_CONST_STRING_CPPFLAGS@
   CONFIG_SYSTEM_LIBS += @LIBS@
-  CONFIG_SYSTEM_DEFS += @SYSTEM_DEFS@
 
   GNUSTEP_BASE_VERSION = @VERSION@
   GNUSTEP_BASE_MAJOR_VERSION = @MAJOR_VERSION@
diff --git a/config.mak.in b/config.mak.in
index e2d9d936b..4180b7dfc 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -11,3 +11,5 @@ HAVE_LIBXML=@HAVE_LIBXML@
 WITH_FFI=@WITH_FFI@
 
 HAVE_PTHREAD_H=@HAVE_PTHREAD_H@
+
+CONFIG_SYSTEM_INCL += @INCLUDE_FLAGS@
diff --git a/configure b/configure
index 68886de45..50f58801f 100755
--- a/configure
+++ b/configure
@@ -2335,6 +2335,10 @@ fi
 #--------------------------------------------------------------------
 # specific target_os options
 #--------------------------------------------------------------------
+# CPPFLAGS are not used anywhere except during configuration. If they
+# are needed, they should have been set when configuring gnustep-make
+# INCLUDE_FLAGS will go into base.make(CONFIG_SYSTEM_INCL)
+INCLUDE_FLAGS=""
 case "$target_os" in
   freebsd*)	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 		LDFLAGS="$LDFLAGS -L/usr/local/lib";;
@@ -6316,6 +6320,8 @@ fi
 
 fi
 
+# NB: This is used as follows: in Source/Makefile.postamble we copy
+# $(DYNAMIC_LINKER)-load.h into dynamic-load.h
 echo "$as_me:$LINENO: checking for dynamic linker type" >&5
 echo $ECHO_N "checking for dynamic linker type... $ECHO_C" >&6
 echo "$as_me:$LINENO: result: $DYNAMIC_LINKER" >&5
@@ -11577,6 +11583,7 @@ echo "${ECHO_T}no" >&6
 
 if test $enable_libxml = yes; then
   CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
+  INCLUDE_FLAGS="$INCLUDE_FLAGS $XML_CFLAGS"
   LIBS="$LIBS $XML_LIBS"
   HAVE_LIBXML=1
 
@@ -11618,6 +11625,7 @@ libs_temp=$LIBS
 
 if test "$gmp_incdir" != "no"; then
   CPPFLAGS="$CPPFLAGS -I$gmp_incdir"
+  INCLUDE_FLAGS="$INCLUDE_FLAGS -I$gmp_incdir"
 fi
 if test "$gmp_libdir" != "no"; then
   LIBS="$LIBS -L$gmp_libdir"
@@ -11970,6 +11978,7 @@ fi;
 
   if test "$libiconv_libdir" != "no"; then
     CPPFLAGS="$CPPFLAGS -L$libiconv_libdir"
+    INCLUDE_FLAGS="$INCLUDE_FLAGS  -L$libiconv_libdir"
   fi
 
   # BSDs install this lib as libgiconv
@@ -12761,7 +12770,7 @@ s,@XML_CFLAGS@,$XML_CFLAGS,;t t
 s,@XML_LIBS@,$XML_LIBS,;t t
 s,@HAVE_LIBXML@,$HAVE_LIBXML,;t t
 s,@USE_GMP@,$USE_GMP,;t t
-s,@SYSTEM_DEFS@,$SYSTEM_DEFS,;t t
+s,@INCLUDE_FLAGS@,$INCLUDE_FLAGS,;t t
 s,@subdirs@,$subdirs,;t t
 s,@VERSION@,$VERSION,;t t
 s,@MAJOR_VERSION@,$MAJOR_VERSION,;t t
diff --git a/configure.ac b/configure.ac
index 9da8120d4..80024e1dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,10 @@ AC_PATH_PROG(WHOAMI, whoami, echo, $PATH:/usr/ucb)
 #--------------------------------------------------------------------
 # specific target_os options
 #--------------------------------------------------------------------
+# CPPFLAGS are not used anywhere except during configuration. If they
+# are needed, they should have been set when configuring gnustep-make
+# INCLUDE_FLAGS will go into base.make(CONFIG_SYSTEM_INCL)
+INCLUDE_FLAGS=""
 case "$target_os" in
   freebsd*)	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 		LDFLAGS="$LDFLAGS -L/usr/local/lib";;
@@ -891,6 +895,7 @@ saved_CFLAGS="$CFLAGS"
 AM_PATH_XML(2.3.0, enable_libxml=yes, enable_libxml=no)
 if test $enable_libxml = yes; then
   CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
+  INCLUDE_FLAGS="$INCLUDE_FLAGS $XML_CFLAGS"
   LIBS="$LIBS $XML_LIBS"
   HAVE_LIBXML=1
   AC_DEFINE(HAVE_LIBXML,1,
@@ -919,6 +924,7 @@ libs_temp=$LIBS
 
 if test "$gmp_incdir" != "no"; then
   CPPFLAGS="$CPPFLAGS -I$gmp_incdir"
+  INCLUDE_FLAGS="$INCLUDE_FLAGS -I$gmp_incdir"
 fi
 if test "$gmp_libdir" != "no"; then
   LIBS="$LIBS -L$gmp_libdir"
@@ -958,6 +964,7 @@ if test $ac_cv_func_iconv = no; then
 
   if test "$libiconv_libdir" != "no"; then
     CPPFLAGS="$CPPFLAGS -L$libiconv_libdir"
+    INCLUDE_FLAGS="$INCLUDE_FLAGS  -L$libiconv_libdir"
   fi
 
   # BSDs install this lib as libgiconv
@@ -974,7 +981,7 @@ if test $ac_cv_func_iconv = no; then
   CPPFLAGS="$cppflags_temp"
 fi
 
-AC_SUBST(SYSTEM_DEFS)
+AC_SUBST(INCLUDE_FLAGS)
 
 AC_CONFIG_SUBDIRS(Source/mframe SSL)