Modernize code by removing use of old style definitions.

Also add -Werror=old-style-definition to enforce new code.
Message-Id: <ZBZ+8xf7GHy2RT/h@jupiter.tail36e24.ts.net>

81 files changed, 325 insertions, 401 deletions

diff --git a/Makeconf b/Makeconf
index dfca7711..b6acd382 100644
--- a/Makeconf
+++ b/Makeconf
@@ -78,8 +78,8 @@ INCLUDES += -I$(..)include -I$(top_srcdir)/include
 CPPFLAGS += $(INCLUDES) \
 	     -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
 	    $($*-CPPFLAGS)
-CFLAGS += -std=gnu99 $(gnu89-inline-CFLAGS) -Wall -g -O3 \
-	    -fno-strict-aliasing $($*-CFLAGS)
+CFLAGS += -std=gnu99 $(gnu89-inline-CFLAGS) -Wall -Werror=old-style-definition \
+					-g -O3 -fno-strict-aliasing $($*-CFLAGS)
 
 # Include the configure-generated file of parameters.
 # This sets up variables for build tools and installation directories.
diff --git a/benchmarks/forks.c b/benchmarks/forks.c
index ed8e53e1..c8464c68 100644
--- a/benchmarks/forks.c
+++ b/benchmarks/forks.c
@@ -15,9 +15,7 @@
  */
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	register int nforks, i;
 	char *cp;
diff --git a/boot/boot.c b/boot/boot.c
index 978d8943..147bb2b0 100644
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -83,7 +83,7 @@ static int isig;
 static char *kernel_command_line;
 
 static void
-init_termstate ()
+init_termstate (void)
 {
   struct termios tty_state;
 
@@ -100,7 +100,7 @@ init_termstate ()
 }
 
 static void
-restore_termstate ()
+restore_termstate (void)
 {
   tcsetattr (0, 0, &orig_tty_state);
 }
@@ -837,7 +837,7 @@ static int should_read = 0;
 
 /* Reply to a queued read. */
 void
