diff --git a/ChangeLog b/ChangeLog
index 5981ff275..1b734de0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-12-30  Adam Fedor  <fedor@gnu.org>
+
+	* SSL/GNUmakefile: Don't compile if base=no
+
+	* Tools/AGSIndex.h: Include gnustep/base/GSXML.h.
+	* Tools/AGSHtml.m: Include GNUstep.h
+	* Tools/AGSInde.m, Tools/AGSOutput.m, Tools/AGSParser.m,
+	Tools/HTMLLinker.m: Idem.
+	* Tools/GNUmakegile: Only compile autogsdoc when add=yes
+	* Tools/Makefile.preamble: Include -lgnustep-baseadd when add=yes
+
 Mon Dec 30 18:19:55 2002  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	* configure.ac: Recognize apple OBJC_RUNTIME_LIB.
diff --git a/SSL/GNUmakefile b/SSL/GNUmakefile
index fd42b47d2..e52e4cbc5 100644
--- a/SSL/GNUmakefile
+++ b/SSL/GNUmakefile
@@ -36,6 +36,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 srcdir = .
 PACKAGE_NAME = gnustep-base
 
+ifneq ($(base),no)
 ifeq ($(HAVE_OPENSSL), yes)
 
 # The bundles to be compiled
@@ -52,6 +53,7 @@ SSL_PRINCIPAL_CLASS = GSSSLHandle
 
 SSL_BUNDLE_LIBS = $(SSLLIBS) -lgnustep-base -lobjc
 
+endif
 endif
 
 # GNUSTEP_INSTALL_PREFIX must be defined here and not in config.h because
diff --git a/Tools/AGSHtml.m b/Tools/AGSHtml.m
index f07b28399..1f1ba88f5 100644
--- a/Tools/AGSHtml.m
+++ b/Tools/AGSHtml.m
@@ -22,6 +22,7 @@
 
 #include	<Foundation/Foundation.h>
 #include        "AGSHtml.h"
+#include "gnustep/base/GNUstep.h"
 
 static int      XML_ELEMENT_NODE;
 static int      XML_ENTITY_REF_NODE;
diff --git a/Tools/AGSIndex.h b/Tools/AGSIndex.h
index e4c3ae39b..19ec11659 100644
--- a/Tools/AGSIndex.h
+++ b/Tools/AGSIndex.h
@@ -22,7 +22,7 @@
 
    */
 
-#include        <Foundation/GSXML.h>
+#include        <gnustep/base/GSXML.h>
 
 @interface AGSIndex : NSObject
 {
diff --git a/Tools/AGSIndex.m b/Tools/AGSIndex.m
index 5b3bed26a..eb56b8a4c 100644
--- a/Tools/AGSIndex.m
+++ b/Tools/AGSIndex.m
@@ -22,6 +22,7 @@
 
 #include	<Foundation/Foundation.h>
 #include        "AGSIndex.h"
+#include 	"gnustep/base/GNUstep.h"
 
 static int      XML_ELEMENT_NODE;
 static int      XML_TEXT_NODE;
diff --git a/Tools/AGSOutput.m b/Tools/AGSOutput.m
index fc81e0ca0..169f7c16d 100644
--- a/Tools/AGSOutput.m
+++ b/Tools/AGSOutput.m
@@ -21,6 +21,7 @@
    */
 
 #include "AGSOutput.h"
+#include "gnustep/base/GNUstep.h"
 
 @interface AGSOutput (Private)
 - (NSString*) mergeMarkup: (NSString*)markup
diff --git a/Tools/AGSParser.m b/Tools/AGSParser.m
index dee00c575..220342da7 100644
--- a/Tools/AGSParser.m
+++ b/Tools/AGSParser.m
@@ -21,6 +21,7 @@
    */
 
 #include "AGSParser.h"
+#include "gnustep/base/GNUstep.h"
 
 @implementation	AGSParser
 
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index b3fcfd2b9..9c4fef082 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -44,13 +44,17 @@ doctemplatesdir = $(GNUSTEP_RESOURCES)/DocTemplates
 DOCTEMPLATES_FILES = indextemplate.gsdoc AutoDocTemplate.gsdoc
 
 # The application to be compiled
-TOOL_NAME = autogsdoc cvtenc gdnc gsdoc defaults plmerge \
+ifeq ($(add),yes)
+TOOL_NAME = autogsdoc
+else
+TOOL_NAME = autogsdoc cvtenc gdnc defaults plmerge \
 		plparse sfparse pldes plser pl2link HTMLLinker
 CTOOL_NAME = gdomap
 
-TEST_TOOL_NAME = locale_alias
-
 SUBPROJECTS = make_strings
+endif
+
+TEST_TOOL_NAME = locale_alias
 
 # The source files to be compiled
 autogsdoc_OBJC_FILES = autogsdoc.m AGSParser.m AGSOutput.m AGSIndex.m AGSHtml.m
diff --git a/Tools/HTMLLinker.m b/Tools/HTMLLinker.m
index 349f43242..b6b9f8c9d 100644
--- a/Tools/HTMLLinker.m
+++ b/Tools/HTMLLinker.m
@@ -22,6 +22,7 @@
  */
 
 #include <Foundation/Foundation.h>
+#include        "gnustep/base/GNUstep.h"
 
 /* For convenience, cached for the whole tool.  */
 
diff --git a/Tools/Makefile.preamble b/Tools/Makefile.preamble
index 224e3c1a8..ba3b3c83c 100644
--- a/Tools/Makefile.preamble
+++ b/Tools/Makefile.preamble
@@ -61,3 +61,8 @@ ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR)
 
 # Additional directories to be created during installation
 #ADDITIONAL_INSTALL_DIRS +=
+
+ifeq ($(add),yes)
+ADDITIONAL_TOOL_LIBS = -lgnustep-baseadd
+endif
+
diff --git a/Tools/autogsdoc.m b/Tools/autogsdoc.m
index 648310537..7985a0124 100644
--- a/Tools/autogsdoc.m
+++ b/Tools/autogsdoc.m
@@ -506,6 +506,7 @@
 #include "AGSOutput.h"
 #include "AGSIndex.h"
 #include "AGSHtml.h"
+#include "gnustep/base/GNUstep.h"
 
 int
 main(int argc, char **argv, char **env)
@@ -541,7 +542,9 @@ main(int argc, char **argv, char **env)
   NSAutoreleasePool	*pool = nil;
 #endif
 
+#ifdef GS_PASS_ARGUMENTS
   [NSProcessInfo initializeWithArguments: argv count: argc environment: env];
+#endif
 
 #if GS_WITH_GC == 0
   outer = [NSAutoreleasePool new];