Include the MIG-generated server header files

This enables the compiler to check that the server function
declarations match MIGs expectations.  Fix a few oddities along the
way.

* console-client/trans.c: Include MIG-generated server header file(s).
* console/console.c: Likewise.  Also, fix declarations.
* console/mutations.h (TIOCTL_IMPORTS): Just use libnetfs/priv.h.
* console/priv.h: Delete now unused file.
* ext2fs/storeinfo.c: Include MIG-generated server header file(s).
* fatfs/inode.c: Likewise.
* fatfs/main.c: Likewise.  Also, fix declaration.
* isofs/inode.c: Likewise.
* libdiskfs/boot-start.c: Likewise.
* libdiskfs/file-chg.c: Include the correct MIG-generated server header file.
* libdiskfs/file-chmod.c: Include MIG-generated server header file(s).
* libdiskfs/file-get-fs-opts.c: Likewise.
* libdiskfs/init-startup.c: Likewise.
* libnetfs/file-get-children.c: Likewise.
* libnetfs/file-getcontrol.c: Include the correct MIG-generated server
header file.
* libnetfs/file-set-translator.c: Include MIG-generated server header file(s).
* libnetfs/fsstubs.c: Likewise.
* libtrivfs/file-access.c: Likewise.
* libtrivfs/file-chauthor.c: Likewise.
* libtrivfs/file-chflags.c: Likewise.
* libtrivfs/file-chg.c: Likewise.
* libtrivfs/file-chmod.c: Likewise.
* libtrivfs/file-chown.c: Likewise.
* libtrivfs/file-exec.c: Likewise.
* libtrivfs/file-get-children.c: Likewise.
* libtrivfs/file-get-fs-options.c: Likewise.
* libtrivfs/file-get-source.c: Likewise.
* libtrivfs/file-get-storage-info.c: Likewise.
* libtrivfs/file-get-trans.c: Likewise.
* libtrivfs/file-get-transcntl.c: Likewise.
* libtrivfs/file-getcontrol.c: Likewise.
* libtrivfs/file-getfh.c: Likewise.
* libtrivfs/file-getlinknode.c: Likewise.
* libtrivfs/file-lock.c: Likewise.
* libtrivfs/file-reparent.c: Likewise.
* libtrivfs/file-set-size.c: Likewise.
* libtrivfs/file-set-trans.c: Likewise.
* libtrivfs/file-statfs.c: Likewise.
* libtrivfs/file-sync.c: Likewise.
* libtrivfs/file-syncfs.c: Likewise.
* libtrivfs/file-utimes.c: Likewise.
* libtrivfs/fsys-forward.c: Likewise.
* libtrivfs/fsys-get-options.c: Likewise.
* libtrivfs/fsys-getroot.c: Likewise.
* libtrivfs/fsys-goaway.c: Likewise.
* libtrivfs/fsys-set-options.c: Likewise.
* libtrivfs/fsys-stubs.c: Likewise.
* libtrivfs/fsys-syncfs.c: Likewise.
* libtrivfs/io-async-icky.c: Likewise.
* libtrivfs/io-async.c: Likewise.
* libtrivfs/io-duplicate.c: Likewise.
* libtrivfs/io-identity.c: Likewise.
* libtrivfs/io-map.c: Likewise.
* libtrivfs/io-modes-get.c: Likewise.
* libtrivfs/io-modes-off.c: Likewise.
* libtrivfs/io-modes-on.c: Likewise.
* libtrivfs/io-modes-set.c: Likewise.
* libtrivfs/io-owner-get.c: Likewise.
* libtrivfs/io-owner-mod.c: Likewise.
* libtrivfs/io-pathconf.c: Likewise.
* libtrivfs/io-read.c: Likewise.
* libtrivfs/io-readable.c: Likewise.
* libtrivfs/io-reauthenticate.c: Likewise.
* libtrivfs/io-restrict-auth.c: Likewise.
* libtrivfs/io-revoke.c: Likewise.
* libtrivfs/io-seek.c: Likewise.
* libtrivfs/io-select.c: Likewise.
* libtrivfs/io-stat.c: Likewise.
* libtrivfs/io-stubs.c: Likewise.
* libtrivfs/io-version.c: Likewise.
* libtrivfs/io-write.c: Likewise.
* pfinet/tunnel.c: Likewise.
* storeio/io.c: Likewise.
* storeio/storeio.c: Likewise.
* term/users.c: Likewise.
* tmpfs/node.c: Likewise.
* trans/fakeroot.c: Likewise.  Also, include all server headers that provide
the X_server_routine functions...
(netfs_demuxer): ... that were previously declared here.
* trans/fifo.c: Include MIG-generated server header file(s).
* trans/firmlink.c: Likewise.
* trans/hello-mt.c: Likewise.
* trans/hello.c: Likewise.
* trans/magic.c: Likewise.
* trans/mtab.c: Likewise.
* trans/new-fifo.c: Likewise.
* trans/null.c: Likewise.
* trans/proxy-defpager.c: Likewise.
* trans/streamio.c: Likewise.
* libdiskfs/fsmutations.h: Qualify the import with the libraries path.
Without this change, out-of-tree builds would no longer work.
* libnetfs/mutations.h: Likewise.
* libtrivfs/mig-mutate.h: Likewise.

55 files changed, 58 insertions, 3 deletions

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";