-read_reply ()
+read_reply (void)
 {
   int avail;
   struct qr *qr;
@@ -919,7 +919,7 @@ read_reply ()
 /* Unlock READLOCK, and also service any new read requests that it was
    blocking.  */
 static void
-unlock_readlock ()
+unlock_readlock (void)
 {
   pthread_spin_unlock (&readlock);
   while (should_read)
@@ -930,9 +930,9 @@ unlock_readlock ()
  *	Handle bootstrap requests.
  */
 kern_return_t
-do_bootstrap_privileged_ports(bootstrap, hostp, devicep)
-	mach_port_t bootstrap;
-	mach_port_t *hostp, *devicep;
+do_bootstrap_privileged_ports(mach_port_t bootstrap,
+	mach_port_t *hostp,
+  mach_port_t *devicep)
 {
 	*hostp = privileged_host_port;
 	*devicep = pseudo_master_device_port;
diff --git a/boot/boot_script.c b/boot/boot_script.c
index 6fd449b2..54007e6b 100644
--- a/boot/boot_script.c
+++ b/boot/boot_script.c
@@ -488,7 +488,7 @@ boot_script_parse_line (void *hook, char *cmdline)
 
 /* Execute commands previously parsed.  */
 int
-boot_script_exec ()
+boot_script_exec (void)
 {
   int cmd_index;
 
diff --git a/console-client/pc-kbd.c b/console-client/pc-kbd.c
index 85f3a5cd..afd3411e 100644
--- a/console-client/pc-kbd.c
+++ b/console-client/pc-kbd.c
@@ -588,7 +588,7 @@ enum scancode sc_set1_to_set2_x1[] =
   };
 
 static enum scancode
-gnumach_v1_input_next ()
+gnumach_v1_input_next (void)
 {
   kd_event data_buf;
 #ifndef XKB_SUPPORT
@@ -671,7 +671,7 @@ update_leds (void)
 }
 
 static enum scancode
-input_next ()
+input_next (void)
 {
   enum scancode sc = 0;
   unsigned char next;
diff --git a/console-client/timer.h b/console-client/timer.h
index 8a923ad0..f74f297d 100644
--- a/console-client/timer.h
+++ b/console-client/timer.h
@@ -55,7 +55,7 @@ int timer_remove (struct timer_list *timer);
 void timer_change (struct timer_list *timer, long long expires);
 
 static inline long long
-fetch_jiffies ()
+fetch_jiffies (void)
 {
   extern volatile struct mapped_time_value *timer_mapped_time;
   extern long long timer_root_jiffies;
diff --git a/console-client/xkb/compose.c b/console-client/xkb/compose.c
index 17f30014..955c820c 100644
--- a/console-client/xkb/compose.c
+++ b/console-client/xkb/compose.c
@@ -518,7 +518,7 @@ match_right_set_left (void *context, struct map_entry *entry)
      - .XCompose at $HOME.
      - System wide compose file for the current locale. */
 static char *
-get_compose_file_for_locale()
+get_compose_file_for_locale(void)
 {
   struct matcher_context context = { NULL };
   char *xcomposefile;
diff --git a/console-client/xkb/lex.l b/console-client/xkb/lex.l
index d9198981..ba805f0e 100644
--- a/console-client/xkb/lex.l
+++ b/console-client/xkb/lex.l
@@ -374,13 +374,13 @@ overlay2		{ yylval.val = 2; return OVERLAY; }
 	}
 
 	int
-	scanner_get_current_location()
+	scanner_get_current_location(void)
 	{
 	  return lineno;
 	}
 
 	const char*
-	scanner_get_current_file()
+	scanner_get_current_file(void)
 	{
 	  return filename;
 	}
diff --git a/console-client/xkb/xkbdata.c b/console-client/xkb/xkbdata.c
index a6e2522f..32a1b1f2 100644
--- a/console-client/xkb/xkbdata.c
+++ b/console-client/xkb/xkbdata.c
@@ -43,7 +43,7 @@ static struct hurd_ihash kn_mapping;
 
 /* Initialize the keyname hashtable.  */
 static void
-keyname_init ()
+keyname_init (void)
 {
   hurd_ihash_init (&kn_mapping, HURD_IHASH_NO_LOCP);
   debug_printf ("Kn_mapping init");
@@ -143,7 +143,7 @@ struct keytype *kthash[KTHSZ];
 
 /* Initialize the keytypes hashtable.  */
 static void
-keytype_init ()
+keytype_init (void)
 {
   int n;
   for (n = 0; n < KTHSZ; n++)
@@ -394,7 +394,7 @@ static struct hurd_ihash ksrm_mapping;
 
 /* Initialize the list for keysyms to realmodifiers mappings.  */
 void
-ksrm_init ()
+ksrm_init (void)
 {
   hurd_ihash_init (&ksrm_mapping, HURD_IHASH_NO_LOCP);
   debug_printf ("KSRM MAP IHASH CREATED \n");
diff --git a/daemons/console-run.c b/daemons/console-run.c
index 0cc1be8e..f98ebf8a 100644
--- a/daemons/console-run.c
+++ b/daemons/console-run.c
@@ -28,7 +28,7 @@
 #include <device/device.h>
 
 static mach_port_t
-get_console ()
+get_console (void)
 {
   mach_port_t device_master, console;
   error_t err = get_privileged_ports (0, &device_master);
diff --git a/daemons/runttys.c b/daemons/runttys.c
index baefdbef..1b4b3601 100644
--- a/daemons/runttys.c
+++ b/daemons/runttys.c
@@ -428,7 +428,7 @@ reopen_console (int signo)
 #endif
 
 int
-main ()
+main (void)
 {
   int fail;
   struct sigaction sa;
diff --git a/eth-multiplexer/vdev.c b/eth-multiplexer/vdev.c
index 8ff39744..548af9d2 100644
--- a/eth-multiplexer/vdev.c
+++ b/eth-multiplexer/vdev.c
@@ -68,7 +68,7 @@ mach_msg_type_t packet_type =
 };
 
 int
-get_dev_num ()
+get_dev_num (void)
 {
   return dev_num;
 }
diff --git a/ext2fs/balloc.c b/ext2fs/balloc.c
index 337b583b..c8137755 100644
--- a/ext2fs/balloc.c
+++ b/ext2fs/balloc.c
@@ -406,7 +406,7 @@ got_block:
 }
 
 unsigned long
-ext2_count_free_blocks ()
+ext2_count_free_blocks (void)
 {
 #ifdef EXT2FS_DEBUG
   unsigned long desc_count, bitmap_count, x;
@@ -448,7 +448,7 @@ block_in_use (block_t block, unsigned char *map)
 }
 
 void
-ext2_check_blocks_bitmap ()
+ext2_check_blocks_bitmap (void)
 {
   unsigned char *bh;
   unsigned long desc_count, bitmap_count, x;
diff --git a/ext2fs/ext2fs.c b/ext2fs/ext2fs.c
index 14952d7d..8e434969 100644
--- a/ext2fs/ext2fs.c
+++ b/ext2fs/ext2fs.c
@@ -262,7 +262,7 @@ main (int argc, char **argv)
 }
 
 error_t
-diskfs_reload_global_state ()
+diskfs_reload_global_state (void)
 {
   error_t err;
 
diff --git a/ext2fs/ialloc.c b/ext2fs/ialloc.c
index 9ab631db..3e26be7e 100644
--- a/ext2fs/ialloc.c
+++ b/ext2fs/ialloc.c
@@ -366,7 +366,7 @@ diskfs_alloc_node (struct node *dir, mode_t mode, struct node **node)
 /* ---------------------------------------------------------------- */
 
 unsigned long
-ext2_count_free_inodes ()
+ext2_count_free_inodes (void)
 {
 #ifdef EXT2FS_DEBUG
   unsigned long desc_count, bitmap_count, x;
@@ -402,7 +402,7 @@ ext2_count_free_inodes ()
 /* ---------------------------------------------------------------- */
 
 void
-ext2_check_inodes_bitmap ()
+ext2_check_inodes_bitmap (void)
 {
   int i;
   struct ext2_group_desc *gdp;
diff --git a/ext2fs/inode.c b/ext2fs/inode.c
index fda3dcba..0bfaa77f 100644
--- a/ext2fs/inode.c
+++ b/ext2fs/inode.c
@@ -487,7 +487,7 @@ diskfs_node_reload (struct node *node)
 
 /* Write all active disknodes into the ext2_inode pager. */
 void
-write_all_disknodes ()
+write_all_disknodes (void)
 {
   error_t write_one_disknode (struct node *node)
     {
@@ -828,7 +828,7 @@ error_t (*diskfs_read_symlink_hook)(struct node *np, char *target) =
 
 /* Called when all hard ports have gone away. */
 void
-diskfs_shutdown_soft_ports ()
+diskfs_shutdown_soft_ports (void)
 {
   /* Should initiate termination of internally held pager ports
      (the only things that should be soft) XXX */
diff --git a/ext2fs/pager.c b/ext2fs/pager.c
index fca5aa8c..e6e1dca6 100644
--- a/ext2fs/pager.c
+++ b/ext2fs/pager.c
@@ -87,7 +87,7 @@ disk_cache_info_free_push (struct disk_cache_info *p);
 
 /* Returns a single page page-aligned buffer.  */
 static void *
-get_page_buf ()
+get_page_buf (void)
 {
   static pthread_mutex_t free_page_bufs_lock = PTHREAD_MUTEX_INITIALIZER;
   static void *free_page_bufs;
@@ -184,7 +184,7 @@ file_pager_read_page (struct node *node, vm_offset_t page,
      pointed to by BUF (allocating it if necessary) at offset OFFS.  OFFS in
      adjusted by the amount read, and NUM_PENDING_BLOCKS is zeroed.  Any read
      error is returned.  */
-  error_t do_pending_reads ()
+  error_t do_pending_reads (void)
     {
       if (num_pending_blocks > 0)
 	{
@@ -1402,7 +1402,7 @@ diskfs_get_filemap_pager_struct (struct node *node)
 
 /* Shutdown all the pagers (except the disk pager). */
 void
-diskfs_shutdown_pager ()
+diskfs_shutdown_pager (void)
 {
   error_t shutdown_one (void *v_p)
     {
@@ -1441,7 +1441,7 @@ diskfs_sync_everything (int wait)
 }
 
 static void
-disable_caching ()
+disable_caching (void)
 {
   error_t block_cache (void *arg)
     {
@@ -1458,7 +1458,7 @@ disable_caching ()
 }
 
 static void
-enable_caching ()
+enable_caching (void)
 {
   error_t enable_cache (void *arg)
     {
@@ -1489,7 +1489,7 @@ enable_caching ()
 /* Tell diskfs if there are pagers exported, and if none, then
    prevent any new ones from showing up.  */
 int
-diskfs_pager_users ()
+diskfs_pager_users (void)
 {
   int npagers = ports_count_bucket (file_pager_bucket);
 
@@ -1521,7 +1521,7 @@ diskfs_pager_users ()
 /* Return the bitwise or of the maximum prot parameter (the second arg to
    diskfs_get_filemap) for all active user pagers. */
 vm_prot_t
-diskfs_max_user_pager_prot ()
+diskfs_max_user_pager_prot (void)
 {
   vm_prot_t max_prot = 0;
   int npagers = ports_count_bucket (file_pager_bucket);
diff --git a/fatfs/inode.c b/fatfs/inode.c
index e2838af8..cb1ca423 100644
--- a/fatfs/inode.c
+++ b/fatfs/inode.c
@@ -409,7 +409,7 @@ diskfs_node_reload (struct node *node)
 
 /* Write all active disknodes into the ext2_inode pager. */
 void
-write_all_disknodes ()
+write_all_disknodes (void)
 {
   error_t write_one_disknode (struct node *node)
     {
@@ -426,7 +426,7 @@ write_all_disknodes ()
 
 
 void
-refresh_node_stats ()
+refresh_node_stats (void)
 {
   error_t refresh_one_node_stat (struct node *node)
     {
@@ -485,7 +485,7 @@ diskfs_get_translator (struct node *node, char **namep, u_int *namelen)
 }
 
 void
-diskfs_shutdown_soft_ports ()
+diskfs_shutdown_soft_ports (void)
 {
     /* Should initiate termination of internally held pager ports
      (the only things that should be soft) XXX */
diff --git a/fatfs/main.c b/fatfs/main.c
index ed8cf910..6b03b20e 100644
--- a/fatfs/main.c
+++ b/fatfs/main.c
@@ -139,7 +139,7 @@ diskfs_append_args (char **argz, unsigned *argz_len)
 
 /* Fetch the root node.  */
 static void
-fetch_root ()
+fetch_root (void)
 {
   error_t err;
   ino_t inum;
@@ -248,7 +248,7 @@ main (int argc, char **argv)
 
 /* Nothing to do for read-only medium.  */
 error_t
-diskfs_reload_global_state ()
+diskfs_reload_global_state (void)
 {
   return 0;
 }
diff --git a/fatfs/pager.c b/fatfs/pager.c
index 9a8b8d6c..36e7012c 100644
--- a/fatfs/pager.c
+++ b/fatfs/pager.c
@@ -54,7 +54,7 @@ static int num_free_page_bufs = 0;
 
 /* Returns a single page page-aligned buffer.  */
 static void *
-get_page_buf ()
+get_page_buf (void)
 {
   void *buf;
 
@@ -221,7 +221,7 @@ file_pager_read_huge_page (struct node *node, vm_offset_t page,
      pointed to by BUF (allocating it if necessary) at offset OFFS.  OFFS in
      adjusted by the amount read, and NUM_PENDING_CLUSTERS is zeroed.  Any read
      error is returned.  */
-  error_t do_pending_reads ()
+  error_t do_pending_reads (void)
     {
       if (num_pending_clusters > 0)
         {
@@ -923,7 +923,7 @@ diskfs_get_filemap_pager_struct (struct node *node)
 
 /* Shutdown all the pagers (except the disk pager). */
 void
-diskfs_shutdown_pager ()
+diskfs_shutdown_pager (void)
 {
   error_t shutdown_one (void *v_p)
     {
@@ -959,7 +959,7 @@ diskfs_sync_everything (int wait)
 }
 
 static void
-disable_caching ()
+disable_caching (void)
 {
   error_t block_cache (void *arg)
     {
@@ -976,7 +976,7 @@ disable_caching ()
 }
 	  
 static void
-enable_caching ()
+enable_caching (void)
 {
   error_t enable_cache (void *arg)
     {
@@ -1007,7 +1007,7 @@ enable_caching ()
 /* Tell diskfs if there are pagers exported, and if none, then
    prevent any new ones from showing up.  */
 int
-diskfs_pager_users ()
+diskfs_pager_users (void)
 {
   int npagers = ports_count_bucket (file_pager_bucket);
 
@@ -1039,7 +1039,7 @@ diskfs_pager_users ()
 /* Return the bitwise or of the maximum prot parameter (the second arg
    to diskfs_get_filemap) for all active user pagers.  */
 vm_prot_t
-diskfs_max_user_pager_prot ()
+diskfs_max_user_pager_prot (void)
 {
   vm_prot_t max_prot = 0;
   int npagers = ports_count_bucket (file_pager_bucket);
diff --git a/fstests/fstests.c b/fstests/fstests.c
index 80b76cf2..b7765034 100644
--- a/fstests/fstests.c
+++ b/fstests/fstests.c
@@ -41,7 +41,7 @@ int check_refs (mach_port_t port) /* To call from gdb */
 }
 
 int
-main ()
+main (void)
 {
 #if HURDISH_TESTS
   mach_port_t root;
diff --git a/isofs/inode.c b/isofs/inode.c
index 70fcd87e..f78f336a 100644
--- a/isofs/inode.c
+++ b/isofs/inode.c
@@ -379,7 +379,7 @@ diskfs_get_translator (struct node *np, char **namep, u_int *namelen)
 }
 
 void
-diskfs_shutdown_soft_ports ()
+diskfs_shutdown_soft_ports (void)
 {
     /* Should initiate termination of internally held pager ports
      (the only things that should be soft) XXX */
diff --git a/isofs/main.c b/isofs/main.c
index d16e7286..76e9766e 100644
--- a/isofs/main.c
+++ b/isofs/main.c
@@ -46,7 +46,7 @@ struct sblock *sblock;
 
 /* Fetch the root node */
 static void
-fetch_root ()
+fetch_root (void)
 {
   struct lookup_context ctx;
   ino_t id;
@@ -73,7 +73,7 @@ fetch_root ()
 
 /* Find and read the superblock.  */
 static void
-read_sblock ()
+read_sblock (void)
 {
   struct voldesc *vd;
   struct sblock * volatile sb = 0;
@@ -153,7 +153,7 @@ main (int argc, char **argv)
 
 /* Nothing to do for read-only medium */
 error_t
-diskfs_reload_global_state ()
+diskfs_reload_global_state (void)
 {
   return 0;
 }
diff --git a/isofs/pager.c b/isofs/pager.c
index c2da2c0b..7838bdfc 100644
--- a/isofs/pager.c
+++ b/isofs/pager.c
@@ -258,7 +258,7 @@ allow_pager_softrefs (struct node *np)
 	
 	
 static void
-block_caching ()
+block_caching (void)
 {
   error_t block_cache (void *arg)
     {
@@ -274,7 +274,7 @@ block_caching ()
 }
 	  
 static void
-enable_caching ()
+enable_caching (void)
 {
   error_t enable_cache (void *arg)
     {
@@ -305,7 +305,7 @@ enable_caching ()
 /* Tell diskfs if there are pagers exported, and if none, then
    prevent any new ones from showing up.  */
 int
-diskfs_pager_users ()
+diskfs_pager_users (void)
 {
   int npagers = ports_count_bucket (pager_bucket);
 
@@ -334,7 +334,7 @@ diskfs_pager_users ()
 /* Return the bitwise or of the maximum prot parameter (the second arg to
    diskfs_get_filemap) for all active user pagers. */
 vm_prot_t
-diskfs_max_user_pager_prot ()
+diskfs_max_user_pager_prot (void)
 {
   /* We never allow writing, so there's no need to carefully check it. */
   return VM_PROT_READ | VM_PROT_EXECUTE;
@@ -354,7 +354,7 @@ diskfs_get_filemap_pager_struct (struct node *np)
 
 /* Shutdown all the pagers. */
 void
-diskfs_shutdown_pager ()
+diskfs_shutdown_pager (void)
 {
   /* Because there's no need to ever sync, we don't have to do anything
      here. */
diff --git a/libdiskfs/boot-start.c b/libdiskfs/boot-start.c
index f245200d..7aaf3669 100644
--- a/libdiskfs/boot-start.c
+++ b/libdiskfs/boot-start.c
@@ -57,7 +57,7 @@ static void start_execserver ();
 char **diskfs_argv = 0;
 
 static mach_port_t
-get_console ()
+get_console (void)
 {
   mach_port_t device_master, console;
   error_t err = get_privileged_ports (0, &device_master);
@@ -95,7 +95,7 @@ _diskfs_boot_privports (void)
 /* Once diskfs_root_node is set, call this if we are a bootstrap
    filesystem.  */
 void
-diskfs_start_bootstrap ()
+diskfs_start_bootstrap (void)
 {
   mach_port_t root_pt, startup_pt, bootpt;
   retry_type retry;
diff --git a/libdiskfs/console.c b/libdiskfs/console.c
index f47431fd..fa4fc2c5 100644
--- a/libdiskfs/console.c
+++ b/libdiskfs/console.c
@@ -35,7 +35,7 @@
 
 /* Make sure errors go somewhere reasonable.  */
 void
-diskfs_console_stdio ()
+diskfs_console_stdio (void)
 {
   if (getpid () > 0)
     {
diff --git a/libdiskfs/init-startup.c b/libdiskfs/init-startup.c
index 92ef8f94..a4095847 100644
--- a/libdiskfs/init-startup.c
+++ b/libdiskfs/init-startup.c
@@ -190,7 +190,7 @@ diskfs_S_startup_dosync (mach_port_t handle)
 /* This is called when we have an ordinary environment, complete
    with proc and auth ports. */
 void
-_diskfs_init_completed ()
+_diskfs_init_completed (void)
 {
   startup_t init;
   process_t proc;
diff --git a/libdiskfs/readonly.c b/libdiskfs/readonly.c
index 02f583c8..d0319375 100644
--- a/libdiskfs/readonly.c
+++ b/libdiskfs/readonly.c
@@ -30,7 +30,7 @@ int diskfs_readonly = 0;
 int diskfs_hard_readonly = 0;
 
 int
-diskfs_check_readonly ()
+diskfs_check_readonly (void)
 {
   error_t err;
 
diff --git a/libdiskfs/remount.c b/libdiskfs/remount.c
index 1ed622f2..7e632ba3 100644
--- a/libdiskfs/remount.c
+++ b/libdiskfs/remount.c
@@ -26,7 +26,7 @@
    DISKFS_READONLY is true.  DISKFS_FSYS_LOCK should be held while calling
    this routine.  */
 error_t
-diskfs_remount ()
+diskfs_remount (void)
 {
   error_t err;
 
diff --git a/libfshelp/get-identity.c b/libfshelp/get-identity.c
index ac1b4f0b..d6856e41 100644
--- a/libfshelp/get-identity.c
+++ b/libfshelp/get-identity.c
@@ -82,7 +82,7 @@ id_clean (void *cookie)
 }
 
 static void
-id_initialize ()
+id_initialize (void)
 {
   assert_backtrace (!idclass);
   idclass = ports_create_class (NULL, id_clean);
diff --git a/libmachdev/ds_routines.c b/libmachdev/ds_routines.c
index cc99e296..0d60d589 100644
--- a/libmachdev/ds_routines.c
+++ b/libmachdev/ds_routines.c
@@ -305,7 +305,7 @@ machdev_create_device_port (size_t size, void *result)
 }
 
 void
-machdev_device_init()
+machdev_device_init(void)
 {
   int i;
 
@@ -320,7 +320,7 @@ machdev_device_init()
 }
 
 void
-machdev_device_sync()
+machdev_device_sync(void)
 {
   int i;
   for (i = 0; i < num_emul; i++)
diff --git a/libnetfs/init-init.c b/libnetfs/init-init.c
index b63e7ffa..19ed0d3d 100644
--- a/libnetfs/init-init.c
+++ b/libnetfs/init-init.c
@@ -35,7 +35,7 @@ volatile struct mapped_time_value *netfs_mtime;
 
 
 void
-netfs_init ()
+netfs_init (void)
 {
   error_t err;
   err = maptime_map (0, 0, &netfs_mtime);
diff --git a/libnetfs/init-loop.c b/libnetfs/init-loop.c
index 61471c2f..c6ca5387 100644
--- a/libnetfs/init-loop.c
+++ b/libnetfs/init-loop.c
@@ -24,7 +24,7 @@ static int thread_timeout = 1000 * 60 * 2; /* two minutes */
 static int server_timeout = 1000 * 60 * 10; /* ten minutes */
 
 void
-netfs_server_loop ()
+netfs_server_loop (void)
 {
   error_t err;
 
diff --git a/libpager/pager-create.c b/libpager/pager-create.c
index 7f2f7d6e..78c04009 100644
--- a/libpager/pager-create.c
+++ b/libpager/pager-create.c
@@ -89,7 +89,7 @@ pager_create_alloc (size_t u_pager_size,
 static void create_class (void) __attribute__ ((constructor));
 
 static void
-create_class ()
+create_class (void)
 {
   _pager_class = ports_create_class (_pager_clean, _pager_real_dropweak);
   (void) &create_class;		/* Avoid warning */
diff --git a/libports/create-bucket.c b/libports/create-bucket.c
index 81fe044c..1095332e 100644
--- a/libports/create-bucket.c
+++ b/libports/create-bucket.c
@@ -28,13 +28,13 @@ static struct port_class *notify_port_class;
 static pthread_once_t init_notify_port_class_once = PTHREAD_ONCE_INIT;
 
 static void
-init_notify_port_class ()
+init_notify_port_class (void)
 {
   notify_port_class = ports_create_class (NULL, NULL);
 }
 
 struct port_bucket *
-ports_create_bucket ()
+ports_create_bucket (void)
 {
   struct port_bucket *ret;
   error_t err;
diff --git a/libports/inhibit-all-rpcs.c b/libports/inhibit-all-rpcs.c
index 71aecf14..1e6e47ea 100644
--- a/libports/inhibit-all-rpcs.c
+++ b/libports/inhibit-all-rpcs.c
@@ -23,7 +23,7 @@
 #include <hurd/ihash.h>
 
 error_t
-ports_inhibit_all_rpcs ()
+ports_inhibit_all_rpcs (void)
 {
   error_t err = 0;
 
diff --git a/libports/interrupted.c b/libports/interrupted.c
index 88fb9ef0..5cd97bad 100644
--- a/libports/interrupted.c
+++ b/libports/interrupted.c
@@ -28,7 +28,7 @@ static struct rpc_info *interrupted = 0;
 /* If the current thread's rpc has been interrupted with
    ports_interrupt_rpcs, return true (and clear the interrupted flag).  */
 int
-ports_self_interrupted ()
+ports_self_interrupted (void)
 {
   struct rpc_info **rpc_p, *rpc;
   thread_t self = hurd_thread_self ();
diff --git a/libports/resume-all-rpcs.c b/libports/resume-all-rpcs.c
index 0b78c925..3c612b67 100644
--- a/libports/resume-all-rpcs.c
+++ b/libports/resume-all-rpcs.c
@@ -22,7 +22,7 @@
 #include <assert-backtrace.h>
 
 void
-ports_resume_all_rpcs ()
+ports_resume_all_rpcs (void)
 {
   pthread_mutex_lock (&_ports_lock);
   assert_backtrace (_ports_flags & _PORTS_INHIBITED);
diff --git a/libps/host.c b/libps/host.c
index 120e5c49..3ef83cae 100644
--- a/libps/host.c
+++ b/libps/host.c
@@ -38,7 +38,7 @@
 
 /* Return the current host port.  */
 mach_port_t
-ps_get_host ()
+ps_get_host (void)
 {
   static mach_port_t host = MACH_PORT_NULL;
   if (host == MACH_PORT_NULL)
diff --git a/libps/procstat.c b/libps/procstat.c
index 131d3a4b..45ae562f 100644
--- a/libps/procstat.c
+++ b/libps/procstat.c
@@ -758,7 +758,7 @@ proc_stat_set_flags (struct proc_stat *ps, ps_flags_t flags)
 
   /* Turn off use of the msg port if we decide somewhere along the way that
      it's hosed.  */
-  void suppress_msgport ()
+  void suppress_msgport (void)
     {
       /* Turn off those things that were only good given the msg port.  */
       need &= ~(flags & ~no_msgport_flags);
@@ -1057,8 +1057,7 @@ proc_stat_set_flags (struct proc_stat *ps, ps_flags_t flags)
 /* ---------------------------------------------------------------- */
 /* Discard PS and any resources it holds.  */
 void
-_proc_stat_free (ps)
-     struct proc_stat *ps;
+_proc_stat_free (struct proc_stat *ps)
 {
   if (ps->context->user_hooks && ps->context->user_hooks->cleanup)
     /* Free any user state.  */
diff --git a/libshouldbeinlibc/idvec.c b/libshouldbeinlibc/idvec.c
index 84131a62..848c4c52 100644
--- a/libshouldbeinlibc/idvec.c
+++ b/libshouldbeinlibc/idvec.c
@@ -25,7 +25,7 @@
 
 /* Return a new, empty, idvec, or NULL if there wasn't enough memory.  */
 struct idvec *
-make_idvec ()
+make_idvec (void)
 {
   struct idvec *idvec = malloc (sizeof (struct idvec));
   if (idvec)
diff --git a/libshouldbeinlibc/localhost.c b/libshouldbeinlibc/localhost.c
index 9b7d4e09..96fd649e 100644
--- a/libshouldbeinlibc/localhost.c
+++ b/libshouldbeinlibc/localhost.c
@@ -28,7 +28,7 @@
    after the first call (so the result should be copied before modification).
    If something goes wrong, 0 is returned, and errno set.  */
 char *
-localhost ()
+localhost (void)
 {
   static char *buf = 0;
   static size_t buf_len = 0;
diff --git a/libshouldbeinlibc/portinfo.c b/libshouldbeinlibc/portinfo.c
index 42b22081..75a20bb9 100644
--- a/libshouldbeinlibc/portinfo.c
+++ b/libshouldbeinlibc/portinfo.c
@@ -43,14 +43,14 @@ print_port_info (mach_port_t name, mach_port_type_t type, task_t task,
 {
   int hex_names = (show & PORTINFO_HEX_NAMES);
   int first = 1, subfirst = 1;
-  void comma ()
+  void comma (void)
     {
       if (first)
 	first = 0;
       else
 	fprintf (stream, ", ");
     }
-  void subcomma ()
+  void subcomma (void)
     {
       if (subfirst)
 	subfirst = 0;
diff --git a/libshouldbeinlibc/ugids.c b/libshouldbeinlibc/ugids.c
index cb2631be..4282c760 100644
--- a/libshouldbeinlibc/ugids.c
+++ b/libshouldbeinlibc/ugids.c
@@ -26,7 +26,7 @@
 
 /* Return a new ugids structure, or 0 if an allocation error occurs.  */
 struct ugids *
-make_ugids ()
+make_ugids (void)
 {
   struct ugids *u = malloc (sizeof (struct ugids));
   if (u)
diff --git a/libshouldbeinlibc/wire.c b/libshouldbeinlibc/wire.c
index 5d7fcfc5..ea6c5526 100644
--- a/libshouldbeinlibc/wire.c
+++ b/libshouldbeinlibc/wire.c
@@ -127,7 +127,7 @@ wire_segment (vm_address_t start,
 /* Wire down all the text and data (including from shared libraries)
    for the current program. */
 error_t
-wire_task_self ()
+wire_task_self (void)
 {
   mach_port_t host, device;
   error_t err;
diff --git a/libstore/task.c b/libstore/task.c
index bd029400..4908ce5d 100644
--- a/libstore/task.c
+++ b/libstore/task.c
@@ -28,7 +28,7 @@
 #include "store.h"
 
 static process_t
-proc_server ()
+proc_server (void)
 {
   static process_t proc = MACH_PORT_NULL;
   if (proc == MACH_PORT_NULL)
diff --git a/lwip/lwip-util.c b/lwip/lwip-util.c
index 61f3194a..fc4cb137 100644
--- a/lwip/lwip-util.c
+++ b/lwip/lwip-util.c
@@ -101,7 +101,7 @@ ipv4config_is_valid (uint32_t addr, uint32_t netmask,
 
 /* Configure the loopback interface */
 static void
-init_loopback ()
+init_loopback (void)
 {
   struct ifcommon ifc;
 
@@ -114,7 +114,7 @@ init_loopback ()
 
 /* Remove the existing interfaces, but the loopback one */
 void
-remove_ifs ()
+remove_ifs (void)
 {
   struct netif *netif;
 
diff --git a/lwip/port/netif/hurdethif.c b/lwip/port/netif/hurdethif.c
index ec899e40..68d7680b 100644
--- a/lwip/port/netif/hurdethif.c
+++ b/lwip/port/netif/hurdethif.c
@@ -556,7 +556,7 @@ hurdethif_input_thread (void *arg)
  * This function should be called once.
  */
 error_t
-hurdethif_module_init ()
+hurdethif_module_init (void)
 {
   error_t err;
   etherport_bucket = ports_create_bucket ();
diff --git a/lwip/port/netif/hurdtunif.c b/lwip/port/netif/hurdtunif.c
index c976703f..da4d5cbe 100644
--- a/lwip/port/netif/hurdtunif.c
+++ b/lwip/port/netif/hurdtunif.c
@@ -278,7 +278,7 @@ hurdtunif_device_init (struct netif *netif)
  * This function should be called once.
  */
 error_t
-hurdtunif_module_init ()
+hurdtunif_module_init (void)
 {
   error_t err = 0;
 
diff --git a/lwip/startup.c b/lwip/startup.c
index 125a49e3..b5d9f763 100644
--- a/lwip/startup.c
+++ b/lwip/startup.c
@@ -38,7 +38,7 @@ sigterm_handler (int signo)
 }
 
 void
-arrange_shutdown_notification ()
+arrange_shutdown_notification (void)
 {
   error_t err;
   mach_port_t initport, notify;
diff --git a/mach-defpager/default_pager.c b/mach-defpager/default_pager.c
index 4ba9763f..b8158b35 100644
--- a/mach-defpager/default_pager.c
+++ b/mach-defpager/default_pager.c
@@ -116,17 +116,15 @@ synchronized_printf (const char *fmt, ...)
 #define	ptoa(p)	((p)*vm_page_size)
 #define	atop(a)	((a)/vm_page_size)
 
-partition_t partition_of(x)
-      int x;
+partition_t partition_of(int x)
 {
       if (x >= all_partitions.n_partitions || x < 0)
 	  panic("partition_of x%x", x);
       return all_partitions.partition_list[x];
 }
 
-void set_partition_of(x, p)
-      int x;
-      partition_t p;
+void set_partition_of(int x,
+      partition_t p)
 {
       if (x >= all_partitions.n_partitions || x < 0)
 	  panic("set_partition_of x%x", x);
@@ -153,7 +151,7 @@ part_id(const char *name)
 }
 
 void
-partition_init()
+partition_init(void)
 {
 	pthread_mutex_init(&all_partitions.lock, NULL);
 	all_partitions.n_partitions = 0;
@@ -465,9 +463,8 @@ create_paging_partition(const char *name,
  * the object has no CUR_PARTition.
  */
 p_index_t
-choose_partition(size, cur_part)
-	unsigned int		size;
-	p_index_t	cur_part;
+choose_partition(unsigned int		size,
+	p_index_t	cur_part)
 {
 	partition_t	part;
 	boolean_t	found = FALSE;
@@ -511,9 +508,8 @@ ddprintf ("choose_partition(%x,%d,%d)\n",size,cur_part,i);
  * The partition is returned unlocked.
  */
 vm_offset_t
-pager_alloc_page(pindex, lock_it)
-	p_index_t	pindex;
-	boolean_t	lock_it;
+pager_alloc_page(p_index_t	pindex,
+	boolean_t	lock_it)
 {
 	int	bm_e;
 	int	bit;
@@ -575,10 +571,9 @@ ddprintf ("pager_alloc_page(%d,%d)\n",pindex,lock_it);
  * Deallocate a page in a paging partition
  */
 void
-pager_dealloc_page(pindex, page, lock_it)
-	p_index_t		pindex;
-	vm_offset_t	page;
-	boolean_t		lock_it;
+pager_dealloc_page(p_index_t		pindex,
+	vm_offset_t	page,
+	boolean_t		lock_it)
 {
 	partition_t	part;
 	int	bit, bm_e;
@@ -615,8 +610,7 @@ vm_size_t	max_doubled_size = 4 * 1024 * 1024;	/* 4 meg */
  * Return first level map for pager.
  * If there is no such map, than allocate it.
  */
-dp_map_t pager_get_direct_map(pager)
-	dpager_t	pager;
+dp_map_t pager_get_direct_map(dpager_t	pager)
 {
 	dp_map_t	mapptr, emapptr;
 	vm_size_t	size = pager->size;
@@ -652,10 +646,9 @@ dp_map_t pager_get_direct_map(pager)
  * Attach a new paging object to a paging partition
  */
 void
-pager_alloc(pager, part, size)
-	dpager_t	pager;
-	p_index_t		part;
-	vm_size_t	size;	/* in BYTES */
+pager_alloc(dpager_t	pager,
+	p_index_t		part,
+	vm_size_t	size	/* in BYTES */)
 {
 	int    i;
 #ifdef	CHECKSUM
@@ -707,8 +700,7 @@ pager_alloc(pager, part, size)
  */
 
 vm_size_t
-pager_allocated(pager)
-	dpager_t	pager;
+pager_allocated(dpager_t	pager)
 {
 	vm_size_t       size;
 	dp_map_t map, emap;
@@ -749,10 +741,9 @@ pager_allocated(pager)
  */
 
 unsigned int
-pager_pages(pager, pages, numpages)
-	dpager_t			pager;
-	default_pager_page_t	*pages;
-	unsigned int			numpages;
+pager_pages(dpager_t			pager,
+	default_pager_page_t	*pages,
+	unsigned int			numpages)
 {
 	vm_size_t       size;
 	dp_map_t        map, emap;
@@ -803,9 +794,8 @@ pager_pages(pager, pages, numpages)
  * system memory.
  */
 void
-pager_extend(pager, new_size)
-	dpager_t	pager;
-	vm_size_t	new_size;	/* in pages */
+pager_extend(dpager_t	pager,
+	vm_size_t	new_size	/* in pages */)
 {
 	dp_map_t	new_mapptr;
 	dp_map_t	old_mapptr;
@@ -1072,9 +1062,8 @@ pager_truncate(dpager_t pager, vm_size_t new_size)	/* in pages */
  * Return NO_BLOCK if none allocated.
  */
 union dp_map
-pager_read_offset(pager, offset)
-	dpager_t	pager;
-	vm_offset_t		offset;
+pager_read_offset(dpager_t	pager,
+	vm_offset_t		offset)
 {
 	vm_offset_t	f_page;
 	union dp_map		pager_offset;
@@ -1127,9 +1116,8 @@ pager_read_offset(pager, offset)
 /*
  * Release a single disk block.
  */
-void pager_release_offset(pager, offset)
-	dpager_t	pager;
-	vm_offset_t		offset;
+void pager_release_offset(dpager_t	pager,
+	vm_offset_t		offset)
 {
 	union dp_map	entry;
 
@@ -1162,8 +1150,7 @@ void pager_release_offset(pager, offset)
  * locked unless LOCK_OLD sez otherwise.
  */
 union dp_map
-pager_move_page(block)
-	union dp_map	block;
+pager_move_page(union dp_map	block)
 {
 	partition_t	old_part, new_part;
 	p_index_t	old_pindex, new_pindex;
@@ -1226,9 +1213,8 @@ ddprintf ("pager_move_page(%x,%d,%d)\n",block.block.p_offset,old_pindex,new_pind
  * Return the checksum for a block.
  */
 int
-pager_get_checksum(pager, offset)
-	dpager_t	pager;
-	vm_offset_t		offset;
+pager_get_checksum(dpager_t	pager,
+	vm_offset_t		offset)
 {
 	vm_offset_t	f_page;
 	int checksum;
@@ -1260,10 +1246,9 @@ pager_get_checksum(pager, offset)
  * Remember the checksum for a block.
  */
 int
-pager_put_checksum(pager, offset, checksum)
-	dpager_t	pager;
-	vm_offset_t		offset;
-	int			checksum;
+pager_put_checksum(dpager_t	pager,
+	vm_offset_t		offset,
+	int			checksum)
 {
 	vm_offset_t	f_page;
 	static char		here[] = "%spager_put_checksum";
@@ -1320,9 +1305,8 @@ compute_checksum(addr, size)
  * without notice!
  */
 union dp_map
-pager_write_offset(pager, offset)
-	dpager_t	pager;
-	vm_offset_t		offset;
+pager_write_offset(dpager_t	pager,
+	vm_offset_t		offset)
 {
 	vm_offset_t	f_page;
 	dp_map_t	mapptr;
@@ -1488,8 +1472,7 @@ out:
  * No locking needed because no other operations can be in progress.
  */
 void
-pager_dealloc(pager)
-	dpager_t	pager;
+pager_dealloc(dpager_t	pager)
 {
 	int i, j;
 	dp_map_t	mapptr;
@@ -1548,9 +1531,8 @@ pager_dealloc(pager)
  * some pages might have been moved nonetheless.
  */
 boolean_t
-pager_realloc(pager, pindex)
-	dpager_t	pager;
-	p_index_t		pindex;
+pager_realloc(dpager_t	pager,
+	p_index_t		pindex)
 {
 	dp_map_t	map, emap;
 	vm_size_t		size;
@@ -1613,15 +1595,14 @@ ok:
  * if it is different from <addr>, it must be deallocated after use.
  */
 int
-default_read(ds, addr, size, offset, out_addr, deallocate, external)
-	dpager_t	ds;
-	vm_offset_t		addr;	/* pointer to block to fill */
-	vm_size_t	size;
-	vm_offset_t	offset;
-	vm_offset_t		*out_addr;
+default_read(dpager_t	ds,
+	vm_offset_t		addr,	/* pointer to block to fill */
+	vm_size_t	size,
+	vm_offset_t	offset,
+	vm_offset_t		*out_addr,
 				/* returns pointer to data */
-	boolean_t		deallocate;
-	boolean_t		external;
+	boolean_t		deallocate,
+	boolean_t		external)
 {
 	union dp_map	block;
 	vm_offset_t	raddr;
@@ -1711,11 +1692,10 @@ ddprintf ("default_read(%lx,%x,%lx,%d)\n",addr,size,offset,block.block.p_index);
 }
 
 int
-default_write(ds, addr, size, offset)
-	dpager_t	ds;
-	vm_offset_t	addr;
-	vm_size_t	size;
-	vm_offset_t	offset;
+default_write(dpager_t	ds,
+	vm_offset_t	addr,
+	vm_size_t	size,
+	vm_offset_t	offset)
 {
 	union dp_map	block;
 	partition_t		part;
@@ -1771,9 +1751,8 @@ ddprintf ("default_write(%lx,%x,%lx,%d)\n",addr,size,offset,block.block.p_index)
 }
 
 boolean_t
-default_has_page(ds, offset)
-	dpager_t	ds;
-	vm_offset_t	offset;
+default_has_page(dpager_t	ds,
+	vm_offset_t	offset)
 {
 	return ( ! no_block(pager_read_offset(ds, offset)) );
 }
@@ -1798,9 +1777,8 @@ struct pager_port all_pagers;
 	queue_init(&all_pagers.leak_queue);			\
 }
 
-void pager_port_list_insert(port, ds)
-	mach_port_t port;
-	default_pager_t	ds;
+void pager_port_list_insert(mach_port_t port,
+	default_pager_t	ds)
 {
 	pthread_mutex_lock(&all_pagers.lock);
 	hurd_ihash_add (&all_pagers.htable,
@@ -1815,8 +1793,7 @@ void pager_port_list_insert(port, ds)
 					 (unsigned long) ds);
 }
 
-void pager_port_list_delete(ds)
-	default_pager_t ds;
+void pager_port_list_delete(default_pager_t ds)
 {
 	pthread_mutex_lock(&all_pagers.lock);
 	hurd_ihash_locp_remove (&all_pagers.htable,
@@ -1832,9 +1809,8 @@ void pager_port_list_delete(ds)
  * XXX this is not re-entrant XXX
  */
 kern_return_t
-destroy_paging_partition(name, pp_private)
-	const char	*name;
-	void **pp_private;
+destroy_paging_partition(const char	*name,
+	void **pp_private)
 {
 	unsigned int	id = part_id(name);
 	partition_t	part = NULL;
@@ -1945,9 +1921,8 @@ unsigned int default_pager_wait_refs = 0;	/* debugging */
 /*
  * Waits for correct sequence number.  Leaves pager locked.
  */
-void pager_port_lock(ds, seqno)
-	default_pager_t ds;
-	mach_port_seqno_t seqno;
+void pager_port_lock(default_pager_t ds,
+	mach_port_seqno_t seqno)
 {
 	default_pager_total++;
 	dstruct_lock(ds);
@@ -1960,8 +1935,7 @@ void pager_port_lock(ds, seqno)
 /*
  * Increments sequence number and unlocks pager.
  */
-void pager_port_unlock(ds)
-	default_pager_t ds;
+void pager_port_unlock(default_pager_t ds)
 {
 	ds->seqno++;
 	pthread_cond_broadcast(&ds->waiting_seqno);
@@ -1971,8 +1945,7 @@ void pager_port_unlock(ds)
 /*
  * Start a read - one more reader.  Pager must be locked.
  */
-void pager_port_start_read(ds)
-	default_pager_t ds;
+void pager_port_start_read(default_pager_t ds)
 {
 	ds->readers++;
 }
@@ -1980,8 +1953,7 @@ void pager_port_start_read(ds)
 /*
  * Wait for readers.  Unlocks and relocks pager if wait needed.
  */
-void pager_port_wait_for_readers(ds)
-	default_pager_t ds;
+void pager_port_wait_for_readers(default_pager_t ds)
 {
 	while (ds->readers != 0) {
 		default_pager_wait_read++;
@@ -1992,8 +1964,7 @@ void pager_port_wait_for_readers(ds)
 /*
  * Finish a read.  Pager is unlocked and returns unlocked.
  */
-void pager_port_finish_read(ds)
-	default_pager_t ds;
+void pager_port_finish_read(default_pager_t ds)
 {
 	dstruct_lock(ds);
 	if (--ds->readers == 0) {
@@ -2008,8 +1979,7 @@ void pager_port_finish_read(ds)
 /*
  * Start a write - one more writer.  Pager must be locked.
  */
-void pager_port_start_write(ds)
-	default_pager_t ds;
+void pager_port_start_write(default_pager_t ds)
 {
 	ds->writers++;
 }
@@ -2017,8 +1987,7 @@ void pager_port_start_write(ds)
 /*
  * Wait for writers.  Unlocks and relocks pager if wait needed.
  */
-void pager_port_wait_for_writers(ds)
-	default_pager_t ds;
+void pager_port_wait_for_writers(default_pager_t ds)
 {
 	while (ds->writers != 0) {
 		default_pager_wait_write++;
@@ -2029,8 +1998,7 @@ void pager_port_wait_for_writers(ds)
 /*
  * Finish a write.  Pager is unlocked and returns unlocked.
  */
-void pager_port_finish_write(ds)
-	default_pager_t ds;
+void pager_port_finish_write(default_pager_t ds)
 {
 	dstruct_lock(ds);
 	if (--ds->writers == 0) {
@@ -2046,8 +2014,7 @@ void pager_port_finish_write(ds)
  * Wait for concurrent default_pager_objects.
  * Unlocks and relocks pager if wait needed.
  */
-void pager_port_wait_for_refs(ds)
-	default_pager_t ds;
+void pager_port_wait_for_refs(default_pager_t ds)
 {
 	while (ds->name_refs == 0) {
 		default_pager_wait_refs++;
@@ -2058,8 +2025,7 @@ void pager_port_wait_for_refs(ds)
 /*
  * Finished creating name refs - wake up waiters.
  */
-void pager_port_finish_refs(ds)
-	default_pager_t ds;
+void pager_port_finish_refs(default_pager_t ds)
 {
 	pthread_cond_broadcast(&ds->waiting_refs);
 }
@@ -2115,8 +2081,7 @@ unsigned int default_pager_internal_count = DEFAULT_PAGER_INTERNAL_COUNT;
 unsigned int default_pager_external_count = DEFAULT_PAGER_EXTERNAL_COUNT;
 					/* Number of "external" threads. */
 
-default_pager_t pager_port_alloc(size)
-	vm_size_t size;
+default_pager_t pager_port_alloc(vm_size_t size)
 {
 	default_pager_t ds;
 	p_index_t	part;
@@ -2156,9 +2121,8 @@ mach_port_urefs_t default_pager_max_urefs = 10000;
  * Pager must be locked.
  * Unlocks and re-locks pager if needs to call kernel.
  */
-void pager_port_check_request(ds, pager_request)
-	default_pager_t ds;
-	mach_port_t pager_request;
+void pager_port_check_request(default_pager_t ds,
+	mach_port_t pager_request)
 {
 	mach_port_delta_t delta;
 	kern_return_t kr;
@@ -2184,9 +2148,8 @@ void pager_port_check_request(ds, pager_request)
 	}
 }
 
-void default_pager_add(ds, internal)
-	default_pager_t ds;
-	boolean_t internal;
+void default_pager_add(default_pager_t ds,
+	boolean_t internal)
 {
 	mach_port_t		pager = ds->pager;
 	mach_port_t		pset;
@@ -2236,15 +2199,13 @@ void default_pager_add(ds, internal)
  *		be so paranoid about the contents.
  */
 kern_return_t
-seqnos_memory_object_create(old_pager, seqno, new_pager, new_size,
-			    new_pager_request, new_pager_name, new_page_size)
-	mach_port_t	old_pager;
-	mach_port_seqno_t seqno;
-	mach_port_t	new_pager;
-	vm_size_t	new_size;
-	mach_port_t	new_pager_request;
-	mach_port_t	new_pager_name;
-	vm_size_t	new_page_size;
+seqnos_memory_object_create(mach_port_t	old_pager,
+	mach_port_seqno_t seqno,
+	mach_port_t	new_pager,
+	vm_size_t	new_size,
+	mach_port_t	new_pager_request,
+	mach_port_t	new_pager_name,
+	vm_size_t	new_page_size)
 {
 	default_pager_t	ds;
 
@@ -2281,13 +2242,11 @@ memory_object_copy_strategy_t default_pager_copy_strategy =
 					MEMORY_OBJECT_COPY_DELAY;
 
 kern_return_t
-seqnos_memory_object_init(ds, seqno, pager_request, pager_name,
-			  pager_page_size)
-	default_pager_t	ds;
-	mach_port_seqno_t seqno;
-	mach_port_t	pager_request;
-	mach_port_t	pager_name;
-	vm_size_t	pager_page_size;
+seqnos_memory_object_init(default_pager_t	ds,
+	mach_port_seqno_t seqno,
+	mach_port_t	pager_request,
+	mach_port_t	pager_name,
+	vm_size_t	pager_page_size)
 {
 	kern_return_t		 kr;
 	static char		 here[] = "%sinit";
@@ -2327,11 +2286,10 @@ seqnos_memory_object_init(ds, seqno, pager_request, pager_name,
 }
 
 kern_return_t
-seqnos_memory_object_terminate(ds, seqno, pager_request, pager_name)
-	default_pager_t	ds;
-	mach_port_seqno_t seqno;
-	mach_port_t	pager_request;
-	mach_port_t	pager_name;
+seqnos_memory_object_terminate(default_pager_t	ds,
+	mach_port_seqno_t seqno,
+	mach_port_t	pager_request,
+	mach_port_t	pager_name)
 {
 	static char			here[] = "%sterminate";
 
@@ -2387,10 +2345,9 @@ ddprintf ("seqnos_memory_object_terminate <%p>: pager_port_unlock: <%p>[s:%d,r:%
 	return (KERN_SUCCESS);
 }
 
-void default_pager_no_senders(ds, seqno, mscount)
-	default_pager_t ds;
-	mach_port_seqno_t seqno;
-	mach_port_mscount_t mscount;
+void default_pager_no_senders(default_pager_t ds,
+	mach_port_seqno_t seqno,
+	mach_port_mscount_t mscount)
 {
 	kern_return_t		 kr;
 	static char		 here[] = "%sno_senders";
@@ -2462,14 +2419,12 @@ int		default_pager_pageout_count = 0;
 static __thread default_pager_thread_t *dpt;
 
 kern_return_t
-seqnos_memory_object_data_request(ds, seqno, reply_to, offset,
-				  length, protection_required)
-	default_pager_t	ds;
-	mach_port_seqno_t seqno;
-	mach_port_t	reply_to;
-	vm_offset_t	offset;
-	vm_size_t	length;
-	vm_prot_t	protection_required;
+seqnos_memory_object_data_request(default_pager_t	ds,
+	mach_port_seqno_t seqno,
+	mach_port_t	reply_to,
+	vm_offset_t	offset,
+	vm_size_t	length,
+	vm_prot_t	protection_required)
 {
 	vm_offset_t		addr;
 	unsigned int 		errors;
@@ -2563,16 +2518,12 @@ ddprintf ("seqnos_memory_object_data_request <%p>: pager_port_unlock: <%p>[s:%d,
  * also assumes that the default_pager is single-threaded.
  */
 kern_return_t
-seqnos_memory_object_data_initialize(ds, seqno, pager_request,
-				     offset, addr, data_cnt)
-	default_pager_t	ds;
-	mach_port_seqno_t seqno;
-	mach_port_t	pager_request;
-	register
-	vm_offset_t	offset;
-	register
-	pointer_t	addr;
-	mach_msg_type_number_t	data_cnt;
+seqnos_memory_object_data_initialize(default_pager_t	ds,
+	mach_port_seqno_t seqno,
+	mach_port_t	pager_request,
+	vm_offset_t	offset,
+	pointer_t	addr,
+	mach_msg_type_number_t	data_cnt)
 {
 	vm_offset_t	amount_sent;
 	static char	here[] = "%sdata_initialize";
@@ -2623,17 +2574,14 @@ ddprintf ("seqnos_memory_object_data_initialize <%p>: pager_port_unlock: <%p>[s:
  * into individual pages and pass them off to default_write.
  */
 kern_return_t
-seqnos_memory_object_data_return(ds, seqno, pager_request,
-				 offset, addr, data_cnt,
-				 dirty, kernel_copy)
-	default_pager_t	ds;
-	mach_port_seqno_t seqno;
-	mach_port_t	pager_request;
-	vm_offset_t	offset;
-	pointer_t	addr;
-	mach_msg_type_number_t	data_cnt;
-	boolean_t	dirty;
-	boolean_t	kernel_copy;
+seqnos_memory_object_data_return(default_pager_t	ds,
+	mach_port_seqno_t seqno,
+	mach_port_t	pager_request,
+	vm_offset_t	offset,
+	pointer_t	addr,
+	mach_msg_type_number_t	data_cnt,
+	boolean_t	dirty,
+	boolean_t	kernel_copy)
 {
 	register
 	vm_size_t	amount_sent;
@@ -2707,15 +2655,13 @@ seqnos_memory_object_data_return(ds, seqno, pager_request,
 
 /*ARGSUSED*/
 kern_return_t
-seqnos_memory_object_copy(old_memory_object, seqno, old_memory_control,
-			  offset, length, new_memory_object)
-	default_pager_t	old_memory_object;
-	mach_port_seqno_t seqno;
+seqnos_memory_object_copy(default_pager_t	old_memory_object,
+	mach_port_seqno_t seqno,
 	memory_object_control_t
-			old_memory_control;
-	vm_offset_t	offset;
-	vm_size_t	length;
-	memory_object_t	new_memory_object;
+			old_memory_control,
+	vm_offset_t	offset,
+	vm_size_t	length,
+	memory_object_t	new_memory_object)
 {
 	panic("%scopy", my_name);
 	return KERN_FAILURE;
@@ -2735,49 +2681,42 @@ seqnos_memory_object_lock_completed (default_pager_t ds,
 }
 
 kern_return_t
-seqnos_memory_object_data_unlock(pager, seqno, pager_request,
-				 offset, length, protection_required)
-	default_pager_t	pager;
-	mach_port_seqno_t seqno;
-	mach_port_t	pager_request;
-	vm_offset_t	offset;
-	vm_size_t	length;
-	vm_prot_t	protection_required;
+seqnos_memory_object_data_unlock(default_pager_t	pager,
+	mach_port_seqno_t seqno,
+	mach_port_t	pager_request,
+	vm_offset_t	offset,
+	vm_size_t	length,
+	vm_prot_t	protection_required)
 {
 	panic("%sdata_unlock",my_name);
 	return(KERN_FAILURE);
 }
 
 kern_return_t
-seqnos_memory_object_supply_completed(ds, seqno, pager_request,
-				      offset, length,
-				      result, error_offset)
-	default_pager_t	ds;
-	mach_port_seqno_t seqno;
-	mach_port_t	pager_request;
-	vm_offset_t	offset;
-	vm_size_t	length;
-	kern_return_t	result;
-	vm_offset_t	error_offset;
+seqnos_memory_object_supply_completed(default_pager_t	ds,
+	mach_port_seqno_t seqno,
+	mach_port_t	pager_request,
+	vm_offset_t	offset,
+	vm_size_t	length,
+	kern_return_t	result,
+	vm_offset_t	error_offset)
 {
 	panic("%ssupply_completed",my_name);
 	return(KERN_FAILURE);
 }
 
 kern_return_t
-seqnos_memory_object_change_completed(ds, seqno, may_cache, copy_strategy)
-	default_pager_t ds;
-	mach_port_seqno_t seqno;
-	boolean_t	may_cache;
-	memory_object_copy_strategy_t copy_strategy;
+seqnos_memory_object_change_completed(default_pager_t ds,
+	mach_port_seqno_t seqno,
+	boolean_t	may_cache,
+	memory_object_copy_strategy_t copy_strategy)
 {
 	panic("%schange_completed",my_name);
 	return(KERN_FAILURE);
 }
 
 
-boolean_t default_pager_notify_server(in, out)
-	mach_msg_header_t *in, *out;
+boolean_t default_pager_notify_server(mach_msg_header_t *in, mach_msg_header_t *out)
 {
 	default_pager_t ds;
 
@@ -2863,9 +2802,8 @@ mig_reply_setup (
 }
 
 boolean_t
-default_pager_demux_object(in, out)
-	mach_msg_header_t	*in;
-	mach_msg_header_t	*out;
+default_pager_demux_object( mach_msg_header_t	*in,
+	mach_msg_header_t	*out)
 {
 	/*
 	 *	We receive memory_object_data_initialize messages in
@@ -2894,9 +2832,8 @@ default_pager_demux_object(in, out)
 mach_msg_size_t default_pager_msg_size_default = 8 * 1024;
 
 boolean_t
-default_pager_demux_default(in, out)
-	mach_msg_header_t	*in;
-	mach_msg_header_t	*out;
+default_pager_demux_default(mach_msg_header_t	*in,
+	mach_msg_header_t	*out)
 {
 	if (in->msgh_local_port == default_pager_default_port) {
 		/*
@@ -2945,7 +2882,7 @@ return rval;
  */
 
 void
-default_pager_thread_privileges()
+default_pager_thread_privileges(void)
 {
 	/*
 	 *	Set thread privileges.
@@ -3001,8 +2938,7 @@ default_pager_thread(void *arg)
 }
 
 void
-start_default_pager_thread(internal)
-	boolean_t internal;
+start_default_pager_thread(boolean_t internal)
 {
 	default_pager_thread_t *ndpt;
 	kern_return_t kr;
@@ -3030,8 +2966,7 @@ start_default_pager_thread(internal)
 }
 
 void
-default_pager_initialize(host_port)
-	mach_port_t	host_port;
+default_pager_initialize(mach_port_t	host_port)
 {
 	memory_object_t		DMM;
 	kern_return_t		kr;
@@ -3092,7 +3027,7 @@ default_pager_initialize(host_port)
  * Initialize and Run the default pager
  */
 void
-default_pager()
+default_pager(void)
 {
 	error_t err;
 	kern_return_t kr;
@@ -3727,11 +3662,10 @@ extern mach_port_t bootstrap_master_device_port;
 extern mach_port_t bootstrap_master_host_port;
 
 kern_return_t
-S_default_pager_paging_file (pager, mdport, file_name, add)
-	mach_port_t			pager;
-	mach_port_t			mdport;
-	const_default_pager_filename_t	file_name;
-	boolean_t			add;
+S_default_pager_paging_file (mach_port_t			pager,
+	mach_port_t			mdport,
+	const_default_pager_filename_t	file_name,
+	boolean_t			add)
 {
 	kern_return_t   kr;
 
@@ -3756,9 +3690,8 @@ dprintf("bmd %x md %x\n", bootstrap_master_device_port, mdport);
 }
 
 kern_return_t
-default_pager_register_fileserver(pager, fileserver)
-	mach_port_t			pager;
-	mach_port_t			fileserver;
+default_pager_register_fileserver(mach_port_t			pager,
+	mach_port_t			fileserver)
 {
 	if (pager != default_pager_default_port)
 		return KERN_INVALID_ARGUMENT;
@@ -3772,8 +3705,7 @@ default_pager_register_fileserver(pager, fileserver)
 /*
  * When things do not quite workout...
  */
-void no_paging_space(out_of_memory)
-	boolean_t		out_of_memory;
+void no_paging_space(boolean_t out_of_memory)
 {
 	static char		here[] = "%s *** NOT ENOUGH PAGING SPACE ***";
 
@@ -3782,9 +3714,8 @@ void no_paging_space(out_of_memory)
 	panic(here, my_name);
 }
 
-void overcommitted(got_more_space, space)
-	boolean_t	got_more_space;
-	vm_size_t	space;		/* in pages */
+void overcommitted(boolean_t	got_more_space,
+		vm_size_t	space		/* in pages */)
 {
 	vm_size_t	pages_free, pages_total;
 
@@ -3825,8 +3756,7 @@ void overcommitted(got_more_space, space)
 #endif
 }
 
-void paging_space_info(totp, freep)
-	vm_size_t	*totp, *freep;
+void paging_space_info(vm_size_t *totp, vm_size_t *freep)
 {
 	vm_size_t	total, free;
 	partition_t	part;
@@ -3856,10 +3786,9 @@ void paging_space_info(totp, freep)
  */
 
 kern_return_t
-catch_exception_raise(exception_port, thread, task, exception, code, subcode)
-	mach_port_t exception_port;
-	mach_port_t thread, task;
-	int exception, code, subcode;
+catch_exception_raise(mach_port_t exception_port,
+		mach_port_t thread, mach_port_t task,
+		int exception, int code, int subcode)
 {
 	ddprintf ("(default_pager)catch_exception_raise(%d,%d,%d)\n",
 	       exception, code, subcode);
diff --git a/mach-defpager/setup.c b/mach-defpager/setup.c
index a1e7fe4e..7b32ea9f 100644
--- a/mach-defpager/setup.c
+++ b/mach-defpager/setup.c
@@ -240,10 +240,9 @@ page_write_file_direct(struct file_direct *fdp,
 /* Compatibility entry points used by default_pager_paging_file RPC.  */
 
 kern_return_t
-add_paging_file(master_device_port, file_name, linux_signature)
-	mach_port_t		master_device_port;
-	const char		*file_name;
-	int			linux_signature;
+add_paging_file(mach_port_t		master_device_port,
+	const char		*file_name,
+	int			linux_signature)
 {
   error_t err;
   mach_port_t dev;
diff --git a/mach-defpager/wiring.c b/mach-defpager/wiring.c
index 43ed91de..cb53de4c 100644
--- a/mach-defpager/wiring.c
+++ b/mach-defpager/wiring.c
@@ -37,15 +37,14 @@ mach_port_t	priv_host_port = MACH_PORT_NULL;
 					/* the privileged host port */
 
 void
-wire_setup(host_priv)
-	mach_port_t	host_priv;
+wire_setup(mach_port_t	host_priv)
 {
 	priv_host_port = host_priv;
 	this_task = mach_task_self();
 }
 
 void
-wire_thread()
+wire_thread(void)
 {
 	kern_return_t	kr;
 
diff --git a/nfs/name-cache.c b/nfs/name-cache.c
index 73bcc071..44d59430 100644
--- a/nfs/name-cache.c
+++ b/nfs/name-cache.c
@@ -227,7 +227,7 @@ register_pos_hit (int n)
   
 /* Register a miss */
 void
-register_miss ()
+register_miss (void)
 {
   int i;
   
diff --git a/nfs/rpc.c b/nfs/rpc.c
index 0d83064a..2a74094a 100644
--- a/nfs/rpc.c
+++ b/nfs/rpc.c
@@ -58,7 +58,7 @@ static pthread_mutex_t outstanding_lock = PTHREAD_MUTEX_INITIALIZER;
 
 /* Generate and return a new transaction ID.  */
 static inline int
-generate_xid ()
+generate_xid (void)
 {
   static int nextxid;
   
diff --git a/nfsd/cache.c b/nfsd/cache.c
index d3ee7659..cd5524af 100644
--- a/nfsd/cache.c
+++ b/nfsd/cache.c
@@ -209,7 +209,7 @@ cred_ref (struct idspec *i)
 }
 
 void
-scan_creds ()
+scan_creds (void)
 {
   int n;
   int newleast = mapped_time->seconds;
@@ -337,7 +337,7 @@ cache_handle_rele (struct cache_handle *c)
 }
 
 void
-scan_fhs ()
+scan_fhs (void)
 {
   int n;
   int newleast = mapped_time->seconds;
@@ -534,7 +534,7 @@ release_cached_reply (struct cached_reply *cr)
 }
 
 void
-scan_replies ()
+scan_replies (void)
 {
   int n;
   int newleast = mapped_time->seconds;
diff --git a/pfinet/glue-include/linux/sched.h b/pfinet/glue-include/linux/sched.h
index 2446e88c..b91c3edf 100644
--- a/pfinet/glue-include/linux/sched.h
+++ b/pfinet/glue-include/linux/sched.h
@@ -79,7 +79,7 @@ struct semaphore { };
 
 
 static inline int
-suser ()
+suser (void)
 {
   return current->isroot;
 };
diff --git a/pfinet/linux-src/net/ipv6/ip6_flowlabel.c b/pfinet/linux-src/net/ipv6/ip6_flowlabel.c
index 4a34b878..802551c7 100644
--- a/pfinet/linux-src/net/ipv6/ip6_flowlabel.c
+++ b/pfinet/linux-src/net/ipv6/ip6_flowlabel.c
@@ -604,7 +604,7 @@ done:
 #endif
 
 
-void ip6_flowlabel_init()
+void ip6_flowlabel_init(void)
 {
 #ifdef CONFIG_PROC_FS
 	struct proc_dir_entry *ent;
@@ -618,7 +618,7 @@ void ip6_flowlabel_init()
 #endif
 }
 
-void ip6_flowlabel_cleanup()
+void ip6_flowlabel_cleanup(void)
 {
 	del_timer(&ip6_fl_gc_timer);
 #ifdef CONFIG_PROC_FS
diff --git a/pfinet/linux-src/net/ipv6/route_ipv6.c b/pfinet/linux-src/net/ipv6/route_ipv6.c
index 5f79a226..d404ae5c 100644
--- a/pfinet/linux-src/net/ipv6/route_ipv6.c
+++ b/pfinet/linux-src/net/ipv6/route_ipv6.c
@@ -542,7 +542,7 @@ static void ip6_link_failure(struct sk_buff *skb)
 	}
 }
 
-static int ip6_dst_gc()
+static int ip6_dst_gc(void)
 {
 	static unsigned expire = 30*HZ;
 	static unsigned long last_gc;
diff --git a/pfinet/main.c b/pfinet/main.c
index e3e027c7..7d85c469 100644
--- a/pfinet/main.c
+++ b/pfinet/main.c
@@ -169,7 +169,7 @@ sigterm_handler (int signo)
 }
 
 void
-arrange_shutdown_notification ()
+arrange_shutdown_notification (void)
 {
   error_t err;
   mach_port_t initport, notify;
diff --git a/pfinet/mapped-time.h b/pfinet/mapped-time.h
index 01f2dcc8..1d37affd 100644
--- a/pfinet/mapped-time.h
+++ b/pfinet/mapped-time.h
@@ -9,13 +9,13 @@ extern volatile struct mapped_time_value *mapped_time;
 extern long long root_jiffies;
 
 static inline int
-read_mapped_secs ()
+read_mapped_secs (void)
 {
   return mapped_time->seconds;
 }
 
 static inline int
-fetch_jiffies ()
+fetch_jiffies (void)
 {
   struct timeval tv;
   long long j;
diff --git a/pfinet/timer-emul.c b/pfinet/timer-emul.c
index e2ed3a26..f1686741 100644
--- a/pfinet/timer-emul.c
+++ b/pfinet/timer-emul.c
@@ -156,7 +156,7 @@ init_timer (struct timer_list *timer)
 }
 
 void
-init_time ()
+init_time (void)
 {
   error_t err;
   struct timeval tp;
diff --git a/pflocal/sock.c b/pflocal/sock.c
index 174494cd..3daf8282 100644
--- a/pflocal/sock.c
+++ b/pflocal/sock.c
@@ -500,7 +500,7 @@ sock_shutdown (struct sock *sock, unsigned flags)
 /* ---------------------------------------------------------------- */
 
 error_t
-sock_global_init ()
+sock_global_init (void)
 {
   sock_port_bucket = ports_create_bucket ();
   sock_user_port_class = ports_create_class (sock_user_clean, NULL);
@@ -510,7 +510,7 @@ sock_global_init ()
 
 /* Try to shutdown any active sockets, returning EBUSY if we can't.  */
 error_t
-sock_global_shutdown ()
+sock_global_shutdown (void)
 {
   int num_ports = ports_count_bucket (sock_port_bucket);
   ports_enable_bucket (sock_port_bucket);
diff --git a/pflocal/sserver.c b/pflocal/sserver.c
index e500a75f..55d2d188 100644
--- a/pflocal/sserver.c
+++ b/pflocal/sserver.c
@@ -83,7 +83,7 @@ handle_sock_requests (void *unused)
    port(s) which need server, as the server routine only operates while there
    are any ports.  */
 void
-ensure_sock_server ()
+ensure_sock_server (void)
 {
   pthread_t thread;
   error_t err;
diff --git a/proc/mgt.c b/proc/mgt.c
index 1170e361..25844dbf 100644
--- a/proc/mgt.c
+++ b/proc/mgt.c
@@ -1219,7 +1219,7 @@ add_tasks (task_t task)
 /* Allocate a new unused PID.
    (Unused means it is neither the pid nor pgrp of any relevant data.) */
 int
-genpid ()
+genpid (void)
 {
 #define WRAP_AROUND 30000
 #define START_OVER 100
diff --git a/startup/startup.c b/startup/startup.c
index 3cb3f31b..e151cd2f 100644
--- a/startup/startup.c
+++ b/startup/startup.c
@@ -976,7 +976,7 @@ launch_core_servers (void)
 
 /* Set up the initial value of the standard exec data. */
 void
-init_stdarrays ()
+init_stdarrays (void)
 {
   auth_t nullauth;
   mach_port_t pt;
diff --git a/storeio/dev.c b/storeio/dev.c
index 4f48d081..c87400c0 100644
--- a/storeio/dev.c
+++ b/storeio/dev.c
@@ -392,7 +392,7 @@ dev_read (struct dev *dev, off_t offs, size_t whole_amount,
 {
   error_t err;
   int allocated_buf = 0;
-  error_t ensure_buf ()
+  error_t ensure_buf (void)
     {
       if (*len < whole_amount)
 	{
diff --git a/storeio/pager.c b/storeio/pager.c
index 01a1525c..11bf4692 100644
--- a/storeio/pager.c
+++ b/storeio/pager.c
@@ -144,7 +144,7 @@ static struct pager_requests *pager_requests;
 
 /* Initialize paging for this device.  */
 static void
-init_dev_paging ()
+init_dev_paging (void)
 {
   if (! pager_port_bucket)
     {
diff --git a/sutils/fsck.c b/sutils/fsck.c
index d864134c..0d3b1d46 100644
--- a/sutils/fsck.c
+++ b/sutils/fsck.c
@@ -99,12 +99,12 @@ static int _debug = 0;
 
 static int got_sigquit = 0, got_sigint = 0;
 
-static void sigquit ()
+static void sigquit (void)
 {
   got_sigquit = 1;
 }
 
-static void sigint ()
+static void sigint (void)
 {
   got_sigint = 1;
 }
diff --git a/term/devio.c b/term/devio.c
index 621ec937..6024acc2 100644
--- a/term/devio.c
+++ b/term/devio.c
@@ -262,7 +262,7 @@ bogus_speed_to_real_speed (int bspeed)
 /* If there are characters on the output queue and no
    pending output requests, then send them. */
 static error_t
-devio_start_output ()
+devio_start_output (void)
 {
   char *cp;
   int size;
@@ -395,21 +395,21 @@ device_read_reply_inband (mach_port_t replypt,
 }
 
 static error_t
-devio_set_break ()
+devio_set_break (void)
 {
   device_set_status (phys_device, TTY_SET_BREAK, 0, 0);
   return 0;
 }
 
 static error_t
-devio_clear_break ()
+devio_clear_break (void)
 {
   device_set_status (phys_device, TTY_CLEAR_BREAK, 0, 0);
   return 0;
 }
 
 static error_t
-devio_abandon_physical_output ()
+devio_abandon_physical_output (void)
 {
   int val = D_WRITE;
 
@@ -429,7 +429,7 @@ devio_abandon_physical_output ()
 }
 
 static error_t
-devio_suspend_physical_output ()
+devio_suspend_physical_output (void)
 {
   if (!output_stopped)
     {
@@ -440,13 +440,13 @@ devio_suspend_physical_output ()
 }
 
 static error_t
-devio_notice_input_flushed ()
+devio_notice_input_flushed (void)
 {
   return 0;
 }
 
 static int
-devio_pending_output_size ()
+devio_pending_output_size (void)
 {
   /* Unfortunately, there's no way to get the amount back from Mach
      that has actually been written from this... */
@@ -455,7 +455,7 @@ devio_pending_output_size ()
 
 /* Do this the first time the device is to be opened */
 static error_t
-initial_open ()
+initial_open (void)
 {
   error_t err;
 
@@ -492,7 +492,7 @@ initial_open ()
 }
 
 static error_t
-devio_desert_dtr ()
+devio_desert_dtr (void)
 {
   int bits;
 
@@ -506,7 +506,7 @@ devio_desert_dtr ()
 }
 
 static error_t
-devio_assert_dtr ()
+devio_assert_dtr (void)
 {
   error_t err;
 
diff --git a/term/hurdio.c b/term/hurdio.c
index 3456ef24..20a939f3 100644
--- a/term/hurdio.c
+++ b/term/hurdio.c
@@ -325,7 +325,7 @@ hurdio_writer_loop (void *arg)
 /* If there are characters on the output queue, then send them.  Is
    called with global lock held.  */
 static error_t
-hurdio_start_output ()
+hurdio_start_output (void)
 {
   /* If the output was suspended earlier and not anymore, we have to
      tell the underlying port to resume it.  */
@@ -346,7 +346,7 @@ hurdio_start_output ()
 
 /* Stop carrier on the line.  Is called with global lock held.  */
 static error_t
-hurdio_set_break ()
+hurdio_set_break (void)
 {
   if (tioc_caps & TIOC_CAP_SBRK)
     {
@@ -362,7 +362,7 @@ hurdio_set_break ()
 
 /* Reassert carrier on the line.  Is called with global lock held.  */
 static error_t
-hurdio_clear_break ()
+hurdio_clear_break (void)
 {
   if (tioc_caps & TIOC_CAP_CBRK)
     {
@@ -382,7 +382,7 @@ hurdio_clear_break ()
    called to flush whatever other such things may be going on.  Is
    called with global lock held.  */
 static error_t
-hurdio_abandon_physical_output ()
+hurdio_abandon_physical_output (void)
 {
   if (tioc_caps & TIOC_CAP_FLUSH)
     {
@@ -405,7 +405,7 @@ hurdio_abandon_physical_output ()
    output in the bottom handler as well.  Is called with the global
    lock held.  */
 static error_t
-hurdio_suspend_physical_output ()
+hurdio_suspend_physical_output (void)
 {
   if (!output_stopped)
     {
@@ -425,7 +425,7 @@ hurdio_suspend_physical_output ()
 /* This is called to notify the bottom half when an input flush has
    occurred.  It is necessary to support pty packet mode.  */
 static error_t
-hurdio_notice_input_flushed ()
+hurdio_notice_input_flushed (void)
 {
   if (tioc_caps & TIOC_CAP_FLUSH)
     {
@@ -441,7 +441,7 @@ hurdio_notice_input_flushed ()
 
 /* Determine the number of bytes of output pending.  */
 static int
-hurdio_pending_output_size ()
+hurdio_pending_output_size (void)
 {
   int queue_size = 0;
 
@@ -460,7 +460,7 @@ hurdio_pending_output_size ()
 
 /* Desert the DTR.  Is called with global lock held.  */
 static error_t
-hurdio_desert_dtr ()
+hurdio_desert_dtr (void)
 {
   if (writer_thread != MACH_PORT_NULL)
     hurd_thread_cancel (writer_thread);
@@ -481,7 +481,7 @@ hurdio_desert_dtr ()
 
 
 static error_t
-hurdio_assert_dtr ()
+hurdio_assert_dtr (void)
 {
   if (ioport == MACH_PORT_NULL)
     {
@@ -614,7 +614,7 @@ hurdio_mdmctl (int how, int bits)
 
 
 static int
-hurdio_mdmstate ()
+hurdio_mdmstate (void)
 {
   int oldbits;
 
diff --git a/term/munge.c b/term/munge.c
index e0e90453..3b304605 100644
--- a/term/munge.c
+++ b/term/munge.c
@@ -192,7 +192,7 @@ echo_double (char c, int quoted)
 
 /* Do a single C-h SPC C-h sequence */
 static inline void
-write_erase_sequence ()
+write_erase_sequence (void)
 {
   poutput ('\b');
   poutput (' ');
@@ -236,7 +236,7 @@ echo_char (char c, int hderase, int quoted)
 
 /* Re-echo the current rawq preceded by the VREPRINT char. */
 static inline void
-reprint_line ()
+reprint_line (void)
 {
   short *cp;
 
@@ -613,7 +613,7 @@ alldone:
 
 /* This is called by the lower half when a break is received. */
 void
-input_break ()
+input_break (void)
 {
   struct queue **qp = termstate.c_lflag & ICANON ? &rawq : &inputq;
 
@@ -663,7 +663,7 @@ input_framing_error (int c)
 
 /* Copy the characters in RAWQ to the end of INPUTQ and clear RAWQ. */
 void
-copy_rawq ()
+copy_rawq (void)
 {
   while (qsize (rawq))
     enqueue (&inputq, dequeue (rawq));
@@ -671,7 +671,7 @@ copy_rawq ()
 
 /* Process all the characters in INPUTQ as if they had just been read. */
 void
-rescan_inputq ()
+rescan_inputq (void)
 {
   short *buf;
   int i, n;
@@ -687,7 +687,7 @@ rescan_inputq ()
 
 
 error_t
-drop_output ()
+drop_output (void)
 {
   error_t err = (*bottom->abandon_physical_output) ();
   if (!err)
@@ -697,7 +697,7 @@ drop_output ()
 
 
 error_t
-drain_output ()
+drain_output (void)
 {
   int cancel = 0;
 
diff --git a/term/ptyio.c b/term/ptyio.c
index acd1015a..51f38078 100644
--- a/term/ptyio.c
+++ b/term/ptyio.c
@@ -125,7 +125,7 @@ pty_po_destroy_hook (struct trivfs_peropen *po)
 }
 
 static inline void
-wake_reader ()
+wake_reader (void)
 {
   if (pty_read_blocked)
     {
@@ -139,7 +139,7 @@ wake_reader ()
 /* Lower half for tty node */
 
 static error_t
-ptyio_start_output ()
+ptyio_start_output (void)
 {
   if (packet_mode && output_stopped && (!(termflags & USER_OUTPUT_SUSP)))
     {
@@ -152,7 +152,7 @@ ptyio_start_output ()
 }
 
 static error_t
-ptyio_abandon_physical_output ()
+ptyio_abandon_physical_output (void)
 {
   if (packet_mode)
     {
@@ -163,7 +163,7 @@ ptyio_abandon_physical_output ()
 }
 
 static error_t
-ptyio_suspend_physical_output ()
+ptyio_suspend_physical_output (void)
 {
   if (packet_mode)
     {
@@ -176,14 +176,14 @@ ptyio_suspend_physical_output ()
 }
 
 static int
-ptyio_pending_output_size ()
+ptyio_pending_output_size (void)
 {
   /* We don't maintain any pending output buffer separate from the outputq. */
   return 0;
 }
 
 static error_t
-ptyio_notice_input_flushed ()
+ptyio_notice_input_flushed (void)
 {
   if (packet_mode)
     {
@@ -194,14 +194,14 @@ ptyio_notice_input_flushed ()
 }
 
 static error_t
-ptyio_assert_dtr ()
+ptyio_assert_dtr (void)
 {
   dtr_on = 1;
   return 0;
 }
 
 static error_t
-ptyio_desert_dtr ()
+ptyio_desert_dtr (void)
 {
   dtr_on = 0;
   wake_reader ();
@@ -248,13 +248,13 @@ ptyio_set_bits (struct termios *state)
 /* These do nothing.  In BSD the associated ioctls get errors, but
    I'd rather just ignore them. */
 static error_t
-ptyio_set_break ()
+ptyio_set_break (void)
 {
   return 0;
 }
 
 static error_t
-ptyio_clear_break ()
+ptyio_clear_break (void)
 {
   return 0;
 }
diff --git a/term/users.c b/term/users.c
index b7429a4f..ac3d6d25 100644
--- a/term/users.c
+++ b/term/users.c
@@ -86,7 +86,7 @@ struct protid_hook
 };
 
 void
-init_users ()
+init_users (void)
 {
   error_t err;
 
@@ -2019,13 +2019,13 @@ trivfs_S_io_map  (struct trivfs_protid *cred,
 }
 
 static void
-report_sig_start ()
+report_sig_start (void)
 {
   sigs_in_progress++;
 }
 
 static void
-report_sig_end ()
+report_sig_end (void)
 {
   sigs_in_progress--;
   if ((sigs_in_progress == 0) && input_sig_wakeup)
@@ -2099,7 +2099,7 @@ send_signal (int signo)
 }
 
 void
-report_carrier_off ()
+report_carrier_off (void)
 {
   clear_queue (inputq);
   (*bottom->notice_input_flushed) ();
@@ -2110,7 +2110,7 @@ report_carrier_off ()
 }
 
 void
-report_carrier_on ()
+report_carrier_on (void)
 {
   termflags &= ~NO_CARRIER;
   pthread_cond_broadcast (&carrier_alert);
diff --git a/tmpfs/node.c b/tmpfs/node.c
index 86e02fea..2129d305 100644
--- a/tmpfs/node.c
+++ b/tmpfs/node.c
@@ -604,19 +604,19 @@ diskfs_get_filemap_pager_struct (struct node *np)
 /* We have no pager of our own, so there is no need to worry about
    users of it, or to shut it down.  */
 int
-diskfs_pager_users ()
+diskfs_pager_users (void)
 {
   return 0;
 }
 void
-diskfs_shutdown_pager ()
+diskfs_shutdown_pager (void)
 {
 }
 
 /* The purpose of this is to decide that it's ok to make the fs read-only.
    Turning a temporary filesystem read-only seem pretty useless.  */
 vm_prot_t
-diskfs_max_user_pager_prot ()
+diskfs_max_user_pager_prot (void)
 {
   return VM_PROT_READ;		/* Probable lie that lets us go read-only.  */
 }
diff --git a/tmpfs/tmpfs.c b/tmpfs/tmpfs.c
index 28151990..5483ec87 100644
--- a/tmpfs/tmpfs.c
+++ b/tmpfs/tmpfs.c
@@ -91,7 +91,7 @@ diskfs_sync_everything (int wait)
 }
 
 error_t
-diskfs_reload_global_state ()
+diskfs_reload_global_state (void)
 {
   return 0;
 }
diff --git a/trans/random.c b/trans/random.c
index 297253e4..ea1f780e 100644
--- a/trans/random.c
+++ b/trans/random.c
@@ -648,7 +648,7 @@ sigterm_handler (int signo)
 }
 
 static error_t
-arrange_shutdown_notification ()
+arrange_shutdown_notification (void)
 {
   error_t err;
   mach_port_t initport, notify;
diff --git a/utils/parse.c b/utils/parse.c
index 5334dbda..c3d28e5c 100644
--- a/utils/parse.c
+++ b/utils/parse.c
@@ -50,13 +50,13 @@ _parse_strlist (char *arg,
       error_t err = 0;
       char *end = arg;
 
-      void mark_end()
+      void mark_end(void)
 	{
 	  *end++ = '\0';
 	  while (isspace(*end))
 	    end++;
 	}
-      error_t parse_element()
+      error_t parse_element(void)
 	{
 	  char *cur = arg;
 	  if (*cur == '\0')
@@ -119,7 +119,7 @@ parse_numlist (char *arg,
 	       int (*lookup_fn)(const char *str, struct argp_state *state),
 	       const char *type_name, struct argp_state *state)
 {
-  error_t default_num_add() { return (*add_fn)((*default_fn)(state), state); }
+  error_t default_num_add(void) { return (*add_fn)((*default_fn)(state), state); }
   error_t add_num_str(const char *str, struct argp_state *state)
     {
       const char *p;
diff --git a/utils/pids.c b/utils/pids.c
index 59646a5a..82b75d1a 100644
--- a/utils/pids.c
+++ b/utils/pids.c
@@ -33,7 +33,7 @@ static process_t _proc_server = MACH_PORT_NULL;
 
 /* Return this process's proc server. */
 static inline process_t
-proc_server ()
+proc_server (void)
 {
   if (_proc_server == MACH_PORT_NULL)
     _proc_server = getproc ();
diff --git a/utils/ps.c b/utils/ps.c
index b23dc1e2..91a00a36 100644
--- a/utils/ps.c
+++ b/utils/ps.c
@@ -250,7 +250,7 @@ main(int argc, char *argv[])
     }
 
   /* Returns the name of the current controlling terminal.  */
-  const char *current_tty_name()
+  const char *current_tty_name(void)
     {
       error_t err;
       struct ps_tty *tty;
diff --git a/utils/storeinfo.c b/utils/storeinfo.c
index 8a9567e0..c837f5d6 100644
--- a/utils/storeinfo.c
+++ b/utils/storeinfo.c
@@ -81,7 +81,7 @@ print_store (struct store *store, int level, unsigned what)
   int i;
   int first = 1;
 
-  void psep ()
+  void psep (void)
     {
       if (first)
 	first = 0;