3 files changed, 43 insertions, 30 deletions
diff --git a/libtrivfs/fsmutations.h b/libtrivfs/fsmutations.h
index cb716c8d..d81e5a87 100644
--- a/libtrivfs/fsmutations.h
+++ b/libtrivfs/fsmutations.h
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1994, 1995 Free Software Foundation
+/*
+   Copyright (C) 1994,95,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -28,6 +28,6 @@
 #define FSYS_INTRAN trivfs_control_t trivfs_begin_using_control (fsys_t)
 #define FSYS_DESTRUCTOR trivfs_end_using_control (trivfs_control_t)
 
-#define FILE_IMPORTS import "priv.h";
-#define IO_IMPORTS import "priv.h";
-#define FSYS_IMPORTS import "priv.h";
+#define FILE_IMPORTS import <hurd/trivfs.h>;
+#define IO_IMPORTS import <hurd/trivfs.h>;
+#define FSYS_IMPORTS import <hurd/trivfs.h>;
diff --git a/libtrivfs/priv.h b/libtrivfs/priv.h
index 585a319e..d92fe336 100644
--- a/libtrivfs/priv.h
+++ b/libtrivfs/priv.h
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 1994, 1997 Free Software Foundation
 
    This program is free software; you can redistribute it and/or
@@ -16,34 +16,11 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifndef TRIVFS_PRIV_H_INCLUDED
+#define TRIVFS_PRIV_H_INCLUDED
 
 #include <mach.h>
 #include <hurd.h>
 #include <hurd/ports.h>
 #include "trivfs.h"
 
-/* For the sake of MiG. */
-typedef struct trivfs_protid *trivfs_protid_t;
-typedef struct trivfs_control *trivfs_control_t;
-
-struct trivfs_protid *_trivfs_begin_using_protid (mach_port_t);
-void _trivfs_end_using_protid (struct trivfs_protid *);
-struct trivfs_control *_trivfs_begin_using_control (mach_port_t);
-void _trivfs_end_using_control (struct trivfs_control *);
-
-/* Vectors of dynamically allocated port classes/buckets.  */
-
-/* Protid port classes.  */
-extern struct port_class **trivfs_dynamic_protid_port_classes;
-extern size_t trivfs_num_dynamic_protid_port_classes;
-
-/* Control port classes.  */
-extern struct port_class **trivfs_dynamic_control_port_classes;
-extern size_t trivfs_num_dynamic_control_port_classes;
-
-/* Port buckets.  */
-extern struct port_bucket **trivfs_dynamic_port_buckets;
-extern size_t trivfs_num_dynamic_port_buckets;
-
-#define TRIVFS_PRIV_H_INCLUDED
 #endif
diff --git a/libtrivfs/trivfs.h b/libtrivfs/trivfs.h
index 1e298dc4..6e087f31 100644
--- a/libtrivfs/trivfs.h
+++ b/libtrivfs/trivfs.h
@@ -261,4 +261,40 @@ error_t trivfs_add_port_bucket (struct port_bucket **bucket);
    if it was allocated by trivfs_add_port_bucket.  */
 void trivfs_remove_port_bucket (struct port_bucket *bucket);
 
+
+/* This stuff is for the sake of MiG stubs and could be in a private
+   header.  But it might be handy for users that override parts of the
+   library.  Moreover, since the stub headers will use all the imports we
+   need for the stubs, we couldn't make the stub headers public without
+   making this public too.  */
+
+typedef struct trivfs_protid *trivfs_protid_t;
+typedef struct trivfs_control *trivfs_control_t;
+
+struct trivfs_protid *_trivfs_begin_using_protid (mach_port_t);
+void _trivfs_end_using_protid (struct trivfs_protid *);
+struct trivfs_control *_trivfs_begin_using_control (mach_port_t);
+void _trivfs_end_using_control (struct trivfs_control *);
+
+/* Vectors of dynamically allocated port classes/buckets.  */
+
+/* Protid port classes.  */
+extern struct port_class **trivfs_dynamic_protid_port_classes;
+extern size_t trivfs_num_dynamic_protid_port_classes;
+
+/* Control port classes.  */
+extern struct port_class **trivfs_dynamic_control_port_classes;
+extern size_t trivfs_num_dynamic_control_port_classes;
+
+/* Port buckets.  */
+extern struct port_bucket **trivfs_dynamic_port_buckets;
+extern size_t trivfs_num_dynamic_port_buckets;
+
+/* These are the MiG-generated headers that declare prototypes
+   for the server functions.  */
+#include <hurd/trivfs_fs_S.h>
+#include <hurd/trivfs_io_S.h>
+#include <hurd/trivfs_fsys_S.h>
+
+
 #endif /* __TRIVFS_H__ */