diff --git a/Source/GSFormat.m b/Source/GSFormat.m
index 9448b4322..4a28ff8c8 100644
--- a/Source/GSFormat.m
+++ b/Source/GSFormat.m
@@ -761,11 +761,11 @@ parse_one_spec (const unichar *format, size_t posn, struct printf_spec *spec,
 
 static inline void GSStrAppendUnichar(GSStr s, unichar u)
 {
-  GSStrAppendUnichars(s, &u, 1);
+  GSPrivateStrAppendUnichars(s, &u, 1);
 }
 
 #define	outchar(Ch)		GSStrAppendUnichar(s, Ch)
-#define outstring(String, Len)	GSStrAppendUnichars(s, String, Len)
+#define outstring(String, Len)	GSPrivateStrAppendUnichars(s, String, Len)
 
 /* For handling long_double and longlong we use the same flag.  If
    `long' and `long long' are effectively the same type define it to
diff --git a/Source/GSPrivate.h b/Source/GSPrivate.h
index 6136c1d2d..e0293e37c 100644
--- a/Source/GSPrivate.h
+++ b/Source/GSPrivate.h
@@ -172,16 +172,6 @@ typedef struct {
 } GSStr_t;
 typedef	GSStr_t	*GSStr;
 
-/*
- * Function to append to GSStr
- */
-extern void GSStrAppendUnichars(GSStr s, const unichar *u, unsigned l);
-/*
- * Make the content of this string into unicode if it is not in
- * the external defaults C string encoding.
- */
-void GSStrExternalize(GSStr s);
-
 
 /*
  * Enumeration for MacOS-X compatibility user defaults settings.
@@ -242,6 +232,11 @@ GSPrivateAvailableEncodings() GS_ATTRIB_PRIVATE;
 void
 GSPrivateBuildStrings(void) GS_ATTRIB_PRIVATE;
 
+/* Used to check for termination of background tasks.
+ */
+BOOL
+GSPrivateCheckTasks(void) GS_ATTRIB_PRIVATE;
+
 /* get the default C-string encoding.
  */
 NSStringEncoding
@@ -285,16 +280,32 @@ GSPrivateIsByteEncoding(NSStringEncoding encoding) GS_ATTRIB_PRIVATE;
 BOOL
 GSPrivateIsEncodingSupported(NSStringEncoding encoding) GS_ATTRIB_PRIVATE;
 
-
-/*
- *	Functions used by the NSRunLoop and friends for processing
- *	queued notifications and task completion events.
+/* Function used by the NSRunLoop and friends for processing
+ * queued notifications which should be processed at the first safe moment.
  */
-BOOL GSPrivateCheckTasks(void) GS_ATTRIB_PRIVATE;
 void GSPrivateNotifyASAP(void) GS_ATTRIB_PRIVATE;
+
+/* Function used by the NSRunLoop and friends for processing
+ * queued notifications which should be processed when the loop is idle.
+ */
 void GSPrivateNotifyIdle(void) GS_ATTRIB_PRIVATE;
+
+/* Function used by the NSRunLoop and friends for determining whether
+ * there are more queued notifications to be processed.
+ */
 BOOL GSPrivateNotifyMore(void) GS_ATTRIB_PRIVATE;
 
+/* Function to append data to an GSStr
+ */
+void
+GSPrivateStrAppendUnichars(GSStr s, const unichar *u, unsigned l)
+  GS_ATTRIB_PRIVATE;
+
+/* Make the content of this string into unicode if it is not in
+ * the external defaults C string encoding.
+ */
+void
+GSPrivateStrExternalize(GSStr s) GS_ATTRIB_PRIVATE;
 
 #endif /* _GSPrivate_h_ */
 
diff --git a/Source/GSString.m b/Source/GSString.m
index 6d2c57d0f..794c371e4 100644
--- a/Source/GSString.m
+++ b/Source/GSString.m
@@ -5007,7 +5007,8 @@ NSAssert(_flags.free == 1 && _zone != 0, NSInternalInconsistencyException);
 /**
  * Append characters to a string.
  */
-void GSStrAppendUnichars(GSStr s, const unichar *u, unsigned l)
+void
+GSPrivateStrAppendUnichars(GSStr s, const unichar *u, unsigned l)
 {
   /*
    * Make the string wide if necessary.
@@ -5080,7 +5081,8 @@ void GSStrAppendUnichars(GSStr s, const unichar *u, unsigned l)
 }
 
 
-void GSStrExternalize(GSStr s)
+void
+GSPrivateStrExternalize(GSStr s)
 {
   if (s->_flags.wide == 0 && internalEncoding != externalEncoding)
     {
diff --git a/Source/NSString.m b/Source/NSString.m
index ce8fdeb3c..8f8c51c62 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -1087,7 +1087,7 @@ handle_printf_atsign (FILE *stream,
   f._flags.wide = 0;
   f._flags.free = 0;
   GSPrivateFormat(&f, fmt, argList, locale);
-  GSStrExternalize(&f);
+  GSPrivateStrExternalize(&f);
   if (fmt != fbuf)
     {
       objc_free(fmt);