2002-06-13 Roland McGrath <roland@frob.com>

	* dir-chg.c: Don't include stub header, trivfs.h now gets those decls.
	* dir-link.c: Likewise.
	* dir-lookup.c: Likewise.
	* dir-mkdir.c: Likewise.
	* dir-mkfile.c: Likewise.
	* dir-readdir.c: Likewise.
	* dir-rename.c: Likewise.
	* dir-rmdir.c: Likewise.
	* dir-unlink.c: Likewise.
	* file-access.c: Likewise.
	* file-chauthor.c: Likewise.
	* file-chflags.c: Likewise.
	* file-chg.c: Likewise.
	* file-chmod.c: Likewise.
	* file-chown.c: Likewise.
	* file-get-fs-options.c: Likewise.
	* file-get-storage-info.c: Likewise.
	* file-get-trans.c: Likewise.
	* file-get-transcntl.c: Likewise.
	* file-getcontrol.c: Likewise.
	* file-getfh.c: Likewise.
	* file-getlinknode.c: Likewise.
	* file-lock.c: Likewise.
	* file-reparent.c: Likewise.
	* file-set-size.c: Likewise.
	* file-set-trans.c: Likewise.
	* file-statfs.c: Likewise.
	* file-sync.c: Likewise.
	* file-syncfs.c: Likewise.
	* file-utimes.c: Likewise.
	* fsys-forward.c: Likewise.
	* fsys-get-options.c: Likewise.
	* fsys-getroot.c: Likewise.
	* fsys-goaway.c: Likewise.
	* fsys-set-options.c: Likewise.
	* fsys-stubs.c: Likewise.
	* fsys-syncfs.c: Likewise.
	* io-async-icky.c: Likewise.
	* io-async.c: Likewise.
	* io-duplicate.c: Likewise.
	* io-identity.c: Likewise.
	* io-map.c: Likewise.
	* io-modes-get.c: Likewise.
	* io-modes-off.c: Likewise.
	* io-modes-on.c: Likewise.
	* io-owner-get.c: Likewise.
	* io-owner-mod.c: Likewise.
	* io-pathconf.c: Likewise.
	* io-read.c: Likewise.
	* io-readable.c: Likewise.
	* io-reauthenticate.c: Likewise.
	* io-restrict-auth.c: Likewise.
	* io-revoke.c: Likewise.
	* io-seek.c: Likewise.
	* io-select.c: Likewise.
	* io-stat.c: Likewise.
	* io-stubs.c: Likewise.
	* io-write.c: Likewise.

58 files changed, 109 insertions, 177 deletions

