* src/xinerama.c (free_xinerama): take void arguments. prototype updated.

(init_xinerama): likewise

* src/window.c (init_window_stuff): take void arguments. prototype updated.
(free_window_stuff): likewise

* src/split.c (remove_all_splits): take void arguments. prototype updated.
(current_frame): likewise
(init_frame_lists): likewise
(find_last_frame): likewise
(current_window): likewise
(remove_all_splits): likewise
(hide_frame_indicator): likewise
(show_frame_indicator): likewise

* src/main.c (check_child_procs): take void arguments. prototype updated.
(clean_up): likewise

* src/number.c (numset_new): take void arguments. prototype updated.

* src/manage.c (clear_unmanaged_list): take void arguments. prototype updated.
(list_unmanaged_windows): likewise
(ungrab_keys_all_wins): likewise
(grab_keys_all_wins): likewise
(current_screen): likewise
(unhide_all_windows): likewise

* src/main.c (sighandler): static function
(hup_handler): likewise
(alrm_handler): likewise
(handler): likewise
(print_version): likewise
(print_help): likewise
(show_welcome_message): take void arguments
(init_defaults): likewise

* src/input.c (ring_bell): take void arguments. prototype updated
(update_modifier_map): likewise

* src/history.c (get_history_filename): take void arguments
(history_load): take void arguments. prototype updated
(history_save): likewise
(history_reset): likewise
(history_previous): likewise
(history_next): likewise
(history_list_items): likewise

* src/group.c (group_in_list): static function
(init_groups): take void arguments. prototype updated
(free_groups): likewise
(group_next_group): likewise
(group_prev_group): likewise

* src/globals.c (x_export_selection): take void arguments
(get_cut_buffer): likewise
(get_primary_selection): likewise
(get_selection): take void arguments. protype updated.
(init_globals): likewise

* src/events.c (selection_clear): take void arguments
(handle_signals): likewise
(listen_for_events): take void argumens. prototype updated

* src/bar.c (reset_alarm): take void arguments
(show_last_message): take void arguments. prototype updated.
(free_bar): likewise

* src/actions.c (init_set_vars): static function. take void arguments
(clear_frame_redos): take void arguments
(pop_frame_undo): likewise
(pop_frame_redo): likewise
(keymap_new): static function
(parse_keydesc): likewise
(trivial_completions): likewise
(keymap_completions): likewise
(window_completions): likewise
(group_completions): likewise
(colon_completions): likewise
(exec_completions): likewise
(hook_completions): likewise
(var_completions): likewise
(update_all_gcs): take void arguments
(grab_rat): likewise
(ungrab_rat): likewise
(init_user_commands): take void arguments. prototype updated.
(free_keymaps): likewise
(free_aliases): likewise

27 files changed, 210 insertions, 120 deletions

