From 2c0b251b29eeafa90c84a3a938c744bc7ba81aea Mon Sep 17 00:00:00 2001
From: Pedro Alves <palves@redhat.com>
Date: Sat, 21 Feb 2009 16:14:50 +0000
Subject: [PATCH] 2008-02-21  Pedro Alves  <pedro@codesorcery.com>

	Silence a few -Wmissing-prototypes warnings.

	PR build/9877:
	* amd64-nat.c: Include "amd64-nat.h".
	* fork-child.c (_initialize_fork_child): Ditto.
	* gcore.c (_initialize_gcore): Ditto.
	* inf-ptrace.c: Include "inf-ptrace.h".
	(inf_ptrace_store_registers): Make it static.
	* linux-nat.c (linux_nat_terminal_ours): Make it static.
	(_initialize_linux_nat): Declare before definition.
	* linux-tdep.c: Include "linux-tdep.h".
	* linux-thread-db.c (_initialize_thread_db): Declare before
	definition.
	* proc-service.c (_initialize_proc_service): Ditto.
	* remote.c (remote_send_printf): Make it static.
	* solib.c: Include "solib.h".
	* symfile-mem.c (_initialize_symfile_mem): Declare before
	definition.
	* ada-lang.c (ada_la_decode, ada_match_name)
	(ada_suppress_symbol_printing, ada_is_array_type)
	(ada_value_ptr_subscript, ada_array_length)
	(ada_to_static_fixed_value): Make them static.
	(_initialize_ada_language): Declare before definition.
	* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
	(ada_task_list_changed, ada_new_objfile_observer): Make them
	static.
	(_initialize_tasks): Declare before definition.
	* addrmap.c (_initialize_addrmap): Declare before definition.
	* auxv.c (default_auxv_parse): Make it static.
	* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
	them static.
	* breakpoint.c (remove_sal): Add line break.
	(expand_line_sal_maybe): Make it static.
	* cp-name-parser.y: Include "cp-support.h".
	* cp-valprint.c (cp_find_class_member): Make it static.
	* eval.c (value_f90_subarray): Ditto.
	* exceptions.c (print_any_exception): Ditto.
	* findcmd.c (_initialize_mem_search): Declare before definition.
	* frame.c (frame_observer_target_changed): Make it static.
	* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
	* inf-child.c: Include "inf-child.h".
	* inferior.h (valid_inferior_id): Rename to ...
	(valid_gdb_inferior_id): ... this.
	* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
	Make them static.
	* jv-lang.c (java_language_arch_info): Make it static.
	* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
	* osdata.c (info_osdata_command): Make it static.
	* regcache.c (regcache_observer_target_changed): Make it static.
	* reverse.c (_initialize_reverse): Declare before definition.
	* stabsread.c (cleanup_undefined_types_noname)
	(cleanup_undefined_types_1): Make them static.
	* symfile.c (place_section): Make it static.
	* symtab.c (find_pc_sect_psymtab_closer): Make it static.
	* target-descriptions.c (_initialize_target_descriptions): Declare
	before definition.
	* target.c (default_get_ada_task_ptid, find_default_can_async_p)
	(find_default_is_async_p, find_default_supports_non_stop): Make
	them static.
	(target_supports_non_stop): Add prototype.
	(dummy_pid_to_str): Make it static.
	* utils.c (_initialize_utils): Declare before definition.
	* ada-exp.y (_initialize_ada_exp): Declare before definition.
	* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
	* target.h (struct target_ops): Add a prototype to the
	to_can_execute_reverse callback.
	* macroscope.c (_initialize_macroscope): Declare before definition.
	* cp-namespace.c (_initialize_cp_namespace): Declare before definition.
	* python/python.c (_initialize_python): Declare before definition.
	* tui/tui-command.c: Include "tui/tui-command.h".
	* tui/tui-data.c (init_content_element, init_win_info): Make them
	static.
	* tui/tui-disasm.c: Include "tui/tui-disasm.h".
	* tui/tui-interp.c (_initialize_tui_interp): Declare before
	definition.
	* tui/tui-layout.c: Include "tui/tui-layout.h".
	(_initialize_tui_layout): Declare before definition.
	* tui/tui-regs.c: Include "tui/tui-regs.h".
	(tui_display_reg_element_at_line): Make it static.
	(_initialize_tui_regs): Declare before definition.
	* tui/tui-stack.c (_initialize_tui_stack): Declare before
	definition.
	* tui/tui-win.c: Include "tui/tui-win.h".
	(_initialize_tui_win): Declare before definition.
	(tui_sigwinch_handler): Make it static.  Wrap in ifdef SIGWINCH.
	* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
	(tui_get_cmd_list): Add a prototype.
	* tui/tui-windata.c: Include tui-windata.h.
	* tui/tui-wingeneral.c (box_win): Make it static.
	* cli/cli-logging.c (show_logging_command): Make it static.
	(_initialize_cli_logging): Declare before definition.
	* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
	definition.