diff --git a/libtrivfs/dir-chg.c b/libtrivfs/dir-chg.c
index 6c9a9faf..d01abbbf 100644
--- a/libtrivfs/dir-chg.c
+++ b/libtrivfs/dir-chg.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_dir_notice_changes (struct trivfs_protid *cred,
diff --git a/libtrivfs/dir-link.c b/libtrivfs/dir-link.c
index 0f4833d0..f5a8c735 100644
--- a/libtrivfs/dir-link.c
+++ b/libtrivfs/dir-link.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994, 1996 Free Software Foundation
+/*
+   Copyright (C) 1994,96,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,10 +16,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
-trivfs_S_dir_link (struct trivfs_protid *dir, 
+trivfs_S_dir_link (struct trivfs_protid *dir,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
 		   struct trivfs_protid *file, char *name, int excl)
 {
@@ -29,5 +28,3 @@ trivfs_S_dir_link (struct trivfs_protid *dir,
     return EXDEV;
   return ENOTDIR;
 }
-
-		     
diff --git a/libtrivfs/dir-lookup.c b/libtrivfs/dir-lookup.c
index 5a0013aa..66afac1d 100644
--- a/libtrivfs/dir-lookup.c
+++ b/libtrivfs/dir-lookup.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1994,98,99,2001 Free Software Foundation
+   Copyright (C) 1994,98,99,2001,02 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 #include <assert.h>
 #include <fcntl.h>
 #include <string.h>
@@ -65,7 +64,7 @@ trivfs_S_dir_lookup (struct trivfs_protid *cred,
   if (!err)
     {
       struct iouser *user;
-      
+
       err = iohelp_dup_iouser (&user, cred->user);
       if (err)
 	return err;
diff --git a/libtrivfs/dir-mkdir.c b/libtrivfs/dir-mkdir.c
index f41dfdbe..d39bd3f8 100644
--- a/libtrivfs/dir-mkdir.c
+++ b/libtrivfs/dir-mkdir.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,02 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,10 +16,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
-trivfs_S_dir_mkdir (struct trivfs_protid *cred, 
+trivfs_S_dir_mkdir (struct trivfs_protid *cred,
 		    mach_port_t reply, mach_msg_type_name_t reply_type,
 		    char *name, mode_t mode)
 {
diff --git a/libtrivfs/dir-mkfile.c b/libtrivfs/dir-mkfile.c
index aaaa7ad9..048db244 100644
--- a/libtrivfs/dir-mkfile.c
+++ b/libtrivfs/dir-mkfile.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_dir_mkfile (struct trivfs_protid *file,
diff --git a/libtrivfs/dir-readdir.c b/libtrivfs/dir-readdir.c
index 361ca87b..f1176f07 100644
--- a/libtrivfs/dir-readdir.c
+++ b/libtrivfs/dir-readdir.c
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_dir_readdir (struct trivfs_protid *cred,
diff --git a/libtrivfs/dir-rename.c b/libtrivfs/dir-rename.c
index 48fff625..d68233ec 100644
--- a/libtrivfs/dir-rename.c
+++ b/libtrivfs/dir-rename.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994, 1996 Free Software Foundation
+/*
+   Copyright (C) 1994,96,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,10 +16,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
-trivfs_S_dir_rename (struct trivfs_protid *cred, 
+trivfs_S_dir_rename (struct trivfs_protid *cred,
 		     mach_port_t reply, mach_msg_type_name_t reply_type,
 		     char *name,
 		     struct trivfs_protid *cred2, char *name2, int excl)
diff --git a/libtrivfs/dir-rmdir.c b/libtrivfs/dir-rmdir.c
index ab9d8f41..a4d320c4 100644
--- a/libtrivfs/dir-rmdir.c
+++ b/libtrivfs/dir-rmdir.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,14 +16,11 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
-trivfs_S_dir_rmdir (struct trivfs_protid *cred, 
+trivfs_S_dir_rmdir (struct trivfs_protid *cred,
 		    mach_port_t reply, mach_msg_type_name_t reply_type,
 		    char *name)
 {
   return cred ? ENOTDIR : EOPNOTSUPP;
 }
-
-  
diff --git a/libtrivfs/dir-unlink.c b/libtrivfs/dir-unlink.c
index d86ad324..a6ef9b0c 100644
--- a/libtrivfs/dir-unlink.c
+++ b/libtrivfs/dir-unlink.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,10 +16,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
-trivfs_S_dir_unlink (struct trivfs_protid *cred, 
+trivfs_S_dir_unlink (struct trivfs_protid *cred,
 		     mach_port_t reply, mach_msg_type_name_t reply_type,
 		     char *name)
 {
diff --git a/libtrivfs/file-access.c b/libtrivfs/file-access.c
index 91b5427a..87029540 100644
--- a/libtrivfs/file-access.c
+++ b/libtrivfs/file-access.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994, 1996 Free Software Foundation
+/*
+   Copyright (C) 1994,96,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 error_t
 trivfs_S_file_check_access (struct trivfs_protid *cred,
@@ -31,6 +30,6 @@ trivfs_S_file_check_access (struct trivfs_protid *cred,
   else
     (*trivfs_check_access_hook) (cred->po->cntl, cred->user,
 				 cred->realnode, allowed);
-  
+
   return 0;
 }
diff --git a/libtrivfs/file-chauthor.c b/libtrivfs/file-chauthor.c
index 5f61743a..0460bfe1 100644
--- a/libtrivfs/file-chauthor.c
+++ b/libtrivfs/file-chauthor.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_chauthor (struct trivfs_protid *cred,
@@ -25,4 +24,3 @@ trivfs_S_file_chauthor (struct trivfs_protid *cred,
 {
   return cred ? file_chauthor (cred->realnode, auth) : EOPNOTSUPP;
 }
-
diff --git a/libtrivfs/file-chflags.c b/libtrivfs/file-chflags.c
index 8d3d4577..c28f12f3 100644
--- a/libtrivfs/file-chflags.c
+++ b/libtrivfs/file-chflags.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,10 +16,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
-trivfs_S_file_chflags (struct trivfs_protid *cred, 
+trivfs_S_file_chflags (struct trivfs_protid *cred,
 		       mach_port_t reply, mach_msg_type_name_t reply_type,
 		       int flags)
 {
diff --git a/libtrivfs/file-chg.c b/libtrivfs/file-chg.c
index a7df7e1d..3af71b33 100644
--- a/libtrivfs/file-chg.c
+++ b/libtrivfs/file-chg.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_notice_changes (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-chmod.c b/libtrivfs/file-chmod.c
index f4a8cdb3..f42a43c7 100644
--- a/libtrivfs/file-chmod.c
+++ b/libtrivfs/file-chmod.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_chmod (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-chown.c b/libtrivfs/file-chown.c
index 4eb664c5..44f79203 100644
--- a/libtrivfs/file-chown.c
+++ b/libtrivfs/file-chown.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_chown (struct trivfs_protid *cred,
@@ -25,6 +24,3 @@ trivfs_S_file_chown (struct trivfs_protid *cred,
 {
   return cred ? file_chown (cred->realnode, uid, gid) : EOPNOTSUPP;
 }
-
-  
-  
diff --git a/libtrivfs/file-get-fs-options.c b/libtrivfs/file-get-fs-options.c
index a244778d..2e06c2d9 100644
--- a/libtrivfs/file-get-fs-options.c
+++ b/libtrivfs/file-get-fs-options.c
@@ -1,6 +1,6 @@
 /* Get runtime options given a file handle
 
-   Copyright (C) 1996, 1998 Free Software Foundation
+   Copyright (C) 1996,98,2002 Free Software Foundation, Inc.
 
    This file is part of the GNU Hurd.
 
@@ -22,7 +22,6 @@
 #include <hurd/fshelp.h>
 
 #include "priv.h"
-#include "fsys_S.h"
 
 error_t
 trivfs_S_file_get_fs_options (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-get-storage-info.c b/libtrivfs/file-get-storage-info.c
index 7e4073ad..58bdbc5c 100644
--- a/libtrivfs/file-get-storage-info.c
+++ b/libtrivfs/file-get-storage-info.c
@@ -1,5 +1,5 @@
 /* Stub for the file_get_storage_info RPC as described in <hurd/fs.defs>.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 error_t
 trivfs_S_file_get_storage_info (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-get-trans.c b/libtrivfs/file-get-trans.c
index 6ae54b73..687dc8cc 100644
--- a/libtrivfs/file-get-trans.c
+++ b/libtrivfs/file-get-trans.c
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_get_translator (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-get-transcntl.c b/libtrivfs/file-get-transcntl.c
index 0367fff2..8af08fc8 100644
--- a/libtrivfs/file-get-transcntl.c
+++ b/libtrivfs/file-get-transcntl.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_get_translator_cntl (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-getcontrol.c b/libtrivfs/file-getcontrol.c
index c75472ab..2a58016e 100644
--- a/libtrivfs/file-getcontrol.c
+++ b/libtrivfs/file-getcontrol.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_getcontrol (struct trivfs_protid *cred,
@@ -27,7 +26,7 @@ trivfs_S_file_getcontrol (struct trivfs_protid *cred,
     return EOPNOTSUPP;
   if (!cred->isroot)
     return EPERM;
-  
+
   *cntl = ports_get_right (cred->po->cntl);
   *cntltype = MACH_MSG_TYPE_MAKE_SEND;
   return 0;
diff --git a/libtrivfs/file-getfh.c b/libtrivfs/file-getfh.c
index f77f09cb..35deb7d5 100644
--- a/libtrivfs/file-getfh.c
+++ b/libtrivfs/file-getfh.c
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_getfh (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-getlinknode.c b/libtrivfs/file-getlinknode.c
index 56ac3dff..078e5deb 100644
--- a/libtrivfs/file-getlinknode.c
+++ b/libtrivfs/file-getlinknode.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_getlinknode (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-lock.c b/libtrivfs/file-lock.c
index 10d39736..993baff6 100644
--- a/libtrivfs/file-lock.c
+++ b/libtrivfs/file-lock.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_lock (struct trivfs_protid *cred,
@@ -33,4 +32,3 @@ trivfs_S_file_lock_stat (struct trivfs_protid *cred,
 {
   return EOPNOTSUPP;
 }
-
diff --git a/libtrivfs/file-reparent.c b/libtrivfs/file-reparent.c
index d2e06c83..321c474a 100644
--- a/libtrivfs/file-reparent.c
+++ b/libtrivfs/file-reparent.c
@@ -1,6 +1,6 @@
 /* Reparent a directory
 
-   Copyright (C) 1997 Free Software Foundation
+   Copyright (C) 1997,2002 Free Software Foundation, Inc.
 
    This file is part of the GNU Hurd.
 
@@ -9,7 +9,7 @@
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   The GNU Hurd is distributed in the hope that it will be useful, 
+   The GNU Hurd is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
@@ -19,7 +19,6 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "priv.h"
-#include "fs_S.h"
 
 error_t
 trivfs_S_file_reparent (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-set-size.c b/libtrivfs/file-set-size.c
index eb174e46..287ed996 100644
--- a/libtrivfs/file-set-size.c
+++ b/libtrivfs/file-set-size.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/file-set-trans.c b/libtrivfs/file-set-trans.c
index 49eeba83..339bdb22 100644
--- a/libtrivfs/file-set-trans.c
+++ b/libtrivfs/file-set-trans.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1994, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,11 +16,11 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_set_translator (struct trivfs_protid *cred,
-			      mach_port_t reply, mach_msg_type_name_t reply_type,
+			      mach_port_t reply,
+			      mach_msg_type_name_t reply_type,
 			      int actflags,
 			      int passflags,
 			      int oldtransflags,
diff --git a/libtrivfs/file-statfs.c b/libtrivfs/file-statfs.c
index 8b306623..648eef64 100644
--- a/libtrivfs/file-statfs.c
+++ b/libtrivfs/file-statfs.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994, 1996 Free Software Foundation
+/*
+   Copyright (C) 1994,96,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 #include <string.h>
 #include <unistd.h>
 
@@ -33,4 +32,4 @@ trivfs_S_file_statfs (struct trivfs_protid *cred,
   stb->f_fsid = trivfs_fsid;
 
   return 0;
-}    
+}
diff --git a/libtrivfs/file-sync.c b/libtrivfs/file-sync.c
index 54076f67..cb0add3d 100644
--- a/libtrivfs/file-sync.c
+++ b/libtrivfs/file-sync.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994, 1996 Free Software Foundation
+/*
+   Copyright (C) 1994,96,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_sync (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-syncfs.c b/libtrivfs/file-syncfs.c
index 1f74e395..d356296e 100644
--- a/libtrivfs/file-syncfs.c
+++ b/libtrivfs/file-syncfs.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994, 1996 Free Software Foundation
+/*
+   Copyright (C) 1994,96,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_syncfs (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-utimes.c b/libtrivfs/file-utimes.c
index 916a8d8a..f9bedd7b 100644
--- a/libtrivfs/file-utimes.c
+++ b/libtrivfs/file-utimes.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
 
 kern_return_t
 trivfs_S_file_utimes (struct trivfs_protid *cred,
diff --git a/libtrivfs/fsys-forward.c b/libtrivfs/fsys-forward.c
index b7127a24..106360ea 100644
--- a/libtrivfs/fsys-forward.c
+++ b/libtrivfs/fsys-forward.c
@@ -1,8 +1,8 @@
 /* fsys_forward
 
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995,2002 Free Software Foundation, Inc.
 
-   Written by Miles Bader <miles@gnu.ai.mit.edu>
+   Written by Miles Bader <miles@gnu.org>
 
    This file is part of the GNU Hurd.
 
@@ -11,7 +11,7 @@
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   The GNU Hurd is distributed in the hope that it will be useful, 
+   The GNU Hurd is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
@@ -21,7 +21,6 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "priv.h"
-#include "fsys_S.h"
 
 /* Ask SERVER to provide fsys translation service for us.  REQUESTOR is
    the bootstrap port supplied to the original translator, and ARGV are
diff --git a/libtrivfs/fsys-get-options.c b/libtrivfs/fsys-get-options.c
index abb2dfeb..4f2d602b 100644
--- a/libtrivfs/fsys-get-options.c
+++ b/libtrivfs/fsys-get-options.c
@@ -1,6 +1,6 @@
 /* Get runtime options
 
-   Copyright (C) 1996, 1998 Free Software Foundation
+   Copyright (C) 1996,98,2002 Free Software Foundation, Inc.
 
    This file is part of the GNU Hurd.
 
@@ -22,7 +22,6 @@
 #include <hurd/fshelp.h>
 
 #include "priv.h"
-#include "fsys_S.h"
 
 error_t
 trivfs_S_fsys_get_options (struct trivfs_control *fsys,
diff --git a/libtrivfs/fsys-getroot.c b/libtrivfs/fsys-getroot.c
index cc9ff56e..60528d72 100644
--- a/libtrivfs/fsys-getroot.c
+++ b/libtrivfs/fsys-getroot.c
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "fsys_S.h"
 #include "fsys_reply_U.h"
 #include <assert.h>
 #include <fcntl.h>
diff --git a/libtrivfs/fsys-goaway.c b/libtrivfs/fsys-goaway.c
index 747e9f0e..1ad119b7 100644
--- a/libtrivfs/fsys-goaway.c
+++ b/libtrivfs/fsys-goaway.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1994, 1995 Free Software Foundation
+   Copyright (C) 1994,95,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "fsys_S.h"
 
 kern_return_t
 trivfs_S_fsys_goaway (struct trivfs_control *cred,
diff --git a/libtrivfs/fsys-set-options.c b/libtrivfs/fsys-set-options.c
index 507bd442..43890df7 100644
--- a/libtrivfs/fsys-set-options.c
+++ b/libtrivfs/fsys-set-options.c
@@ -1,6 +1,6 @@
 /* Set runtime options
 
-   Copyright (C) 1996 Free Software Foundation
+   Copyright (C) 1996,2002 Free Software Foundation, Inc.
 
    This file is part of the GNU Hurd.
 
@@ -9,7 +9,7 @@
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
-   The GNU Hurd is distributed in the hope that it will be useful, 
+   The GNU Hurd is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
@@ -21,7 +21,6 @@
 #include <hurd/fshelp.h>
 
 #include "priv.h"
-#include "fsys_S.h"
 
 error_t
 trivfs_S_fsys_set_options (struct trivfs_control *cntl,
diff --git a/libtrivfs/fsys-stubs.c b/libtrivfs/fsys-stubs.c
index 45c3bc08..28990759 100644
--- a/libtrivfs/fsys-stubs.c
+++ b/libtrivfs/fsys-stubs.c
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "fsys_S.h"
 
 kern_return_t
 trivfs_S_fsys_startup (mach_port_t bootport,
diff --git a/libtrivfs/fsys-syncfs.c b/libtrivfs/fsys-syncfs.c
index 6059adfd..e94fda38 100644
--- a/libtrivfs/fsys-syncfs.c
+++ b/libtrivfs/fsys-syncfs.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+/*
+   Copyright (C) 1994,96,2002 Free Software Foundation, Inc.
    Written by Michael I. Bushnell.
 
    This file is part of the GNU Hurd.
@@ -19,7 +19,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fsys_S.h"
 
 kern_return_t
 trivfs_S_fsys_syncfs (struct trivfs_control *cntl,
diff --git a/libtrivfs/io-async-icky.c b/libtrivfs/io-async-icky.c
index 8c394732..bd9c5490 100644
--- a/libtrivfs/io-async-icky.c
+++ b/libtrivfs/io-async-icky.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1993, 1994, 1999 Free Software Foundation
+   Copyright (C) 1993,94,99,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-async.c b/libtrivfs/io-async.c
index c664c067..b02f57f6 100644
--- a/libtrivfs/io-async.c
+++ b/libtrivfs/io-async.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1993, 1994, 1999 Free Software Foundation
+   Copyright (C) 1993,94,99,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-duplicate.c b/libtrivfs/io-duplicate.c
index 4b20bb99..c1b7798d 100644
--- a/libtrivfs/io-duplicate.c
+++ b/libtrivfs/io-duplicate.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1993, 1994, 1995 Free Software Foundation
+   Copyright (C) 1993,94,95,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <string.h>
 
 kern_return_t
@@ -32,10 +31,10 @@ trivfs_S_io_duplicate (struct trivfs_protid *cred,
 {
   error_t err;
   struct trivfs_protid *newcred;
-  
+
   if (!cred)
     return EOPNOTSUPP;
-  
+
   err = trivfs_protid_dup (cred, &newcred);
   if (!err)
     {
@@ -46,4 +45,3 @@ trivfs_S_io_duplicate (struct trivfs_protid *cred,
 
   return err;
 }
-
diff --git a/libtrivfs/io-identity.c b/libtrivfs/io-identity.c
index 34939dd9..44f60d38 100644
--- a/libtrivfs/io-identity.c
+++ b/libtrivfs/io-identity.c
@@ -19,7 +19,6 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
 #include "priv.h"
-#include "io_S.h"
 
 error_t
 trivfs_S_io_identity (struct trivfs_protid *cred,
diff --git a/libtrivfs/io-map.c b/libtrivfs/io-map.c
index 1dc93c22..2959efba 100644
--- a/libtrivfs/io-map.c
+++ b/libtrivfs/io-map.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1993, 1994 Free Software Foundation
+   Copyright (C) 1993,94,2002 Free Software Foundation
 
 This file is part of the GNU Hurd.
 
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-modes-get.c b/libtrivfs/io-modes-get.c
index d0da546c..4d38d3a6 100644
--- a/libtrivfs/io-modes-get.c
+++ b/libtrivfs/io-modes-get.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1993,94,99 Free Software Foundation, Inc.
+   Copyright (C) 1993,94,99,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-modes-off.c b/libtrivfs/io-modes-off.c
index c78791e9..33b0a573 100644
--- a/libtrivfs/io-modes-off.c
+++ b/libtrivfs/io-modes-off.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1993, 1994 Free Software Foundation
+   Copyright (C) 1993,94,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-modes-on.c b/libtrivfs/io-modes-on.c
index 8ca82bcf..7886dc50 100644
--- a/libtrivfs/io-modes-on.c
+++ b/libtrivfs/io-modes-on.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1993, 1994 Free Software Foundation
+   Copyright (C) 1993,94,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-owner-get.c b/libtrivfs/io-owner-get.c
index 82fe9211..f6c261c7 100644
--- a/libtrivfs/io-owner-get.c
+++ b/libtrivfs/io-owner-get.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1993, 1994 Free Software Foundation
+   Copyright (C) 1993,94,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-owner-mod.c b/libtrivfs/io-owner-mod.c
index 2e70159f..4e96a245 100644
--- a/libtrivfs/io-owner-mod.c
+++ b/libtrivfs/io-owner-mod.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1993, 1994 Free Software Foundation
+   Copyright (C) 1993,94,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-pathconf.c b/libtrivfs/io-pathconf.c
index c24e1801..51d4e094 100644
--- a/libtrivfs/io-pathconf.c
+++ b/libtrivfs/io-pathconf.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994, 1996 Free Software Foundation
+/*
+   Copyright (C) 1994,96,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "io_S.h"
 
 kern_return_t
 trivfs_S_io_pathconf (struct trivfs_protid *cred,
diff --git a/libtrivfs/io-read.c b/libtrivfs/io-read.c
index 24f3642a..dcba818b 100644
--- a/libtrivfs/io-read.c
+++ b/libtrivfs/io-read.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 
 kern_return_t
@@ -30,4 +29,4 @@ trivfs_S_io_read (struct trivfs_protid *cred,
 {
   assert (!trivfs_support_read);
   return EOPNOTSUPP;
-}  
+}
diff --git a/libtrivfs/io-readable.c b/libtrivfs/io-readable.c
index 975ab44b..792bd1a7 100644
--- a/libtrivfs/io-readable.c
+++ b/libtrivfs/io-readable.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-reauthenticate.c b/libtrivfs/io-reauthenticate.c
index 3c675e84..80ef31c1 100644
--- a/libtrivfs/io-reauthenticate.c
+++ b/libtrivfs/io-reauthenticate.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1993,94,95,96,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1993,94,95,96,2000,01,02 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 #include <string.h>
 
diff --git a/libtrivfs/io-restrict-auth.c b/libtrivfs/io-restrict-auth.c
index b9a0598d..98a80a13 100644
--- a/libtrivfs/io-restrict-auth.c
+++ b/libtrivfs/io-restrict-auth.c
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <string.h>
 
 /* Tell if the array LIST (of size N) contains a member equal to QUERY. */
diff --git a/libtrivfs/io-revoke.c b/libtrivfs/io-revoke.c
index 37f0f4a3..901de4c6 100644
--- a/libtrivfs/io-revoke.c
+++ b/libtrivfs/io-revoke.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1999 Free Software Foundation
+   Copyright (C) 1999,2002 Free Software Foundation, Inc.
    Written by Thomas Bushnell, BSG.
 
    This program is free software; you can redistribute it and/or
@@ -17,7 +17,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "io_S.h"
 
 /* Implement io_revoke as described in <hurd/io.defs>. */
 kern_return_t
diff --git a/libtrivfs/io-seek.c b/libtrivfs/io-seek.c
index 8d810786..8e794cf1 100644
--- a/libtrivfs/io-seek.c
+++ b/libtrivfs/io-seek.c
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994 Free Software Foundation
+/*
+   Copyright (C) 1994,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-select.c b/libtrivfs/io-select.c
index 7788da6e..9df24d61 100644
--- a/libtrivfs/io-select.c
+++ b/libtrivfs/io-select.c
@@ -1,5 +1,5 @@
 /* Stub io_select RPC for trivfs library.
-   Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1993,94,95,96,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-stat.c b/libtrivfs/io-stat.c
index 9e6c9585..6e430a22 100644
--- a/libtrivfs/io-stat.c
+++ b/libtrivfs/io-stat.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1993, 1994, 1996 Free Software Foundation
+   Copyright (C) 1993,94,96,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 #include <unistd.h>
 
 kern_return_t
@@ -49,4 +48,3 @@ trivfs_S_io_stat (struct trivfs_protid *cred,
 
   return err;
 }
-
diff --git a/libtrivfs/io-stubs.c b/libtrivfs/io-stubs.c
index 2c4f7330..a8cf3f57 100644
--- a/libtrivfs/io-stubs.c
+++ b/libtrivfs/io-stubs.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1993, 1994 Free Software Foundation
+   Copyright (C) 1993,94,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -20,7 +20,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
-#include "io_S.h"
 
 kern_return_t
 trivfs_S_io_map_cntl (struct trivfs_protid *cred,
@@ -48,7 +47,7 @@ trivfs_S_io_release_conch (struct trivfs_protid *cred,
   return EOPNOTSUPP;
 }
 
-kern_return_t 
+kern_return_t
 trivfs_S_io_eofnotify (struct trivfs_protid *cred,
 		       mach_port_t reply,
 		       mach_msg_type_name_t replytype)
@@ -57,20 +56,20 @@ trivfs_S_io_eofnotify (struct trivfs_protid *cred,
 }
 
 kern_return_t
-trivfs_S_io_prenotify (struct trivfs_protid *cred, 
+trivfs_S_io_prenotify (struct trivfs_protid *cred,
 		       mach_port_t reply,
 		       mach_msg_type_name_t replytype,
-		       vm_offset_t start, 
+		       vm_offset_t start,
 		       vm_offset_t end)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-trivfs_S_io_postnotify (struct trivfs_protid *cred, 
+trivfs_S_io_postnotify (struct trivfs_protid *cred,
 			mach_port_t reply,
 			mach_msg_type_name_t replytype,
-			vm_offset_t start, 
+			vm_offset_t start,
 			vm_offset_t end)
 {
   return EOPNOTSUPP;
diff --git a/libtrivfs/io-write.c b/libtrivfs/io-write.c
index cdc8900d..106031dd 100644
--- a/libtrivfs/io-write.c
+++ b/libtrivfs/io-write.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1994, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1994,99,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -16,7 +16,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "io_S.h"
 #include <assert.h>
 #include <fcntl.h>