diff --git a/ChangeLog b/ChangeLog
index 996bc48a2..cb42b538e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-14  Adam Fedor  <fedor@gnu.org>
+
+	* Source/Additions/GSObjCRuntime.m: Fix previous method def.
+	* Source/Additions/GSXML.m: Idem.
+
+	* Tools/GNUmakefile (TOOL_NAME): Add cvtenc plmerge sfparse xmlparse
+	for add=yes.
+	* Tools/cvtenc.m: Add includes for compiling with darwin.
+	* Tools/plmerge.m, Tools/sfparse.m, Tools/xmlparse.m: Idem.
+	Suggestions and patches from Stephane Corthesy.
+
 2004-01-13 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSURLHandle.m: ([-availableResourceData]) remove condition
diff --git a/Source/Additions/GSObjCRuntime.m b/Source/Additions/GSObjCRuntime.m
index 614216780..f30331509 100644
--- a/Source/Additions/GSObjCRuntime.m
+++ b/Source/Additions/GSObjCRuntime.m
@@ -55,7 +55,7 @@
 
 #ifdef NeXT_Foundation_LIBRARY
 @interface NSObject (MissingFromMacOSX)
-- (IMP) methodForSelector: (SEL)aSelector;
++ (IMP) methodForSelector: (SEL)aSelector;
 @end
 #endif
 
diff --git a/Source/Additions/GSXML.m b/Source/Additions/GSXML.m
index 1e7eb768b..880f439a2 100644
--- a/Source/Additions/GSXML.m
+++ b/Source/Additions/GSXML.m
@@ -102,6 +102,12 @@ UTF8StrLen(const unsigned char *bytes, unsigned length)
 
 static BOOL cacheDone = NO;
 
+#ifdef NeXT_Foundation_LIBRARY
+@interface NSObject (MissingFromMacOSX)
++ (IMP) methodForSelector: (SEL)aSelector;
+@end
+#endif
+
 static void
 setupCache()
 {
@@ -119,12 +125,6 @@ static xmlParserInputPtr
 loadEntityFunction(const unsigned char *url, const unsigned char *eid,
   xmlParserCtxtPtr ctxt);
 
-#ifdef NeXT_Foundation_LIBRARY
-@interface NSObject (MissingFromMacOSX)
-- (IMP) methodForSelector: (SEL)aSelector;
-@end
-#endif
-
 @interface GSXPathObject(Private)
 + (id) _newWithNativePointer: (xmlXPathObject *)lib
                      context: (GSXPathContext *)context;
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index d1f15703b..b22cb057d 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -47,7 +47,7 @@ MAN8_PAGES = gdomap.8
 
 # The application to be compiled
 ifeq ($(add),yes)
-TOOL_NAME = autogsdoc
+TOOL_NAME = autogsdoc cvtenc plmerge sfparse xmlparse
 else
 TOOL_NAME = autogsdoc cvtenc gdnc defaults plmerge \
 		plparse sfparse pldes plser pl2link xmlparse
diff --git a/Tools/cvtenc.m b/Tools/cvtenc.m
index a103ff990..c91abbaf9 100644
--- a/Tools/cvtenc.m
+++ b/Tools/cvtenc.m
@@ -29,6 +29,9 @@
 #include	<Foundation/NSDebug.h>
 #include	<Foundation/NSFileHandle.h>
 #include	<Foundation/NSAutoreleasePool.h>
+#ifdef NeXT_Foundation_LIBRARY
+#include "GNUstepBase/GSCategories.h"
+#endif
 
 #include	<ctype.h>
 
@@ -75,7 +78,7 @@ main(int argc, char** argv, char **env)
     }
   else
     {
-      NSStringEncoding	*e;
+      const NSStringEncoding	*e;
       NSMutableString	*names;
 
       names = [NSMutableString stringWithCapacity: 1024];
diff --git a/Tools/plmerge.m b/Tools/plmerge.m
index f26f4cc32..882ac7450 100644
--- a/Tools/plmerge.m
+++ b/Tools/plmerge.m
@@ -18,6 +18,7 @@
 
    */
 
+#include 	"config.h"
 #include        <Foundation/Foundation.h>
 #include	<Foundation/NSArray.h>
 #include	<Foundation/NSAutoreleasePool.h>
@@ -27,6 +28,10 @@
 #include	<Foundation/NSFileManager.h>
 #include	<Foundation/NSProcessInfo.h>
 #include	<Foundation/NSString.h>
+#ifdef NeXT_Foundation_LIBRARY
+#include "GNUstepBase/GSCategories.h"
+#include "GNUstepBase/GSObjCRuntime.h"
+#endif
 
 int
 main(int argc, char** argv, char **env)
diff --git a/Tools/sfparse.m b/Tools/sfparse.m
index 6389a9f91..23daf38bd 100644
--- a/Tools/sfparse.m
+++ b/Tools/sfparse.m
@@ -27,6 +27,9 @@
 #include	<Foundation/NSUserDefaults.h>
 #include	<Foundation/NSDebug.h>
 #include	<Foundation/NSAutoreleasePool.h>
+#ifdef NeXT_Foundation_LIBRARY
+#include "GNUstepBase/GSCategories.h"
+#endif
 
 int
 convert_unicode(NSArray *args)
diff --git a/Tools/xmlparse.m b/Tools/xmlparse.m
index 4360878c5..fc79ce148 100644
--- a/Tools/xmlparse.m
+++ b/Tools/xmlparse.m
@@ -22,10 +22,15 @@
 
 #include "config.h"
 #include <stdio.h>
+#ifdef NeXT_Foundation_LIBRARY
+#include <Foundation/Foundation.h>
+#include <GNUstepBase/GSCategories.h>
+#else
 #include <Foundation/NSArray.h>
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSObjCRuntime.h>
 #include <Foundation/NSProcessInfo.h>
+#endif
 #include <GNUstepBase/GSXML.h>
 
 @interface GSXMLParser (Loader)