25 files changed, 0 insertions, 10387 deletions

diff --git a/boot-proxy-exc/bootstrap_S.h b/boot-proxy-exc/bootstrap_S.h
deleted file mode 100644
index a93c8052..00000000
--- a/boot-proxy-exc/bootstrap_S.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef	_bootstrap_server_
-#define	_bootstrap_server_
-
-/* Module bootstrap */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-
-/* Routine bootstrap_privileged_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_bootstrap_privileged_ports
-#if	defined(LINTLIBRARY)
-    (bootstrap, priv_host, priv_device)
-	mach_port_t bootstrap;
-	mach_port_t *priv_host;
-	mach_port_t *priv_device;
-{ return do_bootstrap_privileged_ports(bootstrap, priv_host, priv_device); }
-#else
-(
-	mach_port_t bootstrap,
-	mach_port_t *priv_host,
-	mach_port_t *priv_device
-);
-#endif
-
-#endif	/* not defined(_bootstrap_server_) */
diff --git a/boot-proxy-exc/exc_S.h b/boot-proxy-exc/exc_S.h
deleted file mode 100644
index 5b2c327a..00000000
--- a/boot-proxy-exc/exc_S.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef	_exc_server_
-#define	_exc_server_
-
-/* Module exc */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-
-/* Routine exception_raise */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t catch_exception_raise
-#if	defined(LINTLIBRARY)
-    (exception_port, thread, task, exception, code, subcode)
-	mach_port_t exception_port;
-	mach_port_t thread;
-	mach_port_t task;
-	integer_t exception;
-	integer_t code;
-	integer_t subcode;
-{ return catch_exception_raise(exception_port, thread, task, exception, code, subcode); }
-#else
-(
-	mach_port_t exception_port,
-	mach_port_t thread,
-	mach_port_t task,
-	integer_t exception,
-	integer_t code,
-	integer_t subcode
-);
-#endif
-
-#endif	/* not defined(_exc_server_) */
diff --git a/boot-proxy-exc/io_S.h b/boot-proxy-exc/io_S.h
deleted file mode 100644
index 847bff40..00000000
--- a/boot-proxy-exc/io_S.h
+++ /dev/null
@@ -1,782 +0,0 @@
-#ifndef	_io_server_
-#define	_io_server_
-
-/* Module io */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <device/net_status.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <hurd/hurd_types.h>
-
-/* Routine io_write */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_write
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, data, dataCnt, offset, amount)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	data_t data;
-	mach_msg_type_number_t dataCnt;
-	loff_t offset;
-	vm_size_t *amount;
-{ return S_io_write(io_object, reply, replyPoly, data, dataCnt, offset, amount); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	data_t data,
-	mach_msg_type_number_t dataCnt,
-	loff_t offset,
-	vm_size_t *amount
-);
-#endif
-
-/* Routine io_read */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_read
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, data, dataCnt, offset, amount)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	data_t *data;
-	mach_msg_type_number_t *dataCnt;
-	loff_t offset;
-	vm_size_t amount;
-{ return S_io_read(io_object, reply, replyPoly, data, dataCnt, offset, amount); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	data_t *data,
-	mach_msg_type_number_t *dataCnt,
-	loff_t offset,
-	vm_size_t amount
-);
-#endif
-
-/* Routine io_seek */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_seek
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, offset, whence, newp)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	loff_t offset;
-	int whence;
-	loff_t *newp;
-{ return S_io_seek(io_object, reply, replyPoly, offset, whence, newp); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	loff_t offset,
-	int whence,
-	loff_t *newp
-);
-#endif
-
-/* Routine io_readable */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_readable
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, amount)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	vm_size_t *amount;
-{ return S_io_readable(io_object, reply, replyPoly, amount); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	vm_size_t *amount
-);
-#endif
-
-/* Routine io_set_all_openmodes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_set_all_openmodes
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, newbits)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int newbits;
-{ return S_io_set_all_openmodes(io_object, reply, replyPoly, newbits); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int newbits
-);
-#endif
-
-/* Routine io_get_openmodes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_get_openmodes
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, bits)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int *bits;
-{ return S_io_get_openmodes(io_object, reply, replyPoly, bits); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int *bits
-);
-#endif
-
-/* Routine io_set_some_openmodes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_set_some_openmodes
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, bits_to_set)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int bits_to_set;
-{ return S_io_set_some_openmodes(io_object, reply, replyPoly, bits_to_set); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int bits_to_set
-);
-#endif
-
-/* Routine io_clear_some_openmodes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_clear_some_openmodes
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, bits_to_clear)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int bits_to_clear;
-{ return S_io_clear_some_openmodes(io_object, reply, replyPoly, bits_to_clear); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int bits_to_clear
-);
-#endif
-
-/* Routine io_async */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_async
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, notify_port, async_id_port, async_id_portPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t notify_port;
-	mach_port_t *async_id_port;
-	mach_msg_type_name_t *async_id_portPoly;
-{ return S_io_async(io_object, reply, replyPoly, notify_port, async_id_port, async_id_portPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t notify_port,
-	mach_port_t *async_id_port,
-	mach_msg_type_name_t *async_id_portPoly
-);
-#endif
-
-/* Routine io_mod_owner */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_mod_owner
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, owner)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	pid_t owner;
-{ return S_io_mod_owner(io_object, reply, replyPoly, owner); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	pid_t owner
-);
-#endif
-
-/* Routine io_get_owner */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_get_owner
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, owner)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	pid_t *owner;
-{ return S_io_get_owner(io_object, reply, replyPoly, owner); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	pid_t *owner
-);
-#endif
-
-/* Routine io_get_icky_async_id */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_get_icky_async_id
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, icky_async_id_port, icky_async_id_portPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t *icky_async_id_port;
-	mach_msg_type_name_t *icky_async_id_portPoly;
-{ return S_io_get_icky_async_id(io_object, reply, replyPoly, icky_async_id_port, icky_async_id_portPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t *icky_async_id_port,
-	mach_msg_type_name_t *icky_async_id_portPoly
-);
-#endif
-
-/* Routine io_select */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_select
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, select_type)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int *select_type;
-{ return S_io_select(io_object, reply, replyPoly, select_type); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int *select_type
-);
-#endif
-
-/* Routine io_stat */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_stat
-#if	defined(LINTLIBRARY)
-    (stat_object, reply, replyPoly, stat_info)
-	io_t stat_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	io_statbuf_t *stat_info;
-{ return S_io_stat(stat_object, reply, replyPoly, stat_info); }
-#else
-(
-	io_t stat_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	io_statbuf_t *stat_info
-);
-#endif
-
-/* SimpleRoutine io_reauthenticate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_reauthenticate
-#if	defined(LINTLIBRARY)
-    (auth_object, reply, replyPoly, rendezvous2)
-	io_t auth_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t rendezvous2;
-{ return S_io_reauthenticate(auth_object, reply, replyPoly, rendezvous2); }
-#else
-(
-	io_t auth_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t rendezvous2
-);
-#endif
-
-/* Routine io_restrict_auth */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_restrict_auth
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, new_object, new_objectPoly, uids, uidsCnt, gids, gidsCnt)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t *new_object;
-	mach_msg_type_name_t *new_objectPoly;
-	idarray_t uids;
-	mach_msg_type_number_t uidsCnt;
-	idarray_t gids;
-	mach_msg_type_number_t gidsCnt;
-{ return S_io_restrict_auth(io_object, reply, replyPoly, new_object, new_objectPoly, uids, uidsCnt, gids, gidsCnt); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t *new_object,
-	mach_msg_type_name_t *new_objectPoly,
-	idarray_t uids,
-	mach_msg_type_number_t uidsCnt,
-	idarray_t gids,
-	mach_msg_type_number_t gidsCnt
-);
-#endif
-
-/* Routine io_duplicate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_duplicate
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, newport, newportPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t *newport;
-	mach_msg_type_name_t *newportPoly;
-{ return S_io_duplicate(io_object, reply, replyPoly, newport, newportPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t *newport,
-	mach_msg_type_name_t *newportPoly
-);
-#endif
-
-/* Routine io_server_version */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_server_version
-#if	defined(LINTLIBRARY)
-    (vers_object, reply, replyPoly, server_name, server_major_version, server_minor_version, server_edit_level)
-	io_t vers_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	string_t server_name;
-	int *server_major_version;
-	int *server_minor_version;
-	int *server_edit_level;
-{ return S_io_server_version(vers_object, reply, replyPoly, server_name, server_major_version, server_minor_version, server_edit_level); }
-#else
-(
-	io_t vers_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	string_t server_name,
-	int *server_major_version,
-	int *server_minor_version,
-	int *server_edit_level
-);
-#endif
-
-/* Routine io_map */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_map
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, memobjrd, memobjrdPoly, memobjwt, memobjwtPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t *memobjrd;
-	mach_msg_type_name_t *memobjrdPoly;
-	mach_port_t *memobjwt;
-	mach_msg_type_name_t *memobjwtPoly;
-{ return S_io_map(io_object, reply, replyPoly, memobjrd, memobjrdPoly, memobjwt, memobjwtPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t *memobjrd,
-	mach_msg_type_name_t *memobjrdPoly,
-	mach_port_t *memobjwt,
-	mach_msg_type_name_t *memobjwtPoly
-);
-#endif
-
-/* Routine io_map_cntl */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_map_cntl
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, memobj, memobjPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t *memobj;
-	mach_msg_type_name_t *memobjPoly;
-{ return S_io_map_cntl(io_object, reply, replyPoly, memobj, memobjPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t *memobj,
-	mach_msg_type_name_t *memobjPoly
-);
-#endif
-
-/* Routine io_get_conch */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_get_conch
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_get_conch(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-/* Routine io_release_conch */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_release_conch
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_release_conch(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-/* Routine io_eofnotify */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_eofnotify
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_eofnotify(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-/* Routine io_prenotify */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_prenotify
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, write_start, write_end)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	vm_offset_t write_start;
-	vm_offset_t write_end;
-{ return S_io_prenotify(io_object, reply, replyPoly, write_start, write_end); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	vm_offset_t write_start,
-	vm_offset_t write_end
-);
-#endif
-
-/* Routine io_postnotify */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_postnotify
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, write_start, write_end)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	vm_offset_t write_start;
-	vm_offset_t write_end;
-{ return S_io_postnotify(io_object, reply, replyPoly, write_start, write_end); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	vm_offset_t write_start,
-	vm_offset_t write_end
-);
-#endif
-
-/* Routine io_readnotify */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_readnotify
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_readnotify(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-/* Routine io_readsleep */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_readsleep
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_readsleep(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-/* Routine io_sigio */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_sigio
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_sigio(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-/* Routine io_pathconf */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_pathconf
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, name, value)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int name;
-	int *value;
-{ return S_io_pathconf(io_object, reply, replyPoly, name, value); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int name,
-	int *value
-);
-#endif
-
-/* Routine io_identity */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_identity
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, idport, idportPoly, fsidport, fsidportPoly, fileno)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t *idport;
-	mach_msg_type_name_t *idportPoly;
-	mach_port_t *fsidport;
-	mach_msg_type_name_t *fsidportPoly;
-	ino64_t *fileno;
-{ return S_io_identity(io_object, reply, replyPoly, idport, idportPoly, fsidport, fsidportPoly, fileno); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t *idport,
-	mach_msg_type_name_t *idportPoly,
-	mach_port_t *fsidport,
-	mach_msg_type_name_t *fsidportPoly,
-	ino64_t *fileno
-);
-#endif
-
-/* Routine io_revoke */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_revoke
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_revoke(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-#endif	/* not defined(_io_server_) */
diff --git a/boot-proxy-exc/notify_S.h b/boot-proxy-exc/notify_S.h
deleted file mode 100644
index ac3f4659..00000000
--- a/boot-proxy-exc/notify_S.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef	_notify_server_
-#define	_notify_server_
-
-/* Module notify */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-
-/* SimpleRoutine mach_notify_port_deleted */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_port_deleted
-#if	defined(LINTLIBRARY)
-    (notify, name)
-	mach_port_t notify;
-	mach_port_t name;
-{ return do_mach_notify_port_deleted(notify, name); }
-#else
-(
-	mach_port_t notify,
-	mach_port_t name
-);
-#endif
-
-/* SimpleRoutine mach_notify_msg_accepted */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_msg_accepted
-#if	defined(LINTLIBRARY)
-    (notify, name)
-	mach_port_t notify;
-	mach_port_t name;
-{ return do_mach_notify_msg_accepted(notify, name); }
-#else
-(
-	mach_port_t notify,
-	mach_port_t name
-);
-#endif
-
-/* SimpleRoutine mach_notify_port_destroyed */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_port_destroyed
-#if	defined(LINTLIBRARY)
-    (notify, rights)
-	mach_port_t notify;
-	mach_port_t rights;
-{ return do_mach_notify_port_destroyed(notify, rights); }
-#else
-(
-	mach_port_t notify,
-	mach_port_t rights
-);
-#endif
-
-/* SimpleRoutine mach_notify_no_senders */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_no_senders
-#if	defined(LINTLIBRARY)
-    (notify, mscount)
-	mach_port_t notify;
-	mach_port_mscount_t mscount;
-{ return do_mach_notify_no_senders(notify, mscount); }
-#else
-(
-	mach_port_t notify,
-	mach_port_mscount_t mscount
-);
-#endif
-
-/* SimpleRoutine mach_notify_send_once */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_send_once
-#if	defined(LINTLIBRARY)
-    (notify)
-	mach_port_t notify;
-{ return do_mach_notify_send_once(notify); }
-#else
-(
-	mach_port_t notify
-);
-#endif
-
-/* SimpleRoutine mach_notify_dead_name */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_dead_name
-#if	defined(LINTLIBRARY)
-    (notify, name)
-	mach_port_t notify;
-	mach_port_t name;
-{ return do_mach_notify_dead_name(notify, name); }
-#else
-(
-	mach_port_t notify,
-	mach_port_t name
-);
-#endif
-
-#endif	/* not defined(_notify_server_) */
diff --git a/boot-proxy-exc/ourdevice_S.h b/boot-proxy-exc/ourdevice_S.h
deleted file mode 100644
index c899ae3e..00000000
--- a/boot-proxy-exc/ourdevice_S.h
+++ /dev/null
@@ -1,354 +0,0 @@
-#ifndef	_device_server_
-#define	_device_server_
-
-/* Module device */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <device/net_status.h>
-
-/* Routine device_open */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_open
-#if	defined(LINTLIBRARY)
-    (master_port, reply_port, reply_portPoly, mode, name, device, devicePoly)
-	mach_port_t master_port;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	dev_name_t name;
-	mach_port_t *device;
-	mach_msg_type_name_t *devicePoly;
-{ return ds_device_open(master_port, reply_port, reply_portPoly, mode, name, device, devicePoly); }
-#else
-(
-	mach_port_t master_port,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	dev_name_t name,
-	mach_port_t *device,
-	mach_msg_type_name_t *devicePoly
-);
-#endif
-
-/* Routine device_close */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_close
-#if	defined(LINTLIBRARY)
-    (device)
-	mach_port_t device;
-{ return ds_device_close(device); }
-#else
-(
-	mach_port_t device
-);
-#endif
-
-/* Routine device_write */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_write
-#if	defined(LINTLIBRARY)
-    (device, reply_port, reply_portPoly, mode, recnum, data, dataCnt, bytes_written)
-	mach_port_t device;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	recnum_t recnum;
-	io_buf_ptr_t data;
-	mach_msg_type_number_t dataCnt;
-	int *bytes_written;
-{ return ds_device_write(device, reply_port, reply_portPoly, mode, recnum, data, dataCnt, bytes_written); }
-#else
-(
-	mach_port_t device,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	recnum_t recnum,
-	io_buf_ptr_t data,
-	mach_msg_type_number_t dataCnt,
-	int *bytes_written
-);
-#endif
-
-/* Routine device_write_inband */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_write_inband
-#if	defined(LINTLIBRARY)
-    (device, reply_port, reply_portPoly, mode, recnum, data, dataCnt, bytes_written)
-	mach_port_t device;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	recnum_t recnum;
-	io_buf_ptr_inband_t data;
-	mach_msg_type_number_t dataCnt;
-	int *bytes_written;
-{ return ds_device_write_inband(device, reply_port, reply_portPoly, mode, recnum, data, dataCnt, bytes_written); }
-#else
-(
-	mach_port_t device,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	recnum_t recnum,
-	io_buf_ptr_inband_t data,
-	mach_msg_type_number_t dataCnt,
-	int *bytes_written
-);
-#endif
-
-/* Routine device_read */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_read
-#if	defined(LINTLIBRARY)
-    (device, reply_port, reply_portPoly, mode, recnum, bytes_wanted, data, dataCnt)
-	mach_port_t device;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	recnum_t recnum;
-	int bytes_wanted;
-	io_buf_ptr_t *data;
-	mach_msg_type_number_t *dataCnt;
-{ return ds_device_read(device, reply_port, reply_portPoly, mode, recnum, bytes_wanted, data, dataCnt); }
-#else
-(
-	mach_port_t device,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	recnum_t recnum,
-	int bytes_wanted,
-	io_buf_ptr_t *data,
-	mach_msg_type_number_t *dataCnt
-);
-#endif
-
-/* Routine device_read_inband */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_read_inband
-#if	defined(LINTLIBRARY)
-    (device, reply_port, reply_portPoly, mode, recnum, bytes_wanted, data, dataCnt)
-	mach_port_t device;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	recnum_t recnum;
-	int bytes_wanted;
-	io_buf_ptr_inband_t data;
-	mach_msg_type_number_t *dataCnt;
-{ return ds_device_read_inband(device, reply_port, reply_portPoly, mode, recnum, bytes_wanted, data, dataCnt); }
-#else
-(
-	mach_port_t device,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	recnum_t recnum,
-	int bytes_wanted,
-	io_buf_ptr_inband_t data,
-	mach_msg_type_number_t *dataCnt
-);
-#endif
-
-/* Routine xxx_device_set_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_xxx_device_set_status
-#if	defined(LINTLIBRARY)
-    (device, flavor, status, statusCnt)
-	mach_port_t device;
-	dev_flavor_t flavor;
-	dev_status_t status;
-	mach_msg_type_number_t statusCnt;
-{ return ds_xxx_device_set_status(device, flavor, status, statusCnt); }
-#else
-(
-	mach_port_t device,
-	dev_flavor_t flavor,
-	dev_status_t status,
-	mach_msg_type_number_t statusCnt
-);
-#endif
-
-/* Routine xxx_device_get_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_xxx_device_get_status
-#if	defined(LINTLIBRARY)
-    (device, flavor, status, statusCnt)
-	mach_port_t device;
-	dev_flavor_t flavor;
-	dev_status_t status;
-	mach_msg_type_number_t *statusCnt;
-{ return ds_xxx_device_get_status(device, flavor, status, statusCnt); }
-#else
-(
-	mach_port_t device,
-	dev_flavor_t flavor,
-	dev_status_t status,
-	mach_msg_type_number_t *statusCnt
-);
-#endif
-
-/* Routine xxx_device_set_filter */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_xxx_device_set_filter
-#if	defined(LINTLIBRARY)
-    (device, receive_port, priority, filter, filterCnt)
-	mach_port_t device;
-	mach_port_t receive_port;
-	int priority;
-	filter_array_t filter;
-	mach_msg_type_number_t filterCnt;
-{ return ds_xxx_device_set_filter(device, receive_port, priority, filter, filterCnt); }
-#else
-(
-	mach_port_t device,
-	mach_port_t receive_port,
-	int priority,
-	filter_array_t filter,
-	mach_msg_type_number_t filterCnt
-);
-#endif
-
-/* Routine device_map */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_map
-#if	defined(LINTLIBRARY)
-    (device, prot, offset, size, pager, unmap)
-	mach_port_t device;
-	vm_prot_t prot;
-	vm_offset_t offset;
-	vm_size_t size;
-	mach_port_t *pager;
-	int unmap;
-{ return ds_device_map(device, prot, offset, size, pager, unmap); }
-#else
-(
-	mach_port_t device,
-	vm_prot_t prot,
-	vm_offset_t offset,
-	vm_size_t size,
-	mach_port_t *pager,
-	int unmap
-);
-#endif
-
-/* Routine device_set_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_set_status
-#if	defined(LINTLIBRARY)
-    (device, flavor, status, statusCnt)
-	mach_port_t device;
-	dev_flavor_t flavor;
-	dev_status_t status;
-	mach_msg_type_number_t statusCnt;
-{ return ds_device_set_status(device, flavor, status, statusCnt); }
-#else
-(
-	mach_port_t device,
-	dev_flavor_t flavor,
-	dev_status_t status,
-	mach_msg_type_number_t statusCnt
-);
-#endif
-
-/* Routine device_get_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_get_status
-#if	defined(LINTLIBRARY)
-    (device, flavor, status, statusCnt)
-	mach_port_t device;
-	dev_flavor_t flavor;
-	dev_status_t status;
-	mach_msg_type_number_t *statusCnt;
-{ return ds_device_get_status(device, flavor, status, statusCnt); }
-#else
-(
-	mach_port_t device,
-	dev_flavor_t flavor,
-	dev_status_t status,
-	mach_msg_type_number_t *statusCnt
-);
-#endif
-
-/* Routine device_set_filter */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_set_filter
-#if	defined(LINTLIBRARY)
-    (device, receive_port, priority, filter, filterCnt)
-	mach_port_t device;
-	mach_port_t receive_port;
-	int priority;
-	filter_array_t filter;
-	mach_msg_type_number_t filterCnt;
-{ return ds_device_set_filter(device, receive_port, priority, filter, filterCnt); }
-#else
-(
-	mach_port_t device,
-	mach_port_t receive_port,
-	int priority,
-	filter_array_t filter,
-	mach_msg_type_number_t filterCnt
-);
-#endif
-
-#endif	/* not defined(_device_server_) */
diff --git a/boot-proxy-exc/ourmach_S.h b/boot-proxy-exc/ourmach_S.h
deleted file mode 100644
index 9d5bd776..00000000
--- a/boot-proxy-exc/ourmach_S.h
+++ /dev/null
@@ -1,1275 +0,0 @@
-#ifndef	_mach_server_
-#define	_mach_server_
-
-/* Module mach */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-
-/* Routine task_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_create
-#if	defined(LINTLIBRARY)
-    (target_task, inherit_memory, child_task, child_taskPoly)
-	mach_port_t target_task;
-	boolean_t inherit_memory;
-	mach_port_t *child_task;
-	mach_msg_type_name_t *child_taskPoly;
-{ return S_task_create(target_task, inherit_memory, child_task, child_taskPoly); }
-#else
-(
-	mach_port_t target_task,
-	boolean_t inherit_memory,
-	mach_port_t *child_task,
-	mach_msg_type_name_t *child_taskPoly
-);
-#endif
-
-/* Routine task_terminate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_terminate
-#if	defined(LINTLIBRARY)
-    (target_task)
-	mach_port_t target_task;
-{ return S_task_terminate(target_task); }
-#else
-(
-	mach_port_t target_task
-);
-#endif
-
-/* Routine task_get_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_get_emulation_vector
-#if	defined(LINTLIBRARY)
-    (task, vector_start, emulation_vector, emulation_vectorCnt)
-	mach_port_t task;
-	int *vector_start;
-	emulation_vector_t *emulation_vector;
-	mach_msg_type_number_t *emulation_vectorCnt;
-{ return S_task_get_emulation_vector(task, vector_start, emulation_vector, emulation_vectorCnt); }
-#else
-(
-	mach_port_t task,
-	int *vector_start,
-	emulation_vector_t *emulation_vector,
-	mach_msg_type_number_t *emulation_vectorCnt
-);
-#endif
-
-/* Routine task_set_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_set_emulation_vector
-#if	defined(LINTLIBRARY)
-    (task, vector_start, emulation_vector, emulation_vectorCnt)
-	mach_port_t task;
-	int vector_start;
-	emulation_vector_t emulation_vector;
-	mach_msg_type_number_t emulation_vectorCnt;
-{ return S_task_set_emulation_vector(task, vector_start, emulation_vector, emulation_vectorCnt); }
-#else
-(
-	mach_port_t task,
-	int vector_start,
-	emulation_vector_t emulation_vector,
-	mach_msg_type_number_t emulation_vectorCnt
-);
-#endif
-
-/* Routine task_threads */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_threads
-#if	defined(LINTLIBRARY)
-    (target_task, thread_list, thread_listCnt)
-	mach_port_t target_task;
-	thread_array_t *thread_list;
-	mach_msg_type_number_t *thread_listCnt;
-{ return S_task_threads(target_task, thread_list, thread_listCnt); }
-#else
-(
-	mach_port_t target_task,
-	thread_array_t *thread_list,
-	mach_msg_type_number_t *thread_listCnt
-);
-#endif
-
-/* Routine task_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_info
-#if	defined(LINTLIBRARY)
-    (target_task, flavor, task_info_out, task_info_outCnt)
-	mach_port_t target_task;
-	int flavor;
-	task_info_t task_info_out;
-	mach_msg_type_number_t *task_info_outCnt;
-{ return S_task_info(target_task, flavor, task_info_out, task_info_outCnt); }
-#else
-(
-	mach_port_t target_task,
-	int flavor,
-	task_info_t task_info_out,
-	mach_msg_type_number_t *task_info_outCnt
-);
-#endif
-
-/* Routine thread_terminate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_terminate
-#if	defined(LINTLIBRARY)
-    (target_thread)
-	mach_port_t target_thread;
-{ return S_thread_terminate(target_thread); }
-#else
-(
-	mach_port_t target_thread
-);
-#endif
-
-/* Routine thread_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_get_state
-#if	defined(LINTLIBRARY)
-    (target_thread, flavor, old_state, old_stateCnt)
-	mach_port_t target_thread;
-	int flavor;
-	thread_state_t old_state;
-	mach_msg_type_number_t *old_stateCnt;
-{ return S_thread_get_state(target_thread, flavor, old_state, old_stateCnt); }
-#else
-(
-	mach_port_t target_thread,
-	int flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-#endif
-
-/* Routine thread_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_set_state
-#if	defined(LINTLIBRARY)
-    (target_thread, flavor, new_state, new_stateCnt)
-	mach_port_t target_thread;
-	int flavor;
-	thread_state_t new_state;
-	mach_msg_type_number_t new_stateCnt;
-{ return S_thread_set_state(target_thread, flavor, new_state, new_stateCnt); }
-#else
-(
-	mach_port_t target_thread,
-	int flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-#endif
-
-/* Routine thread_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_info
-#if	defined(LINTLIBRARY)
-    (target_thread, flavor, thread_info_out, thread_info_outCnt)
-	mach_port_t target_thread;
-	int flavor;
-	thread_info_t thread_info_out;
-	mach_msg_type_number_t *thread_info_outCnt;
-{ return S_thread_info(target_thread, flavor, thread_info_out, thread_info_outCnt); }
-#else
-(
-	mach_port_t target_thread,
-	int flavor,
-	thread_info_t thread_info_out,
-	mach_msg_type_number_t *thread_info_outCnt
-);
-#endif
-
-/* Routine vm_allocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_allocate
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, anywhere)
-	mach_port_t target_task;
-	vm_address_t *address;
-	vm_size_t size;
-	boolean_t anywhere;
-{ return S_vm_allocate(target_task, address, size, anywhere); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t *address,
-	vm_size_t size,
-	boolean_t anywhere
-);
-#endif
-
-/* Routine vm_deallocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_deallocate
-#if	defined(LINTLIBRARY)
-    (target_task, address, size)
-	mach_port_t target_task;
-	vm_address_t address;
-	vm_size_t size;
-{ return S_vm_deallocate(target_task, address, size); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t address,
-	vm_size_t size
-);
-#endif
-
-/* Routine vm_protect */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_protect
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, set_maximum, new_protection)
-	mach_port_t target_task;
-	vm_address_t address;
-	vm_size_t size;
-	boolean_t set_maximum;
-	vm_prot_t new_protection;
-{ return S_vm_protect(target_task, address, size, set_maximum, new_protection); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	boolean_t set_maximum,
-	vm_prot_t new_protection
-);
-#endif
-
-/* Routine vm_inherit */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_inherit
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, new_inheritance)
-	mach_port_t target_task;
-	vm_address_t address;
-	vm_size_t size;
-	vm_inherit_t new_inheritance;
-{ return S_vm_inherit(target_task, address, size, new_inheritance); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_inherit_t new_inheritance
-);
-#endif
-
-/* Routine vm_read */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_read
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, data, dataCnt)
-	mach_port_t target_task;
-	vm_address_t address;
-	vm_size_t size;
-	vm_offset_t *data;
-	mach_msg_type_number_t *dataCnt;
-{ return S_vm_read(target_task, address, size, data, dataCnt); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_offset_t *data,
-	mach_msg_type_number_t *dataCnt
-);
-#endif
-
-/* Routine vm_write */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_write
-#if	defined(LINTLIBRARY)
-    (target_task, address, data, dataCnt)
-	mach_port_t target_task;
-	vm_address_t address;
-	vm_offset_t data;
-	mach_msg_type_number_t dataCnt;
-{ return S_vm_write(target_task, address, data, dataCnt); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t address,
-	vm_offset_t data,
-	mach_msg_type_number_t dataCnt
-);
-#endif
-
-/* Routine vm_copy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_copy
-#if	defined(LINTLIBRARY)
-    (target_task, source_address, size, dest_address)
-	mach_port_t target_task;
-	vm_address_t source_address;
-	vm_size_t size;
-	vm_address_t dest_address;
-{ return S_vm_copy(target_task, source_address, size, dest_address); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t source_address,
-	vm_size_t size,
-	vm_address_t dest_address
-);
-#endif
-
-/* Routine vm_region */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_region
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, protection, max_protection, inheritance, is_shared, object_name, offset)
-	mach_port_t target_task;
-	vm_address_t *address;
-	vm_size_t *size;
-	vm_prot_t *protection;
-	vm_prot_t *max_protection;
-	vm_inherit_t *inheritance;
-	boolean_t *is_shared;
-	mach_port_t *object_name;
-	vm_offset_t *offset;
-{ return S_vm_region(target_task, address, size, protection, max_protection, inheritance, is_shared, object_name, offset); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t *address,
-	vm_size_t *size,
-	vm_prot_t *protection,
-	vm_prot_t *max_protection,
-	vm_inherit_t *inheritance,
-	boolean_t *is_shared,
-	mach_port_t *object_name,
-	vm_offset_t *offset
-);
-#endif
-
-/* Routine vm_statistics */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_statistics
-#if	defined(LINTLIBRARY)
-    (target_task, vm_stats)
-	mach_port_t target_task;
-	vm_statistics_data_t *vm_stats;
-{ return S_vm_statistics(target_task, vm_stats); }
-#else
-(
-	mach_port_t target_task,
-	vm_statistics_data_t *vm_stats
-);
-#endif
-
-/* Routine mach_ports_register */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_ports_register
-#if	defined(LINTLIBRARY)
-    (target_task, init_port_set, init_port_setCnt)
-	mach_port_t target_task;
-	mach_port_array_t init_port_set;
-	mach_msg_type_number_t init_port_setCnt;
-{ return S_mach_ports_register(target_task, init_port_set, init_port_setCnt); }
-#else
-(
-	mach_port_t target_task,
-	mach_port_array_t init_port_set,
-	mach_msg_type_number_t init_port_setCnt
-);
-#endif
-
-/* Routine mach_ports_lookup */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_ports_lookup
-#if	defined(LINTLIBRARY)
-    (target_task, init_port_set, init_port_setCnt)
-	mach_port_t target_task;
-	mach_port_array_t *init_port_set;
-	mach_msg_type_number_t *init_port_setCnt;
-{ return S_mach_ports_lookup(target_task, init_port_set, init_port_setCnt); }
-#else
-(
-	mach_port_t target_task,
-	mach_port_array_t *init_port_set,
-	mach_msg_type_number_t *init_port_setCnt
-);
-#endif
-
-/* SimpleRoutine memory_object_data_provided */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_data_provided
-#if	defined(LINTLIBRARY)
-    (memory_control, offset, data, dataCnt, lock_value)
-	mach_port_t memory_control;
-	vm_offset_t offset;
-	vm_offset_t data;
-	mach_msg_type_number_t dataCnt;
-	vm_prot_t lock_value;
-{ return S_memory_object_data_provided(memory_control, offset, data, dataCnt, lock_value); }
-#else
-(
-	mach_port_t memory_control,
-	vm_offset_t offset,
-	vm_offset_t data,
-	mach_msg_type_number_t dataCnt,
-	vm_prot_t lock_value
-);
-#endif
-
-/* SimpleRoutine memory_object_data_unavailable */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_data_unavailable
-#if	defined(LINTLIBRARY)
-    (memory_control, offset, size)
-	mach_port_t memory_control;
-	vm_offset_t offset;
-	vm_size_t size;
-{ return S_memory_object_data_unavailable(memory_control, offset, size); }
-#else
-(
-	mach_port_t memory_control,
-	vm_offset_t offset,
-	vm_size_t size
-);
-#endif
-
-/* Routine memory_object_get_attributes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_get_attributes
-#if	defined(LINTLIBRARY)
-    (memory_control, object_ready, may_cache, copy_strategy)
-	mach_port_t memory_control;
-	boolean_t *object_ready;
-	boolean_t *may_cache;
-	memory_object_copy_strategy_t *copy_strategy;
-{ return S_memory_object_get_attributes(memory_control, object_ready, may_cache, copy_strategy); }
-#else
-(
-	mach_port_t memory_control,
-	boolean_t *object_ready,
-	boolean_t *may_cache,
-	memory_object_copy_strategy_t *copy_strategy
-);
-#endif
-
-/* Routine vm_set_default_memory_manager */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_set_default_memory_manager
-#if	defined(LINTLIBRARY)
-    (host_priv, default_manager)
-	mach_port_t host_priv;
-	mach_port_t *default_manager;
-{ return S_vm_set_default_memory_manager(host_priv, default_manager); }
-#else
-(
-	mach_port_t host_priv,
-	mach_port_t *default_manager
-);
-#endif
-
-/* SimpleRoutine xxx_memory_object_lock_request */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_memory_object_lock_request
-#if	defined(LINTLIBRARY)
-    (memory_control, offset, size, should_clean, should_flush, lock_value, reply_to, reply_toPoly)
-	mach_port_t memory_control;
-	vm_offset_t offset;
-	vm_size_t size;
-	boolean_t should_clean;
-	boolean_t should_flush;
-	vm_prot_t lock_value;
-	mach_port_t reply_to;
-	mach_msg_type_name_t reply_toPoly;
-{ return S_xxx_memory_object_lock_request(memory_control, offset, size, should_clean, should_flush, lock_value, reply_to, reply_toPoly); }
-#else
-(
-	mach_port_t memory_control,
-	vm_offset_t offset,
-	vm_size_t size,
-	boolean_t should_clean,
-	boolean_t should_flush,
-	vm_prot_t lock_value,
-	mach_port_t reply_to,
-	mach_msg_type_name_t reply_toPoly
-);
-#endif
-
-/* SimpleRoutine memory_object_lock_request */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_lock_request
-#if	defined(LINTLIBRARY)
-    (memory_control, offset, size, should_return, should_flush, lock_value, reply_to, reply_toPoly)
-	mach_port_t memory_control;
-	vm_offset_t offset;
-	vm_size_t size;
-	memory_object_return_t should_return;
-	boolean_t should_flush;
-	vm_prot_t lock_value;
-	mach_port_t reply_to;
-	mach_msg_type_name_t reply_toPoly;
-{ return S_memory_object_lock_request(memory_control, offset, size, should_return, should_flush, lock_value, reply_to, reply_toPoly); }
-#else
-(
-	mach_port_t memory_control,
-	vm_offset_t offset,
-	vm_size_t size,
-	memory_object_return_t should_return,
-	boolean_t should_flush,
-	vm_prot_t lock_value,
-	mach_port_t reply_to,
-	mach_msg_type_name_t reply_toPoly
-);
-#endif
-
-/* Routine xxx_task_get_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_task_get_emulation_vector
-#if	defined(LINTLIBRARY)
-    (task, vector_start, emulation_vector, emulation_vectorCnt)
-	mach_port_t task;
-	int *vector_start;
-	emulation_vector_t emulation_vector;
-	mach_msg_type_number_t *emulation_vectorCnt;
-{ return S_xxx_task_get_emulation_vector(task, vector_start, emulation_vector, emulation_vectorCnt); }
-#else
-(
-	mach_port_t task,
-	int *vector_start,
-	emulation_vector_t emulation_vector,
-	mach_msg_type_number_t *emulation_vectorCnt
-);
-#endif
-
-/* Routine xxx_task_set_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_task_set_emulation_vector
-#if	defined(LINTLIBRARY)
-    (task, vector_start, emulation_vector, emulation_vectorCnt)
-	mach_port_t task;
-	int vector_start;
-	emulation_vector_t emulation_vector;
-	mach_msg_type_number_t emulation_vectorCnt;
-{ return S_xxx_task_set_emulation_vector(task, vector_start, emulation_vector, emulation_vectorCnt); }
-#else
-(
-	mach_port_t task,
-	int vector_start,
-	emulation_vector_t emulation_vector,
-	mach_msg_type_number_t emulation_vectorCnt
-);
-#endif
-
-/* Routine xxx_host_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_host_info
-#if	defined(LINTLIBRARY)
-    (target_task, info)
-	mach_port_t target_task;
-	machine_info_data_t *info;
-{ return S_xxx_host_info(target_task, info); }
-#else
-(
-	mach_port_t target_task,
-	machine_info_data_t *info
-);
-#endif
-
-/* Routine xxx_slot_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_slot_info
-#if	defined(LINTLIBRARY)
-    (target_task, slot, info)
-	mach_port_t target_task;
-	int slot;
-	machine_slot_data_t *info;
-{ return S_xxx_slot_info(target_task, slot, info); }
-#else
-(
-	mach_port_t target_task,
-	int slot,
-	machine_slot_data_t *info
-);
-#endif
-
-/* Routine xxx_cpu_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_cpu_control
-#if	defined(LINTLIBRARY)
-    (target_task, cpu, running)
-	mach_port_t target_task;
-	int cpu;
-	boolean_t running;
-{ return S_xxx_cpu_control(target_task, cpu, running); }
-#else
-(
-	mach_port_t target_task,
-	int cpu,
-	boolean_t running
-);
-#endif
-
-/* Routine task_suspend */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_suspend
-#if	defined(LINTLIBRARY)
-    (target_task)
-	mach_port_t target_task;
-{ return S_task_suspend(target_task); }
-#else
-(
-	mach_port_t target_task
-);
-#endif
-
-/* Routine task_resume */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_resume
-#if	defined(LINTLIBRARY)
-    (target_task)
-	mach_port_t target_task;
-{ return S_task_resume(target_task); }
-#else
-(
-	mach_port_t target_task
-);
-#endif
-
-/* Routine task_get_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_get_special_port
-#if	defined(LINTLIBRARY)
-    (task, which_port, special_port, special_portPoly)
-	mach_port_t task;
-	int which_port;
-	mach_port_t *special_port;
-	mach_msg_type_name_t *special_portPoly;
-{ return S_task_get_special_port(task, which_port, special_port, special_portPoly); }
-#else
-(
-	mach_port_t task,
-	int which_port,
-	mach_port_t *special_port,
-	mach_msg_type_name_t *special_portPoly
-);
-#endif
-
-/* Routine task_set_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_set_special_port
-#if	defined(LINTLIBRARY)
-    (task, which_port, special_port)
-	mach_port_t task;
-	int which_port;
-	mach_port_t special_port;
-{ return S_task_set_special_port(task, which_port, special_port); }
-#else
-(
-	mach_port_t task,
-	int which_port,
-	mach_port_t special_port
-);
-#endif
-
-/* Routine xxx_task_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_task_info
-#if	defined(LINTLIBRARY)
-    (target_task, flavor, task_info_out, task_info_outCnt)
-	mach_port_t target_task;
-	int flavor;
-	task_info_t task_info_out;
-	mach_msg_type_number_t *task_info_outCnt;
-{ return S_xxx_task_info(target_task, flavor, task_info_out, task_info_outCnt); }
-#else
-(
-	mach_port_t target_task,
-	int flavor,
-	task_info_t task_info_out,
-	mach_msg_type_number_t *task_info_outCnt
-);
-#endif
-
-/* Routine thread_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_create
-#if	defined(LINTLIBRARY)
-    (parent_task, child_thread, child_threadPoly)
-	mach_port_t parent_task;
-	mach_port_t *child_thread;
-	mach_msg_type_name_t *child_threadPoly;
-{ return S_thread_create(parent_task, child_thread, child_threadPoly); }
-#else
-(
-	mach_port_t parent_task,
-	mach_port_t *child_thread,
-	mach_msg_type_name_t *child_threadPoly
-);
-#endif
-
-/* Routine thread_suspend */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_suspend
-#if	defined(LINTLIBRARY)
-    (target_thread)
-	mach_port_t target_thread;
-{ return S_thread_suspend(target_thread); }
-#else
-(
-	mach_port_t target_thread
-);
-#endif
-
-/* Routine thread_resume */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_resume
-#if	defined(LINTLIBRARY)
-    (target_thread)
-	mach_port_t target_thread;
-{ return S_thread_resume(target_thread); }
-#else
-(
-	mach_port_t target_thread
-);
-#endif
-
-/* Routine thread_abort */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_abort
-#if	defined(LINTLIBRARY)
-    (target_thread)
-	mach_port_t target_thread;
-{ return S_thread_abort(target_thread); }
-#else
-(
-	mach_port_t target_thread
-);
-#endif
-
-/* Routine xxx_thread_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_thread_get_state
-#if	defined(LINTLIBRARY)
-    (target_thread, flavor, old_state, old_stateCnt)
-	mach_port_t target_thread;
-	int flavor;
-	thread_state_t old_state;
-	mach_msg_type_number_t *old_stateCnt;
-{ return S_xxx_thread_get_state(target_thread, flavor, old_state, old_stateCnt); }
-#else
-(
-	mach_port_t target_thread,
-	int flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-#endif
-
-/* Routine xxx_thread_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_thread_set_state
-#if	defined(LINTLIBRARY)
-    (target_thread, flavor, new_state, new_stateCnt)
-	mach_port_t target_thread;
-	int flavor;
-	thread_state_t new_state;
-	mach_msg_type_number_t new_stateCnt;
-{ return S_xxx_thread_set_state(target_thread, flavor, new_state, new_stateCnt); }
-#else
-(
-	mach_port_t target_thread,
-	int flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-#endif
-
-/* Routine thread_get_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_get_special_port
-#if	defined(LINTLIBRARY)
-    (thread, which_port, special_port)
-	mach_port_t thread;
-	int which_port;
-	mach_port_t *special_port;
-{ return S_thread_get_special_port(thread, which_port, special_port); }
-#else
-(
-	mach_port_t thread,
-	int which_port,
-	mach_port_t *special_port
-);
-#endif
-
-/* Routine thread_set_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_set_special_port
-#if	defined(LINTLIBRARY)
-    (thread, which_port, special_port)
-	mach_port_t thread;
-	int which_port;
-	mach_port_t special_port;
-{ return S_thread_set_special_port(thread, which_port, special_port); }
-#else
-(
-	mach_port_t thread,
-	int which_port,
-	mach_port_t special_port
-);
-#endif
-
-/* Routine xxx_thread_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_thread_info
-#if	defined(LINTLIBRARY)
-    (target_thread, flavor, thread_info_out, thread_info_outCnt)
-	mach_port_t target_thread;
-	int flavor;
-	thread_info_t thread_info_out;
-	mach_msg_type_number_t *thread_info_outCnt;
-{ return S_xxx_thread_info(target_thread, flavor, thread_info_out, thread_info_outCnt); }
-#else
-(
-	mach_port_t target_thread,
-	int flavor,
-	thread_info_t thread_info_out,
-	mach_msg_type_number_t *thread_info_outCnt
-);
-#endif
-
-/* Routine task_set_emulation */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_set_emulation
-#if	defined(LINTLIBRARY)
-    (target_port, routine_entry_pt, routine_number)
-	mach_port_t target_port;
-	vm_address_t routine_entry_pt;
-	int routine_number;
-{ return S_task_set_emulation(target_port, routine_entry_pt, routine_number); }
-#else
-(
-	mach_port_t target_port,
-	vm_address_t routine_entry_pt,
-	int routine_number
-);
-#endif
-
-/* Routine task_ras_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_ras_control
-#if	defined(LINTLIBRARY)
-    (target_task, basepc, boundspc, flavor)
-	mach_port_t target_task;
-	vm_address_t basepc;
-	vm_address_t boundspc;
-	int flavor;
-{ return S_task_ras_control(target_task, basepc, boundspc, flavor); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t basepc,
-	vm_address_t boundspc,
-	int flavor
-);
-#endif
-
-/* Routine vm_map */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_map
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, mask, anywhere, memory_object, offset, copy, cur_protection, max_protection, inheritance)
-	mach_port_t target_task;
-	vm_address_t *address;
-	vm_size_t size;
-	vm_address_t mask;
-	boolean_t anywhere;
-	mach_port_t memory_object;
-	vm_offset_t offset;
-	boolean_t copy;
-	vm_prot_t cur_protection;
-	vm_prot_t max_protection;
-	vm_inherit_t inheritance;
-{ return S_vm_map(target_task, address, size, mask, anywhere, memory_object, offset, copy, cur_protection, max_protection, inheritance); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t *address,
-	vm_size_t size,
-	vm_address_t mask,
-	boolean_t anywhere,
-	mach_port_t memory_object,
-	vm_offset_t offset,
-	boolean_t copy,
-	vm_prot_t cur_protection,
-	vm_prot_t max_protection,
-	vm_inherit_t inheritance
-);
-#endif
-
-/* SimpleRoutine memory_object_data_error */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_data_error
-#if	defined(LINTLIBRARY)
-    (memory_control, offset, size, error_value)
-	mach_port_t memory_control;
-	vm_offset_t offset;
-	vm_size_t size;
-	kern_return_t error_value;
-{ return S_memory_object_data_error(memory_control, offset, size, error_value); }
-#else
-(
-	mach_port_t memory_control,
-	vm_offset_t offset,
-	vm_size_t size,
-	kern_return_t error_value
-);
-#endif
-
-/* SimpleRoutine memory_object_set_attributes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_set_attributes
-#if	defined(LINTLIBRARY)
-    (memory_control, object_ready, may_cache, copy_strategy)
-	mach_port_t memory_control;
-	boolean_t object_ready;
-	boolean_t may_cache;
-	memory_object_copy_strategy_t copy_strategy;
-{ return S_memory_object_set_attributes(memory_control, object_ready, may_cache, copy_strategy); }
-#else
-(
-	mach_port_t memory_control,
-	boolean_t object_ready,
-	boolean_t may_cache,
-	memory_object_copy_strategy_t copy_strategy
-);
-#endif
-
-/* SimpleRoutine memory_object_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_destroy
-#if	defined(LINTLIBRARY)
-    (memory_control, reason)
-	mach_port_t memory_control;
-	kern_return_t reason;
-{ return S_memory_object_destroy(memory_control, reason); }
-#else
-(
-	mach_port_t memory_control,
-	kern_return_t reason
-);
-#endif
-
-/* SimpleRoutine memory_object_data_supply */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_data_supply
-#if	defined(LINTLIBRARY)
-    (memory_control, offset, data, dataCnt, lock_value, precious, reply_to, reply_toPoly)
-	mach_port_t memory_control;
-	vm_offset_t offset;
-	vm_offset_t data;
-	mach_msg_type_number_t dataCnt;
-	vm_prot_t lock_value;
-	boolean_t precious;
-	mach_port_t reply_to;
-	mach_msg_type_name_t reply_toPoly;
-{ return S_memory_object_data_supply(memory_control, offset, data, dataCnt, lock_value, precious, reply_to, reply_toPoly); }
-#else
-(
-	mach_port_t memory_control,
-	vm_offset_t offset,
-	vm_offset_t data,
-	mach_msg_type_number_t dataCnt,
-	vm_prot_t lock_value,
-	boolean_t precious,
-	mach_port_t reply_to,
-	mach_msg_type_name_t reply_toPoly
-);
-#endif
-
-/* SimpleRoutine memory_object_ready */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_ready
-#if	defined(LINTLIBRARY)
-    (memory_control, may_cache, copy_strategy)
-	mach_port_t memory_control;
-	boolean_t may_cache;
-	memory_object_copy_strategy_t copy_strategy;
-{ return S_memory_object_ready(memory_control, may_cache, copy_strategy); }
-#else
-(
-	mach_port_t memory_control,
-	boolean_t may_cache,
-	memory_object_copy_strategy_t copy_strategy
-);
-#endif
-
-/* SimpleRoutine memory_object_change_attributes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_change_attributes
-#if	defined(LINTLIBRARY)
-    (memory_control, may_cache, copy_strategy, reply_to, reply_toPoly)
-	mach_port_t memory_control;
-	boolean_t may_cache;
-	memory_object_copy_strategy_t copy_strategy;
-	mach_port_t reply_to;
-	mach_msg_type_name_t reply_toPoly;
-{ return S_memory_object_change_attributes(memory_control, may_cache, copy_strategy, reply_to, reply_toPoly); }
-#else
-(
-	mach_port_t memory_control,
-	boolean_t may_cache,
-	memory_object_copy_strategy_t copy_strategy,
-	mach_port_t reply_to,
-	mach_msg_type_name_t reply_toPoly
-);
-#endif
-
-/* Routine vm_machine_attribute */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_machine_attribute
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, attribute, value)
-	mach_port_t target_task;
-	vm_address_t address;
-	vm_size_t size;
-	vm_machine_attribute_t attribute;
-	vm_machine_attribute_val_t *value;
-{ return S_vm_machine_attribute(target_task, address, size, attribute, value); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_machine_attribute_t attribute,
-	vm_machine_attribute_val_t *value
-);
-#endif
-
-#endif	/* not defined(_mach_server_) */
diff --git a/boot-proxy-exc/ourmach_host_S.h b/boot-proxy-exc/ourmach_host_S.h
deleted file mode 100644
index 7c962cbb..00000000
--- a/boot-proxy-exc/ourmach_host_S.h
+++ /dev/null
@@ -1,896 +0,0 @@
-#ifndef	_mach_host_server_
-#define	_mach_host_server_
-
-/* Module mach_host */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-
-/* Routine host_processors */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_processors
-#if	defined(LINTLIBRARY)
-    (host_priv, processor_list, processor_listCnt)
-	mach_port_t host_priv;
-	processor_array_t *processor_list;
-	mach_msg_type_number_t *processor_listCnt;
-{ return S_host_processors(host_priv, processor_list, processor_listCnt); }
-#else
-(
-	mach_port_t host_priv,
-	processor_array_t *processor_list,
-	mach_msg_type_number_t *processor_listCnt
-);
-#endif
-
-/* Routine yyy_host_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_yyy_host_info
-#if	defined(LINTLIBRARY)
-    (host, flavor, host_info_out, host_info_outCnt)
-	mach_port_t host;
-	int flavor;
-	host_info_t host_info_out;
-	mach_msg_type_number_t *host_info_outCnt;
-{ return S_yyy_host_info(host, flavor, host_info_out, host_info_outCnt); }
-#else
-(
-	mach_port_t host,
-	int flavor,
-	host_info_t host_info_out,
-	mach_msg_type_number_t *host_info_outCnt
-);
-#endif
-
-/* Routine yyy_processor_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_yyy_processor_info
-#if	defined(LINTLIBRARY)
-    (processor, flavor, host, processor_info_out, processor_info_outCnt)
-	mach_port_t processor;
-	int flavor;
-	mach_port_t *host;
-	processor_info_t processor_info_out;
-	mach_msg_type_number_t *processor_info_outCnt;
-{ return S_yyy_processor_info(processor, flavor, host, processor_info_out, processor_info_outCnt); }
-#else
-(
-	mach_port_t processor,
-	int flavor,
-	mach_port_t *host,
-	processor_info_t processor_info_out,
-	mach_msg_type_number_t *processor_info_outCnt
-);
-#endif
-
-/* Routine processor_start */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_start
-#if	defined(LINTLIBRARY)
-    (processor)
-	mach_port_t processor;
-{ return S_processor_start(processor); }
-#else
-(
-	mach_port_t processor
-);
-#endif
-
-/* Routine processor_exit */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_exit
-#if	defined(LINTLIBRARY)
-    (processor)
-	mach_port_t processor;
-{ return S_processor_exit(processor); }
-#else
-(
-	mach_port_t processor
-);
-#endif
-
-/* Routine yyy_processor_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_yyy_processor_control
-#if	defined(LINTLIBRARY)
-    (processor, processor_cmd, processor_cmdCnt)
-	mach_port_t processor;
-	processor_info_t processor_cmd;
-	mach_msg_type_number_t processor_cmdCnt;
-{ return S_yyy_processor_control(processor, processor_cmd, processor_cmdCnt); }
-#else
-(
-	mach_port_t processor,
-	processor_info_t processor_cmd,
-	mach_msg_type_number_t processor_cmdCnt
-);
-#endif
-
-/* Routine processor_set_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_default
-#if	defined(LINTLIBRARY)
-    (host, default_set)
-	mach_port_t host;
-	mach_port_t *default_set;
-{ return S_processor_set_default(host, default_set); }
-#else
-(
-	mach_port_t host,
-	mach_port_t *default_set
-);
-#endif
-
-/* Routine xxx_processor_set_default_priv */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_processor_set_default_priv
-#if	defined(LINTLIBRARY)
-    (host, default_set)
-	mach_port_t host;
-	mach_port_t *default_set;
-{ return S_xxx_processor_set_default_priv(host, default_set); }
-#else
-(
-	mach_port_t host,
-	mach_port_t *default_set
-);
-#endif
-
-/* Routine processor_set_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_create
-#if	defined(LINTLIBRARY)
-    (host, new_set, new_name)
-	mach_port_t host;
-	mach_port_t *new_set;
-	mach_port_t *new_name;
-{ return S_processor_set_create(host, new_set, new_name); }
-#else
-(
-	mach_port_t host,
-	mach_port_t *new_set,
-	mach_port_t *new_name
-);
-#endif
-
-/* Routine processor_set_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_destroy
-#if	defined(LINTLIBRARY)
-    (set)
-	mach_port_t set;
-{ return S_processor_set_destroy(set); }
-#else
-(
-	mach_port_t set
-);
-#endif
-
-/* Routine yyy_processor_set_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_yyy_processor_set_info
-#if	defined(LINTLIBRARY)
-    (set_name, flavor, host, info_out, info_outCnt)
-	mach_port_t set_name;
-	int flavor;
-	mach_port_t *host;
-	processor_set_info_t info_out;
-	mach_msg_type_number_t *info_outCnt;
-{ return S_yyy_processor_set_info(set_name, flavor, host, info_out, info_outCnt); }
-#else
-(
-	mach_port_t set_name,
-	int flavor,
-	mach_port_t *host,
-	processor_set_info_t info_out,
-	mach_msg_type_number_t *info_outCnt
-);
-#endif
-
-/* Routine processor_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_assign
-#if	defined(LINTLIBRARY)
-    (processor, new_set, wait)
-	mach_port_t processor;
-	mach_port_t new_set;
-	boolean_t wait;
-{ return S_processor_assign(processor, new_set, wait); }
-#else
-(
-	mach_port_t processor,
-	mach_port_t new_set,
-	boolean_t wait
-);
-#endif
-
-/* Routine processor_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_get_assignment
-#if	defined(LINTLIBRARY)
-    (processor, assigned_set)
-	mach_port_t processor;
-	mach_port_t *assigned_set;
-{ return S_processor_get_assignment(processor, assigned_set); }
-#else
-(
-	mach_port_t processor,
-	mach_port_t *assigned_set
-);
-#endif
-
-/* Routine thread_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_assign
-#if	defined(LINTLIBRARY)
-    (thread, new_set)
-	mach_port_t thread;
-	mach_port_t new_set;
-{ return S_thread_assign(thread, new_set); }
-#else
-(
-	mach_port_t thread,
-	mach_port_t new_set
-);
-#endif
-
-/* Routine thread_assign_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_assign_default
-#if	defined(LINTLIBRARY)
-    (thread)
-	mach_port_t thread;
-{ return S_thread_assign_default(thread); }
-#else
-(
-	mach_port_t thread
-);
-#endif
-
-/* Routine thread_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_get_assignment
-#if	defined(LINTLIBRARY)
-    (thread, assigned_set)
-	mach_port_t thread;
-	mach_port_t *assigned_set;
-{ return S_thread_get_assignment(thread, assigned_set); }
-#else
-(
-	mach_port_t thread,
-	mach_port_t *assigned_set
-);
-#endif
-
-/* Routine task_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_assign
-#if	defined(LINTLIBRARY)
-    (task, new_set, assign_threads)
-	mach_port_t task;
-	mach_port_t new_set;
-	boolean_t assign_threads;
-{ return S_task_assign(task, new_set, assign_threads); }
-#else
-(
-	mach_port_t task,
-	mach_port_t new_set,
-	boolean_t assign_threads
-);
-#endif
-
-/* Routine task_assign_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_assign_default
-#if	defined(LINTLIBRARY)
-    (task, assign_threads)
-	mach_port_t task;
-	boolean_t assign_threads;
-{ return S_task_assign_default(task, assign_threads); }
-#else
-(
-	mach_port_t task,
-	boolean_t assign_threads
-);
-#endif
-
-/* Routine task_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_get_assignment
-#if	defined(LINTLIBRARY)
-    (task, assigned_set)
-	mach_port_t task;
-	mach_port_t *assigned_set;
-{ return S_task_get_assignment(task, assigned_set); }
-#else
-(
-	mach_port_t task,
-	mach_port_t *assigned_set
-);
-#endif
-
-/* Routine host_kernel_version */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_kernel_version
-#if	defined(LINTLIBRARY)
-    (host, kernel_version)
-	mach_port_t host;
-	kernel_version_t kernel_version;
-{ return S_host_kernel_version(host, kernel_version); }
-#else
-(
-	mach_port_t host,
-	kernel_version_t kernel_version
-);
-#endif
-
-/* Routine thread_priority */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_priority
-#if	defined(LINTLIBRARY)
-    (thread, priority, set_max)
-	mach_port_t thread;
-	int priority;
-	boolean_t set_max;
-{ return S_thread_priority(thread, priority, set_max); }
-#else
-(
-	mach_port_t thread,
-	int priority,
-	boolean_t set_max
-);
-#endif
-
-/* Routine thread_max_priority */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_max_priority
-#if	defined(LINTLIBRARY)
-    (thread, processor_set, max_priority)
-	mach_port_t thread;
-	mach_port_t processor_set;
-	int max_priority;
-{ return S_thread_max_priority(thread, processor_set, max_priority); }
-#else
-(
-	mach_port_t thread,
-	mach_port_t processor_set,
-	int max_priority
-);
-#endif
-
-/* Routine task_priority */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_priority
-#if	defined(LINTLIBRARY)
-    (task, priority, change_threads)
-	mach_port_t task;
-	int priority;
-	boolean_t change_threads;
-{ return S_task_priority(task, priority, change_threads); }
-#else
-(
-	mach_port_t task,
-	int priority,
-	boolean_t change_threads
-);
-#endif
-
-/* Routine processor_set_max_priority */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_max_priority
-#if	defined(LINTLIBRARY)
-    (processor_set, max_priority, change_threads)
-	mach_port_t processor_set;
-	int max_priority;
-	boolean_t change_threads;
-{ return S_processor_set_max_priority(processor_set, max_priority, change_threads); }
-#else
-(
-	mach_port_t processor_set,
-	int max_priority,
-	boolean_t change_threads
-);
-#endif
-
-/* Routine thread_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_policy
-#if	defined(LINTLIBRARY)
-    (thread, policy, data)
-	mach_port_t thread;
-	int policy;
-	int data;
-{ return S_thread_policy(thread, policy, data); }
-#else
-(
-	mach_port_t thread,
-	int policy,
-	int data
-);
-#endif
-
-/* Routine processor_set_policy_enable */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_policy_enable
-#if	defined(LINTLIBRARY)
-    (processor_set, policy)
-	mach_port_t processor_set;
-	int policy;
-{ return S_processor_set_policy_enable(processor_set, policy); }
-#else
-(
-	mach_port_t processor_set,
-	int policy
-);
-#endif
-
-/* Routine processor_set_policy_disable */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_policy_disable
-#if	defined(LINTLIBRARY)
-    (processor_set, policy, change_threads)
-	mach_port_t processor_set;
-	int policy;
-	boolean_t change_threads;
-{ return S_processor_set_policy_disable(processor_set, policy, change_threads); }
-#else
-(
-	mach_port_t processor_set,
-	int policy,
-	boolean_t change_threads
-);
-#endif
-
-/* Routine processor_set_tasks */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_tasks
-#if	defined(LINTLIBRARY)
-    (processor_set, task_list, task_listCnt)
-	mach_port_t processor_set;
-	task_array_t *task_list;
-	mach_msg_type_number_t *task_listCnt;
-{ return S_processor_set_tasks(processor_set, task_list, task_listCnt); }
-#else
-(
-	mach_port_t processor_set,
-	task_array_t *task_list,
-	mach_msg_type_number_t *task_listCnt
-);
-#endif
-
-/* Routine processor_set_threads */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_threads
-#if	defined(LINTLIBRARY)
-    (processor_set, thread_list, thread_listCnt)
-	mach_port_t processor_set;
-	thread_array_t *thread_list;
-	mach_msg_type_number_t *thread_listCnt;
-{ return S_processor_set_threads(processor_set, thread_list, thread_listCnt); }
-#else
-(
-	mach_port_t processor_set,
-	thread_array_t *thread_list,
-	mach_msg_type_number_t *thread_listCnt
-);
-#endif
-
-/* Routine host_processor_sets */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_processor_sets
-#if	defined(LINTLIBRARY)
-    (host, processor_sets, processor_setsCnt)
-	mach_port_t host;
-	processor_set_name_array_t *processor_sets;
-	mach_msg_type_number_t *processor_setsCnt;
-{ return S_host_processor_sets(host, processor_sets, processor_setsCnt); }
-#else
-(
-	mach_port_t host,
-	processor_set_name_array_t *processor_sets,
-	mach_msg_type_number_t *processor_setsCnt
-);
-#endif
-
-/* Routine host_processor_set_priv */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_processor_set_priv
-#if	defined(LINTLIBRARY)
-    (host_priv, set_name, set, setPoly)
-	mach_port_t host_priv;
-	mach_port_t set_name;
-	mach_port_t *set;
-	mach_msg_type_name_t *setPoly;
-{ return S_host_processor_set_priv(host_priv, set_name, set, setPoly); }
-#else
-(
-	mach_port_t host_priv,
-	mach_port_t set_name,
-	mach_port_t *set,
-	mach_msg_type_name_t *setPoly
-);
-#endif
-
-/* Routine thread_depress_abort */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_depress_abort
-#if	defined(LINTLIBRARY)
-    (thread)
-	mach_port_t thread;
-{ return S_thread_depress_abort(thread); }
-#else
-(
-	mach_port_t thread
-);
-#endif
-
-/* Routine host_set_time */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_set_time
-#if	defined(LINTLIBRARY)
-    (host_priv, new_time)
-	mach_port_t host_priv;
-	time_value_t new_time;
-{ return S_host_set_time(host_priv, new_time); }
-#else
-(
-	mach_port_t host_priv,
-	time_value_t new_time
-);
-#endif
-
-/* Routine host_adjust_time */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_adjust_time
-#if	defined(LINTLIBRARY)
-    (host_priv, new_adjustment, old_adjustment)
-	mach_port_t host_priv;
-	time_value_t new_adjustment;
-	time_value_t *old_adjustment;
-{ return S_host_adjust_time(host_priv, new_adjustment, old_adjustment); }
-#else
-(
-	mach_port_t host_priv,
-	time_value_t new_adjustment,
-	time_value_t *old_adjustment
-);
-#endif
-
-/* Routine host_get_time */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_get_time
-#if	defined(LINTLIBRARY)
-    (host, current_time)
-	mach_port_t host;
-	time_value_t *current_time;
-{ return S_host_get_time(host, current_time); }
-#else
-(
-	mach_port_t host,
-	time_value_t *current_time
-);
-#endif
-
-/* Routine host_reboot */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_reboot
-#if	defined(LINTLIBRARY)
-    (host_priv, options)
-	mach_port_t host_priv;
-	int options;
-{ return S_host_reboot(host_priv, options); }
-#else
-(
-	mach_port_t host_priv,
-	int options
-);
-#endif
-
-/* Routine vm_wire */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_wire
-#if	defined(LINTLIBRARY)
-    (host_priv, task, address, size, access)
-	mach_port_t host_priv;
-	mach_port_t task;
-	vm_address_t address;
-	vm_size_t size;
-	vm_prot_t access;
-{ return S_vm_wire(host_priv, task, address, size, access); }
-#else
-(
-	mach_port_t host_priv,
-	mach_port_t task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_prot_t access
-);
-#endif
-
-/* Routine thread_wire */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_wire
-#if	defined(LINTLIBRARY)
-    (host_priv, thread, wired)
-	mach_port_t host_priv;
-	mach_port_t thread;
-	boolean_t wired;
-{ return S_thread_wire(host_priv, thread, wired); }
-#else
-(
-	mach_port_t host_priv,
-	mach_port_t thread,
-	boolean_t wired
-);
-#endif
-
-/* Routine host_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_info
-#if	defined(LINTLIBRARY)
-    (host, flavor, host_info_out, host_info_outCnt)
-	mach_port_t host;
-	int flavor;
-	host_info_t host_info_out;
-	mach_msg_type_number_t *host_info_outCnt;
-{ return S_host_info(host, flavor, host_info_out, host_info_outCnt); }
-#else
-(
-	mach_port_t host,
-	int flavor,
-	host_info_t host_info_out,
-	mach_msg_type_number_t *host_info_outCnt
-);
-#endif
-
-/* Routine processor_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_info
-#if	defined(LINTLIBRARY)
-    (processor, flavor, host, processor_info_out, processor_info_outCnt)
-	mach_port_t processor;
-	int flavor;
-	mach_port_t *host;
-	processor_info_t processor_info_out;
-	mach_msg_type_number_t *processor_info_outCnt;
-{ return S_processor_info(processor, flavor, host, processor_info_out, processor_info_outCnt); }
-#else
-(
-	mach_port_t processor,
-	int flavor,
-	mach_port_t *host,
-	processor_info_t processor_info_out,
-	mach_msg_type_number_t *processor_info_outCnt
-);
-#endif
-
-/* Routine processor_set_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_info
-#if	defined(LINTLIBRARY)
-    (set_name, flavor, host, info_out, info_outCnt)
-	mach_port_t set_name;
-	int flavor;
-	mach_port_t *host;
-	processor_set_info_t info_out;
-	mach_msg_type_number_t *info_outCnt;
-{ return S_processor_set_info(set_name, flavor, host, info_out, info_outCnt); }
-#else
-(
-	mach_port_t set_name,
-	int flavor,
-	mach_port_t *host,
-	processor_set_info_t info_out,
-	mach_msg_type_number_t *info_outCnt
-);
-#endif
-
-/* Routine processor_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_control
-#if	defined(LINTLIBRARY)
-    (processor, processor_cmd, processor_cmdCnt)
-	mach_port_t processor;
-	processor_info_t processor_cmd;
-	mach_msg_type_number_t processor_cmdCnt;
-{ return S_processor_control(processor, processor_cmd, processor_cmdCnt); }
-#else
-(
-	mach_port_t processor,
-	processor_info_t processor_cmd,
-	mach_msg_type_number_t processor_cmdCnt
-);
-#endif
-
-/* Routine host_get_boot_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_get_boot_info
-#if	defined(LINTLIBRARY)
-    (host_priv, boot_info)
-	mach_port_t host_priv;
-	kernel_boot_info_t boot_info;
-{ return S_host_get_boot_info(host_priv, boot_info); }
-#else
-(
-	mach_port_t host_priv,
-	kernel_boot_info_t boot_info
-);
-#endif
-
-#endif	/* not defined(_mach_host_server_) */
diff --git a/boot-proxy-exc/ourmach_port_S.h b/boot-proxy-exc/ourmach_port_S.h
deleted file mode 100644
index df473c50..00000000
--- a/boot-proxy-exc/ourmach_port_S.h
+++ /dev/null
@@ -1,432 +0,0 @@
-#ifndef	_mach_port_server_
-#define	_mach_port_server_
-
-/* Module mach_port */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-
-/* Routine mach_port_names */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_names
-#if	defined(LINTLIBRARY)
-    (task, names, namesCnt, types, typesCnt)
-	mach_port_t task;
-	mach_port_array_t *names;
-	mach_msg_type_number_t *namesCnt;
-	mach_port_type_array_t *types;
-	mach_msg_type_number_t *typesCnt;
-{ return S_mach_port_names(task, names, namesCnt, types, typesCnt); }
-#else
-(
-	mach_port_t task,
-	mach_port_array_t *names,
-	mach_msg_type_number_t *namesCnt,
-	mach_port_type_array_t *types,
-	mach_msg_type_number_t *typesCnt
-);
-#endif
-
-/* Routine mach_port_type */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_type
-#if	defined(LINTLIBRARY)
-    (task, name, ptype)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_type_t *ptype;
-{ return S_mach_port_type(task, name, ptype); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_type_t *ptype
-);
-#endif
-
-/* Routine mach_port_rename */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_rename
-#if	defined(LINTLIBRARY)
-    (task, old_name, new_name)
-	mach_port_t task;
-	mach_port_t old_name;
-	mach_port_t new_name;
-{ return S_mach_port_rename(task, old_name, new_name); }
-#else
-(
-	mach_port_t task,
-	mach_port_t old_name,
-	mach_port_t new_name
-);
-#endif
-
-/* Routine mach_port_allocate_name */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_allocate_name
-#if	defined(LINTLIBRARY)
-    (task, right, name)
-	mach_port_t task;
-	mach_port_right_t right;
-	mach_port_t name;
-{ return S_mach_port_allocate_name(task, right, name); }
-#else
-(
-	mach_port_t task,
-	mach_port_right_t right,
-	mach_port_t name
-);
-#endif
-
-/* Routine mach_port_allocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_allocate
-#if	defined(LINTLIBRARY)
-    (task, right, name)
-	mach_port_t task;
-	mach_port_right_t right;
-	mach_port_t *name;
-{ return S_mach_port_allocate(task, right, name); }
-#else
-(
-	mach_port_t task,
-	mach_port_right_t right,
-	mach_port_t *name
-);
-#endif
-
-/* Routine mach_port_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_destroy
-#if	defined(LINTLIBRARY)
-    (task, name)
-	mach_port_t task;
-	mach_port_t name;
-{ return S_mach_port_destroy(task, name); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name
-);
-#endif
-
-/* Routine mach_port_deallocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_deallocate
-#if	defined(LINTLIBRARY)
-    (task, name)
-	mach_port_t task;
-	mach_port_t name;
-{ return S_mach_port_deallocate(task, name); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name
-);
-#endif
-
-/* Routine mach_port_get_refs */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_get_refs
-#if	defined(LINTLIBRARY)
-    (task, name, right, refs)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_right_t right;
-	mach_port_urefs_t *refs;
-{ return S_mach_port_get_refs(task, name, right, refs); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_right_t right,
-	mach_port_urefs_t *refs
-);
-#endif
-
-/* Routine mach_port_mod_refs */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_mod_refs
-#if	defined(LINTLIBRARY)
-    (task, name, right, delta)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_right_t right;
-	mach_port_delta_t delta;
-{ return S_mach_port_mod_refs(task, name, right, delta); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_right_t right,
-	mach_port_delta_t delta
-);
-#endif
-
-/* Routine old_mach_port_get_receive_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_old_mach_port_get_receive_status
-#if	defined(LINTLIBRARY)
-    (task, name, status)
-	mach_port_t task;
-	mach_port_t name;
-	old_mach_port_status_t *status;
-{ return S_old_mach_port_get_receive_status(task, name, status); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	old_mach_port_status_t *status
-);
-#endif
-
-/* Routine mach_port_set_qlimit */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_set_qlimit
-#if	defined(LINTLIBRARY)
-    (task, name, qlimit)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_msgcount_t qlimit;
-{ return S_mach_port_set_qlimit(task, name, qlimit); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_msgcount_t qlimit
-);
-#endif
-
-/* Routine mach_port_set_mscount */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_set_mscount
-#if	defined(LINTLIBRARY)
-    (task, name, mscount)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_mscount_t mscount;
-{ return S_mach_port_set_mscount(task, name, mscount); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_mscount_t mscount
-);
-#endif
-
-/* Routine mach_port_get_set_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_get_set_status
-#if	defined(LINTLIBRARY)
-    (task, name, members, membersCnt)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_array_t *members;
-	mach_msg_type_number_t *membersCnt;
-{ return S_mach_port_get_set_status(task, name, members, membersCnt); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_array_t *members,
-	mach_msg_type_number_t *membersCnt
-);
-#endif
-
-/* Routine mach_port_move_member */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_move_member
-#if	defined(LINTLIBRARY)
-    (task, member, after)
-	mach_port_t task;
-	mach_port_t member;
-	mach_port_t after;
-{ return S_mach_port_move_member(task, member, after); }
-#else
-(
-	mach_port_t task,
-	mach_port_t member,
-	mach_port_t after
-);
-#endif
-
-/* Routine mach_port_request_notification */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_request_notification
-#if	defined(LINTLIBRARY)
-    (task, name, id, sync, notify, previous, previousPoly)
-	mach_port_t task;
-	mach_port_t name;
-	mach_msg_id_t id;
-	mach_port_mscount_t sync;
-	mach_port_t notify;
-	mach_port_t *previous;
-	mach_msg_type_name_t *previousPoly;
-{ return S_mach_port_request_notification(task, name, id, sync, notify, previous, previousPoly); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_msg_id_t id,
-	mach_port_mscount_t sync,
-	mach_port_t notify,
-	mach_port_t *previous,
-	mach_msg_type_name_t *previousPoly
-);
-#endif
-
-/* Routine mach_port_insert_right */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_insert_right
-#if	defined(LINTLIBRARY)
-    (task, name, poly, polyPoly)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_t poly;
-	mach_msg_type_name_t polyPoly;
-{ return S_mach_port_insert_right(task, name, poly, polyPoly); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_t poly,
-	mach_msg_type_name_t polyPoly
-);
-#endif
-
-/* Routine mach_port_extract_right */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_extract_right
-#if	defined(LINTLIBRARY)
-    (task, name, msgt_name, poly, polyPoly)
-	mach_port_t task;
-	mach_port_t name;
-	mach_msg_type_name_t msgt_name;
-	mach_port_t *poly;
-	mach_msg_type_name_t *polyPoly;
-{ return S_mach_port_extract_right(task, name, msgt_name, poly, polyPoly); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_msg_type_name_t msgt_name,
-	mach_port_t *poly,
-	mach_msg_type_name_t *polyPoly
-);
-#endif
-
-/* Routine mach_port_get_receive_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_get_receive_status
-#if	defined(LINTLIBRARY)
-    (task, name, status)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_status_t *status;
-{ return S_mach_port_get_receive_status(task, name, status); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_status_t *status
-);
-#endif
-
-/* Routine mach_port_set_seqno */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_set_seqno
-#if	defined(LINTLIBRARY)
-    (task, name, seqno)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_seqno_t seqno;
-{ return S_mach_port_set_seqno(task, name, seqno); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_seqno_t seqno
-);
-#endif
-
-#endif	/* not defined(_mach_port_server_) */
diff --git a/boot-proxy-exc/term_S.h b/boot-proxy-exc/term_S.h
deleted file mode 100644
index 95b385f8..00000000
--- a/boot-proxy-exc/term_S.h
+++ /dev/null
@@ -1,242 +0,0 @@
-#ifndef	_term_server_
-#define	_term_server_
-
-/* Module term */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <device/net_status.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <hurd/hurd_types.h>
-
-/* Routine term_getctty */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_getctty
-#if	defined(LINTLIBRARY)
-    (terminal, ctty, cttyPoly)
-	io_t terminal;
-	mach_port_t *ctty;
-	mach_msg_type_name_t *cttyPoly;
-{ return S_term_getctty(terminal, ctty, cttyPoly); }
-#else
-(
-	io_t terminal,
-	mach_port_t *ctty,
-	mach_msg_type_name_t *cttyPoly
-);
-#endif
-
-/* Routine term_open_ctty */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_open_ctty
-#if	defined(LINTLIBRARY)
-    (terminal, pid, pgrp, newtty, newttyPoly)
-	io_t terminal;
-	pid_t pid;
-	pid_t pgrp;
-	mach_port_t *newtty;
-	mach_msg_type_name_t *newttyPoly;
-{ return S_term_open_ctty(terminal, pid, pgrp, newtty, newttyPoly); }
-#else
-(
-	io_t terminal,
-	pid_t pid,
-	pid_t pgrp,
-	mach_port_t *newtty,
-	mach_msg_type_name_t *newttyPoly
-);
-#endif
-
-/* Routine term_set_nodename */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_set_nodename
-#if	defined(LINTLIBRARY)
-    (terminal, name)
-	io_t terminal;
-	string_t name;
-{ return S_term_set_nodename(terminal, name); }
-#else
-(
-	io_t terminal,
-	string_t name
-);
-#endif
-
-/* Routine term_get_nodename */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_get_nodename
-#if	defined(LINTLIBRARY)
-    (terminal, name)
-	io_t terminal;
-	string_t name;
-{ return S_term_get_nodename(terminal, name); }
-#else
-(
-	io_t terminal,
-	string_t name
-);
-#endif
-
-/* Routine term_set_filenode */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_set_filenode
-#if	defined(LINTLIBRARY)
-    (terminal, filenode)
-	io_t terminal;
-	file_t filenode;
-{ return S_term_set_filenode(terminal, filenode); }
-#else
-(
-	io_t terminal,
-	file_t filenode
-);
-#endif
-
-/* Routine term_get_bottom_type */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_get_bottom_type
-#if	defined(LINTLIBRARY)
-    (terminal, ttype)
-	io_t terminal;
-	int *ttype;
-{ return S_term_get_bottom_type(terminal, ttype); }
-#else
-(
-	io_t terminal,
-	int *ttype
-);
-#endif
-
-/* Routine term_on_machdev */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_on_machdev
-#if	defined(LINTLIBRARY)
-    (terminal, machdev)
-	io_t terminal;
-	mach_port_t machdev;
-{ return S_term_on_machdev(terminal, machdev); }
-#else
-(
-	io_t terminal,
-	mach_port_t machdev
-);
-#endif
-
-/* Routine term_on_hurddev */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_on_hurddev
-#if	defined(LINTLIBRARY)
-    (terminal, hurddev)
-	io_t terminal;
-	io_t hurddev;
-{ return S_term_on_hurddev(terminal, hurddev); }
-#else
-(
-	io_t terminal,
-	io_t hurddev
-);
-#endif
-
-/* Routine term_on_pty */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_on_pty
-#if	defined(LINTLIBRARY)
-    (terminal, ptymaster)
-	io_t terminal;
-	io_t *ptymaster;
-{ return S_term_on_pty(terminal, ptymaster); }
-#else
-(
-	io_t terminal,
-	io_t *ptymaster
-);
-#endif
-
-/* Routine termctty_open_terminal */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_termctty_open_terminal
-#if	defined(LINTLIBRARY)
-    (ctty, flags, terminal, terminalPoly)
-	mach_port_t ctty;
-	int flags;
-	mach_port_t *terminal;
-	mach_msg_type_name_t *terminalPoly;
-{ return S_termctty_open_terminal(ctty, flags, terminal, terminalPoly); }
-#else
-(
-	mach_port_t ctty,
-	int flags,
-	mach_port_t *terminal,
-	mach_msg_type_name_t *terminalPoly
-);
-#endif
-
-/* Routine term_get_peername */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_get_peername
-#if	defined(LINTLIBRARY)
-    (terminal, name)
-	io_t terminal;
-	string_t name;
-{ return S_term_get_peername(terminal, name); }
-#else
-(
-	io_t terminal,
-	string_t name
-);
-#endif
-
-#endif	/* not defined(_term_server_) */
diff --git a/boot.backup1/bootstrap_S.h b/boot.backup1/bootstrap_S.h
deleted file mode 100644
index a93c8052..00000000
--- a/boot.backup1/bootstrap_S.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef	_bootstrap_server_
-#define	_bootstrap_server_
-
-/* Module bootstrap */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-
-/* Routine bootstrap_privileged_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_bootstrap_privileged_ports
-#if	defined(LINTLIBRARY)
-    (bootstrap, priv_host, priv_device)
-	mach_port_t bootstrap;
-	mach_port_t *priv_host;
-	mach_port_t *priv_device;
-{ return do_bootstrap_privileged_ports(bootstrap, priv_host, priv_device); }
-#else
-(
-	mach_port_t bootstrap,
-	mach_port_t *priv_host,
-	mach_port_t *priv_device
-);
-#endif
-
-#endif	/* not defined(_bootstrap_server_) */
diff --git a/boot.backup1/exc_S.h b/boot.backup1/exc_S.h
deleted file mode 100644
index 5b2c327a..00000000
--- a/boot.backup1/exc_S.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef	_exc_server_
-#define	_exc_server_
-
-/* Module exc */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-
-/* Routine exception_raise */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t catch_exception_raise
-#if	defined(LINTLIBRARY)
-    (exception_port, thread, task, exception, code, subcode)
-	mach_port_t exception_port;
-	mach_port_t thread;
-	mach_port_t task;
-	integer_t exception;
-	integer_t code;
-	integer_t subcode;
-{ return catch_exception_raise(exception_port, thread, task, exception, code, subcode); }
-#else
-(
-	mach_port_t exception_port,
-	mach_port_t thread,
-	mach_port_t task,
-	integer_t exception,
-	integer_t code,
-	integer_t subcode
-);
-#endif
-
-#endif	/* not defined(_exc_server_) */
diff --git a/boot.backup1/io_S.h b/boot.backup1/io_S.h
deleted file mode 100644
index 847bff40..00000000
--- a/boot.backup1/io_S.h
+++ /dev/null
@@ -1,782 +0,0 @@
-#ifndef	_io_server_
-#define	_io_server_
-
-/* Module io */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <device/net_status.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <hurd/hurd_types.h>
-
-/* Routine io_write */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_write
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, data, dataCnt, offset, amount)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	data_t data;
-	mach_msg_type_number_t dataCnt;
-	loff_t offset;
-	vm_size_t *amount;
-{ return S_io_write(io_object, reply, replyPoly, data, dataCnt, offset, amount); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	data_t data,
-	mach_msg_type_number_t dataCnt,
-	loff_t offset,
-	vm_size_t *amount
-);
-#endif
-
-/* Routine io_read */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_read
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, data, dataCnt, offset, amount)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	data_t *data;
-	mach_msg_type_number_t *dataCnt;
-	loff_t offset;
-	vm_size_t amount;
-{ return S_io_read(io_object, reply, replyPoly, data, dataCnt, offset, amount); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	data_t *data,
-	mach_msg_type_number_t *dataCnt,
-	loff_t offset,
-	vm_size_t amount
-);
-#endif
-
-/* Routine io_seek */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_seek
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, offset, whence, newp)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	loff_t offset;
-	int whence;
-	loff_t *newp;
-{ return S_io_seek(io_object, reply, replyPoly, offset, whence, newp); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	loff_t offset,
-	int whence,
-	loff_t *newp
-);
-#endif
-
-/* Routine io_readable */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_readable
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, amount)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	vm_size_t *amount;
-{ return S_io_readable(io_object, reply, replyPoly, amount); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	vm_size_t *amount
-);
-#endif
-
-/* Routine io_set_all_openmodes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_set_all_openmodes
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, newbits)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int newbits;
-{ return S_io_set_all_openmodes(io_object, reply, replyPoly, newbits); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int newbits
-);
-#endif
-
-/* Routine io_get_openmodes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_get_openmodes
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, bits)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int *bits;
-{ return S_io_get_openmodes(io_object, reply, replyPoly, bits); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int *bits
-);
-#endif
-
-/* Routine io_set_some_openmodes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_set_some_openmodes
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, bits_to_set)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int bits_to_set;
-{ return S_io_set_some_openmodes(io_object, reply, replyPoly, bits_to_set); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int bits_to_set
-);
-#endif
-
-/* Routine io_clear_some_openmodes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_clear_some_openmodes
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, bits_to_clear)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int bits_to_clear;
-{ return S_io_clear_some_openmodes(io_object, reply, replyPoly, bits_to_clear); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int bits_to_clear
-);
-#endif
-
-/* Routine io_async */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_async
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, notify_port, async_id_port, async_id_portPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t notify_port;
-	mach_port_t *async_id_port;
-	mach_msg_type_name_t *async_id_portPoly;
-{ return S_io_async(io_object, reply, replyPoly, notify_port, async_id_port, async_id_portPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t notify_port,
-	mach_port_t *async_id_port,
-	mach_msg_type_name_t *async_id_portPoly
-);
-#endif
-
-/* Routine io_mod_owner */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_mod_owner
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, owner)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	pid_t owner;
-{ return S_io_mod_owner(io_object, reply, replyPoly, owner); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	pid_t owner
-);
-#endif
-
-/* Routine io_get_owner */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_get_owner
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, owner)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	pid_t *owner;
-{ return S_io_get_owner(io_object, reply, replyPoly, owner); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	pid_t *owner
-);
-#endif
-
-/* Routine io_get_icky_async_id */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_get_icky_async_id
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, icky_async_id_port, icky_async_id_portPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t *icky_async_id_port;
-	mach_msg_type_name_t *icky_async_id_portPoly;
-{ return S_io_get_icky_async_id(io_object, reply, replyPoly, icky_async_id_port, icky_async_id_portPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t *icky_async_id_port,
-	mach_msg_type_name_t *icky_async_id_portPoly
-);
-#endif
-
-/* Routine io_select */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_select
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, select_type)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int *select_type;
-{ return S_io_select(io_object, reply, replyPoly, select_type); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int *select_type
-);
-#endif
-
-/* Routine io_stat */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_stat
-#if	defined(LINTLIBRARY)
-    (stat_object, reply, replyPoly, stat_info)
-	io_t stat_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	io_statbuf_t *stat_info;
-{ return S_io_stat(stat_object, reply, replyPoly, stat_info); }
-#else
-(
-	io_t stat_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	io_statbuf_t *stat_info
-);
-#endif
-
-/* SimpleRoutine io_reauthenticate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_reauthenticate
-#if	defined(LINTLIBRARY)
-    (auth_object, reply, replyPoly, rendezvous2)
-	io_t auth_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t rendezvous2;
-{ return S_io_reauthenticate(auth_object, reply, replyPoly, rendezvous2); }
-#else
-(
-	io_t auth_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t rendezvous2
-);
-#endif
-
-/* Routine io_restrict_auth */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_restrict_auth
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, new_object, new_objectPoly, uids, uidsCnt, gids, gidsCnt)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t *new_object;
-	mach_msg_type_name_t *new_objectPoly;
-	idarray_t uids;
-	mach_msg_type_number_t uidsCnt;
-	idarray_t gids;
-	mach_msg_type_number_t gidsCnt;
-{ return S_io_restrict_auth(io_object, reply, replyPoly, new_object, new_objectPoly, uids, uidsCnt, gids, gidsCnt); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t *new_object,
-	mach_msg_type_name_t *new_objectPoly,
-	idarray_t uids,
-	mach_msg_type_number_t uidsCnt,
-	idarray_t gids,
-	mach_msg_type_number_t gidsCnt
-);
-#endif
-
-/* Routine io_duplicate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_duplicate
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, newport, newportPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t *newport;
-	mach_msg_type_name_t *newportPoly;
-{ return S_io_duplicate(io_object, reply, replyPoly, newport, newportPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t *newport,
-	mach_msg_type_name_t *newportPoly
-);
-#endif
-
-/* Routine io_server_version */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_server_version
-#if	defined(LINTLIBRARY)
-    (vers_object, reply, replyPoly, server_name, server_major_version, server_minor_version, server_edit_level)
-	io_t vers_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	string_t server_name;
-	int *server_major_version;
-	int *server_minor_version;
-	int *server_edit_level;
-{ return S_io_server_version(vers_object, reply, replyPoly, server_name, server_major_version, server_minor_version, server_edit_level); }
-#else
-(
-	io_t vers_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	string_t server_name,
-	int *server_major_version,
-	int *server_minor_version,
-	int *server_edit_level
-);
-#endif
-
-/* Routine io_map */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_map
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, memobjrd, memobjrdPoly, memobjwt, memobjwtPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t *memobjrd;
-	mach_msg_type_name_t *memobjrdPoly;
-	mach_port_t *memobjwt;
-	mach_msg_type_name_t *memobjwtPoly;
-{ return S_io_map(io_object, reply, replyPoly, memobjrd, memobjrdPoly, memobjwt, memobjwtPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t *memobjrd,
-	mach_msg_type_name_t *memobjrdPoly,
-	mach_port_t *memobjwt,
-	mach_msg_type_name_t *memobjwtPoly
-);
-#endif
-
-/* Routine io_map_cntl */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_map_cntl
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, memobj, memobjPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t *memobj;
-	mach_msg_type_name_t *memobjPoly;
-{ return S_io_map_cntl(io_object, reply, replyPoly, memobj, memobjPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t *memobj,
-	mach_msg_type_name_t *memobjPoly
-);
-#endif
-
-/* Routine io_get_conch */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_get_conch
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_get_conch(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-/* Routine io_release_conch */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_release_conch
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_release_conch(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-/* Routine io_eofnotify */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_eofnotify
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_eofnotify(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-/* Routine io_prenotify */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_prenotify
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, write_start, write_end)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	vm_offset_t write_start;
-	vm_offset_t write_end;
-{ return S_io_prenotify(io_object, reply, replyPoly, write_start, write_end); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	vm_offset_t write_start,
-	vm_offset_t write_end
-);
-#endif
-
-/* Routine io_postnotify */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_postnotify
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, write_start, write_end)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	vm_offset_t write_start;
-	vm_offset_t write_end;
-{ return S_io_postnotify(io_object, reply, replyPoly, write_start, write_end); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	vm_offset_t write_start,
-	vm_offset_t write_end
-);
-#endif
-
-/* Routine io_readnotify */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_readnotify
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_readnotify(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-/* Routine io_readsleep */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_readsleep
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_readsleep(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-/* Routine io_sigio */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_sigio
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_sigio(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-/* Routine io_pathconf */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_pathconf
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, name, value)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int name;
-	int *value;
-{ return S_io_pathconf(io_object, reply, replyPoly, name, value); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int name,
-	int *value
-);
-#endif
-
-/* Routine io_identity */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_identity
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, idport, idportPoly, fsidport, fsidportPoly, fileno)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	mach_port_t *idport;
-	mach_msg_type_name_t *idportPoly;
-	mach_port_t *fsidport;
-	mach_msg_type_name_t *fsidportPoly;
-	ino64_t *fileno;
-{ return S_io_identity(io_object, reply, replyPoly, idport, idportPoly, fsidport, fsidportPoly, fileno); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	mach_port_t *idport,
-	mach_msg_type_name_t *idportPoly,
-	mach_port_t *fsidport,
-	mach_msg_type_name_t *fsidportPoly,
-	ino64_t *fileno
-);
-#endif
-
-/* Routine io_revoke */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_revoke
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly)
-	io_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-{ return S_io_revoke(io_object, reply, replyPoly); }
-#else
-(
-	io_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly
-);
-#endif
-
-#endif	/* not defined(_io_server_) */
diff --git a/boot.backup1/notify_S.h b/boot.backup1/notify_S.h
deleted file mode 100644
index ac3f4659..00000000
--- a/boot.backup1/notify_S.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef	_notify_server_
-#define	_notify_server_
-
-/* Module notify */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-
-/* SimpleRoutine mach_notify_port_deleted */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_port_deleted
-#if	defined(LINTLIBRARY)
-    (notify, name)
-	mach_port_t notify;
-	mach_port_t name;
-{ return do_mach_notify_port_deleted(notify, name); }
-#else
-(
-	mach_port_t notify,
-	mach_port_t name
-);
-#endif
-
-/* SimpleRoutine mach_notify_msg_accepted */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_msg_accepted
-#if	defined(LINTLIBRARY)
-    (notify, name)
-	mach_port_t notify;
-	mach_port_t name;
-{ return do_mach_notify_msg_accepted(notify, name); }
-#else
-(
-	mach_port_t notify,
-	mach_port_t name
-);
-#endif
-
-/* SimpleRoutine mach_notify_port_destroyed */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_port_destroyed
-#if	defined(LINTLIBRARY)
-    (notify, rights)
-	mach_port_t notify;
-	mach_port_t rights;
-{ return do_mach_notify_port_destroyed(notify, rights); }
-#else
-(
-	mach_port_t notify,
-	mach_port_t rights
-);
-#endif
-
-/* SimpleRoutine mach_notify_no_senders */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_no_senders
-#if	defined(LINTLIBRARY)
-    (notify, mscount)
-	mach_port_t notify;
-	mach_port_mscount_t mscount;
-{ return do_mach_notify_no_senders(notify, mscount); }
-#else
-(
-	mach_port_t notify,
-	mach_port_mscount_t mscount
-);
-#endif
-
-/* SimpleRoutine mach_notify_send_once */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_send_once
-#if	defined(LINTLIBRARY)
-    (notify)
-	mach_port_t notify;
-{ return do_mach_notify_send_once(notify); }
-#else
-(
-	mach_port_t notify
-);
-#endif
-
-/* SimpleRoutine mach_notify_dead_name */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_dead_name
-#if	defined(LINTLIBRARY)
-    (notify, name)
-	mach_port_t notify;
-	mach_port_t name;
-{ return do_mach_notify_dead_name(notify, name); }
-#else
-(
-	mach_port_t notify,
-	mach_port_t name
-);
-#endif
-
-#endif	/* not defined(_notify_server_) */
diff --git a/boot.backup1/ourdevice_S.h b/boot.backup1/ourdevice_S.h
deleted file mode 100644
index c899ae3e..00000000
--- a/boot.backup1/ourdevice_S.h
+++ /dev/null
@@ -1,354 +0,0 @@
-#ifndef	_device_server_
-#define	_device_server_
-
-/* Module device */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <device/net_status.h>
-
-/* Routine device_open */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_open
-#if	defined(LINTLIBRARY)
-    (master_port, reply_port, reply_portPoly, mode, name, device, devicePoly)
-	mach_port_t master_port;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	dev_name_t name;
-	mach_port_t *device;
-	mach_msg_type_name_t *devicePoly;
-{ return ds_device_open(master_port, reply_port, reply_portPoly, mode, name, device, devicePoly); }
-#else
-(
-	mach_port_t master_port,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	dev_name_t name,
-	mach_port_t *device,
-	mach_msg_type_name_t *devicePoly
-);
-#endif
-
-/* Routine device_close */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_close
-#if	defined(LINTLIBRARY)
-    (device)
-	mach_port_t device;
-{ return ds_device_close(device); }
-#else
-(
-	mach_port_t device
-);
-#endif
-
-/* Routine device_write */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_write
-#if	defined(LINTLIBRARY)
-    (device, reply_port, reply_portPoly, mode, recnum, data, dataCnt, bytes_written)
-	mach_port_t device;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	recnum_t recnum;
-	io_buf_ptr_t data;
-	mach_msg_type_number_t dataCnt;
-	int *bytes_written;
-{ return ds_device_write(device, reply_port, reply_portPoly, mode, recnum, data, dataCnt, bytes_written); }
-#else
-(
-	mach_port_t device,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	recnum_t recnum,
-	io_buf_ptr_t data,
-	mach_msg_type_number_t dataCnt,
-	int *bytes_written
-);
-#endif
-
-/* Routine device_write_inband */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_write_inband
-#if	defined(LINTLIBRARY)
-    (device, reply_port, reply_portPoly, mode, recnum, data, dataCnt, bytes_written)
-	mach_port_t device;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	recnum_t recnum;
-	io_buf_ptr_inband_t data;
-	mach_msg_type_number_t dataCnt;
-	int *bytes_written;
-{ return ds_device_write_inband(device, reply_port, reply_portPoly, mode, recnum, data, dataCnt, bytes_written); }
-#else
-(
-	mach_port_t device,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	recnum_t recnum,
-	io_buf_ptr_inband_t data,
-	mach_msg_type_number_t dataCnt,
-	int *bytes_written
-);
-#endif
-
-/* Routine device_read */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_read
-#if	defined(LINTLIBRARY)
-    (device, reply_port, reply_portPoly, mode, recnum, bytes_wanted, data, dataCnt)
-	mach_port_t device;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	recnum_t recnum;
-	int bytes_wanted;
-	io_buf_ptr_t *data;
-	mach_msg_type_number_t *dataCnt;
-{ return ds_device_read(device, reply_port, reply_portPoly, mode, recnum, bytes_wanted, data, dataCnt); }
-#else
-(
-	mach_port_t device,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	recnum_t recnum,
-	int bytes_wanted,
-	io_buf_ptr_t *data,
-	mach_msg_type_number_t *dataCnt
-);
-#endif
-
-/* Routine device_read_inband */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_read_inband
-#if	defined(LINTLIBRARY)
-    (device, reply_port, reply_portPoly, mode, recnum, bytes_wanted, data, dataCnt)
-	mach_port_t device;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	recnum_t recnum;
-	int bytes_wanted;
-	io_buf_ptr_inband_t data;
-	mach_msg_type_number_t *dataCnt;
-{ return ds_device_read_inband(device, reply_port, reply_portPoly, mode, recnum, bytes_wanted, data, dataCnt); }
-#else
-(
-	mach_port_t device,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	recnum_t recnum,
-	int bytes_wanted,
-	io_buf_ptr_inband_t data,
-	mach_msg_type_number_t *dataCnt
-);
-#endif
-
-/* Routine xxx_device_set_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_xxx_device_set_status
-#if	defined(LINTLIBRARY)
-    (device, flavor, status, statusCnt)
-	mach_port_t device;
-	dev_flavor_t flavor;
-	dev_status_t status;
-	mach_msg_type_number_t statusCnt;
-{ return ds_xxx_device_set_status(device, flavor, status, statusCnt); }
-#else
-(
-	mach_port_t device,
-	dev_flavor_t flavor,
-	dev_status_t status,
-	mach_msg_type_number_t statusCnt
-);
-#endif
-
-/* Routine xxx_device_get_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_xxx_device_get_status
-#if	defined(LINTLIBRARY)
-    (device, flavor, status, statusCnt)
-	mach_port_t device;
-	dev_flavor_t flavor;
-	dev_status_t status;
-	mach_msg_type_number_t *statusCnt;
-{ return ds_xxx_device_get_status(device, flavor, status, statusCnt); }
-#else
-(
-	mach_port_t device,
-	dev_flavor_t flavor,
-	dev_status_t status,
-	mach_msg_type_number_t *statusCnt
-);
-#endif
-
-/* Routine xxx_device_set_filter */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_xxx_device_set_filter
-#if	defined(LINTLIBRARY)
-    (device, receive_port, priority, filter, filterCnt)
-	mach_port_t device;
-	mach_port_t receive_port;
-	int priority;
-	filter_array_t filter;
-	mach_msg_type_number_t filterCnt;
-{ return ds_xxx_device_set_filter(device, receive_port, priority, filter, filterCnt); }
-#else
-(
-	mach_port_t device,
-	mach_port_t receive_port,
-	int priority,
-	filter_array_t filter,
-	mach_msg_type_number_t filterCnt
-);
-#endif
-
-/* Routine device_map */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_map
-#if	defined(LINTLIBRARY)
-    (device, prot, offset, size, pager, unmap)
-	mach_port_t device;
-	vm_prot_t prot;
-	vm_offset_t offset;
-	vm_size_t size;
-	mach_port_t *pager;
-	int unmap;
-{ return ds_device_map(device, prot, offset, size, pager, unmap); }
-#else
-(
-	mach_port_t device,
-	vm_prot_t prot,
-	vm_offset_t offset,
-	vm_size_t size,
-	mach_port_t *pager,
-	int unmap
-);
-#endif
-
-/* Routine device_set_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_set_status
-#if	defined(LINTLIBRARY)
-    (device, flavor, status, statusCnt)
-	mach_port_t device;
-	dev_flavor_t flavor;
-	dev_status_t status;
-	mach_msg_type_number_t statusCnt;
-{ return ds_device_set_status(device, flavor, status, statusCnt); }
-#else
-(
-	mach_port_t device,
-	dev_flavor_t flavor,
-	dev_status_t status,
-	mach_msg_type_number_t statusCnt
-);
-#endif
-
-/* Routine device_get_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_get_status
-#if	defined(LINTLIBRARY)
-    (device, flavor, status, statusCnt)
-	mach_port_t device;
-	dev_flavor_t flavor;
-	dev_status_t status;
-	mach_msg_type_number_t *statusCnt;
-{ return ds_device_get_status(device, flavor, status, statusCnt); }
-#else
-(
-	mach_port_t device,
-	dev_flavor_t flavor,
-	dev_status_t status,
-	mach_msg_type_number_t *statusCnt
-);
-#endif
-
-/* Routine device_set_filter */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_set_filter
-#if	defined(LINTLIBRARY)
-    (device, receive_port, priority, filter, filterCnt)
-	mach_port_t device;
-	mach_port_t receive_port;
-	int priority;
-	filter_array_t filter;
-	mach_msg_type_number_t filterCnt;
-{ return ds_device_set_filter(device, receive_port, priority, filter, filterCnt); }
-#else
-(
-	mach_port_t device,
-	mach_port_t receive_port,
-	int priority,
-	filter_array_t filter,
-	mach_msg_type_number_t filterCnt
-);
-#endif
-
-#endif	/* not defined(_device_server_) */
diff --git a/boot.backup1/ourmach_S.h b/boot.backup1/ourmach_S.h
deleted file mode 100644
index e86f68cf..00000000
--- a/boot.backup1/ourmach_S.h
+++ /dev/null
@@ -1,1277 +0,0 @@
-#ifndef	_mach_server_
-#define	_mach_server_
-
-/* Module mach */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-
-/* Routine task_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_create
-#if	defined(LINTLIBRARY)
-    (target_task, inherit_memory, child_task, child_taskPoly)
-	mach_port_t target_task;
-	boolean_t inherit_memory;
-	mach_port_t *child_task;
-	mach_msg_type_name_t *child_taskPoly;
-{ return S_task_create(target_task, inherit_memory, child_task, child_taskPoly); }
-#else
-(
-	mach_port_t target_task,
-	boolean_t inherit_memory,
-	mach_port_t *child_task,
-	mach_msg_type_name_t *child_taskPoly
-);
-#endif
-
-/* Routine task_terminate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_terminate
-#if	defined(LINTLIBRARY)
-    (target_task)
-	mach_port_t target_task;
-{ return S_task_terminate(target_task); }
-#else
-(
-	mach_port_t target_task
-);
-#endif
-
-/* Routine task_get_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_get_emulation_vector
-#if	defined(LINTLIBRARY)
-    (task, vector_start, emulation_vector, emulation_vectorCnt)
-	mach_port_t task;
-	int *vector_start;
-	emulation_vector_t *emulation_vector;
-	mach_msg_type_number_t *emulation_vectorCnt;
-{ return S_task_get_emulation_vector(task, vector_start, emulation_vector, emulation_vectorCnt); }
-#else
-(
-	mach_port_t task,
-	int *vector_start,
-	emulation_vector_t *emulation_vector,
-	mach_msg_type_number_t *emulation_vectorCnt
-);
-#endif
-
-/* Routine task_set_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_set_emulation_vector
-#if	defined(LINTLIBRARY)
-    (task, vector_start, emulation_vector, emulation_vectorCnt)
-	mach_port_t task;
-	int vector_start;
-	emulation_vector_t emulation_vector;
-	mach_msg_type_number_t emulation_vectorCnt;
-{ return S_task_set_emulation_vector(task, vector_start, emulation_vector, emulation_vectorCnt); }
-#else
-(
-	mach_port_t task,
-	int vector_start,
-	emulation_vector_t emulation_vector,
-	mach_msg_type_number_t emulation_vectorCnt
-);
-#endif
-
-/* Routine task_threads */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_threads
-#if	defined(LINTLIBRARY)
-    (target_task, thread_list, thread_listCnt)
-	mach_port_t target_task;
-	thread_array_t *thread_list;
-	mach_msg_type_number_t *thread_listCnt;
-{ return S_task_threads(target_task, thread_list, thread_listCnt); }
-#else
-(
-	mach_port_t target_task,
-	thread_array_t *thread_list,
-	mach_msg_type_number_t *thread_listCnt
-);
-#endif
-
-/* Routine task_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_info
-#if	defined(LINTLIBRARY)
-    (target_task, flavor, task_info_out, task_info_outCnt)
-	mach_port_t target_task;
-	int flavor;
-	task_info_t task_info_out;
-	mach_msg_type_number_t *task_info_outCnt;
-{ return S_task_info(target_task, flavor, task_info_out, task_info_outCnt); }
-#else
-(
-	mach_port_t target_task,
-	int flavor,
-	task_info_t task_info_out,
-	mach_msg_type_number_t *task_info_outCnt
-);
-#endif
-
-/* Routine thread_terminate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_terminate
-#if	defined(LINTLIBRARY)
-    (target_thread)
-	mach_port_t target_thread;
-{ return S_thread_terminate(target_thread); }
-#else
-(
-	mach_port_t target_thread
-);
-#endif
-
-/* Routine thread_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_get_state
-#if	defined(LINTLIBRARY)
-    (target_thread, flavor, old_state, old_stateCnt)
-	mach_port_t target_thread;
-	int flavor;
-	thread_state_t old_state;
-	mach_msg_type_number_t *old_stateCnt;
-{ return S_thread_get_state(target_thread, flavor, old_state, old_stateCnt); }
-#else
-(
-	mach_port_t target_thread,
-	int flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-#endif
-
-/* Routine thread_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_set_state
-#if	defined(LINTLIBRARY)
-    (target_thread, flavor, new_state, new_stateCnt)
-	mach_port_t target_thread;
-	int flavor;
-	thread_state_t new_state;
-	mach_msg_type_number_t new_stateCnt;
-{ return S_thread_set_state(target_thread, flavor, new_state, new_stateCnt); }
-#else
-(
-	mach_port_t target_thread,
-	int flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-#endif
-
-/* Routine thread_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_info
-#if	defined(LINTLIBRARY)
-    (target_thread, flavor, thread_info_out, thread_info_outCnt)
-	mach_port_t target_thread;
-	int flavor;
-	thread_info_t thread_info_out;
-	mach_msg_type_number_t *thread_info_outCnt;
-{ return S_thread_info(target_thread, flavor, thread_info_out, thread_info_outCnt); }
-#else
-(
-	mach_port_t target_thread,
-	int flavor,
-	thread_info_t thread_info_out,
-	mach_msg_type_number_t *thread_info_outCnt
-);
-#endif
-
-/* Routine vm_allocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_allocate
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, anywhere)
-	mach_port_t target_task;
-	vm_address_t *address;
-	vm_size_t size;
-	boolean_t anywhere;
-{ return S_vm_allocate(target_task, address, size, anywhere); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t *address,
-	vm_size_t size,
-	boolean_t anywhere
-);
-#endif
-
-/* Routine vm_deallocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_deallocate
-#if	defined(LINTLIBRARY)
-    (target_task, address, size)
-	mach_port_t target_task;
-	vm_address_t address;
-	vm_size_t size;
-{ return S_vm_deallocate(target_task, address, size); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t address,
-	vm_size_t size
-);
-#endif
-
-/* Routine vm_protect */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_protect
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, set_maximum, new_protection)
-	mach_port_t target_task;
-	vm_address_t address;
-	vm_size_t size;
-	boolean_t set_maximum;
-	vm_prot_t new_protection;
-{ return S_vm_protect(target_task, address, size, set_maximum, new_protection); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	boolean_t set_maximum,
-	vm_prot_t new_protection
-);
-#endif
-
-/* Routine vm_inherit */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_inherit
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, new_inheritance)
-	mach_port_t target_task;
-	vm_address_t address;
-	vm_size_t size;
-	vm_inherit_t new_inheritance;
-{ return S_vm_inherit(target_task, address, size, new_inheritance); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_inherit_t new_inheritance
-);
-#endif
-
-/* Routine vm_read */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_read
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, data, dataCnt)
-	mach_port_t target_task;
-	vm_address_t address;
-	vm_size_t size;
-	vm_offset_t *data;
-	mach_msg_type_number_t *dataCnt;
-{ return S_vm_read(target_task, address, size, data, dataCnt); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_offset_t *data,
-	mach_msg_type_number_t *dataCnt
-);
-#endif
-
-/* Routine vm_write */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_write
-#if	defined(LINTLIBRARY)
-    (target_task, address, data, dataCnt)
-	mach_port_t target_task;
-	vm_address_t address;
-	vm_offset_t data;
-	mach_msg_type_number_t dataCnt;
-{ return S_vm_write(target_task, address, data, dataCnt); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t address,
-	vm_offset_t data,
-	mach_msg_type_number_t dataCnt
-);
-#endif
-
-/* Routine vm_copy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_copy
-#if	defined(LINTLIBRARY)
-    (target_task, source_address, size, dest_address)
-	mach_port_t target_task;
-	vm_address_t source_address;
-	vm_size_t size;
-	vm_address_t dest_address;
-{ return S_vm_copy(target_task, source_address, size, dest_address); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t source_address,
-	vm_size_t size,
-	vm_address_t dest_address
-);
-#endif
-
-/* Routine vm_region */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_region
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, protection, max_protection, inheritance, is_shared, object_name, offset)
-	mach_port_t target_task;
-	vm_address_t *address;
-	vm_size_t *size;
-	vm_prot_t *protection;
-	vm_prot_t *max_protection;
-	vm_inherit_t *inheritance;
-	boolean_t *is_shared;
-	mach_port_t *object_name;
-	vm_offset_t *offset;
-{ return S_vm_region(target_task, address, size, protection, max_protection, inheritance, is_shared, object_name, offset); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t *address,
-	vm_size_t *size,
-	vm_prot_t *protection,
-	vm_prot_t *max_protection,
-	vm_inherit_t *inheritance,
-	boolean_t *is_shared,
-	mach_port_t *object_name,
-	vm_offset_t *offset
-);
-#endif
-
-/* Routine vm_statistics */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_statistics
-#if	defined(LINTLIBRARY)
-    (target_task, vm_stats)
-	mach_port_t target_task;
-	vm_statistics_data_t *vm_stats;
-{ return S_vm_statistics(target_task, vm_stats); }
-#else
-(
-	mach_port_t target_task,
-	vm_statistics_data_t *vm_stats
-);
-#endif
-
-/* Routine mach_ports_register */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_ports_register
-#if	defined(LINTLIBRARY)
-    (target_task, init_port_set, init_port_setCnt)
-	mach_port_t target_task;
-	mach_port_array_t init_port_set;
-	mach_msg_type_number_t init_port_setCnt;
-{ return S_mach_ports_register(target_task, init_port_set, init_port_setCnt); }
-#else
-(
-	mach_port_t target_task,
-	mach_port_array_t init_port_set,
-	mach_msg_type_number_t init_port_setCnt
-);
-#endif
-
-/* Routine mach_ports_lookup */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_ports_lookup
-#if	defined(LINTLIBRARY)
-    (target_task, init_port_set, init_port_setCnt)
-	mach_port_t target_task;
-	mach_port_array_t *init_port_set;
-	mach_msg_type_number_t *init_port_setCnt;
-{ return S_mach_ports_lookup(target_task, init_port_set, init_port_setCnt); }
-#else
-(
-	mach_port_t target_task,
-	mach_port_array_t *init_port_set,
-	mach_msg_type_number_t *init_port_setCnt
-);
-#endif
-
-/* SimpleRoutine memory_object_data_provided */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_data_provided
-#if	defined(LINTLIBRARY)
-    (memory_control, offset, data, dataCnt, lock_value)
-	mach_port_t memory_control;
-	vm_offset_t offset;
-	vm_offset_t data;
-	mach_msg_type_number_t dataCnt;
-	vm_prot_t lock_value;
-{ return S_memory_object_data_provided(memory_control, offset, data, dataCnt, lock_value); }
-#else
-(
-	mach_port_t memory_control,
-	vm_offset_t offset,
-	vm_offset_t data,
-	mach_msg_type_number_t dataCnt,
-	vm_prot_t lock_value
-);
-#endif
-
-/* SimpleRoutine memory_object_data_unavailable */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_data_unavailable
-#if	defined(LINTLIBRARY)
-    (memory_control, offset, size)
-	mach_port_t memory_control;
-	vm_offset_t offset;
-	vm_size_t size;
-{ return S_memory_object_data_unavailable(memory_control, offset, size); }
-#else
-(
-	mach_port_t memory_control,
-	vm_offset_t offset,
-	vm_size_t size
-);
-#endif
-
-/* Routine memory_object_get_attributes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_get_attributes
-#if	defined(LINTLIBRARY)
-    (memory_control, object_ready, may_cache, copy_strategy)
-	mach_port_t memory_control;
-	boolean_t *object_ready;
-	boolean_t *may_cache;
-	memory_object_copy_strategy_t *copy_strategy;
-{ return S_memory_object_get_attributes(memory_control, object_ready, may_cache, copy_strategy); }
-#else
-(
-	mach_port_t memory_control,
-	boolean_t *object_ready,
-	boolean_t *may_cache,
-	memory_object_copy_strategy_t *copy_strategy
-);
-#endif
-
-/* Routine vm_set_default_memory_manager */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_set_default_memory_manager
-#if	defined(LINTLIBRARY)
-    (host_priv, default_manager)
-	mach_port_t host_priv;
-	mach_port_t *default_manager;
-{ return S_vm_set_default_memory_manager(host_priv, default_manager); }
-#else
-(
-	mach_port_t host_priv,
-	mach_port_t *default_manager
-);
-#endif
-
-/* SimpleRoutine xxx_memory_object_lock_request */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_memory_object_lock_request
-#if	defined(LINTLIBRARY)
-    (memory_control, offset, size, should_clean, should_flush, lock_value, reply_to, reply_toPoly)
-	mach_port_t memory_control;
-	vm_offset_t offset;
-	vm_size_t size;
-	boolean_t should_clean;
-	boolean_t should_flush;
-	vm_prot_t lock_value;
-	mach_port_t reply_to;
-	mach_msg_type_name_t reply_toPoly;
-{ return S_xxx_memory_object_lock_request(memory_control, offset, size, should_clean, should_flush, lock_value, reply_to, reply_toPoly); }
-#else
-(
-	mach_port_t memory_control,
-	vm_offset_t offset,
-	vm_size_t size,
-	boolean_t should_clean,
-	boolean_t should_flush,
-	vm_prot_t lock_value,
-	mach_port_t reply_to,
-	mach_msg_type_name_t reply_toPoly
-);
-#endif
-
-/* SimpleRoutine memory_object_lock_request */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_lock_request
-#if	defined(LINTLIBRARY)
-    (memory_control, offset, size, should_return, should_flush, lock_value, reply_to, reply_toPoly)
-	mach_port_t memory_control;
-	vm_offset_t offset;
-	vm_size_t size;
-	memory_object_return_t should_return;
-	boolean_t should_flush;
-	vm_prot_t lock_value;
-	mach_port_t reply_to;
-	mach_msg_type_name_t reply_toPoly;
-{ return S_memory_object_lock_request(memory_control, offset, size, should_return, should_flush, lock_value, reply_to, reply_toPoly); }
-#else
-(
-	mach_port_t memory_control,
-	vm_offset_t offset,
-	vm_size_t size,
-	memory_object_return_t should_return,
-	boolean_t should_flush,
-	vm_prot_t lock_value,
-	mach_port_t reply_to,
-	mach_msg_type_name_t reply_toPoly
-);
-#endif
-
-/* Routine xxx_task_get_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_task_get_emulation_vector
-#if	defined(LINTLIBRARY)
-    (task, vector_start, emulation_vector, emulation_vectorCnt)
-	mach_port_t task;
-	int *vector_start;
-	emulation_vector_t emulation_vector;
-	mach_msg_type_number_t *emulation_vectorCnt;
-{ return S_xxx_task_get_emulation_vector(task, vector_start, emulation_vector, emulation_vectorCnt); }
-#else
-(
-	mach_port_t task,
-	int *vector_start,
-	emulation_vector_t emulation_vector,
-	mach_msg_type_number_t *emulation_vectorCnt
-);
-#endif
-
-/* Routine xxx_task_set_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_task_set_emulation_vector
-#if	defined(LINTLIBRARY)
-    (task, vector_start, emulation_vector, emulation_vectorCnt)
-	mach_port_t task;
-	int vector_start;
-	emulation_vector_t emulation_vector;
-	mach_msg_type_number_t emulation_vectorCnt;
-{ return S_xxx_task_set_emulation_vector(task, vector_start, emulation_vector, emulation_vectorCnt); }
-#else
-(
-	mach_port_t task,
-	int vector_start,
-	emulation_vector_t emulation_vector,
-	mach_msg_type_number_t emulation_vectorCnt
-);
-#endif
-
-/* Routine xxx_host_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_host_info
-#if	defined(LINTLIBRARY)
-    (target_task, info)
-	mach_port_t target_task;
-	machine_info_data_t *info;
-{ return S_xxx_host_info(target_task, info); }
-#else
-(
-	mach_port_t target_task,
-	machine_info_data_t *info
-);
-#endif
-
-/* Routine xxx_slot_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_slot_info
-#if	defined(LINTLIBRARY)
-    (target_task, slot, info)
-	mach_port_t target_task;
-	int slot;
-	machine_slot_data_t *info;
-{ return S_xxx_slot_info(target_task, slot, info); }
-#else
-(
-	mach_port_t target_task,
-	int slot,
-	machine_slot_data_t *info
-);
-#endif
-
-/* Routine xxx_cpu_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_cpu_control
-#if	defined(LINTLIBRARY)
-    (target_task, cpu, running)
-	mach_port_t target_task;
-	int cpu;
-	boolean_t running;
-{ return S_xxx_cpu_control(target_task, cpu, running); }
-#else
-(
-	mach_port_t target_task,
-	int cpu,
-	boolean_t running
-);
-#endif
-
-/* Routine task_suspend */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_suspend
-#if	defined(LINTLIBRARY)
-    (target_task)
-	mach_port_t target_task;
-{ return S_task_suspend(target_task); }
-#else
-(
-	mach_port_t target_task
-);
-#endif
-
-/* Routine task_resume */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_resume
-#if	defined(LINTLIBRARY)
-    (target_task)
-	mach_port_t target_task;
-{ return S_task_resume(target_task); }
-#else
-(
-	mach_port_t target_task
-);
-#endif
-
-/* Routine task_get_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_get_special_port
-#if	defined(LINTLIBRARY)
-    (task, which_port, special_port, special_portPoly)
-	mach_port_t task;
-	int which_port;
-	mach_port_t *special_port;
-	mach_msg_type_name_t *special_portPoly;
-{ return S_task_get_special_port(task, which_port, special_port, special_portPoly); }
-#else
-(
-	mach_port_t task,
-	int which_port,
-	mach_port_t *special_port,
-	mach_msg_type_name_t *special_portPoly
-);
-#endif
-
-/* Routine task_set_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_set_special_port
-#if	defined(LINTLIBRARY)
-    (task, which_port, special_port)
-	mach_port_t task;
-	int which_port;
-	mach_port_t special_port;
-{ return S_task_set_special_port(task, which_port, special_port); }
-#else
-(
-	mach_port_t task,
-	int which_port,
-	mach_port_t special_port
-);
-#endif
-
-/* Routine xxx_task_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_task_info
-#if	defined(LINTLIBRARY)
-    (target_task, flavor, task_info_out, task_info_outCnt)
-	mach_port_t target_task;
-	int flavor;
-	task_info_t task_info_out;
-	mach_msg_type_number_t *task_info_outCnt;
-{ return S_xxx_task_info(target_task, flavor, task_info_out, task_info_outCnt); }
-#else
-(
-	mach_port_t target_task,
-	int flavor,
-	task_info_t task_info_out,
-	mach_msg_type_number_t *task_info_outCnt
-);
-#endif
-
-/* Routine thread_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_create
-#if	defined(LINTLIBRARY)
-    (parent_task, child_thread, child_threadPoly)
-	mach_port_t parent_task;
-	mach_port_t *child_thread;
-	mach_msg_type_name_t *child_threadPoly;
-{ return S_thread_create(parent_task, child_thread, child_threadPoly); }
-#else
-(
-	mach_port_t parent_task,
-	mach_port_t *child_thread,
-	mach_msg_type_name_t *child_threadPoly
-);
-#endif
-
-/* Routine thread_suspend */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_suspend
-#if	defined(LINTLIBRARY)
-    (target_thread)
-	mach_port_t target_thread;
-{ return S_thread_suspend(target_thread); }
-#else
-(
-	mach_port_t target_thread
-);
-#endif
-
-/* Routine thread_resume */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_resume
-#if	defined(LINTLIBRARY)
-    (target_thread)
-	mach_port_t target_thread;
-{ return S_thread_resume(target_thread); }
-#else
-(
-	mach_port_t target_thread
-);
-#endif
-
-/* Routine thread_abort */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_abort
-#if	defined(LINTLIBRARY)
-    (target_thread)
-	mach_port_t target_thread;
-{ return S_thread_abort(target_thread); }
-#else
-(
-	mach_port_t target_thread
-);
-#endif
-
-/* Routine xxx_thread_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_thread_get_state
-#if	defined(LINTLIBRARY)
-    (target_thread, flavor, old_state, old_stateCnt)
-	mach_port_t target_thread;
-	int flavor;
-	thread_state_t old_state;
-	mach_msg_type_number_t *old_stateCnt;
-{ return S_xxx_thread_get_state(target_thread, flavor, old_state, old_stateCnt); }
-#else
-(
-	mach_port_t target_thread,
-	int flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-#endif
-
-/* Routine xxx_thread_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_thread_set_state
-#if	defined(LINTLIBRARY)
-    (target_thread, flavor, new_state, new_stateCnt)
-	mach_port_t target_thread;
-	int flavor;
-	thread_state_t new_state;
-	mach_msg_type_number_t new_stateCnt;
-{ return S_xxx_thread_set_state(target_thread, flavor, new_state, new_stateCnt); }
-#else
-(
-	mach_port_t target_thread,
-	int flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-#endif
-
-/* Routine thread_get_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_get_special_port
-#if	defined(LINTLIBRARY)
-    (thread, which_port, special_port, special_portPoly)
-	mach_port_t thread;
-	int which_port;
-	mach_port_t *special_port;
-	mach_msg_type_name_t *special_portPoly;
-{ return S_thread_get_special_port(thread, which_port, special_port, special_portPoly); }
-#else
-(
-	mach_port_t thread,
-	int which_port,
-	mach_port_t *special_port,
-	mach_msg_type_name_t *special_portPoly
-);
-#endif
-
-/* Routine thread_set_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_set_special_port
-#if	defined(LINTLIBRARY)
-    (thread, which_port, special_port)
-	mach_port_t thread;
-	int which_port;
-	mach_port_t special_port;
-{ return S_thread_set_special_port(thread, which_port, special_port); }
-#else
-(
-	mach_port_t thread,
-	int which_port,
-	mach_port_t special_port
-);
-#endif
-
-/* Routine xxx_thread_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_thread_info
-#if	defined(LINTLIBRARY)
-    (target_thread, flavor, thread_info_out, thread_info_outCnt)
-	mach_port_t target_thread;
-	int flavor;
-	thread_info_t thread_info_out;
-	mach_msg_type_number_t *thread_info_outCnt;
-{ return S_xxx_thread_info(target_thread, flavor, thread_info_out, thread_info_outCnt); }
-#else
-(
-	mach_port_t target_thread,
-	int flavor,
-	thread_info_t thread_info_out,
-	mach_msg_type_number_t *thread_info_outCnt
-);
-#endif
-
-/* Routine task_set_emulation */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_set_emulation
-#if	defined(LINTLIBRARY)
-    (target_port, routine_entry_pt, routine_number)
-	mach_port_t target_port;
-	vm_address_t routine_entry_pt;
-	int routine_number;
-{ return S_task_set_emulation(target_port, routine_entry_pt, routine_number); }
-#else
-(
-	mach_port_t target_port,
-	vm_address_t routine_entry_pt,
-	int routine_number
-);
-#endif
-
-/* Routine task_ras_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_ras_control
-#if	defined(LINTLIBRARY)
-    (target_task, basepc, boundspc, flavor)
-	mach_port_t target_task;
-	vm_address_t basepc;
-	vm_address_t boundspc;
-	int flavor;
-{ return S_task_ras_control(target_task, basepc, boundspc, flavor); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t basepc,
-	vm_address_t boundspc,
-	int flavor
-);
-#endif
-
-/* Routine vm_map */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_map
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, mask, anywhere, memory_object, offset, copy, cur_protection, max_protection, inheritance)
-	mach_port_t target_task;
-	vm_address_t *address;
-	vm_size_t size;
-	vm_address_t mask;
-	boolean_t anywhere;
-	mach_port_t memory_object;
-	vm_offset_t offset;
-	boolean_t copy;
-	vm_prot_t cur_protection;
-	vm_prot_t max_protection;
-	vm_inherit_t inheritance;
-{ return S_vm_map(target_task, address, size, mask, anywhere, memory_object, offset, copy, cur_protection, max_protection, inheritance); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t *address,
-	vm_size_t size,
-	vm_address_t mask,
-	boolean_t anywhere,
-	mach_port_t memory_object,
-	vm_offset_t offset,
-	boolean_t copy,
-	vm_prot_t cur_protection,
-	vm_prot_t max_protection,
-	vm_inherit_t inheritance
-);
-#endif
-
-/* SimpleRoutine memory_object_data_error */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_data_error
-#if	defined(LINTLIBRARY)
-    (memory_control, offset, size, error_value)
-	mach_port_t memory_control;
-	vm_offset_t offset;
-	vm_size_t size;
-	kern_return_t error_value;
-{ return S_memory_object_data_error(memory_control, offset, size, error_value); }
-#else
-(
-	mach_port_t memory_control,
-	vm_offset_t offset,
-	vm_size_t size,
-	kern_return_t error_value
-);
-#endif
-
-/* SimpleRoutine memory_object_set_attributes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_set_attributes
-#if	defined(LINTLIBRARY)
-    (memory_control, object_ready, may_cache, copy_strategy)
-	mach_port_t memory_control;
-	boolean_t object_ready;
-	boolean_t may_cache;
-	memory_object_copy_strategy_t copy_strategy;
-{ return S_memory_object_set_attributes(memory_control, object_ready, may_cache, copy_strategy); }
-#else
-(
-	mach_port_t memory_control,
-	boolean_t object_ready,
-	boolean_t may_cache,
-	memory_object_copy_strategy_t copy_strategy
-);
-#endif
-
-/* SimpleRoutine memory_object_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_destroy
-#if	defined(LINTLIBRARY)
-    (memory_control, reason)
-	mach_port_t memory_control;
-	kern_return_t reason;
-{ return S_memory_object_destroy(memory_control, reason); }
-#else
-(
-	mach_port_t memory_control,
-	kern_return_t reason
-);
-#endif
-
-/* SimpleRoutine memory_object_data_supply */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_data_supply
-#if	defined(LINTLIBRARY)
-    (memory_control, offset, data, dataCnt, lock_value, precious, reply_to, reply_toPoly)
-	mach_port_t memory_control;
-	vm_offset_t offset;
-	vm_offset_t data;
-	mach_msg_type_number_t dataCnt;
-	vm_prot_t lock_value;
-	boolean_t precious;
-	mach_port_t reply_to;
-	mach_msg_type_name_t reply_toPoly;
-{ return S_memory_object_data_supply(memory_control, offset, data, dataCnt, lock_value, precious, reply_to, reply_toPoly); }
-#else
-(
-	mach_port_t memory_control,
-	vm_offset_t offset,
-	vm_offset_t data,
-	mach_msg_type_number_t dataCnt,
-	vm_prot_t lock_value,
-	boolean_t precious,
-	mach_port_t reply_to,
-	mach_msg_type_name_t reply_toPoly
-);
-#endif
-
-/* SimpleRoutine memory_object_ready */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_ready
-#if	defined(LINTLIBRARY)
-    (memory_control, may_cache, copy_strategy)
-	mach_port_t memory_control;
-	boolean_t may_cache;
-	memory_object_copy_strategy_t copy_strategy;
-{ return S_memory_object_ready(memory_control, may_cache, copy_strategy); }
-#else
-(
-	mach_port_t memory_control,
-	boolean_t may_cache,
-	memory_object_copy_strategy_t copy_strategy
-);
-#endif
-
-/* SimpleRoutine memory_object_change_attributes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_memory_object_change_attributes
-#if	defined(LINTLIBRARY)
-    (memory_control, may_cache, copy_strategy, reply_to, reply_toPoly)
-	mach_port_t memory_control;
-	boolean_t may_cache;
-	memory_object_copy_strategy_t copy_strategy;
-	mach_port_t reply_to;
-	mach_msg_type_name_t reply_toPoly;
-{ return S_memory_object_change_attributes(memory_control, may_cache, copy_strategy, reply_to, reply_toPoly); }
-#else
-(
-	mach_port_t memory_control,
-	boolean_t may_cache,
-	memory_object_copy_strategy_t copy_strategy,
-	mach_port_t reply_to,
-	mach_msg_type_name_t reply_toPoly
-);
-#endif
-
-/* Routine vm_machine_attribute */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_machine_attribute
-#if	defined(LINTLIBRARY)
-    (target_task, address, size, attribute, value)
-	mach_port_t target_task;
-	vm_address_t address;
-	vm_size_t size;
-	vm_machine_attribute_t attribute;
-	vm_machine_attribute_val_t *value;
-{ return S_vm_machine_attribute(target_task, address, size, attribute, value); }
-#else
-(
-	mach_port_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_machine_attribute_t attribute,
-	vm_machine_attribute_val_t *value
-);
-#endif
-
-#endif	/* not defined(_mach_server_) */
diff --git a/boot.backup1/ourmach_host_S.h b/boot.backup1/ourmach_host_S.h
deleted file mode 100644
index 7c962cbb..00000000
--- a/boot.backup1/ourmach_host_S.h
+++ /dev/null
@@ -1,896 +0,0 @@
-#ifndef	_mach_host_server_
-#define	_mach_host_server_
-
-/* Module mach_host */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-
-/* Routine host_processors */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_processors
-#if	defined(LINTLIBRARY)
-    (host_priv, processor_list, processor_listCnt)
-	mach_port_t host_priv;
-	processor_array_t *processor_list;
-	mach_msg_type_number_t *processor_listCnt;
-{ return S_host_processors(host_priv, processor_list, processor_listCnt); }
-#else
-(
-	mach_port_t host_priv,
-	processor_array_t *processor_list,
-	mach_msg_type_number_t *processor_listCnt
-);
-#endif
-
-/* Routine yyy_host_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_yyy_host_info
-#if	defined(LINTLIBRARY)
-    (host, flavor, host_info_out, host_info_outCnt)
-	mach_port_t host;
-	int flavor;
-	host_info_t host_info_out;
-	mach_msg_type_number_t *host_info_outCnt;
-{ return S_yyy_host_info(host, flavor, host_info_out, host_info_outCnt); }
-#else
-(
-	mach_port_t host,
-	int flavor,
-	host_info_t host_info_out,
-	mach_msg_type_number_t *host_info_outCnt
-);
-#endif
-
-/* Routine yyy_processor_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_yyy_processor_info
-#if	defined(LINTLIBRARY)
-    (processor, flavor, host, processor_info_out, processor_info_outCnt)
-	mach_port_t processor;
-	int flavor;
-	mach_port_t *host;
-	processor_info_t processor_info_out;
-	mach_msg_type_number_t *processor_info_outCnt;
-{ return S_yyy_processor_info(processor, flavor, host, processor_info_out, processor_info_outCnt); }
-#else
-(
-	mach_port_t processor,
-	int flavor,
-	mach_port_t *host,
-	processor_info_t processor_info_out,
-	mach_msg_type_number_t *processor_info_outCnt
-);
-#endif
-
-/* Routine processor_start */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_start
-#if	defined(LINTLIBRARY)
-    (processor)
-	mach_port_t processor;
-{ return S_processor_start(processor); }
-#else
-(
-	mach_port_t processor
-);
-#endif
-
-/* Routine processor_exit */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_exit
-#if	defined(LINTLIBRARY)
-    (processor)
-	mach_port_t processor;
-{ return S_processor_exit(processor); }
-#else
-(
-	mach_port_t processor
-);
-#endif
-
-/* Routine yyy_processor_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_yyy_processor_control
-#if	defined(LINTLIBRARY)
-    (processor, processor_cmd, processor_cmdCnt)
-	mach_port_t processor;
-	processor_info_t processor_cmd;
-	mach_msg_type_number_t processor_cmdCnt;
-{ return S_yyy_processor_control(processor, processor_cmd, processor_cmdCnt); }
-#else
-(
-	mach_port_t processor,
-	processor_info_t processor_cmd,
-	mach_msg_type_number_t processor_cmdCnt
-);
-#endif
-
-/* Routine processor_set_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_default
-#if	defined(LINTLIBRARY)
-    (host, default_set)
-	mach_port_t host;
-	mach_port_t *default_set;
-{ return S_processor_set_default(host, default_set); }
-#else
-(
-	mach_port_t host,
-	mach_port_t *default_set
-);
-#endif
-
-/* Routine xxx_processor_set_default_priv */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_xxx_processor_set_default_priv
-#if	defined(LINTLIBRARY)
-    (host, default_set)
-	mach_port_t host;
-	mach_port_t *default_set;
-{ return S_xxx_processor_set_default_priv(host, default_set); }
-#else
-(
-	mach_port_t host,
-	mach_port_t *default_set
-);
-#endif
-
-/* Routine processor_set_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_create
-#if	defined(LINTLIBRARY)
-    (host, new_set, new_name)
-	mach_port_t host;
-	mach_port_t *new_set;
-	mach_port_t *new_name;
-{ return S_processor_set_create(host, new_set, new_name); }
-#else
-(
-	mach_port_t host,
-	mach_port_t *new_set,
-	mach_port_t *new_name
-);
-#endif
-
-/* Routine processor_set_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_destroy
-#if	defined(LINTLIBRARY)
-    (set)
-	mach_port_t set;
-{ return S_processor_set_destroy(set); }
-#else
-(
-	mach_port_t set
-);
-#endif
-
-/* Routine yyy_processor_set_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_yyy_processor_set_info
-#if	defined(LINTLIBRARY)
-    (set_name, flavor, host, info_out, info_outCnt)
-	mach_port_t set_name;
-	int flavor;
-	mach_port_t *host;
-	processor_set_info_t info_out;
-	mach_msg_type_number_t *info_outCnt;
-{ return S_yyy_processor_set_info(set_name, flavor, host, info_out, info_outCnt); }
-#else
-(
-	mach_port_t set_name,
-	int flavor,
-	mach_port_t *host,
-	processor_set_info_t info_out,
-	mach_msg_type_number_t *info_outCnt
-);
-#endif
-
-/* Routine processor_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_assign
-#if	defined(LINTLIBRARY)
-    (processor, new_set, wait)
-	mach_port_t processor;
-	mach_port_t new_set;
-	boolean_t wait;
-{ return S_processor_assign(processor, new_set, wait); }
-#else
-(
-	mach_port_t processor,
-	mach_port_t new_set,
-	boolean_t wait
-);
-#endif
-
-/* Routine processor_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_get_assignment
-#if	defined(LINTLIBRARY)
-    (processor, assigned_set)
-	mach_port_t processor;
-	mach_port_t *assigned_set;
-{ return S_processor_get_assignment(processor, assigned_set); }
-#else
-(
-	mach_port_t processor,
-	mach_port_t *assigned_set
-);
-#endif
-
-/* Routine thread_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_assign
-#if	defined(LINTLIBRARY)
-    (thread, new_set)
-	mach_port_t thread;
-	mach_port_t new_set;
-{ return S_thread_assign(thread, new_set); }
-#else
-(
-	mach_port_t thread,
-	mach_port_t new_set
-);
-#endif
-
-/* Routine thread_assign_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_assign_default
-#if	defined(LINTLIBRARY)
-    (thread)
-	mach_port_t thread;
-{ return S_thread_assign_default(thread); }
-#else
-(
-	mach_port_t thread
-);
-#endif
-
-/* Routine thread_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_get_assignment
-#if	defined(LINTLIBRARY)
-    (thread, assigned_set)
-	mach_port_t thread;
-	mach_port_t *assigned_set;
-{ return S_thread_get_assignment(thread, assigned_set); }
-#else
-(
-	mach_port_t thread,
-	mach_port_t *assigned_set
-);
-#endif
-
-/* Routine task_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_assign
-#if	defined(LINTLIBRARY)
-    (task, new_set, assign_threads)
-	mach_port_t task;
-	mach_port_t new_set;
-	boolean_t assign_threads;
-{ return S_task_assign(task, new_set, assign_threads); }
-#else
-(
-	mach_port_t task,
-	mach_port_t new_set,
-	boolean_t assign_threads
-);
-#endif
-
-/* Routine task_assign_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_assign_default
-#if	defined(LINTLIBRARY)
-    (task, assign_threads)
-	mach_port_t task;
-	boolean_t assign_threads;
-{ return S_task_assign_default(task, assign_threads); }
-#else
-(
-	mach_port_t task,
-	boolean_t assign_threads
-);
-#endif
-
-/* Routine task_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_get_assignment
-#if	defined(LINTLIBRARY)
-    (task, assigned_set)
-	mach_port_t task;
-	mach_port_t *assigned_set;
-{ return S_task_get_assignment(task, assigned_set); }
-#else
-(
-	mach_port_t task,
-	mach_port_t *assigned_set
-);
-#endif
-
-/* Routine host_kernel_version */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_kernel_version
-#if	defined(LINTLIBRARY)
-    (host, kernel_version)
-	mach_port_t host;
-	kernel_version_t kernel_version;
-{ return S_host_kernel_version(host, kernel_version); }
-#else
-(
-	mach_port_t host,
-	kernel_version_t kernel_version
-);
-#endif
-
-/* Routine thread_priority */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_priority
-#if	defined(LINTLIBRARY)
-    (thread, priority, set_max)
-	mach_port_t thread;
-	int priority;
-	boolean_t set_max;
-{ return S_thread_priority(thread, priority, set_max); }
-#else
-(
-	mach_port_t thread,
-	int priority,
-	boolean_t set_max
-);
-#endif
-
-/* Routine thread_max_priority */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_max_priority
-#if	defined(LINTLIBRARY)
-    (thread, processor_set, max_priority)
-	mach_port_t thread;
-	mach_port_t processor_set;
-	int max_priority;
-{ return S_thread_max_priority(thread, processor_set, max_priority); }
-#else
-(
-	mach_port_t thread,
-	mach_port_t processor_set,
-	int max_priority
-);
-#endif
-
-/* Routine task_priority */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_task_priority
-#if	defined(LINTLIBRARY)
-    (task, priority, change_threads)
-	mach_port_t task;
-	int priority;
-	boolean_t change_threads;
-{ return S_task_priority(task, priority, change_threads); }
-#else
-(
-	mach_port_t task,
-	int priority,
-	boolean_t change_threads
-);
-#endif
-
-/* Routine processor_set_max_priority */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_max_priority
-#if	defined(LINTLIBRARY)
-    (processor_set, max_priority, change_threads)
-	mach_port_t processor_set;
-	int max_priority;
-	boolean_t change_threads;
-{ return S_processor_set_max_priority(processor_set, max_priority, change_threads); }
-#else
-(
-	mach_port_t processor_set,
-	int max_priority,
-	boolean_t change_threads
-);
-#endif
-
-/* Routine thread_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_policy
-#if	defined(LINTLIBRARY)
-    (thread, policy, data)
-	mach_port_t thread;
-	int policy;
-	int data;
-{ return S_thread_policy(thread, policy, data); }
-#else
-(
-	mach_port_t thread,
-	int policy,
-	int data
-);
-#endif
-
-/* Routine processor_set_policy_enable */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_policy_enable
-#if	defined(LINTLIBRARY)
-    (processor_set, policy)
-	mach_port_t processor_set;
-	int policy;
-{ return S_processor_set_policy_enable(processor_set, policy); }
-#else
-(
-	mach_port_t processor_set,
-	int policy
-);
-#endif
-
-/* Routine processor_set_policy_disable */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_policy_disable
-#if	defined(LINTLIBRARY)
-    (processor_set, policy, change_threads)
-	mach_port_t processor_set;
-	int policy;
-	boolean_t change_threads;
-{ return S_processor_set_policy_disable(processor_set, policy, change_threads); }
-#else
-(
-	mach_port_t processor_set,
-	int policy,
-	boolean_t change_threads
-);
-#endif
-
-/* Routine processor_set_tasks */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_tasks
-#if	defined(LINTLIBRARY)
-    (processor_set, task_list, task_listCnt)
-	mach_port_t processor_set;
-	task_array_t *task_list;
-	mach_msg_type_number_t *task_listCnt;
-{ return S_processor_set_tasks(processor_set, task_list, task_listCnt); }
-#else
-(
-	mach_port_t processor_set,
-	task_array_t *task_list,
-	mach_msg_type_number_t *task_listCnt
-);
-#endif
-
-/* Routine processor_set_threads */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_threads
-#if	defined(LINTLIBRARY)
-    (processor_set, thread_list, thread_listCnt)
-	mach_port_t processor_set;
-	thread_array_t *thread_list;
-	mach_msg_type_number_t *thread_listCnt;
-{ return S_processor_set_threads(processor_set, thread_list, thread_listCnt); }
-#else
-(
-	mach_port_t processor_set,
-	thread_array_t *thread_list,
-	mach_msg_type_number_t *thread_listCnt
-);
-#endif
-
-/* Routine host_processor_sets */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_processor_sets
-#if	defined(LINTLIBRARY)
-    (host, processor_sets, processor_setsCnt)
-	mach_port_t host;
-	processor_set_name_array_t *processor_sets;
-	mach_msg_type_number_t *processor_setsCnt;
-{ return S_host_processor_sets(host, processor_sets, processor_setsCnt); }
-#else
-(
-	mach_port_t host,
-	processor_set_name_array_t *processor_sets,
-	mach_msg_type_number_t *processor_setsCnt
-);
-#endif
-
-/* Routine host_processor_set_priv */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_processor_set_priv
-#if	defined(LINTLIBRARY)
-    (host_priv, set_name, set, setPoly)
-	mach_port_t host_priv;
-	mach_port_t set_name;
-	mach_port_t *set;
-	mach_msg_type_name_t *setPoly;
-{ return S_host_processor_set_priv(host_priv, set_name, set, setPoly); }
-#else
-(
-	mach_port_t host_priv,
-	mach_port_t set_name,
-	mach_port_t *set,
-	mach_msg_type_name_t *setPoly
-);
-#endif
-
-/* Routine thread_depress_abort */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_depress_abort
-#if	defined(LINTLIBRARY)
-    (thread)
-	mach_port_t thread;
-{ return S_thread_depress_abort(thread); }
-#else
-(
-	mach_port_t thread
-);
-#endif
-
-/* Routine host_set_time */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_set_time
-#if	defined(LINTLIBRARY)
-    (host_priv, new_time)
-	mach_port_t host_priv;
-	time_value_t new_time;
-{ return S_host_set_time(host_priv, new_time); }
-#else
-(
-	mach_port_t host_priv,
-	time_value_t new_time
-);
-#endif
-
-/* Routine host_adjust_time */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_adjust_time
-#if	defined(LINTLIBRARY)
-    (host_priv, new_adjustment, old_adjustment)
-	mach_port_t host_priv;
-	time_value_t new_adjustment;
-	time_value_t *old_adjustment;
-{ return S_host_adjust_time(host_priv, new_adjustment, old_adjustment); }
-#else
-(
-	mach_port_t host_priv,
-	time_value_t new_adjustment,
-	time_value_t *old_adjustment
-);
-#endif
-
-/* Routine host_get_time */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_get_time
-#if	defined(LINTLIBRARY)
-    (host, current_time)
-	mach_port_t host;
-	time_value_t *current_time;
-{ return S_host_get_time(host, current_time); }
-#else
-(
-	mach_port_t host,
-	time_value_t *current_time
-);
-#endif
-
-/* Routine host_reboot */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_reboot
-#if	defined(LINTLIBRARY)
-    (host_priv, options)
-	mach_port_t host_priv;
-	int options;
-{ return S_host_reboot(host_priv, options); }
-#else
-(
-	mach_port_t host_priv,
-	int options
-);
-#endif
-
-/* Routine vm_wire */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_vm_wire
-#if	defined(LINTLIBRARY)
-    (host_priv, task, address, size, access)
-	mach_port_t host_priv;
-	mach_port_t task;
-	vm_address_t address;
-	vm_size_t size;
-	vm_prot_t access;
-{ return S_vm_wire(host_priv, task, address, size, access); }
-#else
-(
-	mach_port_t host_priv,
-	mach_port_t task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_prot_t access
-);
-#endif
-
-/* Routine thread_wire */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_thread_wire
-#if	defined(LINTLIBRARY)
-    (host_priv, thread, wired)
-	mach_port_t host_priv;
-	mach_port_t thread;
-	boolean_t wired;
-{ return S_thread_wire(host_priv, thread, wired); }
-#else
-(
-	mach_port_t host_priv,
-	mach_port_t thread,
-	boolean_t wired
-);
-#endif
-
-/* Routine host_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_info
-#if	defined(LINTLIBRARY)
-    (host, flavor, host_info_out, host_info_outCnt)
-	mach_port_t host;
-	int flavor;
-	host_info_t host_info_out;
-	mach_msg_type_number_t *host_info_outCnt;
-{ return S_host_info(host, flavor, host_info_out, host_info_outCnt); }
-#else
-(
-	mach_port_t host,
-	int flavor,
-	host_info_t host_info_out,
-	mach_msg_type_number_t *host_info_outCnt
-);
-#endif
-
-/* Routine processor_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_info
-#if	defined(LINTLIBRARY)
-    (processor, flavor, host, processor_info_out, processor_info_outCnt)
-	mach_port_t processor;
-	int flavor;
-	mach_port_t *host;
-	processor_info_t processor_info_out;
-	mach_msg_type_number_t *processor_info_outCnt;
-{ return S_processor_info(processor, flavor, host, processor_info_out, processor_info_outCnt); }
-#else
-(
-	mach_port_t processor,
-	int flavor,
-	mach_port_t *host,
-	processor_info_t processor_info_out,
-	mach_msg_type_number_t *processor_info_outCnt
-);
-#endif
-
-/* Routine processor_set_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_set_info
-#if	defined(LINTLIBRARY)
-    (set_name, flavor, host, info_out, info_outCnt)
-	mach_port_t set_name;
-	int flavor;
-	mach_port_t *host;
-	processor_set_info_t info_out;
-	mach_msg_type_number_t *info_outCnt;
-{ return S_processor_set_info(set_name, flavor, host, info_out, info_outCnt); }
-#else
-(
-	mach_port_t set_name,
-	int flavor,
-	mach_port_t *host,
-	processor_set_info_t info_out,
-	mach_msg_type_number_t *info_outCnt
-);
-#endif
-
-/* Routine processor_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_processor_control
-#if	defined(LINTLIBRARY)
-    (processor, processor_cmd, processor_cmdCnt)
-	mach_port_t processor;
-	processor_info_t processor_cmd;
-	mach_msg_type_number_t processor_cmdCnt;
-{ return S_processor_control(processor, processor_cmd, processor_cmdCnt); }
-#else
-(
-	mach_port_t processor,
-	processor_info_t processor_cmd,
-	mach_msg_type_number_t processor_cmdCnt
-);
-#endif
-
-/* Routine host_get_boot_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_host_get_boot_info
-#if	defined(LINTLIBRARY)
-    (host_priv, boot_info)
-	mach_port_t host_priv;
-	kernel_boot_info_t boot_info;
-{ return S_host_get_boot_info(host_priv, boot_info); }
-#else
-(
-	mach_port_t host_priv,
-	kernel_boot_info_t boot_info
-);
-#endif
-
-#endif	/* not defined(_mach_host_server_) */
diff --git a/boot.backup1/ourmach_port_S.h b/boot.backup1/ourmach_port_S.h
deleted file mode 100644
index df473c50..00000000
--- a/boot.backup1/ourmach_port_S.h
+++ /dev/null
@@ -1,432 +0,0 @@
-#ifndef	_mach_port_server_
-#define	_mach_port_server_
-
-/* Module mach_port */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-
-/* Routine mach_port_names */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_names
-#if	defined(LINTLIBRARY)
-    (task, names, namesCnt, types, typesCnt)
-	mach_port_t task;
-	mach_port_array_t *names;
-	mach_msg_type_number_t *namesCnt;
-	mach_port_type_array_t *types;
-	mach_msg_type_number_t *typesCnt;
-{ return S_mach_port_names(task, names, namesCnt, types, typesCnt); }
-#else
-(
-	mach_port_t task,
-	mach_port_array_t *names,
-	mach_msg_type_number_t *namesCnt,
-	mach_port_type_array_t *types,
-	mach_msg_type_number_t *typesCnt
-);
-#endif
-
-/* Routine mach_port_type */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_type
-#if	defined(LINTLIBRARY)
-    (task, name, ptype)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_type_t *ptype;
-{ return S_mach_port_type(task, name, ptype); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_type_t *ptype
-);
-#endif
-
-/* Routine mach_port_rename */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_rename
-#if	defined(LINTLIBRARY)
-    (task, old_name, new_name)
-	mach_port_t task;
-	mach_port_t old_name;
-	mach_port_t new_name;
-{ return S_mach_port_rename(task, old_name, new_name); }
-#else
-(
-	mach_port_t task,
-	mach_port_t old_name,
-	mach_port_t new_name
-);
-#endif
-
-/* Routine mach_port_allocate_name */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_allocate_name
-#if	defined(LINTLIBRARY)
-    (task, right, name)
-	mach_port_t task;
-	mach_port_right_t right;
-	mach_port_t name;
-{ return S_mach_port_allocate_name(task, right, name); }
-#else
-(
-	mach_port_t task,
-	mach_port_right_t right,
-	mach_port_t name
-);
-#endif
-
-/* Routine mach_port_allocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_allocate
-#if	defined(LINTLIBRARY)
-    (task, right, name)
-	mach_port_t task;
-	mach_port_right_t right;
-	mach_port_t *name;
-{ return S_mach_port_allocate(task, right, name); }
-#else
-(
-	mach_port_t task,
-	mach_port_right_t right,
-	mach_port_t *name
-);
-#endif
-
-/* Routine mach_port_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_destroy
-#if	defined(LINTLIBRARY)
-    (task, name)
-	mach_port_t task;
-	mach_port_t name;
-{ return S_mach_port_destroy(task, name); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name
-);
-#endif
-
-/* Routine mach_port_deallocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_deallocate
-#if	defined(LINTLIBRARY)
-    (task, name)
-	mach_port_t task;
-	mach_port_t name;
-{ return S_mach_port_deallocate(task, name); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name
-);
-#endif
-
-/* Routine mach_port_get_refs */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_get_refs
-#if	defined(LINTLIBRARY)
-    (task, name, right, refs)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_right_t right;
-	mach_port_urefs_t *refs;
-{ return S_mach_port_get_refs(task, name, right, refs); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_right_t right,
-	mach_port_urefs_t *refs
-);
-#endif
-
-/* Routine mach_port_mod_refs */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_mod_refs
-#if	defined(LINTLIBRARY)
-    (task, name, right, delta)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_right_t right;
-	mach_port_delta_t delta;
-{ return S_mach_port_mod_refs(task, name, right, delta); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_right_t right,
-	mach_port_delta_t delta
-);
-#endif
-
-/* Routine old_mach_port_get_receive_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_old_mach_port_get_receive_status
-#if	defined(LINTLIBRARY)
-    (task, name, status)
-	mach_port_t task;
-	mach_port_t name;
-	old_mach_port_status_t *status;
-{ return S_old_mach_port_get_receive_status(task, name, status); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	old_mach_port_status_t *status
-);
-#endif
-
-/* Routine mach_port_set_qlimit */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_set_qlimit
-#if	defined(LINTLIBRARY)
-    (task, name, qlimit)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_msgcount_t qlimit;
-{ return S_mach_port_set_qlimit(task, name, qlimit); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_msgcount_t qlimit
-);
-#endif
-
-/* Routine mach_port_set_mscount */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_set_mscount
-#if	defined(LINTLIBRARY)
-    (task, name, mscount)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_mscount_t mscount;
-{ return S_mach_port_set_mscount(task, name, mscount); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_mscount_t mscount
-);
-#endif
-
-/* Routine mach_port_get_set_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_get_set_status
-#if	defined(LINTLIBRARY)
-    (task, name, members, membersCnt)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_array_t *members;
-	mach_msg_type_number_t *membersCnt;
-{ return S_mach_port_get_set_status(task, name, members, membersCnt); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_array_t *members,
-	mach_msg_type_number_t *membersCnt
-);
-#endif
-
-/* Routine mach_port_move_member */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_move_member
-#if	defined(LINTLIBRARY)
-    (task, member, after)
-	mach_port_t task;
-	mach_port_t member;
-	mach_port_t after;
-{ return S_mach_port_move_member(task, member, after); }
-#else
-(
-	mach_port_t task,
-	mach_port_t member,
-	mach_port_t after
-);
-#endif
-
-/* Routine mach_port_request_notification */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_request_notification
-#if	defined(LINTLIBRARY)
-    (task, name, id, sync, notify, previous, previousPoly)
-	mach_port_t task;
-	mach_port_t name;
-	mach_msg_id_t id;
-	mach_port_mscount_t sync;
-	mach_port_t notify;
-	mach_port_t *previous;
-	mach_msg_type_name_t *previousPoly;
-{ return S_mach_port_request_notification(task, name, id, sync, notify, previous, previousPoly); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_msg_id_t id,
-	mach_port_mscount_t sync,
-	mach_port_t notify,
-	mach_port_t *previous,
-	mach_msg_type_name_t *previousPoly
-);
-#endif
-
-/* Routine mach_port_insert_right */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_insert_right
-#if	defined(LINTLIBRARY)
-    (task, name, poly, polyPoly)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_t poly;
-	mach_msg_type_name_t polyPoly;
-{ return S_mach_port_insert_right(task, name, poly, polyPoly); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_t poly,
-	mach_msg_type_name_t polyPoly
-);
-#endif
-
-/* Routine mach_port_extract_right */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_extract_right
-#if	defined(LINTLIBRARY)
-    (task, name, msgt_name, poly, polyPoly)
-	mach_port_t task;
-	mach_port_t name;
-	mach_msg_type_name_t msgt_name;
-	mach_port_t *poly;
-	mach_msg_type_name_t *polyPoly;
-{ return S_mach_port_extract_right(task, name, msgt_name, poly, polyPoly); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_msg_type_name_t msgt_name,
-	mach_port_t *poly,
-	mach_msg_type_name_t *polyPoly
-);
-#endif
-
-/* Routine mach_port_get_receive_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_get_receive_status
-#if	defined(LINTLIBRARY)
-    (task, name, status)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_status_t *status;
-{ return S_mach_port_get_receive_status(task, name, status); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_status_t *status
-);
-#endif
-
-/* Routine mach_port_set_seqno */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_mach_port_set_seqno
-#if	defined(LINTLIBRARY)
-    (task, name, seqno)
-	mach_port_t task;
-	mach_port_t name;
-	mach_port_seqno_t seqno;
-{ return S_mach_port_set_seqno(task, name, seqno); }
-#else
-(
-	mach_port_t task,
-	mach_port_t name,
-	mach_port_seqno_t seqno
-);
-#endif
-
-#endif	/* not defined(_mach_port_server_) */
diff --git a/boot.backup1/term_S.h b/boot.backup1/term_S.h
deleted file mode 100644
index 95b385f8..00000000
--- a/boot.backup1/term_S.h
+++ /dev/null
@@ -1,242 +0,0 @@
-#ifndef	_term_server_
-#define	_term_server_
-
-/* Module term */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <device/net_status.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <hurd/hurd_types.h>
-
-/* Routine term_getctty */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_getctty
-#if	defined(LINTLIBRARY)
-    (terminal, ctty, cttyPoly)
-	io_t terminal;
-	mach_port_t *ctty;
-	mach_msg_type_name_t *cttyPoly;
-{ return S_term_getctty(terminal, ctty, cttyPoly); }
-#else
-(
-	io_t terminal,
-	mach_port_t *ctty,
-	mach_msg_type_name_t *cttyPoly
-);
-#endif
-
-/* Routine term_open_ctty */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_open_ctty
-#if	defined(LINTLIBRARY)
-    (terminal, pid, pgrp, newtty, newttyPoly)
-	io_t terminal;
-	pid_t pid;
-	pid_t pgrp;
-	mach_port_t *newtty;
-	mach_msg_type_name_t *newttyPoly;
-{ return S_term_open_ctty(terminal, pid, pgrp, newtty, newttyPoly); }
-#else
-(
-	io_t terminal,
-	pid_t pid,
-	pid_t pgrp,
-	mach_port_t *newtty,
-	mach_msg_type_name_t *newttyPoly
-);
-#endif
-
-/* Routine term_set_nodename */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_set_nodename
-#if	defined(LINTLIBRARY)
-    (terminal, name)
-	io_t terminal;
-	string_t name;
-{ return S_term_set_nodename(terminal, name); }
-#else
-(
-	io_t terminal,
-	string_t name
-);
-#endif
-
-/* Routine term_get_nodename */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_get_nodename
-#if	defined(LINTLIBRARY)
-    (terminal, name)
-	io_t terminal;
-	string_t name;
-{ return S_term_get_nodename(terminal, name); }
-#else
-(
-	io_t terminal,
-	string_t name
-);
-#endif
-
-/* Routine term_set_filenode */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_set_filenode
-#if	defined(LINTLIBRARY)
-    (terminal, filenode)
-	io_t terminal;
-	file_t filenode;
-{ return S_term_set_filenode(terminal, filenode); }
-#else
-(
-	io_t terminal,
-	file_t filenode
-);
-#endif
-
-/* Routine term_get_bottom_type */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_get_bottom_type
-#if	defined(LINTLIBRARY)
-    (terminal, ttype)
-	io_t terminal;
-	int *ttype;
-{ return S_term_get_bottom_type(terminal, ttype); }
-#else
-(
-	io_t terminal,
-	int *ttype
-);
-#endif
-
-/* Routine term_on_machdev */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_on_machdev
-#if	defined(LINTLIBRARY)
-    (terminal, machdev)
-	io_t terminal;
-	mach_port_t machdev;
-{ return S_term_on_machdev(terminal, machdev); }
-#else
-(
-	io_t terminal,
-	mach_port_t machdev
-);
-#endif
-
-/* Routine term_on_hurddev */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_on_hurddev
-#if	defined(LINTLIBRARY)
-    (terminal, hurddev)
-	io_t terminal;
-	io_t hurddev;
-{ return S_term_on_hurddev(terminal, hurddev); }
-#else
-(
-	io_t terminal,
-	io_t hurddev
-);
-#endif
-
-/* Routine term_on_pty */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_on_pty
-#if	defined(LINTLIBRARY)
-    (terminal, ptymaster)
-	io_t terminal;
-	io_t *ptymaster;
-{ return S_term_on_pty(terminal, ptymaster); }
-#else
-(
-	io_t terminal,
-	io_t *ptymaster
-);
-#endif
-
-/* Routine termctty_open_terminal */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_termctty_open_terminal
-#if	defined(LINTLIBRARY)
-    (ctty, flags, terminal, terminalPoly)
-	mach_port_t ctty;
-	int flags;
-	mach_port_t *terminal;
-	mach_msg_type_name_t *terminalPoly;
-{ return S_termctty_open_terminal(ctty, flags, terminal, terminalPoly); }
-#else
-(
-	mach_port_t ctty,
-	int flags,
-	mach_port_t *terminal,
-	mach_msg_type_name_t *terminalPoly
-);
-#endif
-
-/* Routine term_get_peername */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_term_get_peername
-#if	defined(LINTLIBRARY)
-    (terminal, name)
-	io_t terminal;
-	string_t name;
-{ return S_term_get_peername(terminal, name); }
-#else
-(
-	io_t terminal,
-	string_t name
-);
-#endif
-
-#endif	/* not defined(_term_server_) */
diff --git a/eth-filter.multi-thread/notify_S.h b/eth-filter.multi-thread/notify_S.h
deleted file mode 100644
index ac3f4659..00000000
--- a/eth-filter.multi-thread/notify_S.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef	_notify_server_
-#define	_notify_server_
-
-/* Module notify */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-
-/* SimpleRoutine mach_notify_port_deleted */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_port_deleted
-#if	defined(LINTLIBRARY)
-    (notify, name)
-	mach_port_t notify;
-	mach_port_t name;
-{ return do_mach_notify_port_deleted(notify, name); }
-#else
-(
-	mach_port_t notify,
-	mach_port_t name
-);
-#endif
-
-/* SimpleRoutine mach_notify_msg_accepted */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_msg_accepted
-#if	defined(LINTLIBRARY)
-    (notify, name)
-	mach_port_t notify;
-	mach_port_t name;
-{ return do_mach_notify_msg_accepted(notify, name); }
-#else
-(
-	mach_port_t notify,
-	mach_port_t name
-);
-#endif
-
-/* SimpleRoutine mach_notify_port_destroyed */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_port_destroyed
-#if	defined(LINTLIBRARY)
-    (notify, rights)
-	mach_port_t notify;
-	mach_port_t rights;
-{ return do_mach_notify_port_destroyed(notify, rights); }
-#else
-(
-	mach_port_t notify,
-	mach_port_t rights
-);
-#endif
-
-/* SimpleRoutine mach_notify_no_senders */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_no_senders
-#if	defined(LINTLIBRARY)
-    (notify, mscount)
-	mach_port_t notify;
-	mach_port_mscount_t mscount;
-{ return do_mach_notify_no_senders(notify, mscount); }
-#else
-(
-	mach_port_t notify,
-	mach_port_mscount_t mscount
-);
-#endif
-
-/* SimpleRoutine mach_notify_send_once */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_send_once
-#if	defined(LINTLIBRARY)
-    (notify)
-	mach_port_t notify;
-{ return do_mach_notify_send_once(notify); }
-#else
-(
-	mach_port_t notify
-);
-#endif
-
-/* SimpleRoutine mach_notify_dead_name */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t do_mach_notify_dead_name
-#if	defined(LINTLIBRARY)
-    (notify, name)
-	mach_port_t notify;
-	mach_port_t name;
-{ return do_mach_notify_dead_name(notify, name); }
-#else
-(
-	mach_port_t notify,
-	mach_port_t name
-);
-#endif
-
-#endif	/* not defined(_notify_server_) */
diff --git a/eth-filter.multi-thread/ourdevice_S.h b/eth-filter.multi-thread/ourdevice_S.h
deleted file mode 100644
index c899ae3e..00000000
--- a/eth-filter.multi-thread/ourdevice_S.h
+++ /dev/null
@@ -1,354 +0,0 @@
-#ifndef	_device_server_
-#define	_device_server_
-
-/* Module device */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <device/net_status.h>
-
-/* Routine device_open */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_open
-#if	defined(LINTLIBRARY)
-    (master_port, reply_port, reply_portPoly, mode, name, device, devicePoly)
-	mach_port_t master_port;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	dev_name_t name;
-	mach_port_t *device;
-	mach_msg_type_name_t *devicePoly;
-{ return ds_device_open(master_port, reply_port, reply_portPoly, mode, name, device, devicePoly); }
-#else
-(
-	mach_port_t master_port,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	dev_name_t name,
-	mach_port_t *device,
-	mach_msg_type_name_t *devicePoly
-);
-#endif
-
-/* Routine device_close */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_close
-#if	defined(LINTLIBRARY)
-    (device)
-	mach_port_t device;
-{ return ds_device_close(device); }
-#else
-(
-	mach_port_t device
-);
-#endif
-
-/* Routine device_write */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_write
-#if	defined(LINTLIBRARY)
-    (device, reply_port, reply_portPoly, mode, recnum, data, dataCnt, bytes_written)
-	mach_port_t device;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	recnum_t recnum;
-	io_buf_ptr_t data;
-	mach_msg_type_number_t dataCnt;
-	int *bytes_written;
-{ return ds_device_write(device, reply_port, reply_portPoly, mode, recnum, data, dataCnt, bytes_written); }
-#else
-(
-	mach_port_t device,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	recnum_t recnum,
-	io_buf_ptr_t data,
-	mach_msg_type_number_t dataCnt,
-	int *bytes_written
-);
-#endif
-
-/* Routine device_write_inband */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_write_inband
-#if	defined(LINTLIBRARY)
-    (device, reply_port, reply_portPoly, mode, recnum, data, dataCnt, bytes_written)
-	mach_port_t device;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	recnum_t recnum;
-	io_buf_ptr_inband_t data;
-	mach_msg_type_number_t dataCnt;
-	int *bytes_written;
-{ return ds_device_write_inband(device, reply_port, reply_portPoly, mode, recnum, data, dataCnt, bytes_written); }
-#else
-(
-	mach_port_t device,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	recnum_t recnum,
-	io_buf_ptr_inband_t data,
-	mach_msg_type_number_t dataCnt,
-	int *bytes_written
-);
-#endif
-
-/* Routine device_read */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_read
-#if	defined(LINTLIBRARY)
-    (device, reply_port, reply_portPoly, mode, recnum, bytes_wanted, data, dataCnt)
-	mach_port_t device;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	recnum_t recnum;
-	int bytes_wanted;
-	io_buf_ptr_t *data;
-	mach_msg_type_number_t *dataCnt;
-{ return ds_device_read(device, reply_port, reply_portPoly, mode, recnum, bytes_wanted, data, dataCnt); }
-#else
-(
-	mach_port_t device,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	recnum_t recnum,
-	int bytes_wanted,
-	io_buf_ptr_t *data,
-	mach_msg_type_number_t *dataCnt
-);
-#endif
-
-/* Routine device_read_inband */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_read_inband
-#if	defined(LINTLIBRARY)
-    (device, reply_port, reply_portPoly, mode, recnum, bytes_wanted, data, dataCnt)
-	mach_port_t device;
-	mach_port_t reply_port;
-	mach_msg_type_name_t reply_portPoly;
-	dev_mode_t mode;
-	recnum_t recnum;
-	int bytes_wanted;
-	io_buf_ptr_inband_t data;
-	mach_msg_type_number_t *dataCnt;
-{ return ds_device_read_inband(device, reply_port, reply_portPoly, mode, recnum, bytes_wanted, data, dataCnt); }
-#else
-(
-	mach_port_t device,
-	mach_port_t reply_port,
-	mach_msg_type_name_t reply_portPoly,
-	dev_mode_t mode,
-	recnum_t recnum,
-	int bytes_wanted,
-	io_buf_ptr_inband_t data,
-	mach_msg_type_number_t *dataCnt
-);
-#endif
-
-/* Routine xxx_device_set_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_xxx_device_set_status
-#if	defined(LINTLIBRARY)
-    (device, flavor, status, statusCnt)
-	mach_port_t device;
-	dev_flavor_t flavor;
-	dev_status_t status;
-	mach_msg_type_number_t statusCnt;
-{ return ds_xxx_device_set_status(device, flavor, status, statusCnt); }
-#else
-(
-	mach_port_t device,
-	dev_flavor_t flavor,
-	dev_status_t status,
-	mach_msg_type_number_t statusCnt
-);
-#endif
-
-/* Routine xxx_device_get_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_xxx_device_get_status
-#if	defined(LINTLIBRARY)
-    (device, flavor, status, statusCnt)
-	mach_port_t device;
-	dev_flavor_t flavor;
-	dev_status_t status;
-	mach_msg_type_number_t *statusCnt;
-{ return ds_xxx_device_get_status(device, flavor, status, statusCnt); }
-#else
-(
-	mach_port_t device,
-	dev_flavor_t flavor,
-	dev_status_t status,
-	mach_msg_type_number_t *statusCnt
-);
-#endif
-
-/* Routine xxx_device_set_filter */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_xxx_device_set_filter
-#if	defined(LINTLIBRARY)
-    (device, receive_port, priority, filter, filterCnt)
-	mach_port_t device;
-	mach_port_t receive_port;
-	int priority;
-	filter_array_t filter;
-	mach_msg_type_number_t filterCnt;
-{ return ds_xxx_device_set_filter(device, receive_port, priority, filter, filterCnt); }
-#else
-(
-	mach_port_t device,
-	mach_port_t receive_port,
-	int priority,
-	filter_array_t filter,
-	mach_msg_type_number_t filterCnt
-);
-#endif
-
-/* Routine device_map */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_map
-#if	defined(LINTLIBRARY)
-    (device, prot, offset, size, pager, unmap)
-	mach_port_t device;
-	vm_prot_t prot;
-	vm_offset_t offset;
-	vm_size_t size;
-	mach_port_t *pager;
-	int unmap;
-{ return ds_device_map(device, prot, offset, size, pager, unmap); }
-#else
-(
-	mach_port_t device,
-	vm_prot_t prot,
-	vm_offset_t offset,
-	vm_size_t size,
-	mach_port_t *pager,
-	int unmap
-);
-#endif
-
-/* Routine device_set_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_set_status
-#if	defined(LINTLIBRARY)
-    (device, flavor, status, statusCnt)
-	mach_port_t device;
-	dev_flavor_t flavor;
-	dev_status_t status;
-	mach_msg_type_number_t statusCnt;
-{ return ds_device_set_status(device, flavor, status, statusCnt); }
-#else
-(
-	mach_port_t device,
-	dev_flavor_t flavor,
-	dev_status_t status,
-	mach_msg_type_number_t statusCnt
-);
-#endif
-
-/* Routine device_get_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_get_status
-#if	defined(LINTLIBRARY)
-    (device, flavor, status, statusCnt)
-	mach_port_t device;
-	dev_flavor_t flavor;
-	dev_status_t status;
-	mach_msg_type_number_t *statusCnt;
-{ return ds_device_get_status(device, flavor, status, statusCnt); }
-#else
-(
-	mach_port_t device,
-	dev_flavor_t flavor,
-	dev_status_t status,
-	mach_msg_type_number_t *statusCnt
-);
-#endif
-
-/* Routine device_set_filter */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t ds_device_set_filter
-#if	defined(LINTLIBRARY)
-    (device, receive_port, priority, filter, filterCnt)
-	mach_port_t device;
-	mach_port_t receive_port;
-	int priority;
-	filter_array_t filter;
-	mach_msg_type_number_t filterCnt;
-{ return ds_device_set_filter(device, receive_port, priority, filter, filterCnt); }
-#else
-(
-	mach_port_t device,
-	mach_port_t receive_port,
-	int priority,
-	filter_array_t filter,
-	mach_msg_type_number_t filterCnt
-);
-#endif
-
-#endif	/* not defined(_device_server_) */
diff --git a/pfinet.old/iioctl_S.h b/pfinet.old/iioctl_S.h
deleted file mode 100644
index c372f025..00000000
--- a/pfinet.old/iioctl_S.h
+++ /dev/null
@@ -1,400 +0,0 @@
-#ifndef	_iioctl_server_
-#define	_iioctl_server_
-
-/* Module iioctl */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <device/net_status.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <hurd/hurd_types.h>
-#include <hurd/ioctl_types.h>
-
-/* Routine iioctl_siocsifaddr */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocsifaddr
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, addr)
-	io_t reqport;
-	ifname_t ifnam;
-	sockaddr_t addr;
-{ return S_iioctl_siocsifaddr(reqport, ifnam, addr); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	sockaddr_t addr
-);
-#endif
-
-/* Routine iioctl_siocsifdstaddr */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocsifdstaddr
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, dstaddr)
-	io_t reqport;
-	ifname_t ifnam;
-	sockaddr_t dstaddr;
-{ return S_iioctl_siocsifdstaddr(reqport, ifnam, dstaddr); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	sockaddr_t dstaddr
-);
-#endif
-
-/* Routine iioctl_siocsifflags */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocsifflags
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, flags)
-	io_t reqport;
-	ifname_t ifnam;
-	short flags;
-{ return S_iioctl_siocsifflags(reqport, ifnam, flags); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	short flags
-);
-#endif
-
-/* Routine iioctl_siocgifflags */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocgifflags
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, flags)
-	io_t reqport;
-	ifname_t ifnam;
-	short *flags;
-{ return S_iioctl_siocgifflags(reqport, ifnam, flags); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	short *flags
-);
-#endif
-
-/* Routine iioctl_siocsifbrdaddr */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocsifbrdaddr
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, brdaddr)
-	io_t reqport;
-	ifname_t ifnam;
-	sockaddr_t brdaddr;
-{ return S_iioctl_siocsifbrdaddr(reqport, ifnam, brdaddr); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	sockaddr_t brdaddr
-);
-#endif
-
-/* Routine iioctl_siocsifnetmask */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocsifnetmask
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, netmask)
-	io_t reqport;
-	ifname_t ifnam;
-	sockaddr_t netmask;
-{ return S_iioctl_siocsifnetmask(reqport, ifnam, netmask); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	sockaddr_t netmask
-);
-#endif
-
-/* Routine iioctl_siocgifmetric */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocgifmetric
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, metric)
-	io_t reqport;
-	ifname_t ifnam;
-	int *metric;
-{ return S_iioctl_siocgifmetric(reqport, ifnam, metric); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	int *metric
-);
-#endif
-
-/* Routine iioctl_siocsifmetric */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocsifmetric
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, metric)
-	io_t reqport;
-	ifname_t ifnam;
-	int metric;
-{ return S_iioctl_siocsifmetric(reqport, ifnam, metric); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	int metric
-);
-#endif
-
-/* Routine iioctl_siocdifaddr */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocdifaddr
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, addr)
-	io_t reqport;
-	ifname_t ifnam;
-	sockaddr_t addr;
-{ return S_iioctl_siocdifaddr(reqport, ifnam, addr); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	sockaddr_t addr
-);
-#endif
-
-/* Routine iioctl_siocgifaddr */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocgifaddr
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, addr)
-	io_t reqport;
-	ifname_t ifnam;
-	sockaddr_t *addr;
-{ return S_iioctl_siocgifaddr(reqport, ifnam, addr); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	sockaddr_t *addr
-);
-#endif
-
-/* Routine iioctl_siocgifdstaddr */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocgifdstaddr
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, dstaddr)
-	io_t reqport;
-	ifname_t ifnam;
-	sockaddr_t *dstaddr;
-{ return S_iioctl_siocgifdstaddr(reqport, ifnam, dstaddr); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	sockaddr_t *dstaddr
-);
-#endif
-
-/* Routine iioctl_siocgifbrdaddr */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocgifbrdaddr
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, brdaddr)
-	io_t reqport;
-	ifname_t ifnam;
-	sockaddr_t *brdaddr;
-{ return S_iioctl_siocgifbrdaddr(reqport, ifnam, brdaddr); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	sockaddr_t *brdaddr
-);
-#endif
-
-/* Routine iioctl_siocgifnetmask */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocgifnetmask
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, netmask)
-	io_t reqport;
-	ifname_t ifnam;
-	sockaddr_t *netmask;
-{ return S_iioctl_siocgifnetmask(reqport, ifnam, netmask); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	sockaddr_t *netmask
-);
-#endif
-
-/* Routine iioctl_siocgifhwaddr */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocgifhwaddr
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, netmask)
-	io_t reqport;
-	ifname_t ifnam;
-	sockaddr_t *netmask;
-{ return S_iioctl_siocgifhwaddr(reqport, ifnam, netmask); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	sockaddr_t *netmask
-);
-#endif
-
-/* Routine iioctl_siocgifmtu */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocgifmtu
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, mtu)
-	io_t reqport;
-	ifname_t ifnam;
-	int *mtu;
-{ return S_iioctl_siocgifmtu(reqport, ifnam, mtu); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	int *mtu
-);
-#endif
-
-/* Routine iioctl_siocsifmtu */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocsifmtu
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, mtu)
-	io_t reqport;
-	ifname_t ifnam;
-	int mtu;
-{ return S_iioctl_siocsifmtu(reqport, ifnam, mtu); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	int mtu
-);
-#endif
-
-/* Routine iioctl_siocgifindex */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocgifindex
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, index)
-	io_t reqport;
-	ifname_t ifnam;
-	int *index;
-{ return S_iioctl_siocgifindex(reqport, ifnam, index); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	int *index
-);
-#endif
-
-/* Routine iioctl_siocgifname */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_iioctl_siocgifname
-#if	defined(LINTLIBRARY)
-    (reqport, ifnam, index)
-	io_t reqport;
-	ifname_t ifnam;
-	int *index;
-{ return S_iioctl_siocgifname(reqport, ifnam, index); }
-#else
-(
-	io_t reqport,
-	ifname_t ifnam,
-	int *index
-);
-#endif
-
-#endif	/* not defined(_iioctl_server_) */
diff --git a/pfinet.old/io_S.h b/pfinet.old/io_S.h
deleted file mode 100644
index 10a2557c..00000000
--- a/pfinet.old/io_S.h
+++ /dev/null
@@ -1,663 +0,0 @@
-#ifndef	_io_server_
-#define	_io_server_
-
-/* Module io */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <device/net_status.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <hurd/hurd_types.h>
-#include "pfinet.h"
-
-/* Routine io_write */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_write
-#if	defined(LINTLIBRARY)
-    (io_object, data, dataCnt, offset, amount)
-	sock_user_t io_object;
-	data_t data;
-	mach_msg_type_number_t dataCnt;
-	loff_t offset;
-	vm_size_t *amount;
-{ return S_io_write(io_object, data, dataCnt, offset, amount); }
-#else
-(
-	sock_user_t io_object,
-	data_t data,
-	mach_msg_type_number_t dataCnt,
-	loff_t offset,
-	vm_size_t *amount
-);
-#endif
-
-/* Routine io_read */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_read
-#if	defined(LINTLIBRARY)
-    (io_object, data, dataCnt, offset, amount)
-	sock_user_t io_object;
-	data_t *data;
-	mach_msg_type_number_t *dataCnt;
-	loff_t offset;
-	vm_size_t amount;
-{ return S_io_read(io_object, data, dataCnt, offset, amount); }
-#else
-(
-	sock_user_t io_object,
-	data_t *data,
-	mach_msg_type_number_t *dataCnt,
-	loff_t offset,
-	vm_size_t amount
-);
-#endif
-
-/* Routine io_seek */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_seek
-#if	defined(LINTLIBRARY)
-    (io_object, offset, whence, newp)
-	sock_user_t io_object;
-	loff_t offset;
-	int whence;
-	loff_t *newp;
-{ return S_io_seek(io_object, offset, whence, newp); }
-#else
-(
-	sock_user_t io_object,
-	loff_t offset,
-	int whence,
-	loff_t *newp
-);
-#endif
-
-/* Routine io_readable */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_readable
-#if	defined(LINTLIBRARY)
-    (io_object, amount)
-	sock_user_t io_object;
-	vm_size_t *amount;
-{ return S_io_readable(io_object, amount); }
-#else
-(
-	sock_user_t io_object,
-	vm_size_t *amount
-);
-#endif
-
-/* Routine io_set_all_openmodes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_set_all_openmodes
-#if	defined(LINTLIBRARY)
-    (io_object, newbits)
-	sock_user_t io_object;
-	int newbits;
-{ return S_io_set_all_openmodes(io_object, newbits); }
-#else
-(
-	sock_user_t io_object,
-	int newbits
-);
-#endif
-
-/* Routine io_get_openmodes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_get_openmodes
-#if	defined(LINTLIBRARY)
-    (io_object, bits)
-	sock_user_t io_object;
-	int *bits;
-{ return S_io_get_openmodes(io_object, bits); }
-#else
-(
-	sock_user_t io_object,
-	int *bits
-);
-#endif
-
-/* Routine io_set_some_openmodes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_set_some_openmodes
-#if	defined(LINTLIBRARY)
-    (io_object, bits_to_set)
-	sock_user_t io_object;
-	int bits_to_set;
-{ return S_io_set_some_openmodes(io_object, bits_to_set); }
-#else
-(
-	sock_user_t io_object,
-	int bits_to_set
-);
-#endif
-
-/* Routine io_clear_some_openmodes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_clear_some_openmodes
-#if	defined(LINTLIBRARY)
-    (io_object, bits_to_clear)
-	sock_user_t io_object;
-	int bits_to_clear;
-{ return S_io_clear_some_openmodes(io_object, bits_to_clear); }
-#else
-(
-	sock_user_t io_object,
-	int bits_to_clear
-);
-#endif
-
-/* Routine io_async */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_async
-#if	defined(LINTLIBRARY)
-    (io_object, notify_port, async_id_port, async_id_portPoly)
-	sock_user_t io_object;
-	mach_port_t notify_port;
-	mach_port_t *async_id_port;
-	mach_msg_type_name_t *async_id_portPoly;
-{ return S_io_async(io_object, notify_port, async_id_port, async_id_portPoly); }
-#else
-(
-	sock_user_t io_object,
-	mach_port_t notify_port,
-	mach_port_t *async_id_port,
-	mach_msg_type_name_t *async_id_portPoly
-);
-#endif
-
-/* Routine io_mod_owner */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_mod_owner
-#if	defined(LINTLIBRARY)
-    (io_object, owner)
-	sock_user_t io_object;
-	pid_t owner;
-{ return S_io_mod_owner(io_object, owner); }
-#else
-(
-	sock_user_t io_object,
-	pid_t owner
-);
-#endif
-
-/* Routine io_get_owner */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_get_owner
-#if	defined(LINTLIBRARY)
-    (io_object, owner)
-	sock_user_t io_object;
-	pid_t *owner;
-{ return S_io_get_owner(io_object, owner); }
-#else
-(
-	sock_user_t io_object,
-	pid_t *owner
-);
-#endif
-
-/* Routine io_get_icky_async_id */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_get_icky_async_id
-#if	defined(LINTLIBRARY)
-    (io_object, icky_async_id_port, icky_async_id_portPoly)
-	sock_user_t io_object;
-	mach_port_t *icky_async_id_port;
-	mach_msg_type_name_t *icky_async_id_portPoly;
-{ return S_io_get_icky_async_id(io_object, icky_async_id_port, icky_async_id_portPoly); }
-#else
-(
-	sock_user_t io_object,
-	mach_port_t *icky_async_id_port,
-	mach_msg_type_name_t *icky_async_id_portPoly
-);
-#endif
-
-/* Routine io_select */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_select
-#if	defined(LINTLIBRARY)
-    (io_object, reply, replyPoly, select_type)
-	sock_user_t io_object;
-	mach_port_t reply;
-	mach_msg_type_name_t replyPoly;
-	int *select_type;
-{ return S_io_select(io_object, reply, replyPoly, select_type); }
-#else
-(
-	sock_user_t io_object,
-	mach_port_t reply,
-	mach_msg_type_name_t replyPoly,
-	int *select_type
-);
-#endif
-
-/* Routine io_stat */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_stat
-#if	defined(LINTLIBRARY)
-    (stat_object, stat_info)
-	sock_user_t stat_object;
-	io_statbuf_t *stat_info;
-{ return S_io_stat(stat_object, stat_info); }
-#else
-(
-	sock_user_t stat_object,
-	io_statbuf_t *stat_info
-);
-#endif
-
-/* SimpleRoutine io_reauthenticate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_reauthenticate
-#if	defined(LINTLIBRARY)
-    (auth_object, rendezvous2)
-	sock_user_t auth_object;
-	mach_port_t rendezvous2;
-{ return S_io_reauthenticate(auth_object, rendezvous2); }
-#else
-(
-	sock_user_t auth_object,
-	mach_port_t rendezvous2
-);
-#endif
-
-/* Routine io_restrict_auth */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_restrict_auth
-#if	defined(LINTLIBRARY)
-    (io_object, new_object, new_objectPoly, uids, uidsCnt, gids, gidsCnt)
-	sock_user_t io_object;
-	mach_port_t *new_object;
-	mach_msg_type_name_t *new_objectPoly;
-	idarray_t uids;
-	mach_msg_type_number_t uidsCnt;
-	idarray_t gids;
-	mach_msg_type_number_t gidsCnt;
-{ return S_io_restrict_auth(io_object, new_object, new_objectPoly, uids, uidsCnt, gids, gidsCnt); }
-#else
-(
-	sock_user_t io_object,
-	mach_port_t *new_object,
-	mach_msg_type_name_t *new_objectPoly,
-	idarray_t uids,
-	mach_msg_type_number_t uidsCnt,
-	idarray_t gids,
-	mach_msg_type_number_t gidsCnt
-);
-#endif
-
-/* Routine io_duplicate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_duplicate
-#if	defined(LINTLIBRARY)
-    (io_object, newport, newportPoly)
-	sock_user_t io_object;
-	mach_port_t *newport;
-	mach_msg_type_name_t *newportPoly;
-{ return S_io_duplicate(io_object, newport, newportPoly); }
-#else
-(
-	sock_user_t io_object,
-	mach_port_t *newport,
-	mach_msg_type_name_t *newportPoly
-);
-#endif
-
-/* Routine io_server_version */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_server_version
-#if	defined(LINTLIBRARY)
-    (vers_object, server_name, server_major_version, server_minor_version, server_edit_level)
-	sock_user_t vers_object;
-	string_t server_name;
-	int *server_major_version;
-	int *server_minor_version;
-	int *server_edit_level;
-{ return S_io_server_version(vers_object, server_name, server_major_version, server_minor_version, server_edit_level); }
-#else
-(
-	sock_user_t vers_object,
-	string_t server_name,
-	int *server_major_version,
-	int *server_minor_version,
-	int *server_edit_level
-);
-#endif
-
-/* Routine io_map */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_map
-#if	defined(LINTLIBRARY)
-    (io_object, memobjrd, memobjrdPoly, memobjwt, memobjwtPoly)
-	sock_user_t io_object;
-	mach_port_t *memobjrd;
-	mach_msg_type_name_t *memobjrdPoly;
-	mach_port_t *memobjwt;
-	mach_msg_type_name_t *memobjwtPoly;
-{ return S_io_map(io_object, memobjrd, memobjrdPoly, memobjwt, memobjwtPoly); }
-#else
-(
-	sock_user_t io_object,
-	mach_port_t *memobjrd,
-	mach_msg_type_name_t *memobjrdPoly,
-	mach_port_t *memobjwt,
-	mach_msg_type_name_t *memobjwtPoly
-);
-#endif
-
-/* Routine io_map_cntl */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_map_cntl
-#if	defined(LINTLIBRARY)
-    (io_object, memobj, memobjPoly)
-	sock_user_t io_object;
-	mach_port_t *memobj;
-	mach_msg_type_name_t *memobjPoly;
-{ return S_io_map_cntl(io_object, memobj, memobjPoly); }
-#else
-(
-	sock_user_t io_object,
-	mach_port_t *memobj,
-	mach_msg_type_name_t *memobjPoly
-);
-#endif
-
-/* Routine io_get_conch */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_get_conch
-#if	defined(LINTLIBRARY)
-    (io_object)
-	sock_user_t io_object;
-{ return S_io_get_conch(io_object); }
-#else
-(
-	sock_user_t io_object
-);
-#endif
-
-/* Routine io_release_conch */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_release_conch
-#if	defined(LINTLIBRARY)
-    (io_object)
-	sock_user_t io_object;
-{ return S_io_release_conch(io_object); }
-#else
-(
-	sock_user_t io_object
-);
-#endif
-
-/* Routine io_eofnotify */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_eofnotify
-#if	defined(LINTLIBRARY)
-    (io_object)
-	sock_user_t io_object;
-{ return S_io_eofnotify(io_object); }
-#else
-(
-	sock_user_t io_object
-);
-#endif
-
-/* Routine io_prenotify */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_prenotify
-#if	defined(LINTLIBRARY)
-    (io_object, write_start, write_end)
-	sock_user_t io_object;
-	vm_offset_t write_start;
-	vm_offset_t write_end;
-{ return S_io_prenotify(io_object, write_start, write_end); }
-#else
-(
-	sock_user_t io_object,
-	vm_offset_t write_start,
-	vm_offset_t write_end
-);
-#endif
-
-/* Routine io_postnotify */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_postnotify
-#if	defined(LINTLIBRARY)
-    (io_object, write_start, write_end)
-	sock_user_t io_object;
-	vm_offset_t write_start;
-	vm_offset_t write_end;
-{ return S_io_postnotify(io_object, write_start, write_end); }
-#else
-(
-	sock_user_t io_object,
-	vm_offset_t write_start,
-	vm_offset_t write_end
-);
-#endif
-
-/* Routine io_readnotify */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_readnotify
-#if	defined(LINTLIBRARY)
-    (io_object)
-	sock_user_t io_object;
-{ return S_io_readnotify(io_object); }
-#else
-(
-	sock_user_t io_object
-);
-#endif
-
-/* Routine io_readsleep */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_readsleep
-#if	defined(LINTLIBRARY)
-    (io_object)
-	sock_user_t io_object;
-{ return S_io_readsleep(io_object); }
-#else
-(
-	sock_user_t io_object
-);
-#endif
-
-/* Routine io_sigio */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_sigio
-#if	defined(LINTLIBRARY)
-    (io_object)
-	sock_user_t io_object;
-{ return S_io_sigio(io_object); }
-#else
-(
-	sock_user_t io_object
-);
-#endif
-
-/* Routine io_pathconf */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_pathconf
-#if	defined(LINTLIBRARY)
-    (io_object, name, value)
-	sock_user_t io_object;
-	int name;
-	int *value;
-{ return S_io_pathconf(io_object, name, value); }
-#else
-(
-	sock_user_t io_object,
-	int name,
-	int *value
-);
-#endif
-
-/* Routine io_identity */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_identity
-#if	defined(LINTLIBRARY)
-    (io_object, idport, idportPoly, fsidport, fsidportPoly, fileno)
-	sock_user_t io_object;
-	mach_port_t *idport;
-	mach_msg_type_name_t *idportPoly;
-	mach_port_t *fsidport;
-	mach_msg_type_name_t *fsidportPoly;
-	ino64_t *fileno;
-{ return S_io_identity(io_object, idport, idportPoly, fsidport, fsidportPoly, fileno); }
-#else
-(
-	sock_user_t io_object,
-	mach_port_t *idport,
-	mach_msg_type_name_t *idportPoly,
-	mach_port_t *fsidport,
-	mach_msg_type_name_t *fsidportPoly,
-	ino64_t *fileno
-);
-#endif
-
-/* Routine io_revoke */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_io_revoke
-#if	defined(LINTLIBRARY)
-    (io_object)
-	sock_user_t io_object;
-{ return S_io_revoke(io_object); }
-#else
-(
-	sock_user_t io_object
-);
-#endif
-
-#endif	/* not defined(_io_server_) */
diff --git a/pfinet.old/pfinet_S.h b/pfinet.old/pfinet_S.h
deleted file mode 100644
index 983931f1..00000000
--- a/pfinet.old/pfinet_S.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef	_pfinet_server_
-#define	_pfinet_server_
-
-/* Module pfinet */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <device/net_status.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <hurd/hurd_types.h>
-
-/* Routine pfinet_siocgifconf */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_pfinet_siocgifconf
-#if	defined(LINTLIBRARY)
-    (port, amount, buf, bufCnt)
-	io_t port;
-	vm_size_t amount;
-	data_t *buf;
-	mach_msg_type_number_t *bufCnt;
-{ return S_pfinet_siocgifconf(port, amount, buf, bufCnt); }
-#else
-(
-	io_t port,
-	vm_size_t amount,
-	data_t *buf,
-	mach_msg_type_number_t *bufCnt
-);
-#endif
-
-#endif	/* not defined(_pfinet_server_) */
diff --git a/pfinet.old/socket_S.h b/pfinet.old/socket_S.h
deleted file mode 100644
index b20bef01..00000000
--- a/pfinet.old/socket_S.h
+++ /dev/null
@@ -1,408 +0,0 @@
-#ifndef	_socket_server_
-#define	_socket_server_
-
-/* Module socket */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <device/net_status.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <hurd/hurd_types.h>
-#include "pfinet.h"
-
-/* Routine socket_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_create
-#if	defined(LINTLIBRARY)
-    (server, sock_type, protocol, sock, sockPoly)
-	trivfs_protid_t server;
-	int sock_type;
-	int protocol;
-	mach_port_t *sock;
-	mach_msg_type_name_t *sockPoly;
-{ return S_socket_create(server, sock_type, protocol, sock, sockPoly); }
-#else
-(
-	trivfs_protid_t server,
-	int sock_type,
-	int protocol,
-	mach_port_t *sock,
-	mach_msg_type_name_t *sockPoly
-);
-#endif
-
-/* Routine socket_listen */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_listen
-#if	defined(LINTLIBRARY)
-    (sock, queue_limit)
-	sock_user_t sock;
-	int queue_limit;
-{ return S_socket_listen(sock, queue_limit); }
-#else
-(
-	sock_user_t sock,
-	int queue_limit
-);
-#endif
-
-/* Routine socket_accept */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_accept
-#if	defined(LINTLIBRARY)
-    (sock, conn_sock, conn_sockPoly, peer_addr, peer_addrPoly)
-	sock_user_t sock;
-	mach_port_t *conn_sock;
-	mach_msg_type_name_t *conn_sockPoly;
-	mach_port_t *peer_addr;
-	mach_msg_type_name_t *peer_addrPoly;
-{ return S_socket_accept(sock, conn_sock, conn_sockPoly, peer_addr, peer_addrPoly); }
-#else
-(
-	sock_user_t sock,
-	mach_port_t *conn_sock,
-	mach_msg_type_name_t *conn_sockPoly,
-	mach_port_t *peer_addr,
-	mach_msg_type_name_t *peer_addrPoly
-);
-#endif
-
-/* Routine socket_connect */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_connect
-#if	defined(LINTLIBRARY)
-    (sock, addr)
-	sock_user_t sock;
-	sock_addr_t addr;
-{ return S_socket_connect(sock, addr); }
-#else
-(
-	sock_user_t sock,
-	sock_addr_t addr
-);
-#endif
-
-/* Routine socket_bind */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_bind
-#if	defined(LINTLIBRARY)
-    (sock, addr)
-	sock_user_t sock;
-	sock_addr_t addr;
-{ return S_socket_bind(sock, addr); }
-#else
-(
-	sock_user_t sock,
-	sock_addr_t addr
-);
-#endif
-
-/* Routine socket_name */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_name
-#if	defined(LINTLIBRARY)
-    (sock, addr, addrPoly)
-	sock_user_t sock;
-	mach_port_t *addr;
-	mach_msg_type_name_t *addrPoly;
-{ return S_socket_name(sock, addr, addrPoly); }
-#else
-(
-	sock_user_t sock,
-	mach_port_t *addr,
-	mach_msg_type_name_t *addrPoly
-);
-#endif
-
-/* Routine socket_peername */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_peername
-#if	defined(LINTLIBRARY)
-    (sock, addr, addrPoly)
-	sock_user_t sock;
-	mach_port_t *addr;
-	mach_msg_type_name_t *addrPoly;
-{ return S_socket_peername(sock, addr, addrPoly); }
-#else
-(
-	sock_user_t sock,
-	mach_port_t *addr,
-	mach_msg_type_name_t *addrPoly
-);
-#endif
-
-/* Routine socket_connect2 */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_connect2
-#if	defined(LINTLIBRARY)
-    (sock1, sock2)
-	sock_user_t sock1;
-	sock_user_t sock2;
-{ return S_socket_connect2(sock1, sock2); }
-#else
-(
-	sock_user_t sock1,
-	sock_user_t sock2
-);
-#endif
-
-/* Routine socket_create_address */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_create_address
-#if	defined(LINTLIBRARY)
-    (server, sockaddr_type, sockaddr, sockaddrCnt, addr, addrPoly)
-	mach_port_t server;
-	int sockaddr_type;
-	data_t sockaddr;
-	mach_msg_type_number_t sockaddrCnt;
-	mach_port_t *addr;
-	mach_msg_type_name_t *addrPoly;
-{ return S_socket_create_address(server, sockaddr_type, sockaddr, sockaddrCnt, addr, addrPoly); }
-#else
-(
-	mach_port_t server,
-	int sockaddr_type,
-	data_t sockaddr,
-	mach_msg_type_number_t sockaddrCnt,
-	mach_port_t *addr,
-	mach_msg_type_name_t *addrPoly
-);
-#endif
-
-/* Routine socket_fabricate_address */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_fabricate_address
-#if	defined(LINTLIBRARY)
-    (server, sockaddr_type, addr, addrPoly)
-	mach_port_t server;
-	int sockaddr_type;
-	mach_port_t *addr;
-	mach_msg_type_name_t *addrPoly;
-{ return S_socket_fabricate_address(server, sockaddr_type, addr, addrPoly); }
-#else
-(
-	mach_port_t server,
-	int sockaddr_type,
-	mach_port_t *addr,
-	mach_msg_type_name_t *addrPoly
-);
-#endif
-
-/* Routine socket_whatis_address */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_whatis_address
-#if	defined(LINTLIBRARY)
-    (addr, sockaddr_type, sockaddr, sockaddrCnt)
-	sock_addr_t addr;
-	int *sockaddr_type;
-	data_t *sockaddr;
-	mach_msg_type_number_t *sockaddrCnt;
-{ return S_socket_whatis_address(addr, sockaddr_type, sockaddr, sockaddrCnt); }
-#else
-(
-	sock_addr_t addr,
-	int *sockaddr_type,
-	data_t *sockaddr,
-	mach_msg_type_number_t *sockaddrCnt
-);
-#endif
-
-/* Routine socket_shutdown */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_shutdown
-#if	defined(LINTLIBRARY)
-    (sock, direction)
-	sock_user_t sock;
-	int direction;
-{ return S_socket_shutdown(sock, direction); }
-#else
-(
-	sock_user_t sock,
-	int direction
-);
-#endif
-
-/* Routine socket_getopt */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_getopt
-#if	defined(LINTLIBRARY)
-    (sock, level, option, optval, optvalCnt)
-	sock_user_t sock;
-	int level;
-	int option;
-	data_t *optval;
-	mach_msg_type_number_t *optvalCnt;
-{ return S_socket_getopt(sock, level, option, optval, optvalCnt); }
-#else
-(
-	sock_user_t sock,
-	int level,
-	int option,
-	data_t *optval,
-	mach_msg_type_number_t *optvalCnt
-);
-#endif
-
-/* Routine socket_setopt */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_setopt
-#if	defined(LINTLIBRARY)
-    (sock, level, option, optval, optvalCnt)
-	sock_user_t sock;
-	int level;
-	int option;
-	data_t optval;
-	mach_msg_type_number_t optvalCnt;
-{ return S_socket_setopt(sock, level, option, optval, optvalCnt); }
-#else
-(
-	sock_user_t sock,
-	int level,
-	int option,
-	data_t optval,
-	mach_msg_type_number_t optvalCnt
-);
-#endif
-
-/* Routine socket_send */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_send
-#if	defined(LINTLIBRARY)
-    (sock, addr, flags, data, dataCnt, ports, portsCnt, control, controlCnt, amount)
-	sock_user_t sock;
-	sock_addr_t addr;
-	int flags;
-	data_t data;
-	mach_msg_type_number_t dataCnt;
-	portarray_t ports;
-	mach_msg_type_number_t portsCnt;
-	data_t control;
-	mach_msg_type_number_t controlCnt;
-	vm_size_t *amount;
-{ return S_socket_send(sock, addr, flags, data, dataCnt, ports, portsCnt, control, controlCnt, amount); }
-#else
-(
-	sock_user_t sock,
-	sock_addr_t addr,
-	int flags,
-	data_t data,
-	mach_msg_type_number_t dataCnt,
-	portarray_t ports,
-	mach_msg_type_number_t portsCnt,
-	data_t control,
-	mach_msg_type_number_t controlCnt,
-	vm_size_t *amount
-);
-#endif
-
-/* Routine socket_recv */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_socket_recv
-#if	defined(LINTLIBRARY)
-    (sock, addr, addrPoly, flags, data, dataCnt, ports, portsPoly, portsCnt, control, controlCnt, outflags, amount)
-	sock_user_t sock;
-	mach_port_t *addr;
-	mach_msg_type_name_t *addrPoly;
-	int flags;
-	data_t *data;
-	mach_msg_type_number_t *dataCnt;
-	portarray_t *ports;
-	mach_msg_type_name_t *portsPoly;
-	mach_msg_type_number_t *portsCnt;
-	data_t *control;
-	mach_msg_type_number_t *controlCnt;
-	int *outflags;
-	vm_size_t amount;
-{ return S_socket_recv(sock, addr, addrPoly, flags, data, dataCnt, ports, portsPoly, portsCnt, control, controlCnt, outflags, amount); }
-#else
-(
-	sock_user_t sock,
-	mach_port_t *addr,
-	mach_msg_type_name_t *addrPoly,
-	int flags,
-	data_t *data,
-	mach_msg_type_number_t *dataCnt,
-	portarray_t *ports,
-	mach_msg_type_name_t *portsPoly,
-	mach_msg_type_number_t *portsCnt,
-	data_t *control,
-	mach_msg_type_number_t *controlCnt,
-	int *outflags,
-	vm_size_t amount
-);
-#endif
-
-#endif	/* not defined(_socket_server_) */
diff --git a/pfinet.old/startup_notify_S.h b/pfinet.old/startup_notify_S.h
deleted file mode 100644
index ed1ddc3b..00000000
--- a/pfinet.old/startup_notify_S.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef	_startup_notify_server_
-#define	_startup_notify_server_
-
-/* Module startup_notify */
-
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <device/net_status.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <hurd/hurd_types.h>
-
-/* Routine startup_dosync */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif
-kern_return_t S_startup_dosync
-#if	defined(LINTLIBRARY)
-    (notify_port)
-	mach_port_t notify_port;
-{ return S_startup_dosync(notify_port); }
-#else
-(
-	mach_port_t notify_port
-);
-#endif
-
-#endif	/* not defined(_startup_notify_server_) */