Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd

94 files changed, 152 insertions, 93 deletions

diff --git a/config.make.in b/config.make.in
index c5d4e68d..0f1390a7 100644
--- a/config.make.in
+++ b/config.make.in
@@ -65,9 +65,6 @@ gnu89-inline-CFLAGS = @libc_cv_gnu89_inline@
 # `yes' or `no' to indicate if ld --version-script is available.
 VERSIONING = @VERSIONING@
 
-# If a separate libcrypt is available, use it.
-LIBCRYPT = @LIBCRYPT@
-
 # How to link against Parted libraries, if at all.
 PARTED_LIBS = @PARTED_LIBS@
 
diff --git a/configure.ac b/configure.ac
index ecabfdfd..873ced81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,10 +106,6 @@ fi
 dnl Let these propagate from the environment.
 AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS)
 
-# See if there's a separate libcrypt (many systems put crypt there).
-AC_CHECK_LIB(crypt, crypt, LIBCRYPT=-lcrypt)
-AC_SUBST(LIBCRYPT)
-
 hurd_MIG_RETCODE
 
 # See if --version-script is available.
diff --git a/console-client/trans.c b/console-client/trans.c
index d65161c0..67cd149d 100644
--- a/console-client/trans.c
+++ b/console-client/trans.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 
 #include "trans.h"
+#include "libnetfs/io_S.h"
 
 
 char *netfs_server_name = "console";
diff --git a/console/console.c b/console/console.c
index 0577ea04..57ae8133 100644
--- a/console/console.c
+++ b/console/console.c
@@ -48,6 +48,9 @@
 #include "input.h"
 
 #include "fs_notify_U.h"
+#include "libnetfs/fs_S.h"
+#include "libnetfs/io_S.h"
+#include "tioctl_S.h"
 
 const char *argp_program_version = STANDARD_HURD_VERSION (console);
 
@@ -1815,98 +1818,101 @@ S_tioctl_tiocgpgrp (struct protid *cred, int *pgrp)
 }
 
 kern_return_t
