diff options
Diffstat (limited to 'debian/patches/includefest.patch')
| -rw-r--r-- | debian/patches/includefest.patch | 1310 |
1 files changed, 0 insertions, 1310 deletions
diff --git a/debian/patches/includefest.patch b/debian/patches/includefest.patch deleted file mode 100644 index 32ca0d57..00000000 --- a/debian/patches/includefest.patch +++ /dev/null @@ -1,1310 +0,0 @@ -diff --git a/console-client/trans.c b/console-client/trans.c -index d65161c..67cd149 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 0577ea0..57ae813 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 c1867a0..4e1cc7e 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 fdb96e7..0000000 ---- 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 5d21b05..d9a2be8 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 e3ca09d..4229806 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 b34f8da..2bbcdfa 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 f542d18..cdc05ae 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 9dd2751..a60a1d0 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 2674398..9da43e7 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 5dad2c7..df262ea 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 1e70da2..d759311 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 6248708..3f9362b 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 bf955d2..d10c964 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 80a727f..bd7e8fc 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 50401f8..0e29ccf 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 b46eb02..02c5583 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 f1b9bf7..75bd790 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 51ca871..e60a220 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 8702954..f289a23 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 0460bfe..660181c 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 c28f12f..d427015 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 3af71b3..0e8c839 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 f42a43c..8c15ec2 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 44f7920..416103f 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 a3ab048..b353d8a 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 a3afbba..4126119 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 2e06c2d..3c8bbca 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 35636b5..f6637d8 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 58bdbc5..60fdc98 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 687dc8c..69de453 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 8af08fc..7deb304 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 2a58016..36c2ca3 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 35deb7d..d585936 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 078e5de..1802d9a 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 993baff..c89f2fa 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 0682a91..5892013 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 287ed99..f90ceec 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 339bdb2..47a7f7c 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 648eef6..348126e 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 cb0add3..f26f3c1 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 d356296..e379df2 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 f9bedd7..827c055 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 106360e..8f92d45 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 4f2d602..8030435 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 60528d7..d343e14 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 1ad119b..d551d55 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 43890df..135bc74 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 2899075..bcac43c 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 e94fda3..0c337f4 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 bd9c549..3e0cf6f 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 b02f57f..874c589 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 c1b7798..5e2fabf 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 44f60d3..a67ed7e 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 2959efb..39428ad 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 4d38d3a..9ed591c 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 33b0a57..786f0a1 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 7886dc5..74b10ad 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 c1bc740..bc57626 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 f6c261c..5ffce4d 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 4e96a24..8b85e7c 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 51d4e09..f4a4edf 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 dcba818..7dfdc19 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 792bd1a..90e66c7 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 6623d94..7677697 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 db3c99a..65b4fd6 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 901de4c..b2fc00e 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 8e794cf..cfb7f53 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 e44a836..78018bb 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 6e430a2..7004741 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 a8cf3f5..af3ad38 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 ff820db..e656d5c 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 106031d..c479c55 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 fad5389..cc15d38 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 495356c..6a7f355 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 eaa20de..2295615 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 3bde964..eb38349 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 9ec9594..97bc22c 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 9d5f9b7..bc0ad64 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/fakeroot.c b/trans/fakeroot.c -index c519180..987af24 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 e6fbd0e..a9ad2dd 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 9c063c0..69d4aae 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 c2d4cc9..ba9329a 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 c49feeb..4e88c60 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 1a8427c..5808483 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 da83e6f..8c9f8d3 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 dc3cc79..e71c95c 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 4828cce..bd082dc 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 0a5ab65..9817657 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 68badd2..54627b7 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; - |