diff --git a/include/X11/Xaw3d/List.h b/include/X11/Xaw3d/List.h
index 99e61dfb9cc5bd6d939792fdcb8dc69b7cfe8a65..087fc4e7c2e262992c0023902c518502d8fc8fa3 100644
--- a/include/X11/Xaw3d/List.h
+++ b/include/X11/Xaw3d/List.h
@@ -181,7 +181,7 @@ _XFUNCPROTOBEGIN
 
 extern void XawListChange(
     Widget		/* w */,
-    String*		/* list */,
+    char**		/* list */,
     int			/* nitems */,
     int			/* longest */,
 #if NeedWidePrototypes
diff --git a/src/AsciiSrc.c b/src/AsciiSrc.c
index 0581040a643aa969b22dd78cdc113b4e232b12c8..c3d73fa33ef0b0d69fcf7cd4278ee7d249ae01d6 100644
--- a/src/AsciiSrc.c
+++ b/src/AsciiSrc.c
@@ -111,7 +111,7 @@ static void Initialize(Widget, Widget, ArgList, Cardinal *);
 static void Destroy(Widget);
 static void GetValuesHook(Widget, ArgList, Cardinal *);
 static String MyStrncpy(char *, char *, int);
-static String StorePiecesInString(AsciiSrcObject);
+static char * StorePiecesInString(AsciiSrcObject);
 static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
 static Boolean WriteToFile(_Xconst _XtString, _Xconst _XtString);
 
@@ -927,10 +927,10 @@ WriteToFile(_Xconst _XtString string, _Xconst _XtString name)
  *	Returns: none.
  */
 
-static String
+static char *
 StorePiecesInString(AsciiSrcObject src)
 {
-  String string;
+  char * string;
   XawTextPosition first;
   Piece * piece;
 
diff --git a/src/MultiSrc.c b/src/MultiSrc.c
index a1b20353cacc35fb2643e1f164e2676647325798..86703ae439341c0c4fc3119cfb506fe513196bb1 100644
--- a/src/MultiSrc.c
+++ b/src/MultiSrc.c
@@ -137,8 +137,6 @@ static Boolean WriteToFile(String, String);
 static void (MyWStrncpy)();
 #endif
 
-extern char *tmpnam(String);
-
 extern wchar_t* _XawTextMBToWC(Display *, char *, int *);
 extern char *_XawTextWCToMB(Display *, wchar_t *, int *);