diff --git a/ChangeLog b/ChangeLog
index b8e3d07..6382b73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,93 @@
+2006-05-23  Shawn Betts  <sabetts@vcn.bc.ca>
+
+	* src/xinerama.c (free_xinerama): take void arguments. prototype updated.
+	(init_xinerama): likewise
+
+	* src/window.c (init_window_stuff): take void arguments. prototype updated.
+	(free_window_stuff): likewise
+
+	* src/split.c (remove_all_splits): take void arguments. prototype updated.
+	(current_frame): likewise
+	(init_frame_lists): likewise
+	(find_last_frame): likewise
+	(current_window): likewise
+	(remove_all_splits): likewise
+	(hide_frame_indicator): likewise
+	(show_frame_indicator): likewise
+
+	* src/main.c (check_child_procs): take void arguments. prototype updated.
+	(clean_up): likewise
+
+	* src/number.c (numset_new): take void arguments. prototype updated.
+
+	* src/manage.c (clear_unmanaged_list): take void arguments. prototype updated.
+	(list_unmanaged_windows): likewise
+	(ungrab_keys_all_wins): likewise
+	(grab_keys_all_wins): likewise
+	(current_screen): likewise
+	(unhide_all_windows): likewise
+
+	* src/main.c (sighandler): static function
+	(hup_handler): likewise
+	(alrm_handler): likewise
+	(handler): likewise
+	(print_version): likewise
+	(print_help): likewise
+	(show_welcome_message): take void arguments
+	(init_defaults): likewise
+
+	* src/input.c (ring_bell): take void arguments. prototype updated
+	(update_modifier_map): likewise
+
+	* src/history.c (get_history_filename): take void arguments
+	(history_load): take void arguments. prototype updated
+	(history_save): likewise
+	(history_reset): likewise
+	(history_previous): likewise
+	(history_next): likewise
+	(history_list_items): likewise
+
+	* src/group.c (group_in_list): static function
+	(init_groups): take void arguments. prototype updated
+	(free_groups): likewise
+	(group_next_group): likewise
+	(group_prev_group): likewise
+
+	* src/globals.c (x_export_selection): take void arguments
+	(get_cut_buffer): likewise
+	(get_primary_selection): likewise
+	(get_selection): take void arguments. protype updated.
+	(init_globals): likewise
+
+	* src/events.c (selection_clear): take void arguments
+	(handle_signals): likewise
+	(listen_for_events): take void argumens. prototype updated
+
+	* src/bar.c (reset_alarm): take void arguments
+	(show_last_message): take void arguments. prototype updated.
+	(free_bar): likewise
+
+	* src/actions.c (init_set_vars): static function. take void arguments
+	(clear_frame_redos): take void arguments
+	(pop_frame_undo): likewise
+	(pop_frame_redo): likewise
+	(keymap_new): static function
+	(parse_keydesc): likewise
+	(trivial_completions): likewise
+	(keymap_completions): likewise
+	(window_completions): likewise
+	(group_completions): likewise
+	(colon_completions): likewise
+	(exec_completions): likewise
+	(hook_completions): likewise
+	(var_completions): likewise
+	(update_all_gcs): take void arguments
+	(grab_rat): likewise
+	(ungrab_rat): likewise
+	(init_user_commands): take void arguments. prototype updated.
+	(free_keymaps): likewise
+	(free_aliases): likewise
+
 2006-05-21  Shawn Betts  <sabetts@vcn.bc.ca>
 
 	* src/conf.h (DEFAULT_FONT): changed
diff --git a/src/actions.c b/src/actions.c
index 9c097db..3674d28 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -92,8 +92,8 @@ add_set_var (char *name, cmdret * (*fn)(struct cmdarg **), int nargs, ...)
   list_add (&var->node, &set_vars);
 }
 
