diff --git a/gdb/gdbtk/generic/gdbtk-cmds.c b/gdb/gdbtk/generic/gdbtk-cmds.c
index 9b6a67e..42f2b1e 100644
--- a/gdb/gdbtk/generic/gdbtk-cmds.c
+++ b/gdb/gdbtk/generic/gdbtk-cmds.c
@@ -1528,11 +1528,8 @@ gdb_search (ClientData clientData, Tcl_Interp *interp,
 */
 
 static int
-gdb_listfuncs (clientData, interp, objc, objv)
-     ClientData clientData;
-     Tcl_Interp *interp;
-     int objc;
-     Tcl_Obj *CONST objv[];
+gdb_listfuncs (ClientData clientData, Tcl_Interp *interp,
+	       int objc, Tcl_Obj *CONST objv[])
 {
   struct symtab *symtab;
   struct blockvector *bv;
diff --git a/gdb/gdbtk/generic/gdbtk-hooks.c b/gdb/gdbtk/generic/gdbtk-hooks.c
index e1445e9..4aa8d06 100644
--- a/gdb/gdbtk/generic/gdbtk-hooks.c
+++ b/gdb/gdbtk/generic/gdbtk-hooks.c
@@ -194,9 +194,7 @@ gdbtk_restore_result_ptr (void *old_result_ptr)
 /* This allows you to Tcl_Eval a tcl command which takes
    a command word, and then a single argument. */
 int
-gdbtk_two_elem_cmd (cmd_name, argv1)
-     char *cmd_name;
-     char *argv1;
+gdbtk_two_elem_cmd (char *cmd_name, char *argv1)
 {
   char *command;
   int result, flags_ptr, arg_len, cmd_len;
@@ -364,7 +362,7 @@ gdbtk_warning (const char *warning, va_list args)
 /* the gdbtk dbug command.  */
 
 void
-report_error ()
+report_error (void)
 {
   TclDebug ('E', Tcl_GetVar (gdbtk_interp, "errorInfo", TCL_GLOBAL_ONLY));
   /*  Tcl_BackgroundError(gdbtk_interp); */
@@ -518,7 +516,7 @@ gdbtk_readline (char *prompt)
 }
 
 static void
-gdbtk_readline_end ()
+gdbtk_readline_end (void)
 {
   if (Tcl_Eval (gdbtk_interp, "gdbtk_tcl_readline_end") != TCL_OK)
     report_error ();
@@ -644,7 +642,7 @@ gdbtk_pre_add_symbol (const char *name)
 
 /* This hook is called whenever we finish loading a symbol file. */
 static void
-gdbtk_post_add_symbol ()
+gdbtk_post_add_symbol (void)
 {
   if (Tcl_Eval (gdbtk_interp, "gdbtk_tcl_post_add_symbol") != TCL_OK)
     report_error ();
@@ -783,7 +781,7 @@ gdbtk_exec_file_display (char *filename)
 /* Called from error_begin, this hook is used to warn the gui
    about multi-line error messages */
 static void
-gdbtk_error_begin ()
+gdbtk_error_begin (void)
 {
   if (result_ptr != NULL)
     result_ptr->flags |= GDBTK_ERROR_ONLY;
@@ -816,7 +814,7 @@ gdbtk_annotate_signal (void)
 }
 
 static void
-gdbtk_attach ()
+gdbtk_attach (void)
 {
   if (Tcl_Eval (gdbtk_interp, "after idle \"update idletasks;gdbtk_attached\"") != TCL_OK)
     {
@@ -825,7 +823,7 @@ gdbtk_attach ()
 }
 
 static void
-gdbtk_detach ()
+gdbtk_detach (void)
 {
   if (Tcl_Eval (gdbtk_interp, "gdbtk_detached") != TCL_OK)
     {
diff --git a/gdb/gdbtk/generic/gdbtk-register.c b/gdb/gdbtk/generic/gdbtk-register.c
index 8f40d94..4f95c89 100644
--- a/gdb/gdbtk/generic/gdbtk-register.c
+++ b/gdb/gdbtk/generic/gdbtk-register.c
@@ -462,7 +462,7 @@ register_changed_p (int regnum, map_arg arg)
 }
 
 static void
-setup_architecture_data ()
+setup_architecture_data (void)
 {
   int numregs;
 
diff --git a/gdb/gdbtk/generic/gdbtk-wrapper.c b/gdb/gdbtk/generic/gdbtk-wrapper.c
index 491ffa3..8e0fc87 100644
--- a/gdb/gdbtk/generic/gdbtk-wrapper.c
+++ b/gdb/gdbtk/generic/gdbtk-wrapper.c
@@ -1,5 +1,5 @@
 /* longjmp-free interface between gdb and gdbtk.
-   Copyright (C) 1999, 2000, 2002, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2008, 2013 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -271,10 +271,7 @@ wrap_evaluate_expression (char *a)
 }
 
 gdb_result
-GDB_value_equal (val1, val2, result)
-     value_ptr val1;
-     value_ptr val2;
-     int *result;
+GDB_value_equal (value_ptr val1, value_ptr val2, int *result)
 {
   struct gdb_wrapper_arguments args;
   gdb_result r;
@@ -422,7 +419,7 @@ wrap_block_innermost_frame (char *opaque_arg)
 }
 
 gdb_result
-GDB_reinit_frame_cache ()
+GDB_reinit_frame_cache (void)
 {
   gdb_result r;
 
@@ -500,9 +497,7 @@ wrap_value_slice (char *opaque_arg)
 }
 
 gdb_result
-GDB_value_coerce_array (val, rval)
-     value_ptr val;
-     value_ptr *rval;
+GDB_value_coerce_array (value_ptr val, value_ptr *rval)
 {
   struct gdb_wrapper_arguments args;
   gdb_result r;
diff --git a/gdb/gdbtk/generic/gdbtk.c b/gdb/gdbtk/generic/gdbtk.c
index d205347..ea13943 100644
--- a/gdb/gdbtk/generic/gdbtk.c
+++ b/gdb/gdbtk/generic/gdbtk.c
@@ -250,14 +250,14 @@ cleanup_init (void *ignore)
    via the QUIT macro.  */
 
 void
-gdbtk_interactive ()
+gdbtk_interactive (void)
 {
   /* Tk_DoOneEvent (TK_DONT_WAIT|TK_IDLE_EVENTS); */
 }
 
 /* Start a timer which will keep the GUI alive while in target_wait. */
 void
-gdbtk_start_timer ()
+gdbtk_start_timer (void)
 {
   static int first = 1;
 
@@ -304,7 +304,7 @@ gdbtk_start_timer ()
 
 /* Stop the timer if it is running. */
 void
-gdbtk_stop_timer ()
+gdbtk_stop_timer (void)
 {
   if (gdbtk_timer_going)
     {
@@ -688,7 +688,7 @@ gdbtk_test (char *filename)
 /* Come here during initialize_all_files () */
 
 void
-_initialize_gdbtk ()
+_initialize_gdbtk (void)
 {
   /* Current_interpreter not set yet, so we must check
      if "interpreter_p" is set to "insight" to know if