---
 gdb/ChangeLog             | 96 +++++++++++++++++++++++++++++++++++++++
 gdb/ada-exp.y             |  3 ++
 gdb/ada-lang.c            | 17 ++++---
 gdb/ada-tasks.c           | 11 +++--
 gdb/addrmap.c             |  3 ++
 gdb/amd64-nat.c           |  1 +
 gdb/auxv.c                |  2 +-
 gdb/bfd-target.c          |  4 +-
 gdb/breakpoint.c          |  5 +-
 gdb/cli/cli-logging.c     |  5 +-
 gdb/cp-name-parser.y      |  1 +
 gdb/cp-namespace.c        |  3 ++
 gdb/cp-valprint.c         |  2 +-
 gdb/eval.c                |  2 +-
 gdb/exceptions.c          |  2 +-
 gdb/findcmd.c             |  3 ++
 gdb/fork-child.c          |  3 ++
 gdb/frame.c               |  2 +-
 gdb/gcore.c               |  3 ++
 gdb/gnu-v3-abi.c          |  2 +-
 gdb/inf-child.c           |  1 +
 gdb/inf-ptrace.c          |  3 +-
 gdb/inferior.h            |  2 +-
 gdb/infrun.c              |  4 +-
 gdb/jv-lang.c             |  2 +-
 gdb/linux-nat.c           |  5 +-
 gdb/linux-tdep.c          |  1 +
 gdb/linux-thread-db.c     |  3 ++
 gdb/m2-typeprint.c        |  2 +-
 gdb/macroscope.c          |  2 +
 gdb/mi/mi-common.c        |  3 ++
 gdb/osdata.c              |  2 +-
 gdb/proc-service.c        |  3 ++
 gdb/python/python.c       |  3 ++
 gdb/regcache.c            |  2 +-
 gdb/remote.c              |  2 +-
 gdb/reverse.c             |  3 ++
 gdb/solib-svr4.c          |  2 +-
 gdb/solib.c               |  1 +
 gdb/stabsread.c           |  4 +-
 gdb/symfile-mem.c         |  4 ++
 gdb/symfile.c             |  2 +-
 gdb/symtab.c              |  2 +-
 gdb/target-descriptions.c |  3 ++
 gdb/target.c              | 12 ++---
 gdb/target.h              |  2 +-
 gdb/tui/tui-command.c     |  1 +
 gdb/tui/tui-data.c        |  4 +-
 gdb/tui/tui-disasm.c      |  1 +
 gdb/tui/tui-interp.c      |  3 ++
 gdb/tui/tui-layout.c      |  5 ++
 gdb/tui/tui-regs.c        |  6 ++-
 gdb/tui/tui-stack.c       |  4 ++
 gdb/tui/tui-win.c         | 10 +++-
 gdb/tui/tui-win.h         |  3 +-
 gdb/tui/tui-windata.c     |  1 +
 gdb/tui/tui-wingeneral.c  |  2 +-
 gdb/utils.c               |  3 ++
 58 files changed, 236 insertions(+), 52 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bce126beb5..b79ba28fef 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,99 @@
+2008-02-21  Pedro Alves  <pedro@codesorcery.com>
+
+	Silence a few -Wmissing-prototypes warnings.
+
+	PR build/9877:
+	* amd64-nat.c: Include "amd64-nat.h".
+	* fork-child.c (_initialize_fork_child): Ditto.
+	* gcore.c (_initialize_gcore): Ditto.
+	* inf-ptrace.c: Include "inf-ptrace.h".
+	(inf_ptrace_store_registers): Make it static.
+	* linux-nat.c (linux_nat_terminal_ours): Make it static.
+	(_initialize_linux_nat): Declare before definition.
+	* linux-tdep.c: Include "linux-tdep.h".
+	* linux-thread-db.c (_initialize_thread_db): Declare before
+	definition.
+	* proc-service.c (_initialize_proc_service): Ditto.
+	* remote.c (remote_send_printf): Make it static.
+	* solib.c: Include "solib.h".
+	* symfile-mem.c (_initialize_symfile_mem): Declare before
+	definition.
+	* ada-lang.c (ada_la_decode, ada_match_name)
+	(ada_suppress_symbol_printing, ada_is_array_type)
+	(ada_value_ptr_subscript, ada_array_length)
+	(ada_to_static_fixed_value): Make them static.
+	(_initialize_ada_language): Declare before definition.
+	* ada-tasks.c (ada_get_task_number, ada_get_environment_task)
+	(ada_task_list_changed, ada_new_objfile_observer): Make them
+	static.
+	(_initialize_tasks): Declare before definition.
+	* addrmap.c (_initialize_addrmap): Declare before definition.
+	* auxv.c (default_auxv_parse): Make it static.
+	* bfd-target.c (target_bfd_xfer_partial, target_bfd_xclose): Make
+	them static.
+	* breakpoint.c (remove_sal): Add line break.
+	(expand_line_sal_maybe): Make it static.
+	* cp-name-parser.y: Include "cp-support.h".
+	* cp-valprint.c (cp_find_class_member): Make it static.
+	* eval.c (value_f90_subarray): Ditto.
+	* exceptions.c (print_any_exception): Ditto.
+	* findcmd.c (_initialize_mem_search): Declare before definition.
+	* frame.c (frame_observer_target_changed): Make it static.
+	* gnu-v3-abi.c (gnuv3_find_method_in): Make it static.
+	* inf-child.c: Include "inf-child.h".
+	* inferior.h (valid_inferior_id): Rename to ...
+	(valid_gdb_inferior_id): ... this.
+	* infrun.c (infrun_thread_stop_requested, siginfo_make_value):
+	Make them static.
+	* jv-lang.c (java_language_arch_info): Make it static.
+	* m2-typeprint.c (m2_get_discrete_bounds): Ditto.
+	* osdata.c (info_osdata_command): Make it static.
+	* regcache.c (regcache_observer_target_changed): Make it static.
+	* reverse.c (_initialize_reverse): Declare before definition.
+	* stabsread.c (cleanup_undefined_types_noname)
+	(cleanup_undefined_types_1): Make them static.
+	* symfile.c (place_section): Make it static.
+	* symtab.c (find_pc_sect_psymtab_closer): Make it static.
+	* target-descriptions.c (_initialize_target_descriptions): Declare
+	before definition.
+	* target.c (default_get_ada_task_ptid, find_default_can_async_p)
+	(find_default_is_async_p, find_default_supports_non_stop): Make
+	them static.
+	(target_supports_non_stop): Add prototype.
+	(dummy_pid_to_str): Make it static.
+	* utils.c (_initialize_utils): Declare before definition.
+	* ada-exp.y (_initialize_ada_exp): Declare before definition.
+	* solib-svr4.c (HAS_LM_DYNAMIC_FROM_LINK_MAP): Add a prototype.
+	* target.h (struct target_ops): Add a prototype to the
+	to_can_execute_reverse callback.
+	* macroscope.c (_initialize_macroscope): Declare before definition. 
+	* cp-namespace.c (_initialize_cp_namespace): Declare before definition. 
+	* python/python.c (_initialize_python): Declare before definition.
+	* tui/tui-command.c: Include "tui/tui-command.h".
+	* tui/tui-data.c (init_content_element, init_win_info): Make them
+	static.
+	* tui/tui-disasm.c: Include "tui/tui-disasm.h".
+	* tui/tui-interp.c (_initialize_tui_interp): Declare before
+	definition.
+	* tui/tui-layout.c: Include "tui/tui-layout.h".
+	(_initialize_tui_layout): Declare before definition.
+	* tui/tui-regs.c: Include "tui/tui-regs.h".
+	(tui_display_reg_element_at_line): Make it static.
+	(_initialize_tui_regs): Declare before definition.
+	* tui/tui-stack.c (_initialize_tui_stack): Declare before
+	definition.
+	* tui/tui-win.c: Include "tui/tui-win.h".
+	(_initialize_tui_win): Declare before definition.
+	(tui_sigwinch_handler): Make it static.  Wrap in ifdef SIGWINCH.
+	* tui/tui-win.h (tui_sigwinch_handler): Delete declaration.
+	(tui_get_cmd_list): Add a prototype.
+	* tui/tui-windata.c: Include tui-windata.h.
+	* tui/tui-wingeneral.c (box_win): Make it static.
+	* cli/cli-logging.c (show_logging_command): Make it static.
+	(_initialize_cli_logging): Declare before definition.
+	* mi/mi-common.c (_initialize_gdb_mi_common): Declare before
+	definition.
+
 2009-02-20  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	* Extend use of i386_use_watchpoints to all i386 native files
diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index b71be36ad4..243b152451 100644
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -1520,6 +1520,9 @@ type_system_address (void)
   return  type != NULL ? type : parse_type->builtin_data_ptr;
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_ada_exp;
+
 void
 _initialize_ada_exp (void)
 {
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index a6d5757164..671cb35b21 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -1201,7 +1201,7 @@ ada_decode_symbol (const struct general_symbol_info *gsymbol)
   return *resultp;
 }
 
-char *
+static char *
 ada_la_decode (const char *encoded, int options)
 {
   return xstrdup (ada_decode (encoded));
@@ -1214,7 +1214,7 @@ ada_la_decode (const char *encoded, int options)
    suffix of SYM_NAME minus the same suffixes.  Also returns 0 if
    either argument is NULL.  */
 
-int
+static int
 ada_match_name (const char *sym_name, const char *name, int wild)
 {
   if (sym_name == NULL || name == NULL)
@@ -1235,7 +1235,7 @@ ada_match_name (const char *sym_name, const char *name, int wild)
 /* True (non-zero) iff, in Ada mode, the symbol SYM should be
    suppressed in info listings.  */
 
-int
+static int
 ada_suppress_symbol_printing (struct symbol *sym)
 {
   if (SYMBOL_DOMAIN (sym) == STRUCT_DOMAIN)
@@ -1570,7 +1570,7 @@ ada_is_direct_array_type (struct type *type)
 /* Non-zero iff TYPE represents any kind of array in Ada, or a pointer
  * to one. */
 
-int
+static int
 ada_is_array_type (struct type *type)
 {
   while (type != NULL 
@@ -2315,7 +2315,7 @@ ada_value_subscript (struct value *arr, int arity, struct value **ind)
    value of the element of *ARR at the ARITY indices given in
    IND.  Does not read the entire array into memory.  */
 
-struct value *
+static struct value *
 ada_value_ptr_subscript (struct value *arr, struct type *type, int arity,
                          struct value **ind)
 {
@@ -2574,7 +2574,7 @@ ada_array_bound (struct value *arr, int n, int which)
    Does not work for arrays indexed by enumeration types with representation
    clauses at the moment.  */
 
-struct value *
+static struct value *
 ada_array_length (struct value *arr, int n)
 {
   struct type *arr_type = ada_check_typedef (value_type (arr));
@@ -7532,7 +7532,7 @@ ada_to_fixed_value (struct value *val)
    without consulting any runtime values.  For Ada dynamic-sized
    types, therefore, the type of the result is likely to be inaccurate.  */
 
-struct value *
+static struct value *
 ada_to_static_fixed_value (struct value *val)
 {
   struct type *type =
@@ -11067,6 +11067,9 @@ const struct language_defn ada_language_defn = {
   LANG_MAGIC
 };
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_ada_language;
+
 void
 _initialize_ada_language (void)
 {
diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
index 3639472abc..61ed06e7e9 100644
--- a/gdb/ada-tasks.c
+++ b/gdb/ada-tasks.c
@@ -154,7 +154,7 @@ static int stale_task_list_p = 1;
 /* Return the task number of the task whose ptid is PTID, or zero
    if the task could not be found.  */
 
-int
+static int
 ada_get_task_number (ptid_t ptid)
 {
   int i;
@@ -199,7 +199,7 @@ valid_task_id (int task_num)
 /* Return the task info associated to the Environment Task.
    This function assumes that the inferior does in fact use tasking.  */
 
-struct ada_task_info *
+static struct ada_task_info *
 ada_get_environment_task (void)
 {
   ada_build_task_list (0);
@@ -942,7 +942,7 @@ Task switching not supported when debugging from core files\n\
 
 /* Indicate that the task list may have changed, so invalidate the cache.  */
 
-void
+static void
 ada_task_list_changed (void)
 {
   stale_task_list_p = 1;  
@@ -960,7 +960,7 @@ ada_normal_stop_observer (struct bpstats *unused_args, int unused_args2)
 
 /* A routine to be called when the objfiles have changed.  */
 
-void
+static void
 ada_new_objfile_observer (struct objfile *objfile)
 {
   /* Invalidate all cached data that were extracted from an objfile.  */
@@ -973,6 +973,9 @@ ada_new_objfile_observer (struct objfile *objfile)
   ada_tasks_check_symbol_table = 1;
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_tasks;
+
 void
 _initialize_tasks (void)
 {
diff --git a/gdb/addrmap.c b/gdb/addrmap.c
index aa5afeb55b..4b119f5d00 100644
--- a/gdb/addrmap.c
+++ b/gdb/addrmap.c
@@ -533,6 +533,9 @@ addrmap_create_mutable (struct obstack *obstack)
 
 /* Initialization.  */
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_addrmap;
+
 void
 _initialize_addrmap (void)
 {
diff --git a/gdb/amd64-nat.c b/gdb/amd64-nat.c
index c78bc909f7..f72842dbf6 100644
--- a/gdb/amd64-nat.c
+++ b/gdb/amd64-nat.c
@@ -26,6 +26,7 @@
 
 #include "i386-tdep.h"
 #include "amd64-tdep.h"
+#include "amd64-nat.h"
 
 /* The following bits of code help with implementing debugging 32-bit
    code natively on AMD64.  The idea is to define two mappings between
diff --git a/gdb/auxv.c b/gdb/auxv.c
index 2c42529685..5007cd007d 100644
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -79,7 +79,7 @@ procfs_xfer_auxv (struct target_ops *ops,
    Return 0 if *READPTR is already at the end of the buffer.
    Return -1 if there is insufficient buffer for a whole entry.
    Return 1 if an entry was read into *TYPEP and *VALP.  */
-int
+static int
 default_auxv_parse (struct target_ops *ops, gdb_byte **readptr,
 		   gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp)
 {
diff --git a/gdb/bfd-target.c b/gdb/bfd-target.c
index aed669bbee..5ce9e19f3a 100644
--- a/gdb/bfd-target.c
+++ b/gdb/bfd-target.c
@@ -66,7 +66,7 @@ build_target_sections_from_bfd (struct target_ops *targ, struct bfd *abfd)
   gdb_assert (cl.end - start <= count);
 }
 
-LONGEST
+static LONGEST
 target_bfd_xfer_partial (struct target_ops *ops,
 			 enum target_object object,
 			 const char *annex, gdb_byte *readbuf,
@@ -107,7 +107,7 @@ target_bfd_xfer_partial (struct target_ops *ops,
     }
 }
 
-void
+static void
 target_bfd_xclose (struct target_ops *t, int quitting)
 {
   bfd_close (t->to_data);
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 8a7057b03f..b63f0c4d6b 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -5157,7 +5157,8 @@ create_breakpoint (struct symtabs_and_lines sals, char *addr_string,
 
 /* Remove element at INDEX_TO_REMOVE from SAL, shifting other
    elements to fill the void space.  */
-static void remove_sal (struct symtabs_and_lines *sal, int index_to_remove)
+static void
+remove_sal (struct symtabs_and_lines *sal, int index_to_remove)
 {
   int i = index_to_remove+1;
   int last_index = sal->nelts-1;
@@ -5182,7 +5183,7 @@ static void remove_sal (struct symtabs_and_lines *sal, int index_to_remove)
    line in all existing instantiations of 'foo'.
 
 */
-struct symtabs_and_lines
+static struct symtabs_and_lines
 expand_line_sal_maybe (struct symtab_and_line sal)
 {
   struct symtabs_and_lines expanded;
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index 4e7b65577b..bafc913e3e 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -170,7 +170,7 @@ Usage: set logging on [FILENAME]\n\
        set logging redirect [on|off]\n"));
 }
 
-void
+static void
 show_logging_command (char *args, int from_tty)
 {
   if (saved_filename)
@@ -191,6 +191,9 @@ show_logging_command (char *args, int from_tty)
     printf_unfiltered (_("Output will be logged and displayed.\n"));
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_cli_logging;
+
 void
 _initialize_cli_logging (void)
 {
diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y
index 60a9a7ff16..5f5ee3ac1d 100644
--- a/gdb/cp-name-parser.y
+++ b/gdb/cp-name-parser.y
@@ -42,6 +42,7 @@ Boston, MA 02110-1301, USA.  */
 #include "safe-ctype.h"
 #include "libiberty.h"
 #include "demangle.h"
+#include "cp-support.h"
 
 /* Bison does not make it easy to create a parser without global
    state, unfortunately.  Here are all the global variables used
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index b22f0311cc..c6c5617744 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -811,6 +811,9 @@ maintenance_cplus_namespace (char *args, int from_tty)
     }
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_cp_namespace;
+
 void
 _initialize_cp_namespace (void)
 {
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 56aeaede9a..8b7d868eab 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -502,7 +502,7 @@ cp_print_static_field (struct type *type,
    field number.  If OFFSET is not exactly at the start of some field, set
    *DOMAIN to NULL.  */
 
-void
+static void
 cp_find_class_member (struct type **domain_p, int *fieldno,
 		      LONGEST offset)
 {
diff --git a/gdb/eval.c b/gdb/eval.c
index 038334b5e4..1d3557135c 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -413,7 +413,7 @@ init_array_element (struct value *array, struct value *element,
   return index;
 }
 
-struct value *
+static struct value *
 value_f90_subarray (struct value *array,
 		    struct expression *exp, int *pos, enum noside noside)
 {
diff --git a/gdb/exceptions.c b/gdb/exceptions.c
index ed48e6d21c..4383ad3825 100644
--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -356,7 +356,7 @@ exception_fprintf (struct ui_file *file, struct gdb_exception e,
     }
 }
 
-void
+static void
 print_any_exception (struct ui_file *file, const char *prefix,
 		     struct gdb_exception e)
 {
diff --git a/gdb/findcmd.c b/gdb/findcmd.c
index 4e7fa09f8f..7ae43e5dc5 100644
--- a/gdb/findcmd.c
+++ b/gdb/findcmd.c
@@ -311,6 +311,9 @@ find_command (char *args, int from_tty)
   do_cleanups (old_cleanups);
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_mem_search;
+
 void
 _initialize_mem_search (void)
 {
diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index 8cd87e1199..a1726bd543 100644
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -543,6 +543,9 @@ unset_exec_wrapper_command (char *args, int from_tty)
   exec_wrapper = NULL;
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_fork_child;
+
 void
 _initialize_fork_child (void)
 {
diff --git a/gdb/frame.c b/gdb/frame.c
index f0aefb5620..dfd6b3d53c 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1145,7 +1145,7 @@ get_next_frame (struct frame_info *this_frame)
 
 /* Observer for the target_changed event.  */
 
-void
+static void
 frame_observer_target_changed (struct target_ops *target)
 {
   reinit_frame_cache ();
diff --git a/gdb/gcore.c b/gdb/gcore.c
index 754fb2c882..ec1be44de8 100644
--- a/gdb/gcore.c
+++ b/gdb/gcore.c
@@ -511,6 +511,9 @@ gcore_memory_sections (bfd *obfd)
   return 1;
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_gcore;
+
 void
 _initialize_gcore (void)
 {
diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index ea0a7a4eb7..3a52df3c40 100644
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -482,7 +482,7 @@ gnuv3_baseclass_offset (struct type *type, int index, const bfd_byte *valaddr,
    which has virtual table index VOFFSET.  The method has an associated
    "this" adjustment of ADJUSTMENT bytes.  */
 
-const char *
+static const char *
 gnuv3_find_method_in (struct type *domain, CORE_ADDR voffset,
 		      LONGEST adjustment)
 {
diff --git a/gdb/inf-child.c b/gdb/inf-child.c
index 2e95c9bd2d..4171d1ef1a 100644
--- a/gdb/inf-child.c
+++ b/gdb/inf-child.c
@@ -27,6 +27,7 @@
 #include "target.h"
 #include "inferior.h"
 #include "gdb_string.h"
+#include "inf-child.h"
 
 /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
    for all registers.  */
diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index 06792007cd..35f425c6cf 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -32,6 +32,7 @@
 #include "gdb_wait.h"
 #include <signal.h>
 
+#include "inf-ptrace.h"
 #include "inf-child.h"
 #include "gdbthread.h"
 
@@ -761,7 +762,7 @@ inf_ptrace_store_register (const struct regcache *regcache, int regnum)
 /* Store register REGNUM back into the inferior.  If REGNUM is -1, do
    this for all registers.  */
 
-void
+static void
 inf_ptrace_store_registers (struct regcache *regcache, int regnum)
 {
   if (regnum == -1)
diff --git a/gdb/inferior.h b/gdb/inferior.h
index 5427677c5c..c4594112d3 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -479,7 +479,7 @@ extern int in_inferior_list (int pid);
 
 /* Boolean test for an already-known inferior id (GDB's homegrown id,
    not the system's).  */
-extern int valid_inferior_id (int num);
+extern int valid_gdb_inferior_id (int num);
 
 /* Search function to lookup a inferior by target 'pid'.  */
 extern struct inferior *find_inferior_pid (int pid);
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 2afc738010..59fee8b9b3 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1660,7 +1660,7 @@ infrun_thread_stop_requested_callback (struct thread_info *info, void *arg)
    Cleanup local state that assumed the PTID was to be resumed, and
    report the stop to the frontend.  */
 
-void
+static void
 infrun_thread_stop_requested (ptid_t ptid)
 {
   struct displaced_step_request *it, *next, *prev = NULL;
@@ -4848,7 +4848,7 @@ static struct lval_funcs siginfo_value_funcs =
    the current thread.  Return a void value if there's no object
    available.  */
 
-struct value *
+static struct value *
 siginfo_make_value (struct internalvar *var)
 {
   struct type *type;
diff --git a/gdb/jv-lang.c b/gdb/jv-lang.c
index 07288664b0..b702ebf27e 100644
--- a/gdb/jv-lang.c
+++ b/gdb/jv-lang.c
@@ -1054,7 +1054,7 @@ enum java_primitive_types
   nr_java_primitive_types
 };
 
-void
+static void
 java_language_arch_info (struct gdbarch *gdbarch,
 			 struct language_arch_info *lai)
 {
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index adb763a6b2..4c91e4ff03 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -4558,7 +4558,7 @@ linux_nat_terminal_inferior (void)
 
 /* target_terminal_ours implementation.  */
 
-void
+static void
 linux_nat_terminal_ours (void)
 {
   if (!target_is_async_p ())
@@ -4799,6 +4799,9 @@ linux_nat_setup_async (void)
   fcntl (linux_nat_event_pipe[1], F_SETFL, O_NONBLOCK);
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_linux_nat;
+
 void
 _initialize_linux_nat (void)
 {
diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index f1f73735e3..e18e134ed3 100644
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -19,6 +19,7 @@
 
 #include "defs.h"
 #include "gdbtypes.h"
+#include "linux-tdep.h"
 
 /* This function is suitable for architectures that don't
    extend/override the standard siginfo structure.  */
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index d3371d053a..68ec157795 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -1175,6 +1175,9 @@ init_thread_db_ops (void)
   thread_db_ops.to_magic = OPS_MAGIC;
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_thread_db;
+
 void
 _initialize_thread_db (void)
 {
diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index 0c7a0b4163..162ef9fbcd 100644
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -371,7 +371,7 @@ m2_is_long_set (struct type *type)
                             This should be integrated into gdbtypes.c
                             inside get_discrete_bounds.  */
 
-int
+static int
 m2_get_discrete_bounds (struct type *type, LONGEST *lowp, LONGEST *highp)
 {
   CHECK_TYPEDEF (type);
diff --git a/gdb/macroscope.c b/gdb/macroscope.c
index c27785a9c9..18852611b0 100644
--- a/gdb/macroscope.c
+++ b/gdb/macroscope.c
@@ -151,6 +151,8 @@ standard_macro_lookup (const char *name, void *baton)
   return result;
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_macroscope;
 
 void
 _initialize_macroscope (void)
diff --git a/gdb/mi/mi-common.c b/gdb/mi/mi-common.c
index 5fafb1d8cc..45385270ac 100644
--- a/gdb/mi/mi-common.c
+++ b/gdb/mi/mi-common.c
@@ -42,6 +42,9 @@ async_reason_lookup (enum async_reply_reason reason)
   return async_reason_string_lookup[reason];
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_gdb_mi_common;
+
 void
 _initialize_gdb_mi_common (void)
 {
diff --git a/gdb/osdata.c b/gdb/osdata.c
index 06506dddba..3d2c23c79f 100644
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -278,7 +278,7 @@ get_osdata_column (struct osdata_item *item, const char *name)
   return NULL;
 }
 
-void
+static void
 info_osdata_command (char *type, int from_tty)
 {
   struct osdata *osdata = NULL;
diff --git a/gdb/proc-service.c b/gdb/proc-service.c
index a07c9a4e86..425afd9b0f 100644
--- a/gdb/proc-service.c
+++ b/gdb/proc-service.c
@@ -335,6 +335,9 @@ ps_getpid (gdb_ps_prochandle_t ph)
   return ph->pid;
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_proc_service;
+
 void
 _initialize_proc_service (void)
 {
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 4f97416f2a..b3a27d6ed9 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -355,6 +355,9 @@ show_python (char *args, int from_tty)
 
 /* Initialize the Python code.  */
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_python;
+
 void
 _initialize_python (void)
 {
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 6366e11cb2..2604d287f7 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -447,7 +447,7 @@ struct regcache *get_current_regcache (void)
 
 /* Observer for the target_changed event.  */
 
-void
+static void
 regcache_observer_target_changed (struct target_ops *target)
 {
   registers_changed ();
diff --git a/gdb/remote.c b/gdb/remote.c
index af2c10b767..51a238cc23 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -5709,7 +5709,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, gdb_byte *buffer, int mem_len,
    FORMAT and the remaining arguments, then gets the reply.  Returns
    whether the packet was a success, a failure, or unknown.  */
 
-enum packet_result
+static enum packet_result
 remote_send_printf (const char *format, ...)
 {
   struct remote_state *rs = get_remote_state ();
diff --git a/gdb/reverse.c b/gdb/reverse.c
index 63eb95d219..bbd3a60918 100644
--- a/gdb/reverse.c
+++ b/gdb/reverse.c
@@ -103,6 +103,9 @@ reverse_finish (char *args, int from_tty)
   exec_reverse_once ("finish", args, from_tty);
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_reverse;
+
 void
 _initialize_reverse (void)
 {
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index b437cee3cb..5970a7e4a7 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -149,7 +149,7 @@ LM_ADDR_FROM_LINK_MAP (struct so_list *so)
 }
 
 static int
-HAS_LM_DYNAMIC_FROM_LINK_MAP ()
+HAS_LM_DYNAMIC_FROM_LINK_MAP (void)
 {
   struct link_map_offsets *lmo = svr4_fetch_link_map_offsets ();
 
diff --git a/gdb/solib.c b/gdb/solib.c
index 5a282920a1..f3e03a16ef 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -45,6 +45,7 @@
 #include "observer.h"
 #include "readline/readline.h"
 #include "remote.h"
+#include "solib.h"
 
 /* Architecture-specific operations.  */
 
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index 3457784d12..2d7eb15a96 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -4264,7 +4264,7 @@ add_undefined_type (struct type *type, int typenums[2])
 
 /* Try to fix all undefined types pushed on the UNDEF_TYPES vector.  */
 
-void
+static void
 cleanup_undefined_types_noname (void)
 {
   int i;
@@ -4299,7 +4299,7 @@ cleanup_undefined_types_noname (void)
    yet defined at the time a pointer to it was made.
    Fix:  Do a full lookup on the struct/union tag.  */
 
-void
+static void
 cleanup_undefined_types_1 (void)
 {
   struct type **type;
diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index 0a9c8d93c0..e336350f9f 100644
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -208,6 +208,10 @@ try using the \"file\" command first."));
 }
 
 
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_symfile_mem;
+
 void
 _initialize_symfile_mem (void)
 {
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 21328b89f2..6a0a8e5104 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -480,7 +480,7 @@ struct place_section_arg
 /* Find a unique offset to use for loadable section SECT if
    the user did not provide an offset.  */
 
-void
+static void
 place_section (bfd *abfd, asection *sect, void *obj)
 {
   struct place_section_arg *arg = obj;
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 97d7950d7c..1ef92a8d91 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -770,7 +770,7 @@ matching_obj_sections (struct obj_section *obj_first,
 /* Find which partial symtab contains PC and SECTION starting at psymtab PST.
    We may find a different psymtab than PST.  See FIND_PC_SECT_PSYMTAB.  */
 
-struct partial_symtab *
+static struct partial_symtab *
 find_pc_sect_psymtab_closer (CORE_ADDR pc, struct obj_section *section,
 			     struct partial_symtab *pst,
 			     struct minimal_symbol *msymbol)
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 9ff66ddd94..c1eec14542 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -1125,6 +1125,9 @@ maint_print_c_tdesc_cmd (char *args, int from_tty)
   printf_unfiltered ("}\n");
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_target_descriptions;
+
 void
 _initialize_target_descriptions (void)
 {
diff --git a/gdb/target.c b/gdb/target.c
index 937b26a560..fbff40c4f5 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -370,7 +370,7 @@ kill_or_be_killed (int from_tty)
    the PTID lwp and tid elements.  The pid used is the pid of the
    inferior_ptid.  */
 
-ptid_t
+static ptid_t
 default_get_ada_task_ptid (long lwp, long tid)
 {
   return ptid_build (ptid_get_pid (inferior_ptid), lwp, tid);
@@ -2207,7 +2207,7 @@ find_default_create_inferior (struct target_ops *ops,
   return;
 }
 
-int
+static int
 find_default_can_async_p (void)
 {
   struct target_ops *t;
@@ -2222,7 +2222,7 @@ find_default_can_async_p (void)
   return 0;
 }
 
-int
+static int
 find_default_is_async_p (void)
 {
   struct target_ops *t;
@@ -2237,7 +2237,7 @@ find_default_is_async_p (void)
   return 0;
 }
 
-int
+static int
 find_default_supports_non_stop (void)
 {
   struct target_ops *t;
@@ -2249,7 +2249,7 @@ find_default_supports_non_stop (void)
 }
 
 int
-target_supports_non_stop ()
+target_supports_non_stop (void)
 {
   struct target_ops *t;
   for (t = &current_target; t != NULL; t = t->beneath)
@@ -2523,7 +2523,7 @@ normal_pid_to_str (ptid_t ptid)
   return buf;
 }
 
-char *
+static char *
 dummy_pid_to_str (struct target_ops *ops, ptid_t ptid)
 {
   return normal_pid_to_str (ptid);
diff --git a/gdb/target.h b/gdb/target.h
index 916d8e949d..c3d6c03ee5 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -538,7 +538,7 @@ struct target_ops
 			     CORE_ADDR *found_addrp);
 
     /* Can target execute in reverse?  */
-    int (*to_can_execute_reverse) ();
+    int (*to_can_execute_reverse) (void);
 
     /* Does this target support debugging multiple processes
        simultaneously?  */
diff --git a/gdb/tui/tui-command.c b/gdb/tui/tui-command.c
index 7ce04f3154..13afb65db7 100644
--- a/gdb/tui/tui-command.c
+++ b/gdb/tui/tui-command.c
@@ -26,6 +26,7 @@
 #include "tui/tui-data.h"
 #include "tui/tui-win.h"
 #include "tui/tui-io.h"
+#include "tui/tui-command.h"
 
 #include "gdb_curses.h"
 #include "gdb_string.h"
diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index 25190776df..655a5d09b1 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -483,7 +483,7 @@ tui_init_generic_part (struct tui_gen_win_info *win)
 
 /* init_content_element().
  */
-void
+static void
 init_content_element (struct tui_win_element *element, 
 		      enum tui_win_type type)
 {
@@ -532,7 +532,7 @@ init_content_element (struct tui_win_element *element,
     }
 }
 
-void
+static void
 init_win_info (struct tui_win_info *win_info)
 {
   tui_init_generic_part (&win_info->generic);
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index c079087e17..14f0496c31 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -35,6 +35,7 @@
 #include "tui/tui-winsource.h"
 #include "tui/tui-stack.h"
 #include "tui/tui-file.h"
+#include "tui/tui-disasm.h"
 
 #include "gdb_curses.h"
 
diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c
index bf38aae3e0..71f6656080 100644
--- a/gdb/tui/tui-interp.c
+++ b/gdb/tui/tui-interp.c
@@ -190,6 +190,9 @@ tui_command_loop (void *data)
   return;
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_tui_interp;
+
 void
 _initialize_tui_interp (void)
 {
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 3b6bb663fa..09fd0c3e89 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -36,6 +36,7 @@
 #include "tui/tui-win.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-disasm.h"
+#include "tui/tui-layout.h"
 
 #include "gdb_string.h"
 #include "gdb_curses.h"
@@ -375,6 +376,10 @@ tui_default_win_viewport_height (enum tui_win_type type,
 
 /* Function to initialize gdb commands, for tui window layout
    manipulation.  */
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_tui_layout;
+
 void
 _initialize_tui_layout (void)
 {
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index b74ad15cca..86a2457fc5 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -36,6 +36,7 @@
 #include "tui/tui-windata.h"
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-file.h"
+#include "tui/tui-regs.h"
 #include "reggroups.h"
 #include "valprint.h"
 
@@ -416,7 +417,7 @@ tui_display_registers_from (int start_element_no)
    'start_element_no' on 'start_line_no' until the end of the register
    content or the end of the display height.  This function checks
    that we won't display off the end of the register display.  */
-void
+static void
 tui_display_reg_element_at_line (int start_element_no,
 				 int start_line_no)
 {
@@ -604,6 +605,9 @@ tui_reg_command (char *args, int from_tty)
   help_list (tuireglist, "tui reg ", -1, gdb_stdout);
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_tui_regs;
+
 void
 _initialize_tui_regs (void)
 {
diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c
index e95bd083ad..ccc9b9ffdb 100644
--- a/gdb/tui/tui-stack.c
+++ b/gdb/tui/tui-stack.c
@@ -411,6 +411,10 @@ tui_show_frame_info (struct frame_info *fi)
 
 /* Function to initialize gdb commands, for tui window stack
    manipulation.  */
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_tui_stack;
+
 void
 _initialize_tui_stack (void)
 {
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 5ec56b6957..b101cdd533 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -43,6 +43,7 @@
 #include "tui/tui-source.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-windata.h"
+#include "tui/tui-win.h"
 
 #include "gdb_curses.h"
 
@@ -348,6 +349,10 @@ tui_get_cmd_list (void)
 
 /* Function to initialize gdb commands, for tui window
    manipulation.  */
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_tui_win;
+
 void
 _initialize_tui_win (void)
 {
@@ -803,17 +808,18 @@ tui_resize_all (void)
     }
 }
 
-
+#ifdef SIGWINCH
 /* SIGWINCH signal handler for the tui.  This signal handler is always
    called, even when the readline package clears signals because it is
    set as the old_sigwinch() (TUI only).  */
-void
+static void
 tui_sigwinch_handler (int signal)
 {
   /* Say that a resize was done so that the readline can do it later
      when appropriate.  */
   tui_set_win_resized_to (TRUE);
 }
+#endif
 
 /* Initializes SIGWINCH signal handler for the tui.  */
 void
diff --git a/gdb/tui/tui-win.h b/gdb/tui/tui-win.h
index 23630e6e18..34cefb4c19 100644
--- a/gdb/tui/tui-win.h
+++ b/gdb/tui/tui-win.h
@@ -36,7 +36,6 @@ extern void tui_scroll (enum tui_scroll_direction,
 extern void tui_set_win_focus_to (struct tui_win_info *);
 extern void tui_resize_all (void);
 extern void tui_refresh_all_win (void);
-extern void tui_sigwinch_handler (int);
 
 extern chtype tui_border_ulcorner;
 extern chtype tui_border_urcorner;
@@ -55,6 +54,6 @@ extern void tui_initialize_win (void);
 extern void tui_update_gdb_sizes (void);
 
 /* Create or get the TUI command list.  */
-struct cmd_list_element **tui_get_cmd_list ();
+struct cmd_list_element **tui_get_cmd_list (void);
 
 #endif
diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c
index f15cb84370..b852065973 100644
--- a/gdb/tui/tui-windata.c
+++ b/gdb/tui/tui-windata.c
@@ -25,6 +25,7 @@
 #include "tui/tui-data.h"
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-regs.h"
+#include "tui/tui-windata.h"
 
 #include "gdb_string.h"
 #include "gdb_curses.h"
diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index 6d6bdf5800..39b7118d2b 100644
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -77,7 +77,7 @@ tui_delete_win (WINDOW *window)
 
 
 /* Draw a border arround the window.  */
-void
+static void
 box_win (struct tui_gen_win_info *win_info, 
 	 int highlight_flag)
 {
diff --git a/gdb/utils.c b/gdb/utils.c
index 6719ae1cd2..92248391ee 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -3541,6 +3541,9 @@ gdb_buildargv (const char *s)
   return argv;
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_utils;
+
 void
 _initialize_utils (void)
 {