diff --git a/src/ChangeLog b/src/ChangeLog
index 2fb5e03ca961543dcf1650751770fb8cecad8d24..1a7f0bbf7b0fbaea9c6c7b0f3917381ab24c8838 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2011-03-15  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* fileio.c (file_name_as_directory, directory_file_name):
+	(barf_or_query_if_file_exists, auto_save_error, auto_save_1):
+	Now static.
+
 	* minibuf.c (choose_minibuf_frame_1): Now static.
 	(Ftry_completion, Fall_completions): Rename or remove locals
 	to avoid shadowing.
diff --git a/src/fileio.c b/src/fileio.c
index 18e9dbe9680db7f97026d7cc97da0406099c8324..e68fcbc65b59d9e3d00950240759a080a0ac6152 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -433,7 +433,7 @@ get a current directory to run processes in.  */)
 }
 
 
-char *
+static char *
 file_name_as_directory (char *out, char *in)
 {
   int size = strlen (in) - 1;
@@ -496,7 +496,7 @@ For a Unix-syntax file name, just appends a slash.  */)
  * Value is nonzero if the string output is different from the input.
  */
 
-int
+static int
 directory_file_name (char *src, char *dst)
 {
   long slen;
@@ -1734,7 +1734,7 @@ expand_and_dir_to_file (Lisp_Object filename, Lisp_Object defdir)
 
    If QUICK is nonzero, we ask for y or n, not yes or no.  */
 
-void
+static void
 barf_or_query_if_file_exists (Lisp_Object absname, const char *querystring,
 			      int interactive, struct stat *statptr, int quick)
 {
@@ -5059,7 +5059,7 @@ An argument specifies the modification time value to use
   return Qnil;
 }
 
-Lisp_Object
+static Lisp_Object
 auto_save_error (Lisp_Object error)
 {
   Lisp_Object args[3], msg;
@@ -5095,7 +5095,7 @@ auto_save_error (Lisp_Object error)
   return Qnil;
 }
 
-Lisp_Object
+static Lisp_Object
 auto_save_1 (void)
 {
   struct stat st;