diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6d49fec347..1568a9e102 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-07  Yao Qi  <yao@codesourcery.com>
+
+	* gnu-nat.c (make_inf) Update declaration.
+	(make_inf): Make it static.
+	(inf_set_traced): Likewise.
+	(inf_port_to_thread, inf_task_died_status): Likewise.
+
 2014-01-07  Yao Qi  <yao@codesourcery.com>
 
 	* gnu-nat.c (inf_tid_to_proc): Remove declaration.
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 7e58b4fbbf..68e7459cc4 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -87,7 +87,7 @@ int gnu_debug_flag = 0;
 
 /* Forward decls */
 
-struct inf *make_inf ();
+static struct inf *make_inf ();
 void inf_clear_wait (struct inf *inf);
 void inf_cleanup (struct inf *inf);
 void inf_startup (struct inf *inf, int pid);
@@ -637,7 +637,7 @@ _proc_free (struct proc *proc)
 }
 
 
-struct inf *
+static struct inf *
 make_inf (void)
 {
   struct inf *inf = xmalloc (sizeof (struct inf));
@@ -873,7 +873,7 @@ inf_validate_task_sc (struct inf *inf)
    is.  If INF is running, the resume_sc count of INF's threads will
    be modified, and the signal thread will briefly be run to change
    the trace state.  */
-void
+static void
 inf_set_traced (struct inf *inf, int on)
 {
   if (on == inf->traced)
@@ -974,7 +974,7 @@ inf_tid_to_thread (struct inf *inf, int tid)
 }
 
 /* Converts a thread port to a struct proc.  */
-struct proc *
+static struct proc *
 inf_port_to_thread (struct inf *inf, mach_port_t port)
 {
   struct proc *thread = inf->threads;
@@ -1742,7 +1742,7 @@ S_exception_raise_request (mach_port_t port, mach_port_t reply_port,
 
 /* Fill in INF's wait field after a task has died without giving us more
    detailed information.  */
-void
+static void
 inf_task_died_status (struct inf *inf)
 {
   warning (_("Pid %d died with unknown exit status, using SIGKILL."),