-void
-init_set_vars()
+static void
+init_set_vars(void)
 {
   add_set_var ("resizeunit", set_resizeunit, 1, "", arg_NUMBER);
   add_set_var ("maxundos", set_maxundos, 1, "", arg_NUMBER);
@@ -153,7 +153,7 @@ add_command (char *name, cmdret * (*fn)(int, struct cmdarg **), int nargs, int i
 }
 
 void
-init_user_commands()
+init_user_commands(void)
 {
   /*@begin (tag required for genrpbindings) */
   add_command ("abort",         cmd_abort,      0, 0, 0);
@@ -365,7 +365,7 @@ static char* fdump (rp_screen *screen);
 
 /* Delete all entries in the redo list. */
 static void
-clear_frame_redos ()
+clear_frame_redos (void)
 {
   rp_frame_undo *cur;
   struct list_head *tmp, *iter;
@@ -428,14 +428,14 @@ pop_frame_list (struct list_head *undo_list, struct list_head *redo_list)
 
 /* Pop the head of the frame undo list off and put it in the redo list. */
 static rp_frame_undo *
-pop_frame_undo ()
+pop_frame_undo (void)
 {
   return pop_frame_list (&rp_frame_undos, &rp_frame_redos);
 }
 
 /* Pop the head of the frame redo list off and put it in the undo list. */
 static rp_frame_undo *
-pop_frame_redo ()
+pop_frame_redo (void)
 {
   return pop_frame_list (&rp_frame_redos, &rp_frame_undos);
 }
@@ -566,7 +566,7 @@ remove_keybinding (KeySym keysym, unsigned int state, rp_keymap *map)
   return 0;
 }
 
-rp_keymap *
+static rp_keymap *
 keymap_new (char *name)
 {
   rp_keymap *map;
@@ -789,7 +789,7 @@ keymap_free (rp_keymap *map)
 }
 
 void
-free_keymaps ()
+free_keymaps (void)
 {
   rp_keymap *cur;
   struct list_head *tmp, *iter;
@@ -802,7 +802,7 @@ free_keymaps ()
 }
 
 void
-free_aliases ()
+free_aliases (void)
 {
   int i;
 
@@ -833,7 +833,7 @@ static int string_to_keysym (char *str)
 }
 
 /* Parse a key description. 's' is, naturally, the key description. */
-cmdret *
+static cmdret *
 parse_keydesc (char *s, struct rp_key *key)
 {
   char *token, *next_token, *keydesc;
@@ -1183,7 +1183,7 @@ string_to_window_number (char *str)
   return *s ? -1 : i;
 }
 
-struct list_head *
+static struct list_head *
 trivial_completions (char* str)
 {
   struct list_head *list;
@@ -1195,7 +1195,7 @@ trivial_completions (char* str)
   return list;
 }
 
-struct list_head *
+static struct list_head *
 keymap_completions (char* str)
 {
   rp_keymap *cur;
@@ -1217,7 +1217,7 @@ keymap_completions (char* str)
   return list;
 }
 
-struct list_head *
+static struct list_head *
 window_completions (char* str)
 {
   rp_window_elem *cur;
@@ -1467,7 +1467,7 @@ read_keydesc (struct argspec *spec, struct sbuf *s, struct cmdarg **arg)
   return cmdret_new (RET_SUCCESS, NULL);
 }
 
-struct list_head *
+static struct list_head *
 group_completions (char *str)
 {
   struct list_head *list;
@@ -1500,7 +1500,7 @@ group_completions (char *str)
   return list;
 }
 
-struct list_head *
+static struct list_head *
 colon_completions (char* str)
 {
   int i;
@@ -1543,7 +1543,7 @@ read_command (struct argspec *spec, struct sbuf *s, struct cmdarg **arg)
   return read_string (spec, s, colon_completions, arg);
 }
 
-struct list_head *
+static struct list_head *
 exec_completions (char *str)
 {
   size_t n = 256;
@@ -1885,7 +1885,7 @@ read_group (struct argspec *spec, struct sbuf *s,  struct cmdarg **arg)
   return cmdret_new (RET_SUCCESS, NULL);
 }
 
-struct list_head *
+static struct list_head *
 hook_completions (char* str)
 {
   struct list_head *list;
@@ -1953,7 +1953,7 @@ find_variable (char *str)
   return NULL;
 }
 
-struct list_head *
+static struct list_head *
 var_completions (char *str)
 {
   struct list_head *list;
@@ -3434,7 +3434,7 @@ update_gc (rp_screen *s)
 }
 
 static void
-update_all_gcs ()
+update_all_gcs (void)
 {
   int i;
 
@@ -4734,7 +4734,7 @@ cmd_gdelete (int interactive, struct cmdarg **args)
 }
 
 static void
-grab_rat ()
+grab_rat (void)
 {
   XGrabPointer (dpy, current_screen()->root, True, 0,
                 GrabModeAsync, GrabModeAsync,
@@ -4742,7 +4742,7 @@ grab_rat ()
 }
 
 static void
-ungrab_rat ()
+ungrab_rat (void)
 {
   XUngrabPointer (dpy, CurrentTime);
 }
diff --git a/src/actions.h b/src/actions.h
index 34bf3cc..d17c6d3 100644
--- a/src/actions.h
+++ b/src/actions.h
@@ -210,12 +210,12 @@ RP_CMD (getsel);
 void del_frame_undo (rp_frame_undo *u);
 
 rp_keymap *find_keymap (char *name);
-void init_user_commands();
+void init_user_commands(void);
 void initialize_default_keybindings (void);
 void cmdret_free (cmdret *ret);
 void keymap_free (rp_keymap *map);
-void free_aliases ();
-void free_keymaps ();
+void free_aliases (void);
+void free_keymaps (void);
 char *wingravity_to_string (int g);
 rp_action* find_keybinding (KeySym keysym, unsigned int state, rp_keymap *map);
 rp_action* find_keybinding_by_action (char *action, rp_keymap *map);
diff --git a/src/bar.c b/src/bar.c
index a44ef5c..b1b7880 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -46,7 +46,7 @@ static int last_mark_end = 0;
 
 /* Reset the alarm to auto-hide the bar in BAR_TIMEOUT seconds. */
 static void
-reset_alarm ()
+reset_alarm (void)
 {
   alarm (defaults.bar_timeout);
   alarm_signalled = 0;
@@ -519,7 +519,7 @@ marked_message (char *msg, int mark_start, int mark_end)
 }
 
 void
-show_last_message ()
+show_last_message (void)
 {
   char *msg;
 
@@ -536,7 +536,7 @@ show_last_message ()
 
 /* Free any memory associated with the bar. */
 void
-free_bar ()
+free_bar (void)
 {
   if (last_msg)
     free (last_msg);
diff --git a/src/bar.h b/src/bar.h
index 4991f76..f5a4110 100644
--- a/src/bar.h
+++ b/src/bar.h
@@ -32,7 +32,7 @@ int bar_x (rp_screen *s, int width);
 void message (char *s);
 void marked_message (char *s, int mark_start, int mark_end);
 void marked_message_printf (int mark_start, int mark_end, char *fmt, ...);
-void show_last_message ();
-void free_bar ();
+void show_last_message (void);
+void free_bar (void);
 
 #endif /* ! _RATPOISON_BAR_H */
diff --git a/src/events.c b/src/events.c
index dec08b8..eb40ff0 100644
--- a/src/events.c
+++ b/src/events.c
@@ -780,7 +780,7 @@ selection_request (XSelectionRequestEvent *rq)
 }
 
 static void
-selection_clear ()
+selection_clear (void)
 {
   if (selection.text)
     free (selection.text);
@@ -884,7 +884,7 @@ delegate_event (XEvent *ev)
 }
 
 static void
-handle_signals ()
+handle_signals (void)
 {
   /* An alarm means we need to hide the popup windows. */
   if (alarm_signalled > 0)
@@ -968,7 +968,7 @@ handle_signals ()
 
 /* The main loop. */
 void
-listen_for_events ()
+listen_for_events (void)
 {
   int x_fd;
   fd_set fds;
diff --git a/src/events.h b/src/events.h
index aa23692..69eb27d 100644
--- a/src/events.h
+++ b/src/events.h
@@ -22,7 +22,7 @@
 #ifndef _RATPOISON_EVENTS_H
 #define _RATPOISON_EVENTS_H 1
 
-void listen_for_events ();
+void listen_for_events (void);
 void show_rudeness_msg (rp_window *win, int raised);
 
 #endif /* _RATPOISON_EVENTS_H */
diff --git a/src/globals.c b/src/globals.c
index 6534cc8..42fc985 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -84,7 +84,7 @@ struct numset *rp_frame_numset;
 rp_xselection selection;
 
 static void
-x_export_selection ()
+x_export_selection (void)
 {
   /* Hang the selections off screen 0's key window. */
   XSetSelectionOwner(dpy, XA_PRIMARY, screens[0].key_window, CurrentTime);
@@ -126,7 +126,7 @@ set_selection (char *txt)
 }
 
 static char *
-get_cut_buffer ()
+get_cut_buffer (void)
 {
   int nbytes;
   char *data;
@@ -148,7 +148,7 @@ get_cut_buffer ()
 
 /* Lifted the code from rxvt. */
 static char *
-get_primary_selection()
+get_primary_selection(void)
 {
   long            nread;
   unsigned long   bytes_after;
@@ -175,7 +175,7 @@ get_primary_selection()
 }
 
 char *
-get_selection ()
+get_selection (void)
 {
   Atom property;
   XEvent ev;
@@ -257,7 +257,7 @@ LIST_HEAD (rp_frame_undos);
 LIST_HEAD (rp_frame_redos);
 
 void
-init_globals ()
+init_globals (void)
 {
   selection.text = NULL;
   selection.len = 0;
diff --git a/src/globals.h b/src/globals.h
index d80e31a..d603472 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -171,8 +171,8 @@ extern struct list_head rp_frame_redos;
 extern rp_xselection selection;
 void set_selection (char *txt);
 void set_nselection (char *txt, int len);
-char *get_selection ();
+char *get_selection (void);
 
-void init_globals ();
+void init_globals (void);
 
 #endif
diff --git a/src/group.c b/src/group.c
index 5f2a3fd..4f0f816 100644
--- a/src/group.c
+++ b/src/group.c
@@ -25,7 +25,7 @@
 static struct numset *group_numset;
 
 void
-init_groups()
+init_groups(void)
 {
   rp_group *g;
 
@@ -40,7 +40,7 @@ init_groups()
 }
 
 void
-free_groups()
+free_groups(void)
 {
   rp_group *cur;
   struct list_head *iter, *tmp;
@@ -92,13 +92,13 @@ group_add_new_group (char *name)
 }
 
 rp_group *
-group_next_group ()
+group_next_group (void)
 {
   return list_next_entry (rp_current_group, &rp_groups, node);
 }
 
 rp_group *
-group_prev_group ()
+group_prev_group (void)
 {
   return list_prev_entry (rp_current_group, &rp_groups, node);
 }
@@ -216,7 +216,7 @@ group_insert_window (struct list_head *h, rp_window_elem *w)
   list_add_tail(&w->node, h);
 }
 
-int
+static int
 group_in_list (struct list_head *h, rp_window_elem *w)
 {
   rp_window_elem *cur;
diff --git a/src/group.h b/src/group.h
index f315c29..8e781c0 100644
--- a/src/group.h
+++ b/src/group.h
@@ -21,8 +21,8 @@
 #ifndef GROUP_H
 #define GROUP_H
 
-void init_groups ();
-void free_groups();
+void init_groups (void);
+void free_groups (void);
 
 void group_add_window (rp_group *g, rp_window *w);
 void group_resort_window (rp_group *g, rp_window_elem *w);
@@ -48,8 +48,8 @@ rp_group *groups_find_group_by_group (rp_group *g);
 
 rp_window *group_last_window (rp_group *g, rp_screen *screen);
 
-rp_group *group_prev_group ();
-rp_group *group_next_group ();
+rp_group *group_prev_group (void);
+rp_group *group_next_group (void);
 
 rp_group *group_add_new_group (char *name);
 
diff --git a/src/history.c b/src/history.c
index e8e513a..1da410e 100644
--- a/src/history.c
+++ b/src/history.c
@@ -29,7 +29,7 @@
 #include "readline/history.h"
 
 static char *
-get_history_filename ()
+get_history_filename (void)
 {
   char *homedir = getenv ("HOME");
   char *filename;
@@ -48,7 +48,7 @@ get_history_filename ()
 }
 
 void
-history_load ()
+history_load (void)
 {
   char *filename = get_history_filename ();
 
@@ -59,7 +59,7 @@ history_load ()
 }
 
 void
-history_save ()
+history_save (void)
 {
   char *filename = get_history_filename ();
 
@@ -76,7 +76,7 @@ history_resize (int size)
 }
 
 void
-history_reset ()
+history_reset (void)
 {
   using_history();
 }
@@ -94,7 +94,7 @@ history_add (char *item)
 }
 
 char *
-history_previous ()
+history_previous (void)
 {
   HIST_ENTRY *h = NULL;
 
@@ -104,7 +104,7 @@ history_previous ()
 }
 
 char *
-history_next ()
+history_next (void)
 {
   HIST_ENTRY *h = NULL;
 
@@ -114,7 +114,7 @@ history_next ()
 }
 
 char *
-history_list_items ()
+history_list_items (void)
 {
   HIST_ENTRY **hlist;
   struct sbuf *list;
diff --git a/src/history.h b/src/history.h
index 6752c2c..94ec147 100644
--- a/src/history.h
+++ b/src/history.h
@@ -21,14 +21,14 @@
 #ifndef _RATPOISON_HISTORY_H
 #define _RATPOISON_HISTORY_H 1
 
-void  history_load ();
-void  history_save ();
+void  history_load (void);
+void  history_save (void);
 void  history_resize (int size);
-void  history_reset ();
+void  history_reset (void);
 void  history_add (char *item);
-char *history_next ();
-char *history_previous ();
-char *history_list_items ();
+char *history_next (void);
+char *history_previous (void);
+char *history_list_items (void);
 int   history_expand_line (char *string, char **output);
 
 #endif /* ! _RATPOISON_HISTORY_H */
diff --git a/src/input.c b/src/input.c
index 331a021..cadd5cb 100644
--- a/src/input.c
+++ b/src/input.c
@@ -117,7 +117,7 @@ rp_mask_to_x11_mask (unsigned int mask)
 
 /* Figure out what keysyms are attached to what modifiers */
 void
-update_modifier_map ()
+update_modifier_map (void)
 {
   unsigned int modmasks[] =
     { Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask };
@@ -430,7 +430,7 @@ update_input_window (rp_screen *s, rp_input_line *line)
 }
 
 void
-ring_bell ()
+ring_bell (void)
 {
 #ifdef VISUAL_BELL
   GC lgc;
diff --git a/src/input.h b/src/input.h
index c5115a4..f3da6bc 100644
--- a/src/input.h
+++ b/src/input.h
@@ -29,9 +29,9 @@ char *get_more_input (char *prompt, char *preinput, completion_fn fn);
 int read_key (KeySym *keysym, unsigned int *modifiers, char *keysym_name, int len);
 unsigned int x11_mask_to_rp_mask (unsigned int mask);
 unsigned int rp_mask_to_x11_mask (unsigned int mask);
-void update_modifier_map ();
+void update_modifier_map (void);
 void grab_key (KeySym keysym, unsigned int modifiers, Window grab_window);
 
-void ring_bell ();
+void ring_bell (void);
 
 #endif /* ! _RATPOISON_INPUT_H */
diff --git a/src/main.c b/src/main.c
index 651d9a9..05e09f6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -163,19 +163,19 @@ str_comp (char *s1, char *s2, int len)
   return 1;
 }
 
-void
+static void
 sighandler (int signum)
 {
   kill_signalled++;
 }
 
-void
+static void
 hup_handler (int signum)
 {
   hup_signalled++;
 }
 
-void
+static void
 alrm_handler (int signum)
 {
   alarm_signalled++;
@@ -184,7 +184,7 @@ alrm_handler (int signum)
 /* Check for child processes that have quit but haven't been
    acknowledged yet. Update their structure. */
 void
-check_child_procs ()
+check_child_procs (void)
 {
   rp_child_info *cur;
   int pid, status;
@@ -221,7 +221,7 @@ chld_handler (int signum)
   errno = serrno;
 }
 
-int
+static int
 handler (Display *d, XErrorEvent *e)
 {
   char error_msg[100];
@@ -280,8 +280,8 @@ set_sig_handler (int sig, void (*action)(int))
     }
 }
 
-void
-print_version ()
+static void
+print_version (void)
 {
   printf ("%s %s (built %s %s)\n", PACKAGE, VERSION, __DATE__, __TIME__);
   printf ("Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Shawn Betts\n\n");
@@ -289,8 +289,8 @@ print_version ()
   exit (EXIT_SUCCESS);
 }
 
-void
-print_help ()
+static void
+print_help (void)
 {
   printf ("Help for %s %s\n\n", PACKAGE, VERSION);
   printf ("-h, --help            Display this help screen\n");
@@ -425,7 +425,7 @@ read_startup_files (char *alt_rcfile)
 /* Odd that we spend so much code on making sure the silly welcome
    message is correct. Oh well... */
 static void
-show_welcome_message ()
+show_welcome_message (void)
 {
   rp_action *help_action;
   char *prefix, *help;
@@ -463,7 +463,7 @@ show_welcome_message ()
 }
 
 static void
-init_defaults ()
+init_defaults (void)
 {
   defaults.top_kmap = xstrdup(TOP_KEYMAP);
 
@@ -722,7 +722,7 @@ free_screen (rp_screen *s)
 }
 
 void
-clean_up ()
+clean_up (void)
 {
   int i;
 
diff --git a/src/manage.c b/src/manage.c
index f2d1a0c..9e9ba2f 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -37,7 +37,7 @@ static char **unmanaged_window_list = NULL;
 static int num_unmanaged_windows = 0;
 
 void
-clear_unmanaged_list ()
+clear_unmanaged_list (void)
 {
   if (unmanaged_window_list)
     {
@@ -54,7 +54,7 @@ clear_unmanaged_list ()
 }
 
 char *
-list_unmanaged_windows ()
+list_unmanaged_windows (void)
 {
   char *tmp = NULL;
   if (unmanaged_window_list)
@@ -135,7 +135,7 @@ ungrab_top_level_keys (Window w)
 }
 
 void
-ungrab_keys_all_wins ()
+ungrab_keys_all_wins (void)
 {
   rp_window *cur;
 
@@ -147,7 +147,7 @@ ungrab_keys_all_wins ()
 }
 
 void
-grab_keys_all_wins ()
+grab_keys_all_wins (void)
 {
   rp_window *cur;
 
@@ -159,7 +159,7 @@ grab_keys_all_wins ()
 }
 
 rp_screen*
-current_screen ()
+current_screen (void)
 {
   int i;
 
@@ -868,7 +868,7 @@ unhide_window (rp_window *win)
 }
 
 void
-unhide_all_windows ()
+unhide_all_windows (void)
 {
   struct list_head *tmp, *iter;
   rp_window *win;
diff --git a/src/manage.h b/src/manage.h
index cdb70e4..6d5f1f5 100644
--- a/src/manage.h
+++ b/src/manage.h
@@ -24,16 +24,16 @@
 
 #include "data.h"
 
-void clear_unmanaged_list ();
-char *list_unmanaged_windows ();
+void clear_unmanaged_list (void);
+char *list_unmanaged_windows (void);
 void add_unmanaged_window (char *name);
 int unmanaged_window (Window w);
-rp_screen* current_screen ();
+rp_screen* current_screen (void);
 void scanwins(rp_screen *s);
 void unmanage (rp_window *w);
 int update_window_name (rp_window *win);
 void update_normal_hints (rp_window *win);
-void rename_current_window ();
+void rename_current_window (void);
 void send_configure (Window w, int x, int y, int width, int height, int border);
 void set_state (rp_window *win, int state);
 long get_state (rp_window *win);
@@ -47,12 +47,12 @@ void force_maximize (rp_window *win);
 
 void grab_top_level_keys (Window w);
 void ungrab_top_level_keys (Window w);
-void ungrab_keys_all_wins ();
-void grab_keys_all_wins ();
+void ungrab_keys_all_wins (void);
+void grab_keys_all_wins (void);
 
 void hide_window (rp_window *win);
 void unhide_window (rp_window *win);
-void unhide_all_windows ();
+void unhide_all_windows (void);
 void unhide_window_below (rp_window *win);
 void withdraw_window (rp_window *win);
 void hide_others (rp_window *win);
diff --git a/src/number.c b/src/number.c
index 6bb959a..332fb06 100644
--- a/src/number.c
+++ b/src/number.c
@@ -125,7 +125,7 @@ numset_release (struct numset *ns, int n)
 
 /* Create a new numset and return a pointer to it. */
 struct numset *
-numset_new ()
+numset_new (void)
 {
   struct numset *ns;
 
diff --git a/src/number.h b/src/number.h
index bac958a..d379aa2 100644
--- a/src/number.h
+++ b/src/number.h
@@ -36,7 +36,7 @@ struct numset
   int max_taken;
 };
 
-struct numset *numset_new ();
+struct numset *numset_new (void);
 void numset_free (struct numset *ns);
 void numset_release (struct numset *ns, int n);
 int numset_request (struct numset *ns);
diff --git a/src/ratpoison.h b/src/ratpoison.h
index 1825eca..639c9b9 100644
--- a/src/ratpoison.h
+++ b/src/ratpoison.h
@@ -90,7 +90,7 @@ extern XGCValues gv;
 #include "xinerama.h"
 #include "format.h"
 
-void clean_up ();
+void clean_up (void);
 rp_screen *find_screen (Window w);
 
 void set_close_on_exec (FILE *fd);
@@ -104,7 +104,7 @@ char *xsprintf (char *fmt, ...);
 char *xvsprintf (char *fmt, va_list ap);
 int str_comp (char *s1, char *s2, int len);
 /* Needed in cmd_tmpwm */
-void check_child_procs ();
+void check_child_procs (void);
 void chld_handler (int signum);
 void set_sig_handler (int sig, void (*action)(int));
 /* Font functions. */
diff --git a/src/split.c b/src/split.c
index a93d3a0..93cfe03 100644
--- a/src/split.c
+++ b/src/split.c
@@ -41,7 +41,7 @@ update_last_access (rp_frame *frame)
 }
 
 rp_frame *
-current_frame ()
+current_frame (void)
 {
   rp_screen *s = current_screen();
   return screen_get_frame (s, s->current_frame);
@@ -172,7 +172,7 @@ create_initial_frame (rp_screen *screen)
 }
 
 void
-init_frame_lists ()
+init_frame_lists (void)
 {
   int i;
 
@@ -189,7 +189,7 @@ init_frame_list (rp_screen *screen)
 }
 
 rp_frame *
-find_last_frame ()
+find_last_frame (void)
 {
   rp_frame *cur, *last = NULL;
   int last_access = -1;
@@ -245,7 +245,7 @@ find_frame_prev (rp_frame *frame)
 }
 
 rp_window *
-current_window ()
+current_window (void)
 {
   return find_window_number (current_frame()->win_number);
 }
@@ -382,7 +382,7 @@ h_split_frame (rp_frame *frame, int pixels)
 }
 
 void
-remove_all_splits ()
+remove_all_splits (void)
 {
   struct list_head *tmp, *iter;
   rp_screen *s = current_screen();
@@ -894,7 +894,7 @@ blank_frame (rp_frame *frame)
 }
 
 void
-hide_frame_indicator ()
+hide_frame_indicator (void)
 {
   int i;
   for (i=0; i<num_screens; i++)
@@ -902,7 +902,7 @@ hide_frame_indicator ()
 }
 
 void
-show_frame_indicator ()
+show_frame_indicator (void)
 {
   hide_frame_indicator ();
   show_frame_message (MESSAGE_FRAME_STRING);
diff --git a/src/split.h b/src/split.h
index 940bd45..1236656 100644
--- a/src/split.h
+++ b/src/split.h
@@ -28,7 +28,7 @@ void cleanup_frame (rp_frame *frame);
 void maximize_all_windows_in_frame (rp_frame *frame);
 void h_split_frame (rp_frame *frame, int pixels);
 void v_split_frame (rp_frame *frame, int pixels);
-void remove_all_splits ();
+void remove_all_splits (void);
 void resize_shrink_to_window (rp_frame *frame);
 void resize_frame_horizontally (rp_frame *frame, int diff);
 void resize_frame_vertically (rp_frame *frame, int diff);
@@ -37,13 +37,13 @@ rp_window *find_window_for_frame (rp_frame *frame);
 rp_frame *find_windows_frame (rp_window *win);
 rp_frame *find_frame_next (rp_frame *frame);
 rp_frame *find_frame_prev (rp_frame *frame);
-rp_window *current_window ();
-void init_frame_lists ();
+rp_window *current_window (void);
+void init_frame_lists (void);
 void init_frame_list (rp_screen *screen);
 void set_active_frame (rp_frame *frame);
 void blank_frame (rp_frame *frame);
-void show_frame_indicator ();
-void hide_frame_indicator ();
+void show_frame_indicator (void);
+void hide_frame_indicator (void);
 
 void show_frame_message (char *msg);
 
@@ -51,9 +51,9 @@ rp_frame *find_frame_right (rp_frame *frame);
 rp_frame *find_frame_left (rp_frame *frame);
 rp_frame *find_frame_down (rp_frame *frame);
 rp_frame *find_frame_up (rp_frame *frame);
-rp_frame *find_last_frame ();
+rp_frame *find_last_frame (void);
 rp_frame * find_frame_number (int num);
 
-rp_frame *current_frame ();
+rp_frame *current_frame (void);
 
 #endif
diff --git a/src/window.c b/src/window.c
index b665f71..737cc40 100644
--- a/src/window.c
+++ b/src/window.c
@@ -763,13 +763,13 @@ get_window_list (char *fmt, char *delim, struct sbuf *buffer,
 }
 
 void
-init_window_stuff ()
+init_window_stuff (void)
 {
   rp_window_numset = numset_new ();
 }
 
 void
-free_window_stuff ()
+free_window_stuff (void)
 {
   numset_free (rp_window_numset);
 }
diff --git a/src/window.h b/src/window.h
index 13080c1..922200b 100644
--- a/src/window.h
+++ b/src/window.h
@@ -26,10 +26,10 @@
 
 void free_window (rp_window *w);
 rp_window *add_to_window_list (rp_screen *s, Window w);
-void last_window ();
+void last_window (void);
 rp_window *find_window_in_list (Window w, struct list_head *list);
 rp_window *find_window (Window w);
-void maximize_current_window ();
+void maximize_current_window (void);
 void give_window_focus (rp_window *win, rp_window *last_win);
 void set_active_window (rp_window *win);
 void goto_window (rp_window *win);
@@ -53,15 +53,15 @@ rp_window *find_window_prev_with_frame (rp_window *w);
 rp_window *find_window_next (rp_window *w);
 rp_window *find_window_next_with_frame (rp_window *w);
 rp_window *find_window_number (int n);
-void sort_window_list_by_number ();
+void sort_window_list_by_number (void);
 
 void insert_into_list (rp_window *win, struct list_head *list);
 
 void print_window_information (rp_group *group, rp_window *win);
 void get_window_list (char *fmt, char *delim, struct sbuf *buffer,
                       int *mark_start, int *mark_end);
-void init_window_stuff ();
-void free_window_stuff ();
+void init_window_stuff (void);
+void free_window_stuff (void);
 
 rp_frame *win_get_frame (rp_window *win);
 
diff --git a/src/xinerama.c b/src/xinerama.c
index ab3db32..044928f 100644
--- a/src/xinerama.c
+++ b/src/xinerama.c
@@ -34,7 +34,7 @@ static XineramaScreenInfo *xine_screens = NULL;
 #endif
 
 void
-init_xinerama()
+init_xinerama(void)
 {
         int evbase, errbase, major, minor;
 
@@ -82,7 +82,7 @@ void xinerama_get_screen_info(int sc, int *x, int *y, int *w, int *h)
 }
 
 void
-free_xinerama()
+free_xinerama(void)
 {
 #ifdef XINERAMA
         if (xine_screens) {
diff --git a/src/xinerama.h b/src/xinerama.h
index 2785b48..233ec46 100644
--- a/src/xinerama.h
+++ b/src/xinerama.h
@@ -21,8 +21,8 @@
 #ifndef XINERAMA_H
 #define XINERAMA_H
 
-void init_xinerama();
-void free_xinerama();
+void init_xinerama(void);
+void free_xinerama(void);
 void xinerama_get_screen_info(int sc, int *x, int *y, int *w, int *h);
 
 #endif