diff --git a/ChangeLog b/ChangeLog
index 7e8d8acc8..2a3abe5a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-09-27 23:26  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/NSDistantObject.m: Make proxyLocation an enum tag, not a
+	variable.
+	* Source/NSFileManager.m (custom_strdup, append_file_to_path): Make
+	static.
+	* Source/NSString.m (-isEqual:): Clarify documentation.
+	* Source/NSUnarchiver.m (mapClassObject, mapClassName): Make static.
+	* Source/Additions/Unicode.m (GetDefEncoding): Add missing void in
+	the prototype.
+	* Tools/make_strings/make_strings.m (ParseFile): Remove spurious
+	static on the nested function add_arg_ch.
+
 2004-09-27 15:51  Alexander Malmberg <alexander@malmberg.org>
 
 	* configure.ac:	Change SO_REUSADDR to SO_REUSEADDR in the checking
diff --git a/Source/Additions/Unicode.m b/Source/Additions/Unicode.m
index 952cc78f0..466be4230 100644
--- a/Source/Additions/Unicode.m
+++ b/Source/Additions/Unicode.m
@@ -559,7 +559,7 @@ GSEncodingFromLocale(const char *clocale)
  * Return the default encoding
  */
 NSStringEncoding
-GetDefEncoding()
+GetDefEncoding(void)
 {
   if (defEnc == GSUndefinedEncoding)
     {
diff --git a/Source/NSDistantObject.m b/Source/NSDistantObject.m
index 3ac748bbe..166a1f5ce 100644
--- a/Source/NSDistantObject.m
+++ b/Source/NSDistantObject.m
@@ -105,12 +105,12 @@ typedef struct {
 /* This is the proxy tag; it indicates where the local object is,
    and determines whether the reply port to the Connection-where-the-
    proxy-is-local needs to encoded/decoded or not. */
-enum
+enum proxyLocation
 {
   PROXY_LOCAL_FOR_RECEIVER = 0,
   PROXY_LOCAL_FOR_SENDER,
   PROXY_REMOTE_FOR_BOTH
-} proxyLocation;
+};
 
 
 
diff --git a/Source/NSFileManager.m b/Source/NSFileManager.m
index 6e2add993..ca7da170a 100644
--- a/Source/NSFileManager.m
+++ b/Source/NSFileManager.m
@@ -1967,7 +1967,7 @@ inline void gsedRelease(GSEnumeratedDirectory X)
 #include "GNUstepBase/GSIArray.h"
 
 /* Portable replacement for strdup - return a copy of original.  */
-inline char *custom_strdup (const char *original)
+static inline char *custom_strdup (const char *original)
 {
   char *result;
   unsigned length = sizeof(char) * (strlen (original) + 1);
@@ -1981,7 +1981,7 @@ inline char *custom_strdup (const char *original)
    The function takes for granted that path and file are correct
    filesystem paths; that path does not end with a path separator, and
    file does not begin with a path separator. */
-inline char *append_file_to_path (const char *path, const char *file)
+static inline char *append_file_to_path (const char *path, const char *file)
 {
   unsigned path_length = strlen(path);
   unsigned file_length = strlen(file);
diff --git a/Source/NSString.m b/Source/NSString.m
index 641f341d1..66262fe10 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -2063,8 +2063,8 @@ handle_printf_atsign (FILE *stream,
 }
 
 /**
- *  Returns based on string comparison if anObject is an NSString, else
- *  uses <code>==</code>.
+ *  Returns whether the receiver and an anObject are equals as strings.
+ *  If anObject isn't an NSString, returns NO.
  */
 - (BOOL) isEqual: (id)anObject
 {
diff --git a/Source/NSUnarchiver.m b/Source/NSUnarchiver.m
index c1062dc2f..3d4d2c761 100644
--- a/Source/NSUnarchiver.m
+++ b/Source/NSUnarchiver.m
@@ -256,7 +256,7 @@ static NSMutableDictionary	*clsDict;	/* Class information	*/
 }
 @end
 
-inline Class
+static inline Class
 mapClassObject(NSUnarchiverObjectInfo *info)
 {
   if (info->overrides == nil)
@@ -273,7 +273,7 @@ mapClassObject(NSUnarchiverObjectInfo *info)
     }
 }
 
-inline NSString*
+static inline NSString*
 mapClassName(NSUnarchiverObjectInfo *info)
 {
   if (info->overrides == nil)
diff --git a/Tools/make_strings/make_strings.m b/Tools/make_strings/make_strings.m
index 335195736..ef073fddf 100644
--- a/Tools/make_strings/make_strings.m
+++ b/Tools/make_strings/make_strings.m
@@ -118,7 +118,7 @@ static int ParseFile(const char *filename,NSMutableDictionary *tables)
 
   int depth=0;
 
-  static void add_arg_ch(int ch)
+  void add_arg_ch(int ch)
     {
       if (arg_len[num_args]+1>=arg_size[num_args])
 	{