diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 0a5edef6982..a7b520cdd16 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -184,9 +184,10 @@ show_args_command (struct ui_file *file, int from_tty,
   deprecated_show_value_hack (file, from_tty, c, get_inferior_args ());
 }
 
-/* See gdbsupport/common-inferior.h.  */
+/* Set the inferior current working directory.  If CWD is NULL, unset
+   the directory.  */
 
-void
+static void
 set_inferior_cwd (const char *cwd)
 {
   struct inferior *inf = current_inferior ();
diff --git a/gdbserver/inferiors.cc b/gdbserver/inferiors.cc
index 3750090c0a1..0a09de79071 100644
--- a/gdbserver/inferiors.cc
+++ b/gdbserver/inferiors.cc
@@ -241,7 +241,7 @@ get_inferior_cwd ()
   return current_inferior_cwd;
 }
 
-/* See gdbsupport/common-inferior.h.  */
+/* See inferiors.h.  */
 
 void
 set_inferior_cwd (const char *cwd)
diff --git a/gdbserver/inferiors.h b/gdbserver/inferiors.h
index 7754f745cd7..3b8959a28cf 100644
--- a/gdbserver/inferiors.h
+++ b/gdbserver/inferiors.h
@@ -154,4 +154,8 @@ void *thread_target_data (struct thread_info *);
 struct regcache *thread_regcache_data (struct thread_info *);
 void set_thread_regcache_data (struct thread_info *, struct regcache *);
 
+/* Set the inferior current working directory.  If CWD is NULL, unset
+   the directory.  */
+void set_inferior_cwd (const char *cwd);
+
 #endif /* GDBSERVER_INFERIORS_H */
diff --git a/gdbsupport/common-inferior.h b/gdbsupport/common-inferior.h
index 3f1b60fd962..5e1221277b8 100644
--- a/gdbsupport/common-inferior.h
+++ b/gdbsupport/common-inferior.h
@@ -36,10 +36,6 @@ extern const char *get_exec_file (int err);
    been set, then return NULL.  */
 extern const char *get_inferior_cwd ();
 
-/* Set the inferior current working directory.  If CWD is NULL, unset
-   the directory.  */
-extern void set_inferior_cwd (const char *cwd);
-
 /* Whether to start up the debuggee under a shell.
 
    If startup-with-shell is set, GDB's "run" will attempt to start up