-S_tioctl_tiocmodg (io_t port, int *state)
+S_tioctl_tiocmodg (struct protid *cred, int *state)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocmods (io_t port, int state)
+S_tioctl_tiocmods (struct protid *cred, int state)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocexcl (io_t port)
+S_tioctl_tiocexcl (struct protid *cred)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocnxcl (io_t port)
+S_tioctl_tiocnxcl (struct protid *cred)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocgeta (io_t port, tcflag_t *modes, cc_t *ccs, speed_t *speeds)
+S_tioctl_tiocgeta (struct protid *cred, tcflag_t *modes, cc_t *ccs,
+		   speed_t *speeds)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocseta (io_t port, tcflag_t *modes, cc_t *ccs, speed_t *speeds)
+S_tioctl_tiocseta (struct protid *cred, tcflag_t *modes, cc_t *ccs,
+		   speed_t *speeds)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocsetaw (io_t port, tcflag_t *modes, cc_t *ccs, speed_t *speeds)
+S_tioctl_tiocsetaw (struct protid *cred, tcflag_t *modes, cc_t *ccs,
+		    speed_t *speeds)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocsetaf (io_t port, tcflag_t *modes, cc_t *ccs,
-				  speed_t *speeds)
+S_tioctl_tiocsetaf (struct protid *cred, tcflag_t *modes, cc_t *ccs,
+		    speed_t *speeds)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocgetd (io_t port, int *disc)
+S_tioctl_tiocgetd (struct protid *cred, int *disc)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocsetd (io_t port, int disc)
+S_tioctl_tiocsetd (struct protid *cred, int disc)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocdrain (io_t port)
+S_tioctl_tiocdrain (struct protid *cred)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocmget (io_t port, int *bits)
+S_tioctl_tiocmget (struct protid *cred, int *bits)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocmset (io_t port, int bits)
+S_tioctl_tiocmset (struct protid *cred, int bits)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocsig (io_t port, int sig)
+S_tioctl_tiocsig (struct protid *cred, int sig)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocext (io_t port, int mode)
+S_tioctl_tiocext (struct protid *cred, int mode)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocucntl (io_t port, int mode)
+S_tioctl_tiocucntl (struct protid *cred, int mode)
 
 {
   return EOPNOTSUPP;
diff --git a/console/mutations.h b/console/mutations.h
index c1867a00..4e1cc7e1 100644
--- a/console/mutations.h
+++ b/console/mutations.h
@@ -23,7 +23,7 @@
 #define IO_INTRAN protid_t begin_using_protid_port (io_t)
 #define IO_DESTRUCTOR end_using_protid_port (protid_t)
 
-#define TIOCTL_IMPORTS import "priv.h";
+#define TIOCTL_IMPORTS import "libnetfs/priv.h";
 
 #define NOTIFY_INTRAN						\
   port_info_t begin_using_port_info_port (mach_port_t)
diff --git a/console/priv.h b/console/priv.h
deleted file mode 100644
index fdb96e7f..00000000
--- a/console/priv.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-   Copyright (C) 1995, 1996, 2001, 2007 Free Software Foundation, Inc.
-
-   Written by Michael I. Bushnell, p/BSG.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify 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, 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.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
-
-#ifndef _CONSOLE_PRIV_H
-#define _CONSOLE_PRIV_H
-
-#include <hurd/hurd_types.h>
-
-#include <hurd/netfs.h>
-
-static inline struct protid * __attribute__ ((unused))
-begin_using_protid_port (file_t port)
-{
-  return ports_lookup_port (netfs_port_bucket, port, netfs_protid_class);
-}
-
-static inline void __attribute__ ((unused))
-end_using_protid_port (struct protid *cred)
-{
-  if (cred)
-    ports_port_deref (cred);
-}
-#endif
diff --git a/ext2fs/storeinfo.c b/ext2fs/storeinfo.c
index 5d21b05e..d9a2be81 100644
--- a/ext2fs/storeinfo.c
+++ b/ext2fs/storeinfo.c
@@ -22,6 +22,7 @@
 #include <hurd/store.h>
 
 #include "ext2fs.h"
+#include "libdiskfs/fs_S.h"
 
 error_t
 diskfs_S_file_get_storage_info (struct protid *cred,
diff --git a/fatfs/inode.c b/fatfs/inode.c
index e3ca09d5..4229806e 100644
--- a/fatfs/inode.c
+++ b/fatfs/inode.c
@@ -23,6 +23,7 @@
 
 #include <string.h>
 #include "fatfs.h"
+#include "libdiskfs/fs_S.h"
 
 /* These flags aren't actually defined by a header file yet, so
    temporarily disable them if necessary.  */
diff --git a/fatfs/main.c b/fatfs/main.c
index b34f8dae..2bbcdfaa 100644
--- a/fatfs/main.c
+++ b/fatfs/main.c
@@ -29,6 +29,7 @@
 
 #include <version.h>
 #include "fatfs.h"
+#include "libdiskfs/fsys_S.h"
 
 struct node *diskfs_root_node;
 
@@ -270,7 +271,7 @@ diskfs_readonly_changed (int readonly)
 /* FIXME: libdiskfs doesn't lock the parent dir when looking up a node
    for fsys_getfile, so we disable NFS.  */
 error_t
-diskfs_S_fsys_getfile (mach_port_t fsys,
+diskfs_S_fsys_getfile (struct diskfs_control *pt,
                       mach_port_t reply, mach_msg_type_name_t reply_type,
                       uid_t *uids, mach_msg_type_number_t nuids,
                       gid_t *gids, mach_msg_type_number_t ngids,
diff --git a/isofs/inode.c b/isofs/inode.c
index f542d18b..cdc05ae3 100644
--- a/isofs/inode.c
+++ b/isofs/inode.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <time.h>
 #include "isofs.h"
+#include "libdiskfs/fs_S.h"
 
 
 /* There is no such thing as an inode in this format, all such
diff --git a/libdiskfs/boot-start.c b/libdiskfs/boot-start.c
index 9dd2751f..a60a1d0e 100644
--- a/libdiskfs/boot-start.c
+++ b/libdiskfs/boot-start.c
@@ -34,6 +34,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <argz.h>
 #include <error.h>
 #include <pids.h>
+#include "exec_S.h"
+#include "exec_startup_S.h"
 #include "fsys_S.h"
 #include "fsys_reply_U.h"
 
diff --git a/libdiskfs/file-chg.c b/libdiskfs/file-chg.c
index 2674398f..9da43e79 100644
--- a/libdiskfs/file-chg.c
+++ b/libdiskfs/file-chg.c
@@ -16,7 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
-#include "fs_S.h"
+#include "fs_notify_S.h"
 #include "fs_notify_U.h"
 
 kern_return_t
diff --git a/libdiskfs/file-chmod.c b/libdiskfs/file-chmod.c
index 5dad2c78..df262ea3 100644
--- a/libdiskfs/file-chmod.c
+++ b/libdiskfs/file-chmod.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "fs_S.h"
 
 /* Implement file_chmod as described in <hurd/fs.defs>. */
 error_t
diff --git a/libdiskfs/file-get-fs-opts.c b/libdiskfs/file-get-fs-opts.c
index 1e70da23..d7593118 100644
--- a/libdiskfs/file-get-fs-opts.c
+++ b/libdiskfs/file-get-fs-opts.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <argz.h>
 #include "priv.h"
+#include "fs_S.h"
 
 error_t
 diskfs_S_file_get_fs_options (struct protid *cred,
diff --git a/libdiskfs/fsmutations.h b/libdiskfs/fsmutations.h
index 6248708e..3f9362b9 100644
--- a/libdiskfs/fsmutations.h
+++ b/libdiskfs/fsmutations.h
@@ -26,14 +26,14 @@
 #define FSYS_INTRAN control_t diskfs_begin_using_control_port (fsys_t)
 #define FSYS_DESTRUCTOR diskfs_end_using_control_port (control_t)
 
-#define FILE_IMPORTS import "priv.h";
-#define IO_IMPORTS import "priv.h";
-#define FSYS_IMPORTS import "priv.h";
-#define IFSOCK_IMPORTS import "priv.h";
+#define FILE_IMPORTS import "libdiskfs/priv.h";
+#define IO_IMPORTS import "libdiskfs/priv.h";
+#define FSYS_IMPORTS import "libdiskfs/priv.h";
+#define IFSOCK_IMPORTS import "libdiskfs/priv.h";
 
 #define EXEC_STARTUP_INTRAN                             \
   bootinfo_t diskfs_begin_using_bootinfo_port (exec_startup_t)
 #define EXEC_STARTUP_DESTRUCTOR                         \
   diskfs_end_using_bootinfo (bootinfo_t)
 #define EXEC_STARTUP_IMPORTS                            \
-  import "priv.h";
+  import "libdiskfs/priv.h";
diff --git a/libdiskfs/init-startup.c b/libdiskfs/init-startup.c
index bf955d20..d10c9641 100644
--- a/libdiskfs/init-startup.c
+++ b/libdiskfs/init-startup.c
@@ -28,6 +28,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <hurd/startup.h>
 #include <pids.h>
 
+#include "startup_S.h"
+
 char *_diskfs_chroot_directory;
 
 mach_port_t
diff --git a/libnetfs/file-get-children.c b/libnetfs/file-get-children.c
index 80a727f5..bd7e8fcf 100644
--- a/libnetfs/file-get-children.c
+++ b/libnetfs/file-get-children.c
@@ -20,6 +20,7 @@
    along with the GNU Hurd.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "priv.h"
+#include "fs_S.h"
 
 #include <argz.h>
 
diff --git a/libnetfs/file-getcontrol.c b/libnetfs/file-getcontrol.c
index 50401f86..0e29ccf9 100644
--- a/libnetfs/file-getcontrol.c
+++ b/libnetfs/file-getcontrol.c
@@ -20,7 +20,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
 #include "netfs.h"
-#include "fsys_S.h"
+#include "fs_S.h"
 #include <hurd/fshelp.h>
 
 error_t
diff --git a/libnetfs/file-set-translator.c b/libnetfs/file-set-translator.c
index b46eb029..02c55836 100644
--- a/libnetfs/file-set-translator.c
+++ b/libnetfs/file-set-translator.c
@@ -20,6 +20,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
 #include "netfs.h"
+#include "fs_S.h"
 #include <hurd/paths.h>
 #include <hurd/fsys.h>
 
diff --git a/libnetfs/fsstubs.c b/libnetfs/fsstubs.c
index f1b9bf7e..75bd7903 100644
--- a/libnetfs/fsstubs.c
+++ b/libnetfs/fsstubs.c
@@ -21,6 +21,7 @@
 
 #include "netfs.h"
 #include "fs_S.h"
+#include "ifsock_S.h"
 
 error_t
 netfs_S_file_notice_changes (struct protid *user,
diff --git a/libnetfs/mutations.h b/libnetfs/mutations.h
index 51ca871a..e60a2208 100644
--- a/libnetfs/mutations.h
+++ b/libnetfs/mutations.h
@@ -31,7 +31,7 @@
 #define FSYS_INTRAN control_t begin_using_control_port (fsys_t)
 #define FSYS_DESTRUCTOR end_using_control_port (control_t)
 
-#define FILE_IMPORTS import "netfs.h"; import "priv.h";
-#define IO_IMPORTS import "netfs.h"; import "priv.h";
-#define FSYS_IMPORTS import "netfs.h"; import "priv.h";
-#define IFSOCK_IMPORTS import "netfs.h"; import "priv.h";
+#define FILE_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h";
+#define IO_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h";
+#define FSYS_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h";
+#define IFSOCK_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h";
diff --git a/libtrivfs/file-access.c b/libtrivfs/file-access.c
index 87029540..f289a23b 100644
--- a/libtrivfs/file-access.c
+++ b/libtrivfs/file-access.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 
 error_t
 trivfs_S_file_check_access (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-chauthor.c b/libtrivfs/file-chauthor.c
index 0460bfe1..660181cb 100644
--- a/libtrivfs/file-chauthor.c
+++ b/libtrivfs/file-chauthor.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 
 kern_return_t
 trivfs_S_file_chauthor (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-chflags.c b/libtrivfs/file-chflags.c
index c28f12f3..d427015f 100644
--- a/libtrivfs/file-chflags.c
+++ b/libtrivfs/file-chflags.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 
 kern_return_t
 trivfs_S_file_chflags (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-chg.c b/libtrivfs/file-chg.c
index 3af71b33..0e8c8394 100644
--- a/libtrivfs/file-chg.c
+++ b/libtrivfs/file-chg.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 f42a43c7..8c15ec2b 100644
--- a/libtrivfs/file-chmod.c
+++ b/libtrivfs/file-chmod.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 44f79203..416103f2 100644
--- a/libtrivfs/file-chown.c
+++ b/libtrivfs/file-chown.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 
 kern_return_t
 trivfs_S_file_chown (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-exec.c b/libtrivfs/file-exec.c
index a3ab048d..b353d8a3 100644
--- a/libtrivfs/file-exec.c
+++ b/libtrivfs/file-exec.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 
 kern_return_t
 trivfs_S_file_exec (trivfs_protid_t exec_file,
diff --git a/libtrivfs/file-get-children.c b/libtrivfs/file-get-children.c
index a3afbba2..4126119e 100644
--- a/libtrivfs/file-get-children.c
+++ b/libtrivfs/file-get-children.c
@@ -20,6 +20,7 @@
    along with the GNU Hurd.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 
 /* Return any active translators bound to nodes of the receiving
    filesystem.  CHILDREN is an argz vector containing file names
diff --git a/libtrivfs/file-get-fs-options.c b/libtrivfs/file-get-fs-options.c
index 2e06c2d9..3c8bbca1 100644
--- a/libtrivfs/file-get-fs-options.c
+++ b/libtrivfs/file-get-fs-options.c
@@ -22,6 +22,7 @@
 #include <hurd/fshelp.h>
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 
 error_t
 trivfs_S_file_get_fs_options (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-get-source.c b/libtrivfs/file-get-source.c
index 35636b56..f6637d87 100644
--- a/libtrivfs/file-get-source.c
+++ b/libtrivfs/file-get-source.c
@@ -20,6 +20,7 @@
    along with the GNU Hurd.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 
 /* Return information about the source of the receiving
    filesystem.	*/
diff --git a/libtrivfs/file-get-storage-info.c b/libtrivfs/file-get-storage-info.c
index 58bdbc5c..60fdc989 100644
--- a/libtrivfs/file-get-storage-info.c
+++ b/libtrivfs/file-get-storage-info.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 687dc8cc..69de4532 100644
--- a/libtrivfs/file-get-trans.c
+++ b/libtrivfs/file-get-trans.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 8af08fc8..7deb3044 100644
--- a/libtrivfs/file-get-transcntl.c
+++ b/libtrivfs/file-get-transcntl.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 2a58016e..36c2ca3d 100644
--- a/libtrivfs/file-getcontrol.c
+++ b/libtrivfs/file-getcontrol.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 
 kern_return_t
 trivfs_S_file_getcontrol (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-getfh.c b/libtrivfs/file-getfh.c
index 35deb7d5..d585936e 100644
--- a/libtrivfs/file-getfh.c
+++ b/libtrivfs/file-getfh.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 078e5deb..1802d9a6 100644
--- a/libtrivfs/file-getlinknode.c
+++ b/libtrivfs/file-getlinknode.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 993baff6..c89f2fac 100644
--- a/libtrivfs/file-lock.c
+++ b/libtrivfs/file-lock.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 
 kern_return_t
 trivfs_S_file_lock (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-reparent.c b/libtrivfs/file-reparent.c
index 0682a912..5892013c 100644
--- a/libtrivfs/file-reparent.c
+++ b/libtrivfs/file-reparent.c
@@ -19,6 +19,8 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
+#include "trivfs_io_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 287ed996..f90ceec6 100644
--- a/libtrivfs/file-set-size.c
+++ b/libtrivfs/file-set-size.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/file-set-trans.c b/libtrivfs/file-set-trans.c
index 339bdb22..47a7f7c4 100644
--- a/libtrivfs/file-set-trans.c
+++ b/libtrivfs/file-set-trans.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 
 kern_return_t
 trivfs_S_file_set_translator (struct trivfs_protid *cred,
diff --git a/libtrivfs/file-statfs.c b/libtrivfs/file-statfs.c
index 648eef64..348126e8 100644
--- a/libtrivfs/file-statfs.c
+++ b/libtrivfs/file-statfs.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_fs_S.h"
 #include <string.h>
 #include <unistd.h>
 
diff --git a/libtrivfs/file-sync.c b/libtrivfs/file-sync.c
index cb0add3d..f26f3c16 100644
--- a/libtrivfs/file-sync.c
+++ b/libtrivfs/file-sync.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 d356296e..e379df29 100644
--- a/libtrivfs/file-syncfs.c
+++ b/libtrivfs/file-syncfs.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 f9bedd7b..827c0554 100644
--- a/libtrivfs/file-utimes.c
+++ b/libtrivfs/file-utimes.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 106360ea..8f92d454 100644
--- a/libtrivfs/fsys-forward.c
+++ b/libtrivfs/fsys-forward.c
@@ -21,6 +21,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "priv.h"
+#include "trivfs_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 4f2d602b..8030435c 100644
--- a/libtrivfs/fsys-get-options.c
+++ b/libtrivfs/fsys-get-options.c
@@ -22,6 +22,7 @@
 #include <hurd/fshelp.h>
 
 #include "priv.h"
+#include "trivfs_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 60528d72..d343e146 100644
--- a/libtrivfs/fsys-getroot.c
+++ b/libtrivfs/fsys-getroot.c
@@ -21,6 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "priv.h"
 #include "fsys_reply_U.h"
+#include "trivfs_fsys_S.h"
 #include <assert.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/libtrivfs/fsys-goaway.c b/libtrivfs/fsys-goaway.c
index 1ad119b7..d551d551 100644
--- a/libtrivfs/fsys-goaway.c
+++ b/libtrivfs/fsys-goaway.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_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 43890df7..135bc746 100644
--- a/libtrivfs/fsys-set-options.c
+++ b/libtrivfs/fsys-set-options.c
@@ -21,6 +21,7 @@
 #include <hurd/fshelp.h>
 
 #include "priv.h"
+#include "trivfs_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 28990759..bcac43c9 100644
--- a/libtrivfs/fsys-stubs.c
+++ b/libtrivfs/fsys-stubs.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_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 e94fda38..0c337f43 100644
--- a/libtrivfs/fsys-syncfs.c
+++ b/libtrivfs/fsys-syncfs.c
@@ -19,6 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 bd9c5490..3e0cf6fc 100644
--- a/libtrivfs/io-async-icky.c
+++ b/libtrivfs/io-async-icky.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-async.c b/libtrivfs/io-async.c
index b02f57f6..874c5899 100644
--- a/libtrivfs/io-async.c
+++ b/libtrivfs/io-async.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-duplicate.c b/libtrivfs/io-duplicate.c
index c1b7798d..5e2fabfb 100644
--- a/libtrivfs/io-duplicate.c
+++ b/libtrivfs/io-duplicate.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <string.h>
 
 kern_return_t
diff --git a/libtrivfs/io-identity.c b/libtrivfs/io-identity.c
index 44f60d38..a67ed7ec 100644
--- a/libtrivfs/io-identity.c
+++ b/libtrivfs/io-identity.c
@@ -19,6 +19,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
 #include "priv.h"
+#include "trivfs_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 2959efba..39428ad2 100644
--- a/libtrivfs/io-map.c
+++ b/libtrivfs/io-map.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-modes-get.c b/libtrivfs/io-modes-get.c
index 4d38d3a6..9ed591cc 100644
--- a/libtrivfs/io-modes-get.c
+++ b/libtrivfs/io-modes-get.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-modes-off.c b/libtrivfs/io-modes-off.c
index 33b0a573..786f0a13 100644
--- a/libtrivfs/io-modes-off.c
+++ b/libtrivfs/io-modes-off.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-modes-on.c b/libtrivfs/io-modes-on.c
index 7886dc50..74b10ad3 100644
--- a/libtrivfs/io-modes-on.c
+++ b/libtrivfs/io-modes-on.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-modes-set.c b/libtrivfs/io-modes-set.c
index c1bc7405..bc576261 100644
--- a/libtrivfs/io-modes-set.c
+++ b/libtrivfs/io-modes-set.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 error_t
diff --git a/libtrivfs/io-owner-get.c b/libtrivfs/io-owner-get.c
index f6c261c7..5ffce4d7 100644
--- a/libtrivfs/io-owner-get.c
+++ b/libtrivfs/io-owner-get.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-owner-mod.c b/libtrivfs/io-owner-mod.c
index 4e96a245..8b85e7c8 100644
--- a/libtrivfs/io-owner-mod.c
+++ b/libtrivfs/io-owner-mod.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-pathconf.c b/libtrivfs/io-pathconf.c
index 51d4e094..f4a4edff 100644
--- a/libtrivfs/io-pathconf.c
+++ b/libtrivfs/io-pathconf.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 dcba818b..7dfdc190 100644
--- a/libtrivfs/io-read.c
+++ b/libtrivfs/io-read.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-readable.c b/libtrivfs/io-readable.c
index 792bd1a7..90e66c77 100644
--- a/libtrivfs/io-readable.c
+++ b/libtrivfs/io-readable.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-reauthenticate.c b/libtrivfs/io-reauthenticate.c
index 6623d947..7677697a 100644
--- a/libtrivfs/io-reauthenticate.c
+++ b/libtrivfs/io-reauthenticate.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 #include <string.h>
 
diff --git a/libtrivfs/io-restrict-auth.c b/libtrivfs/io-restrict-auth.c
index db3c99a0..65b4fd62 100644
--- a/libtrivfs/io-restrict-auth.c
+++ b/libtrivfs/io-restrict-auth.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_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 901de4c6..b2fc00e9 100644
--- a/libtrivfs/io-revoke.c
+++ b/libtrivfs/io-revoke.c
@@ -17,6 +17,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_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 8e794cf1..cfb7f53a 100644
--- a/libtrivfs/io-seek.c
+++ b/libtrivfs/io-seek.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-select.c b/libtrivfs/io-select.c
index e44a8365..78018bb5 100644
--- a/libtrivfs/io-select.c
+++ b/libtrivfs/io-select.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 
 kern_return_t
diff --git a/libtrivfs/io-stat.c b/libtrivfs/io-stat.c
index 6e430a22..70047419 100644
--- a/libtrivfs/io-stat.c
+++ b/libtrivfs/io-stat.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <unistd.h>
 
 kern_return_t
diff --git a/libtrivfs/io-stubs.c b/libtrivfs/io-stubs.c
index a8cf3f57..af3ad38a 100644
--- a/libtrivfs/io-stubs.c
+++ b/libtrivfs/io-stubs.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 
 kern_return_t
 trivfs_S_io_map_cntl (struct trivfs_protid *cred,
diff --git a/libtrivfs/io-version.c b/libtrivfs/io-version.c
index ff820db9..e656d5cc 100644
--- a/libtrivfs/io-version.c
+++ b/libtrivfs/io-version.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 
 kern_return_t
 trivfs_S_io_server_version (trivfs_protid_t obj,
diff --git a/libtrivfs/io-write.c b/libtrivfs/io-write.c
index 106031dd..c479c55b 100644
--- a/libtrivfs/io-write.c
+++ b/libtrivfs/io-write.c
@@ -16,6 +16,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include "priv.h"
+#include "trivfs_io_S.h"
 #include <assert.h>
 #include <fcntl.h>
 
diff --git a/libtrivfs/mig-mutate.h b/libtrivfs/mig-mutate.h
index fad5389a..cc15d38d 100644
--- a/libtrivfs/mig-mutate.h
+++ b/libtrivfs/mig-mutate.h
@@ -21,12 +21,12 @@
 
 #define FILE_INTRAN trivfs_protid_t trivfs_begin_using_protid (file_t)
 #define FILE_DESTRUCTOR trivfs_end_using_protid (trivfs_protid_t)
-#define FILE_IMPORTS import "mig-decls.h";
+#define FILE_IMPORTS import "libtrivfs/mig-decls.h";
 
 #define IO_INTRAN trivfs_protid_t trivfs_begin_using_protid (io_t)
 #define IO_DESTRUCTOR trivfs_end_using_protid (trivfs_protid_t)
-#define IO_IMPORTS import "mig-decls.h";
+#define IO_IMPORTS import "libtrivfs/mig-decls.h";
 
 #define FSYS_INTRAN trivfs_control_t trivfs_begin_using_control (fsys_t)
 #define FSYS_DESTRUCTOR trivfs_end_using_control (trivfs_control_t)
-#define FSYS_IMPORTS import "mig-decls.h";
+#define FSYS_IMPORTS import "libtrivfs/mig-decls.h";
diff --git a/pfinet/tunnel.c b/pfinet/tunnel.c
index 495356c2..6a7f355d 100644
--- a/pfinet/tunnel.c
+++ b/pfinet/tunnel.c
@@ -36,6 +36,9 @@
 #include <linux/ppp_defs.h>
 #include <linux/if_ppp.h>
 
+#include "libtrivfs/trivfs_fs_S.h"
+#include "libtrivfs/trivfs_io_S.h"
+
 struct port_class *tunnel_cntlclass;
 struct port_class *tunnel_class;
 
diff --git a/storeio/io.c b/storeio/io.c
index eaa20def..2295615e 100644
--- a/storeio/io.c
+++ b/storeio/io.c
@@ -23,6 +23,8 @@
 
 #include "open.h"
 #include "dev.h"
+#include "libtrivfs/trivfs_fs_S.h"
+#include "libtrivfs/trivfs_io_S.h"
 
 /* Return objects mapping the data underlying this memory object.  If
    the object can be read then memobjrd will be provided; if the
diff --git a/storeio/storeio.c b/storeio/storeio.c
index 3bde9644..eb383495 100644
--- a/storeio/storeio.c
+++ b/storeio/storeio.c
@@ -31,6 +31,7 @@
 
 #include "open.h"
 #include "dev.h"
+#include "libtrivfs/trivfs_fsys_S.h"
 
 static struct argp_option options[] =
 {
diff --git a/term/users.c b/term/users.c
index 9ec95941..97bc22c2 100644
--- a/term/users.c
+++ b/term/users.c
@@ -43,6 +43,8 @@
 
 #include "term_S.h"
 #include "tioctl_S.h"
+#include "libtrivfs/trivfs_fs_S.h"
+#include "libtrivfs/trivfs_io_S.h"
 #include <sys/ioctl.h>
 
 #define TTYDEFCHARS
diff --git a/tmpfs/node.c b/tmpfs/node.c
index 9d5f9b75..bc0ad642 100644
--- a/tmpfs/node.c
+++ b/tmpfs/node.c
@@ -24,6 +24,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <hurd/hurd_types.h>
 #include <hurd/store.h>
 #include "default_pager_U.h"
+#include "libdiskfs/fs_S.h"
 
 unsigned int num_files;
 static unsigned int gen;
diff --git a/trans/Makefile b/trans/Makefile
index a2942820..71e64248 100644
--- a/trans/Makefile
+++ b/trans/Makefile
@@ -1,6 +1,6 @@
 #
 #   Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2006, 2007,
-#   2008, 2013 Free Software Foundation, Inc.
+#   2008, 2013, 2014 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
@@ -31,7 +31,7 @@ OBJS = $(SRCS:.c=.o) fsysServer.o ifsockServer.o passwordServer.o \
 	device_replyServer.o elfcore.o
 HURDLIBS = ports netfs trivfs iohelp fshelp pipe ihash shouldbeinlibc
 LDLIBS += -lpthread
-password-LDLIBS = $(LIBCRYPT)
+password-LDLIBS = -lcrypt
 password-MIGSFLAGS=\
     "-DIO_INTRAN=trivfs_protid_t trivfs_begin_using_protid (io_t)" \
     "-DIO_DESTRUCTOR=trivfs_end_using_protid (trivfs_protid_t)" \
diff --git a/trans/fakeroot.c b/trans/fakeroot.c
index c519180c..987af243 100644
--- a/trans/fakeroot.c
+++ b/trans/fakeroot.c
@@ -31,6 +31,12 @@
 
 #include <version.h>
 
+#include "libnetfs/fs_S.h"
+#include "libnetfs/io_S.h"
+#include "libnetfs/fsys_S.h"
+#include "libports/notify_S.h"
+#include "libports/interrupt_S.h"
+
 const char *argp_program_version = STANDARD_HURD_VERSION (fakeroot);
 
 char *netfs_server_name = "fakeroot";
@@ -934,12 +940,6 @@ int
 netfs_demuxer (mach_msg_header_t *inp,
 	       mach_msg_header_t *outp)
 {
-  mig_routine_t netfs_io_server_routine (mach_msg_header_t *);
-  mig_routine_t netfs_fs_server_routine (mach_msg_header_t *);
-  mig_routine_t ports_notify_server_routine (mach_msg_header_t *);
-  mig_routine_t netfs_fsys_server_routine (mach_msg_header_t *);
-  mig_routine_t ports_interrupt_server_routine (mach_msg_header_t *);
-
   mig_routine_t routine;
   if ((routine = netfs_io_server_routine (inp)) ||
       (routine = netfs_fs_server_routine (inp)) ||
diff --git a/trans/fifo.c b/trans/fifo.c
index e6fbd0e9..a9ad2dd2 100644
--- a/trans/fifo.c
+++ b/trans/fifo.c
@@ -35,6 +35,9 @@
 
 #include <version.h>
 
+#include "libtrivfs/trivfs_fs_S.h"
+#include "libtrivfs/trivfs_io_S.h"
+
 /* Global options.  These defaults are the standard ones, I think...   */
 int wait_for_reader = 1, wait_for_writer = 1;
 int one_reader = 1;
diff --git a/trans/firmlink.c b/trans/firmlink.c
index 9c063c04..69d4aaed 100644
--- a/trans/firmlink.c
+++ b/trans/firmlink.c
@@ -32,6 +32,8 @@
 
 #include <version.h>
 
+#include "libtrivfs/trivfs_io_S.h"
+
 const char *argp_program_version = STANDARD_HURD_VERSION (firmlink);
 
 static const struct argp_option options[] =
diff --git a/trans/hello-mt.c b/trans/hello-mt.c
index c2d4cc99..ba9329a7 100644
--- a/trans/hello-mt.c
+++ b/trans/hello-mt.c
@@ -30,6 +30,8 @@
 
 #include <version.h>
 
+#include "libtrivfs/trivfs_io_S.h"
+
 const char *argp_program_version = STANDARD_HURD_VERSION (hello-mt);
 
 /* The message we return when we are read.  */
diff --git a/trans/hello.c b/trans/hello.c
index c49feeb2..4e88c609 100644
--- a/trans/hello.c
+++ b/trans/hello.c
@@ -29,6 +29,8 @@
 
 #include <version.h>
 
+#include "libtrivfs/trivfs_io_S.h"
+
 const char *argp_program_version = STANDARD_HURD_VERSION (hello);
 
 /* The message we return when we are read.  */
diff --git a/trans/magic.c b/trans/magic.c
index 1a8427ce..58084838 100644
--- a/trans/magic.c
+++ b/trans/magic.c
@@ -35,6 +35,8 @@
 #include <argp.h>
 #include <argz.h>
 #include <assert.h>
+
+#include "fsys_S.h"
 
 const char *argp_program_version = STANDARD_HURD_VERSION (magic);
 
diff --git a/trans/mtab.c b/trans/mtab.c
index da83e6fc..8c9f8d3b 100644
--- a/trans/mtab.c
+++ b/trans/mtab.c
@@ -36,6 +36,7 @@
 #include <unistd.h>
 #include <version.h>
 
+#include "libtrivfs/trivfs_io_S.h"
 #include "fs_U.h"
 
 static char *target_path = NULL;
diff --git a/trans/new-fifo.c b/trans/new-fifo.c
index dc3cc79e..e71c95ca 100644
--- a/trans/new-fifo.c
+++ b/trans/new-fifo.c
@@ -38,6 +38,10 @@
 
 #include <version.h>
 
+#include "libtrivfs/trivfs_fs_S.h"
+#include "libtrivfs/trivfs_fsys_S.h"
+#include "libtrivfs/trivfs_io_S.h"
+
 #define DEFAULT_SERVER _SERVERS "fifo";
 
 const char *argp_program_version = STANDARD_HURD_VERSION (new-fifo);
diff --git a/trans/null.c b/trans/null.c
index 4828cce3..bd082dc8 100644
--- a/trans/null.c
+++ b/trans/null.c
@@ -32,6 +32,9 @@
 #include <limits.h>
 #include <argp.h>
 #include <nullauth.h>
+
+#include "libtrivfs/trivfs_fs_S.h"
+#include "libtrivfs/trivfs_io_S.h"
 
 const char *argp_program_version = STANDARD_HURD_VERSION (null);
 
diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c
index 0a5ab65e..98176577 100644
--- a/trans/proxy-defpager.c
+++ b/trans/proxy-defpager.c
@@ -24,6 +24,7 @@
 #include <version.h>
 #include <hurd/paths.h>
 
+#include "libtrivfs/trivfs_io_S.h"
 #include "default_pager_S.h"
 #include "default_pager_U.h"
 
diff --git a/trans/streamio.c b/trans/streamio.c
index 68badd21..54627b73 100644
--- a/trans/streamio.c
+++ b/trans/streamio.c
@@ -34,6 +34,9 @@
 #include <hurd/trivfs.h>
 #include <version.h>
 
+#include "libtrivfs/trivfs_fs_S.h"
+#include "libtrivfs/trivfs_io_S.h"
+
 /* The global lock */
 pthread_mutex_t global_lock;
 
diff --git a/utils/Makefile b/utils/Makefile
index 81fa2932..241b0604 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -1,4 +1,4 @@
-#   Copyright (C) 1994,95,96,97,98,99,2000,01,02,12 Free Software Foundation,
+#   Copyright (C) 1994,95,96,97,98,99,2000,01,02,12,14 Free Software Foundation,
 #   Inc.
 #
 #   This program is free software; you can redistribute it and/or
@@ -36,9 +36,9 @@ SRCS = shd.c ps.c settrans.c syncfs.c showtrans.c addauth.c rmauth.c \
 OBJS = $(filter-out %.sh,$(SRCS:.c=.o))
 HURDLIBS = ps ihash store fshelp ports ftpconn shouldbeinlibc
 LDLIBS += -lpthread
-login-LDLIBS = -lutil $(LIBCRYPT)
-addauth-LDLIBS = $(LIBCRYPT)
-setauth-LDLIBS = $(LIBCRYPT)
+login-LDLIBS = -lutil -lcrypt
+addauth-LDLIBS = -lcrypt
+setauth-LDLIBS = -lcrypt
 mount-LDLIBS = $(libblkid_LIBS)
 mount-CPPFLAGS = $(libblkid_CFLAGS)