Make RPC input array parameters const

This follows mig's cf4bcc3f1435 ("Also add const qualifiers on server
side")

93 files changed, 301 insertions, 301 deletions

diff --git a/auth/auth.c b/auth/auth.c
index 886a9cfb..29c9fd8d 100644
--- a/auth/auth.c
+++ b/auth/auth.c
@@ -115,11 +115,11 @@ S_auth_getids (struct authhandle *auth,
 /* Implement auth_makeauth as described in <hurd/auth.defs>. */
 kern_return_t
 S_auth_makeauth (struct authhandle *auth,
-		 mach_port_t *authpts, size_t nauths,
-		 uid_t *euids, size_t neuids,
-		 uid_t *auids, size_t nauids,
-		 uid_t *egids, size_t negids,
-		 uid_t *agids, size_t nagids,
+		 const mach_port_t *authpts, size_t nauths,
+		 const uid_t *euids, size_t neuids,
+		 const uid_t *auids, size_t nauids,
+		 const uid_t *egids, size_t negids,
+		 const uid_t *agids, size_t nagids,
 		 mach_port_t *newhandle)
 {
   struct authhandle *newauth, *auths[1 + nauths];
diff --git a/boot/boot.c b/boot/boot.c
index 1cc6152f..d45d8bb9 100644
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -945,7 +945,7 @@ ds_device_open (mach_port_t master_port,
 		mach_port_t reply_port,
 		mach_msg_type_name_t reply_type,
 		dev_mode_t mode,
-		dev_name_t name,
+		const_dev_name_t name,
 		mach_port_t *device,
 		mach_msg_type_name_t *devicetype)
 {
@@ -1057,7 +1057,7 @@ ds_device_write_inband (device_t device,
 			mach_msg_type_name_t reply_type,
 			dev_mode_t mode,
 			recnum_t recnum,
-			io_buf_ptr_inband_t data,
+			const_io_buf_ptr_inband_t data,
 			size_t datalen,
 			int *bytes_written)
 {
@@ -1409,7 +1409,7 @@ kern_return_t
 S_io_write (mach_port_t object,
 	    mach_port_t reply_port,
 	    mach_msg_type_name_t reply_type,
-	    data_t data,
+	    const_data_t data,
 	    mach_msg_type_number_t datalen,
 	    off_t offset,
 	    mach_msg_type_number_t *amtwritten)
@@ -1699,9 +1699,9 @@ S_io_restrict_auth (mach_port_t object,
 		    mach_msg_type_name_t reply_type,
 		    mach_port_t *newobject,
 		    mach_msg_type_name_t *newobjtype,
-		    uid_t *uids,
+		    const uid_t *uids,
 		    size_t nuids,
-		    uid_t *gids,
+		    const uid_t *gids,
 		    size_t ngids)
 {
   if (object != pseudo_console)
@@ -1906,7 +1906,7 @@ kern_return_t S_term_open_ctty
 kern_return_t S_term_set_nodename
 (
 	io_t terminal,
-	string_t name
+	const_string_t name
 )
 { return EOPNOTSUPP; }
 
diff --git a/console-client/trans.c b/console-client/trans.c
index 0285a234..17cface0 100644
--- a/console-client/trans.c
+++ b/console-client/trans.c
@@ -594,7 +594,7 @@ netfs_S_io_read (struct protid *user,
 
 error_t
 netfs_S_io_write (struct protid *user,
-		  data_t data,
+		  const_data_t data,
 		  mach_msg_type_number_t datalen,
 		  off_t offset,
 		  mach_msg_type_number_t *amount)
diff --git a/console/console.c b/console/console.c
index ab684198..ad31fba2 100644
--- a/console/console.c
+++ b/console/console.c
@@ -1860,22 +1860,22 @@ S_tioctl_tiocgeta (struct protid *cred, modes_t modes, ccs_t ccs,
 }
 
 kern_return_t
-S_tioctl_tiocseta (struct protid *cred, modes_t modes, ccs_t ccs,
-		   speeds_t speeds)
+S_tioctl_tiocseta (struct protid *cred, const modes_t modes, const ccs_t ccs,
+		   const speeds_t speeds)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocsetaw (struct protid *cred, modes_t modes, ccs_t ccs,
-		    speeds_t speeds)
+S_tioctl_tiocsetaw (struct protid *cred, const modes_t modes, const ccs_t ccs,
+		    const speeds_t speeds)
 {
   return EOPNOTSUPP;
 }
 
 kern_return_t
-S_tioctl_tiocsetaf (struct protid *cred, modes_t modes, ccs_t ccs,
-		    speeds_t speeds)
+S_tioctl_tiocsetaf (struct protid *cred, const modes_t modes, const ccs_t ccs,
+		    const speeds_t speeds)
 {
   return EOPNOTSUPP;
 }
diff --git a/devnode/devnode.c b/devnode/devnode.c
index 6f2c1c2a..7ec4f209 100644
--- a/devnode/devnode.c
+++ b/devnode/devnode.c
@@ -140,7 +140,7 @@ do_mach_notify_dead_name (struct port_info *pi,
 kern_return_t
 ds_device_open (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, 
+		dev_mode_t mode, const_dev_name_t name, mach_port_t *device, 
 		mach_msg_type_name_t *devicetype)
 {
   error_t err;
@@ -192,7 +192,7 @@ ds_device_write (device_t device, mach_port_t reply_port,
 kern_return_t
 ds_device_write_inband (device_t device, mach_port_t reply_port,
 			mach_msg_type_name_t reply_type, dev_mode_t mode,
-			recnum_t recnum, io_buf_ptr_inband_t data,
+			recnum_t recnum, const_io_buf_ptr_inband_t data,
 			size_t datalen, int *bytes_written)
 {
   return D_INVALID_OPERATION;
diff --git a/eth-multiplexer/device_impl.c b/eth-multiplexer/device_impl.c
index a029f0be..b6c30840 100644
--- a/eth-multiplexer/device_impl.c
+++ b/eth-multiplexer/device_impl.c
@@ -44,7 +44,7 @@ extern struct port_info *notify_pi;
 kern_return_t
 ds_device_open (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,
+		dev_mode_t mode, const_dev_name_t name, mach_port_t *device,
 	 	mach_msg_type_name_t *devicetype)
 {
   struct vether_device *dev;
@@ -121,7 +121,7 @@ ds_device_write (struct vether_device *vdev, mach_port_t reply_port,
 kern_return_t
 ds_device_write_inband (struct vether_device *vdev, mach_port_t reply_port,
 			mach_msg_type_name_t reply_type, dev_mode_t mode,
-			recnum_t recnum, io_buf_ptr_inband_t data,
+			recnum_t recnum, const_io_buf_ptr_inband_t data,
 			size_t datalen, int *bytes_written)
 {
   if (vdev == NULL)
diff --git a/exec/exec.c b/exec/exec.c
index eeb2715c..06589df9 100644
--- a/exec/exec.c
+++ b/exec/exec.c
@@ -1528,16 +1528,16 @@ S_exec_exec (struct trivfs_protid *protid,
 	     file_t file,
 	     task_t oldtask,
 	     int flags,
-	     data_t argv, mach_msg_type_number_t argvlen, boolean_t argv_copy,
-	     data_t envp, mach_msg_type_number_t envplen, boolean_t envp_copy,
-	     mach_port_t *dtable, mach_msg_type_number_t dtablesize,
+	     const_data_t argv, mach_msg_type_number_t argvlen, boolean_t argv_copy,
+	     const_data_t envp, mach_msg_type_number_t envplen, boolean_t envp_copy,
+	     const mach_port_t *dtable, mach_msg_type_number_t dtablesize,
 	     boolean_t dtable_copy,
-	     mach_port_t *portarray, mach_msg_type_number_t nports,
+	     const mach_port_t *portarray, mach_msg_type_number_t nports,
 	     boolean_t portarray_copy,
-	     int *intarray, mach_msg_type_number_t nints,
+	     const int *intarray, mach_msg_type_number_t nints,
 	     boolean_t intarray_copy,
-	     mach_port_t *deallocnames, mach_msg_type_number_t ndeallocnames,
-	     mach_port_t *destroynames, mach_msg_type_number_t ndestroynames)
+	     const mach_port_t *deallocnames, mach_msg_type_number_t ndeallocnames,
+	     const mach_port_t *destroynames, mach_msg_type_number_t ndestroynames)
 {
   return S_exec_exec_paths (protid,
 				file,
@@ -1562,21 +1562,21 @@ S_exec_exec_paths (struct trivfs_protid *protid,
 		       file_t file,
 		       task_t oldtask,
 		       int flags,
-		       string_t path,
-		       string_t abspath,
-		       char *argv, mach_msg_type_number_t argvlen,
+		       const_string_t path,
+		       const_string_t abspath,
+		       const char *argv, mach_msg_type_number_t argvlen,
 		       boolean_t argv_copy,
-		       char *envp, mach_msg_type_number_t envplen,
+		       const char *envp, mach_msg_type_number_t envplen,
 		       boolean_t envp_copy,
-		       mach_port_t *dtable, mach_msg_type_number_t dtablesize,
+		       const mach_port_t *dtable, mach_msg_type_number_t dtablesize,
 		       boolean_t dtable_copy,
-		       mach_port_t *portarray, mach_msg_type_number_t nports,
+		       const mach_port_t *portarray, mach_msg_type_number_t nports,
 		       boolean_t portarray_copy,
-		       int *intarray, mach_msg_type_number_t nints,
+		       const int *intarray, mach_msg_type_number_t nints,
 		       boolean_t intarray_copy,
-		       mach_port_t *deallocnames,
+		       const mach_port_t *deallocnames,
 		       mach_msg_type_number_t ndeallocnames,
-		       mach_port_t *destroynames,
+		       const mach_port_t *destroynames,
 		       mach_msg_type_number_t ndestroynames)
 {
   if (! protid)
@@ -1597,8 +1597,8 @@ S_exec_exec_paths (struct trivfs_protid *protid,
 
 kern_return_t
 S_exec_setexecdata (struct trivfs_protid *protid,
-		    mach_port_t *ports, mach_msg_type_number_t nports, int ports_copy,
-		    int *ints, mach_msg_type_number_t nints, int ints_copy)
+		    const mach_port_t *ports, mach_msg_type_number_t nports, int ports_copy,
+		    const int *ints, mach_msg_type_number_t nints, int ints_copy)
 {
   error_t err;
 
diff --git a/fatfs/main.c b/fatfs/main.c
index b3836f6f..ed8cf910 100644
--- a/fatfs/main.c
+++ b/fatfs/main.c
@@ -273,9 +273,9 @@ diskfs_readonly_changed (int readonly)
 error_t
 diskfs_S_fsys_getfile (struct diskfs_control *pt,
                       mach_port_t reply, mach_msg_type_name_t reply_type,
-                      uid_t *uids, mach_msg_type_number_t nuids,
-                      gid_t *gids, mach_msg_type_number_t ngids,
-                      data_t handle, mach_msg_type_number_t handle_len,
+                      const uid_t *uids, mach_msg_type_number_t nuids,
+                      const gid_t *gids, mach_msg_type_number_t ngids,
+                      const_data_t handle, mach_msg_type_number_t handle_len,
                       mach_port_t *file, mach_msg_type_name_t *file_type)
 {
   return EOPNOTSUPP;
diff --git a/libcons/dir-changed.c b/libcons/dir-changed.c
index 06c29701..9701b056 100644
--- a/libcons/dir-changed.c
+++ b/libcons/dir-changed.c
@@ -60,7 +60,7 @@ lookup_one (cons_t cons, char *name, vcons_list_t *vcons_entry)
 
 kern_return_t
 cons_S_dir_changed (cons_notify_t notify, natural_t tickno,
-		    dir_changed_type_t change, string_t name)
+		    dir_changed_type_t change, const_string_t name)
 {
   error_t err;
   cons_t cons;
diff --git a/libdiskfs/dir-link.c b/libdiskfs/dir-link.c
index 2e9cb626..5574fea4 100644
--- a/libdiskfs/dir-link.c
+++ b/libdiskfs/dir-link.c
@@ -22,7 +22,7 @@
 kern_return_t
 diskfs_S_dir_link (struct protid *dircred,
 		   struct protid *filecred,
-		   string_t name,
+		   const_string_t name,
 		   int excl)
 {
   struct node *np;		/* node being linked */
diff --git a/libdiskfs/dir-lookup.c b/libdiskfs/dir-lookup.c
index 3534facf..55439b08 100644
--- a/libdiskfs/dir-lookup.c
+++ b/libdiskfs/dir-lookup.c
@@ -30,7 +30,7 @@
 /* Implement dir_lookup as described in <hurd/fs.defs>. */
 error_t
 diskfs_S_dir_lookup (struct protid *dircred,
-		     string_t filename,
+		     const_string_t filename,
 		     int flags,
 		     mode_t mode,
 		     retry_type *do_retry,
diff --git a/libdiskfs/dir-mkdir.c b/libdiskfs/dir-mkdir.c
index f8c07a55..590d859d 100644
--- a/libdiskfs/dir-mkdir.c
+++ b/libdiskfs/dir-mkdir.c
@@ -21,7 +21,7 @@
 /* Implement dir_mkdir as found in <hurd/fs.defs>. */
 kern_return_t
 diskfs_S_dir_mkdir (struct protid *dircred,
-		    string_t name,
+		    const_string_t name,
 		    mode_t mode)
 {
   struct node *dnp;
diff --git a/libdiskfs/dir-rename.c b/libdiskfs/dir-rename.c
index b12dd018..eb123073 100644
--- a/libdiskfs/dir-rename.c
+++ b/libdiskfs/dir-rename.c
@@ -29,9 +29,9 @@ static pthread_mutex_t renamedirlock = PTHREAD_MUTEX_INITIALIZER;
 /* Implement dir_rename as described in <hurd/fs.defs>. */
 kern_return_t
 diskfs_S_dir_rename (struct protid *fromcred,
-		     string_t fromname,
+		     const_string_t fromname,
 		     struct protid *tocred,
-		     string_t toname,
+		     const_string_t toname,
 		     int excl)
 {
   struct node *fdp, *tdp, *fnp, *tnp, *tmpnp;
diff --git a/libdiskfs/dir-rmdir.c b/libdiskfs/dir-rmdir.c
index 8a29979f..7e328c35 100644
--- a/libdiskfs/dir-rmdir.c
+++ b/libdiskfs/dir-rmdir.c
@@ -22,7 +22,7 @@
 /* Implement dir_rmdir as described in <hurd/fs.defs>. */
 kern_return_t
 diskfs_S_dir_rmdir (struct protid *dircred,
-		    char *name)
+		    const_string_t name)
 {
   struct node *dnp;
   struct node *np = NULL;
diff --git a/libdiskfs/dir-unlink.c b/libdiskfs/dir-unlink.c
index 2a54cc38..5a8bef34 100644
--- a/libdiskfs/dir-unlink.c
+++ b/libdiskfs/dir-unlink.c
@@ -22,7 +22,7 @@
 /* Implement dir_unlink as described in <hurd/fs.defs>. */
 kern_return_t
 diskfs_S_dir_unlink (struct protid *dircred,
-		     string_t name)
+		     const_string_t name)
 {
   struct node *dnp;
   struct node *np;
diff --git a/libdiskfs/diskfs.h b/libdiskfs/diskfs.h
index 2390c64d..a9d1f6bb 100644
--- a/libdiskfs/diskfs.h
+++ b/libdiskfs/diskfs.h
@@ -1168,7 +1168,7 @@ void diskfs_console_stdio ();
 typedef struct protid *protid_t;
 
 kern_return_t diskfs_S_io_write (protid_t io_object,
-				 data_t data,
+				 const_data_t data,
 				 mach_msg_type_number_t dataCnt,
 				 loff_t offset,
 				 vm_size_t *amount);
diff --git a/libdiskfs/file-exec.c b/libdiskfs/file-exec.c
index 7625cf43..55b33a14 100644
--- a/libdiskfs/file-exec.c
+++ b/libdiskfs/file-exec.c
@@ -33,19 +33,19 @@ kern_return_t
 diskfs_S_file_exec (struct protid *cred,
 		    task_t task,
 		    int flags,
-		    data_t argv,
+		    const_data_t argv,
 		    size_t argvlen,
-		    data_t envp,
+		    const_data_t envp,
 		    size_t envplen,
-		    mach_port_t *fds,
+		    const mach_port_t *fds,
 		    size_t fdslen,
-		    mach_port_t *portarray,
+		    const mach_port_t *portarray,
 		    size_t portarraylen,
-		    int *intarray,
+		    const int *intarray,
 		    size_t intarraylen,
-		    mach_port_t *deallocnames,
+		    const mach_port_t *deallocnames,
 		    size_t deallocnameslen,
-		    mach_port_t *destroynames,
+		    const mach_port_t *destroynames,
 		    size_t destroynameslen)
 {
   return diskfs_S_file_exec_paths (cred,
@@ -66,21 +66,21 @@ kern_return_t
 diskfs_S_file_exec_paths (struct protid *cred,
 			  task_t task,
 			  int flags,
-			  string_t path,
-			  string_t abspath,
-			  char *argv,
+			  const_string_t path,
+			  const_string_t abspath,
+			  const_data_t argv,
 			  size_t argvlen,
-			  char *envp,
+			  const_data_t envp,
 			  size_t envplen,
-			  mach_port_t *fds,
+			  const mach_port_t *fds,
 			  size_t fdslen,
-			  mach_port_t *portarray,
+			  const mach_port_t *portarray,
 			  size_t portarraylen,
-			  int *intarray,
+			  const int *intarray,
 			  size_t intarraylen,
-			  mach_port_t *deallocnames,
+			  const mach_port_t *deallocnames,
 			  size_t deallocnameslen,
-			  mach_port_t *destroynames,
+			  const mach_port_t *destroynames,
 			  size_t destroynameslen)
 {
   struct node *np;
diff --git a/libdiskfs/file-set-trans.c b/libdiskfs/file-set-trans.c
index 4bcb918d..b55967f9 100644
--- a/libdiskfs/file-set-trans.c
+++ b/libdiskfs/file-set-trans.c
@@ -28,7 +28,7 @@ diskfs_S_file_set_translator (struct protid *cred,
 			      int passive_flags,
 			      int active_flags,
 			      int killtrans_flags,
-			      data_t passive,
+			      const_data_t passive,
 			      size_t passivelen,
 			      fsys_t active)
 {
@@ -139,7 +139,7 @@ diskfs_S_file_set_translator (struct protid *cred,
 		  /* Find the device number from the arguments
 		     of the translator. */
 		  int major, minor;
-		  char *arg;
+		  const char *arg;
 
 		  arg = passive + strlen (passive) + 1;
 		  assert_backtrace (arg <= passive + passivelen);
@@ -185,7 +185,7 @@ diskfs_S_file_set_translator (struct protid *cred,
 
 	      if (newmode == S_IFLNK)
 		{
-		  char *arg = passive + strlen (passive) + 1;
+		  const char *arg = passive + strlen (passive) + 1;
 		  assert_backtrace (arg <= passive + passivelen);
 		  if (arg == passive + passivelen)
 		    {
diff --git a/libdiskfs/fsys-forward.c b/libdiskfs/fsys-forward.c
index 0b88455c..8d5c2fda 100644
--- a/libdiskfs/fsys-forward.c
+++ b/libdiskfs/fsys-forward.c
@@ -31,7 +31,7 @@
 error_t
 diskfs_S_fsys_forward (mach_port_t server,
 		       mach_port_t reply, mach_msg_type_name_t reply_type,
-		       mach_port_t requestor, data_t argz, size_t argz_len)
+		       mach_port_t requestor, const_data_t argz, size_t argz_len)
 {
   return EOPNOTSUPP;
 }
diff --git a/libdiskfs/fsys-getfile.c b/libdiskfs/fsys-getfile.c
index fa242c5e..4dadd736 100644
--- a/libdiskfs/fsys-getfile.c
+++ b/libdiskfs/fsys-getfile.c
@@ -29,9 +29,9 @@
 error_t
 diskfs_S_fsys_getfile (struct diskfs_control *pt,
 		       mach_port_t reply, mach_msg_type_name_t reply_type,
-		       uid_t *uids, mach_msg_type_number_t nuids,
-		       gid_t *gids, mach_msg_type_number_t ngids,
-		       data_t handle, mach_msg_type_number_t handle_len,
+		       const uid_t *uids, mach_msg_type_number_t nuids,
+		       const gid_t *gids, mach_msg_type_number_t ngids,
+		       const_data_t handle, mach_msg_type_number_t handle_len,
 		       mach_port_t *file, mach_msg_type_name_t *file_type)
 {
   int flags;
diff --git a/libdiskfs/fsys-getroot.c b/libdiskfs/fsys-getroot.c
index 81bd7db4..1bc6c4a3 100644
--- a/libdiskfs/fsys-getroot.c
+++ b/libdiskfs/fsys-getroot.c
@@ -31,9 +31,9 @@ diskfs_S_fsys_getroot (struct diskfs_control *pt,
 		       mach_port_t reply,
 		       mach_msg_type_name_t replytype,
 		       mach_port_t dotdot,
-		       uid_t *uids,
+		       const uid_t *uids,
 		       size_t nuids,
-		       uid_t *gids,
+		       const id_t *gids,
 		       size_t ngids,
 		       int flags,
 		       retry_type *retry,
diff --git a/libdiskfs/fsys-options.c b/libdiskfs/fsys-options.c
index 8610fe50..ca646a8d 100644
--- a/libdiskfs/fsys-options.c
+++ b/libdiskfs/fsys-options.c
@@ -28,7 +28,7 @@
 
 struct args
 {
-  char *data;
+  const char *data;
   mach_msg_type_number_t len;
   int do_children;
 };
@@ -50,7 +50,7 @@ kern_return_t
 diskfs_S_fsys_set_options (struct diskfs_control *pt,
 			   mach_port_t reply,
 			   mach_msg_type_name_t replytype,
-			   data_t data, mach_msg_type_number_t len,
+			   const_data_t data, mach_msg_type_number_t len,
 			   int do_children)
 {
   error_t err = 0;
diff --git a/libdiskfs/io-restrict-auth.c b/libdiskfs/io-restrict-auth.c
index 1c2c999d..4b27a919 100644
--- a/libdiskfs/io-restrict-auth.c
+++ b/libdiskfs/io-restrict-auth.c
@@ -24,9 +24,9 @@ kern_return_t
 diskfs_S_io_restrict_auth (struct protid *cred,
 			   mach_port_t *newport,
 			   mach_msg_type_name_t *newportpoly,
-			   uid_t *uids,
+			   const uid_t *uids,
 			   size_t nuids,
-			   gid_t *gids,
+			   const gid_t *gids,
 			   size_t ngids)
 {
   error_t err;
diff --git a/libdiskfs/io-write.c b/libdiskfs/io-write.c
index ef5224d6..fa451d8b 100644
--- a/libdiskfs/io-write.c
+++ b/libdiskfs/io-write.c
@@ -22,7 +22,7 @@
 /* Implement io_write as described in <hurd/io.defs>. */
 kern_return_t
 diskfs_S_io_write (struct protid *cred,
-		   data_t data,
+		   const_data_t data,
 		   mach_msg_type_number_t datalen,
 		   off_t offset,
 		   mach_msg_type_number_t *amt)
diff --git a/libmachdev/ds_routines.c b/libmachdev/ds_routines.c
index b12d1ff3..1ef865db 100644
--- a/libmachdev/ds_routines.c
+++ b/libmachdev/ds_routines.c
@@ -90,7 +90,7 @@ static int num_emul = 0;
 io_return_t
 ds_device_open (mach_port_t open_port, mach_port_t reply_port,
                 mach_msg_type_name_t reply_port_type, dev_mode_t mode,
-                dev_name_t name, device_t *devp,
+                const_dev_name_t name, device_t *devp,
                 mach_msg_type_name_t *devicePoly)
 {
   int i;
@@ -161,7 +161,7 @@ io_return_t
 ds_device_write_inband (struct mach_device *device, mach_port_t reply_port,
 			mach_msg_type_name_t reply_port_type,
 			dev_mode_t mode, recnum_t recnum,
-			io_buf_ptr_inband_t data, unsigned count,
+			const_io_buf_ptr_inband_t data, unsigned count,
 			int *bytes_written)
 {
   /* Refuse if device is dead or not completely open.  */
diff --git a/libmachdev/machdev-device_emul.h b/libmachdev/machdev-device_emul.h
index 9f7b0b21..5c2396f8 100644
--- a/libmachdev/machdev-device_emul.h
+++ b/libmachdev/machdev-device_emul.h
@@ -40,13 +40,13 @@ struct machdev_device_emulation_ops
   void (*dealloc) (void *);
   mach_port_t (*dev_to_port) (void *);
   io_return_t (*open) (mach_port_t, mach_msg_type_name_t,
-		       dev_mode_t, char *, device_t *,
+		       dev_mode_t, const char *, device_t *,
 		       mach_msg_type_name_t *type);
   io_return_t (*close) (void *);
   io_return_t (*write) (void *, mach_port_t, mach_msg_type_name_t,
 			dev_mode_t, recnum_t, io_buf_ptr_t, unsigned, int *);
   io_return_t (*write_inband) (void *, mach_port_t, mach_msg_type_name_t,
-			       dev_mode_t, recnum_t, io_buf_ptr_inband_t,
+			       dev_mode_t, recnum_t, const char *,
 			       unsigned, int *);
   io_return_t (*read) (void *, mach_port_t, mach_msg_type_name_t,
 		       dev_mode_t, recnum_t, int, io_buf_ptr_t *, unsigned *);
diff --git a/libmachdev/trivfs_server.c b/libmachdev/trivfs_server.c
index 029a8da7..14367157 100644
--- a/libmachdev/trivfs_server.c
+++ b/libmachdev/trivfs_server.c
@@ -181,7 +181,7 @@ trivfs_append_args (struct trivfs_control *fsys, char **argz, size_t *argz_len)
 kern_return_t
 S_i386_set_ldt (mach_port_t target_thread,
                        int first_selector,
-                       descriptor_list_t desc_list,
+                       const_descriptor_list_t desc_list,
                        mach_msg_type_number_t desc_listCnt,
                        boolean_t desc_listSCopy)
 {
diff --git a/libnetfs/dir-link.c b/libnetfs/dir-link.c
index 0881adf4..51af402c 100644
--- a/libnetfs/dir-link.c
+++ b/libnetfs/dir-link.c
@@ -23,7 +23,7 @@
 
 error_t
 netfs_S_dir_link (struct protid *diruser, struct protid *fileuser,
-		  string_t name, int excl)
+		  const_string_t name, int excl)
 {
   error_t err;
   
diff --git a/libnetfs/dir-lookup.c b/libnetfs/dir-lookup.c
index 85436ca0..da17a2d3 100644
--- a/libnetfs/dir-lookup.c
+++ b/libnetfs/dir-lookup.c
@@ -29,7 +29,7 @@
 
 error_t
 netfs_S_dir_lookup (struct protid *dircred,
-		    string_t filename,
+		    const_string_t filename,
 		    int flags,
 		    mode_t mode,
 		    retry_type *do_retry,
diff --git a/libnetfs/dir-mkdir.c b/libnetfs/dir-mkdir.c
index 0ba42f9b..c9149804 100644
--- a/libnetfs/dir-mkdir.c
+++ b/libnetfs/dir-mkdir.c
@@ -22,7 +22,7 @@
 #include "fs_S.h"
 
 error_t
-netfs_S_dir_mkdir (struct protid *user, string_t name, mode_t mode)
+netfs_S_dir_mkdir (struct protid *user, const_string_t name, mode_t mode)
 {
   error_t err;
 
diff --git a/libnetfs/dir-rename.c b/libnetfs/dir-rename.c
index 365b29ce..c24488b4 100644
--- a/libnetfs/dir-rename.c
+++ b/libnetfs/dir-rename.c
@@ -22,8 +22,8 @@
 #include "fs_S.h"
 
 error_t
-netfs_S_dir_rename (struct protid *fromdiruser, string_t fromname,
-		    struct protid *todiruser, string_t toname, int excl)
+netfs_S_dir_rename (struct protid *fromdiruser, const_string_t fromname,
+		    struct protid *todiruser, const_string_t toname, int excl)
 {
   error_t err;
   
diff --git a/libnetfs/dir-rmdir.c b/libnetfs/dir-rmdir.c
index 36c97359..74abb497 100644
--- a/libnetfs/dir-rmdir.c
+++ b/libnetfs/dir-rmdir.c
@@ -22,7 +22,7 @@
 #include "fs_S.h"
 
 error_t
-netfs_S_dir_rmdir (struct protid *diruser, string_t name)
+netfs_S_dir_rmdir (struct protid *diruser, const_string_t name)
 {
   error_t err;
   
diff --git a/libnetfs/dir-unlink.c b/libnetfs/dir-unlink.c
index ed27e4d9..83cd7638 100644
--- a/libnetfs/dir-unlink.c
+++ b/libnetfs/dir-unlink.c
@@ -22,7 +22,7 @@
 #include "fs_S.h"
 
 error_t
-netfs_S_dir_unlink (struct protid *user, string_t name)
+netfs_S_dir_unlink (struct protid *user, const_string_t name)
 {
   error_t err;
   
diff --git a/libnetfs/file-exec.c b/libnetfs/file-exec.c
index fb070aca..8ac0f892 100644
--- a/libnetfs/file-exec.c
+++ b/libnetfs/file-exec.c
@@ -35,19 +35,19 @@ kern_return_t
 netfs_S_file_exec (struct protid *cred,
 		   task_t task,
 		   int flags,
-		   data_t argv,
+		   const_data_t argv,
 		   size_t argvlen,
-		   data_t envp,
+		   const_data_t envp,
 		   size_t envplen,
-		   mach_port_t *fds,
+		   const mach_port_t *fds,
 		   size_t fdslen,
-		   mach_port_t *portarray,
+		   const mach_port_t *portarray,
 		   size_t portarraylen,
-		   int *intarray,
+		   const int *intarray,
 		   size_t intarraylen,
-		   mach_port_t *deallocnames,
+		   const mach_port_t *deallocnames,
 		   size_t deallocnameslen,
-		   mach_port_t *destroynames,
+		   const mach_port_t *destroynames,
 		   size_t destroynameslen)
 {
   return netfs_S_file_exec_paths (cred,
@@ -68,21 +68,21 @@ kern_return_t
 netfs_S_file_exec_paths (struct protid *cred,
 			 task_t task,
 			 int flags,
-			 string_t path,
-			 string_t abspath,
-			 char *argv,
+			 const_string_t path,
+			 const_string_t abspath,
+			 const char *argv,
 			 size_t argvlen,
-			 char *envp,
+			 const char *envp,
 			 size_t envplen,
-			 mach_port_t *fds,
+			 const mach_port_t *fds,
 			 size_t fdslen,
-			 mach_port_t *portarray,
+			 const mach_port_t *portarray,
 			 size_t portarraylen,
-			 int *intarray,
+			 const int *intarray,
 			 size_t intarraylen,
-			 mach_port_t *deallocnames,
+			 const mach_port_t *deallocnames,
 			 size_t deallocnameslen,
-			 mach_port_t *destroynames,
+			 const mach_port_t *destroynames,
 			 size_t destroynameslen)
 {
   struct node *np;
diff --git a/libnetfs/file-set-translator.c b/libnetfs/file-set-translator.c
index c73c0376..ae18686c 100644
--- a/libnetfs/file-set-translator.c
+++ b/libnetfs/file-set-translator.c
@@ -28,7 +28,7 @@
 error_t
 netfs_S_file_set_translator (struct protid *user,
 			     int passive_flags, int active_flags,
-			     int killtrans_flags, data_t passive,
+			     int killtrans_flags, const_data_t passive,
 			     mach_msg_type_number_t passivelen,
 			     mach_port_t active)
 {
@@ -116,7 +116,7 @@ netfs_S_file_set_translator (struct protid *user,
       switch (newmode)
 	{
 	  int major, minor;
-	  char *arg;
+	  const char *arg;
 
 	case S_IFBLK:
 	case S_IFCHR:
diff --git a/libnetfs/fsys-getroot.c b/libnetfs/fsys-getroot.c
index 514fc37c..47fb1c74 100644
--- a/libnetfs/fsys-getroot.c
+++ b/libnetfs/fsys-getroot.c
@@ -30,8 +30,8 @@ netfs_S_fsys_getroot (struct netfs_control *pt,
 		      mach_port_t reply,
 		      mach_msg_type_name_t reply_type,
 		      mach_port_t dotdot,
-		      uid_t *uids, mach_msg_type_number_t nuids,
-		      uid_t *gids, mach_msg_type_number_t ngids,
+		      const id_t *uids, mach_msg_type_number_t nuids,
+		      const id_t *gids, mach_msg_type_number_t ngids,
 		      int flags,
 		      retry_type *do_retry,
 		      string_t retry_name,
diff --git a/libnetfs/fsys-set-options.c b/libnetfs/fsys-set-options.c
index 7fa5e5ac..08af9c3c 100644
--- a/libnetfs/fsys-set-options.c
+++ b/libnetfs/fsys-set-options.c
@@ -50,7 +50,7 @@ error_t
 netfs_S_fsys_set_options (struct netfs_control *pt,
 			  mach_port_t reply,
 			  mach_msg_type_name_t reply_type,
-			  data_t data, mach_msg_type_number_t data_len,
+			  const_data_t data, mach_msg_type_number_t data_len,
 			  int do_children)
 {
   error_t err = 0;
diff --git a/libnetfs/fsysstubs.c b/libnetfs/fsysstubs.c
index 91e05cf0..4fbd4756 100644
--- a/libnetfs/fsysstubs.c
+++ b/libnetfs/fsysstubs.c
@@ -26,9 +26,9 @@ error_t __attribute__((weak))
 netfs_S_fsys_getfile (struct netfs_control *cntl,
 		      mach_port_t reply,
 		      mach_msg_type_name_t reply_type,
-		      uid_t *uids, mach_msg_type_number_t nuids,
-		      gid_t *gids, mach_msg_type_number_t ngids,
-		      data_t handle, mach_msg_type_number_t handlelen,
+		      const uid_t *uids, mach_msg_type_number_t nuids,
+		      const gid_t *gids, mach_msg_type_number_t ngids,
+		      const_data_t handle, mach_msg_type_number_t handlelen,
 		      mach_port_t *file, mach_msg_type_name_t *filetype)
 {
   return EOPNOTSUPP;
@@ -59,7 +59,7 @@ netfs_S_fsys_forward (mach_port_t cntl,
 		      mach_port_t reply,
 		      mach_msg_type_name_t reply_type,
 		      mach_port_t request,
-		      data_t argv, mach_msg_type_number_t argvlen)
+		      const_data_t argv, mach_msg_type_number_t argvlen)
 {
   return EOPNOTSUPP;
 }
diff --git a/libnetfs/io-restrict-auth.c b/libnetfs/io-restrict-auth.c
index 89df6716..e1fe79da 100644
--- a/libnetfs/io-restrict-auth.c
+++ b/libnetfs/io-restrict-auth.c
@@ -25,9 +25,9 @@ error_t
 netfs_S_io_restrict_auth (struct protid *user,
 			  mach_port_t *newport,
 			  mach_msg_type_name_t *newporttype,
-			  uid_t *uids,
+			  const uid_t *uids,
 			  mach_msg_type_number_t nuids,
-			  gid_t *gids,
+			  const gid_t *gids,
 			  mach_msg_type_number_t ngids)
 {
   error_t err;
diff --git a/libnetfs/io-write.c b/libnetfs/io-write.c
index 20769df8..482b45fc 100644
--- a/libnetfs/io-write.c
+++ b/libnetfs/io-write.c
@@ -24,7 +24,7 @@
 
 error_t
 netfs_S_io_write (struct protid *user,
-		  data_t data,
+		  const_data_t data,
 		  mach_msg_type_number_t datalen,
 		  off_t offset,
 		  mach_msg_type_number_t *amount)
diff --git a/libnetfs/netfs.h b/libnetfs/netfs.h
index ca506747..b877f0c6 100644
--- a/libnetfs/netfs.h
+++ b/libnetfs/netfs.h
@@ -494,7 +494,7 @@ typedef struct netfs_control *control_t;
    or missing -D_FILE_OFFSET_BITS=64 build flag. */
 
 kern_return_t netfs_S_io_write (protid_t io_object,
-				data_t data,
+				const_data_t data,
 				mach_msg_type_number_t dataCnt,
 				loff_t offset,
 				vm_size_t *amount);
diff --git a/libtrivfs/dir-link.c b/libtrivfs/dir-link.c
index f5a8c735..b2b90f97 100644
--- a/libtrivfs/dir-link.c
+++ b/libtrivfs/dir-link.c
@@ -20,7 +20,7 @@
 kern_return_t
 trivfs_S_dir_link (struct trivfs_protid *dir,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
-		   struct trivfs_protid *file, char *name, int excl)
+		   struct trivfs_protid *file, const_string_t name, int excl)
 {
   if (!file)
     return EOPNOTSUPP;
diff --git a/libtrivfs/dir-lookup.c b/libtrivfs/dir-lookup.c
index 73aff5c4..0a62d496 100644
--- a/libtrivfs/dir-lookup.c
+++ b/libtrivfs/dir-lookup.c
@@ -23,7 +23,7 @@
 kern_return_t
 trivfs_S_dir_lookup (struct trivfs_protid *cred,
 		     mach_port_t reply, mach_msg_type_name_t reply_type,
-		     char *filename,
+		     const_string_t filename,
 		     int flags,
 		     mode_t mode,
 		     retry_type *retry_type,
diff --git a/libtrivfs/dir-mkdir.c b/libtrivfs/dir-mkdir.c
index d39bd3f8..28ed02c5 100644
--- a/libtrivfs/dir-mkdir.c
+++ b/libtrivfs/dir-mkdir.c
@@ -20,7 +20,7 @@
 kern_return_t
 trivfs_S_dir_mkdir (struct trivfs_protid *cred,
 		    mach_port_t reply, mach_msg_type_name_t reply_type,
-		    char *name, mode_t mode)
+		    const_string_t name, mode_t mode)
 {
   return cred ? ENOTDIR : EOPNOTSUPP;
 }
diff --git a/libtrivfs/dir-rename.c b/libtrivfs/dir-rename.c
index d68233ec..60690c23 100644
--- a/libtrivfs/dir-rename.c
+++ b/libtrivfs/dir-rename.c
@@ -20,8 +20,8 @@
 kern_return_t
 trivfs_S_dir_rename (struct trivfs_protid *cred,
 		     mach_port_t reply, mach_msg_type_name_t reply_type,
-		     char *name,
-		     struct trivfs_protid *cred2, char *name2, int excl)
+		     const_string_t name,
+		     struct trivfs_protid *cred2, const_string_t name2, int excl)
 {
   if (!cred)
     return EOPNOTSUPP;
diff --git a/libtrivfs/dir-rmdir.c b/libtrivfs/dir-rmdir.c
index a4d320c4..62b3ca2e 100644
--- a/libtrivfs/dir-rmdir.c
+++ b/libtrivfs/dir-rmdir.c
@@ -20,7 +20,7 @@
 kern_return_t
 trivfs_S_dir_rmdir (struct trivfs_protid *cred,
 		    mach_port_t reply, mach_msg_type_name_t reply_type,
-		    char *name)
+		    const_string_t name)
 {
   return cred ? ENOTDIR : EOPNOTSUPP;
 }
diff --git a/libtrivfs/dir-unlink.c b/libtrivfs/dir-unlink.c
index a6ef9b0c..c59a9253 100644
--- a/libtrivfs/dir-unlink.c
+++ b/libtrivfs/dir-unlink.c
@@ -20,7 +20,7 @@
 kern_return_t
 trivfs_S_dir_unlink (struct trivfs_protid *cred,
 		     mach_port_t reply, mach_msg_type_name_t reply_type,
-		     char *name)
+		     const_string_t name)
 {
   return cred ? ENOTDIR : EOPNOTSUPP;
 }
diff --git a/libtrivfs/file-exec.c b/libtrivfs/file-exec.c
index a0a2a50c..2121a3c0 100644
--- a/libtrivfs/file-exec.c
+++ b/libtrivfs/file-exec.c
@@ -24,19 +24,19 @@ trivfs_S_file_exec (trivfs_protid_t exec_file,
 		    mach_msg_type_name_t replyPoly,
 		    mach_port_t exec_task,
 		    int flags,
-		    data_t argv,
+		    const_data_t argv,
 		    mach_msg_type_number_t argvCnt,
-		    data_t envp,
+		    const_data_t envp,
 		    mach_msg_type_number_t envpCnt,
-		    portarray_t fdarray,
+		    const_portarray_t fdarray,
 		    mach_msg_type_number_t fdarrayCnt,
-		    portarray_t portarray,
+		    const_portarray_t portarray,
 		    mach_msg_type_number_t portarrayCnt,
-		    intarray_t intarray,
+		    const_intarray_t intarray,
 		    mach_msg_type_number_t intarrayCnt,
-		    mach_port_array_t deallocnames,
+		    const_mach_port_array_t deallocnames,
 		    mach_msg_type_number_t deallocnamesCnt,
-		    mach_port_array_t destroynames,
+		    const_mach_port_array_t destroynames,
 		    mach_msg_type_number_t destroynamesCnt)
 {
   return EOPNOTSUPP;
@@ -48,21 +48,21 @@ trivfs_S_file_exec_paths (trivfs_protid_t exec_file,
 			  mach_msg_type_name_t replyPoly,
 			  mach_port_t exec_task,
 			  int flags,
-			  string_t path,
-			  string_t abspath,
-			  data_t argv,
+			  const_string_t path,
+			  const_string_t abspath,
+			  const_data_t argv,
 			  mach_msg_type_number_t argvCnt,
-			  data_t envp,
+			  const_data_t envp,
 			  mach_msg_type_number_t envpCnt,
-			  portarray_t fdarray,
+			  const_portarray_t fdarray,
 			  mach_msg_type_number_t fdarrayCnt,
-			  portarray_t portarray,
+			  const_portarray_t portarray,
 			  mach_msg_type_number_t portarrayCnt,
-			  intarray_t intarray,
+			  const_intarray_t intarray,
 			  mach_msg_type_number_t intarrayCnt,
-			  mach_port_array_t deallocnames,
+			  const_mach_port_array_t deallocnames,
 			  mach_msg_type_number_t deallocnamesCnt,
-			  mach_port_array_t destroynames,
+			  const_mach_port_array_t destroynames,
 			  mach_msg_type_number_t destroynamesCnt)
 {
   return EOPNOTSUPP;
diff --git a/libtrivfs/file-set-trans.c b/libtrivfs/file-set-trans.c
index 5a011184..02a679f0 100644
--- a/libtrivfs/file-set-trans.c
+++ b/libtrivfs/file-set-trans.c
@@ -25,7 +25,7 @@ trivfs_S_file_set_translator (struct trivfs_protid *cred,
 			      int actflags,
 			      int passflags,
 			      int oldtransflags,
-			      data_t trans,
+			      const_data_t trans,
 			      size_t translen,
 			      mach_port_t existing)
 {
diff --git a/libtrivfs/fsys-forward.c b/libtrivfs/fsys-forward.c
index f1480d16..4e4e2703 100644
--- a/libtrivfs/fsys-forward.c
+++ b/libtrivfs/fsys-forward.c
@@ -33,7 +33,7 @@ trivfs_S_fsys_forward (mach_port_t server,
 		       mach_port_t reply,
 		       mach_msg_type_name_t replytype,
 		       mach_port_t requestor,
-		       data_t argz, size_t argz_len)
+		       const_data_t argz, size_t argz_len)
 {
   return EOPNOTSUPP;
 }
diff --git a/libtrivfs/fsys-getroot.c b/libtrivfs/fsys-getroot.c
index 6542ab16..446f9ff0 100644
--- a/libtrivfs/fsys-getroot.c
+++ b/libtrivfs/fsys-getroot.c
@@ -31,8 +31,8 @@ trivfs_S_fsys_getroot (struct trivfs_control *cntl,
 		       mach_port_t reply_port,
 		       mach_msg_type_name_t reply_port_type,
 		       mach_port_t dotdot,
-		       uid_t *uids, size_t nuids,
-		       uid_t *gids, size_t ngids,
+		       const id_t *uids, size_t nuids,
+		       const id_t *gids, size_t ngids,
 		       int flags,
 		       retry_type *do_retry,
 		       string_t retry_name,
diff --git a/libtrivfs/fsys-set-options.c b/libtrivfs/fsys-set-options.c
index 033f5dcc..ca5a9458 100644
--- a/libtrivfs/fsys-set-options.c
+++ b/libtrivfs/fsys-set-options.c
@@ -26,7 +26,7 @@
 error_t
 trivfs_S_fsys_set_options (struct trivfs_control *cntl,
 			   mach_port_t reply, mach_msg_type_name_t reply_type,
-			   data_t data, mach_msg_type_number_t len,
+			   const_data_t data, mach_msg_type_number_t len,
 			   int do_children)
 {
   if (cntl)
diff --git a/libtrivfs/fsys-stubs.c b/libtrivfs/fsys-stubs.c
index 96b3d122..430ea382 100644
--- a/libtrivfs/fsys-stubs.c
+++ b/libtrivfs/fsys-stubs.c
@@ -59,11 +59,11 @@ kern_return_t __attribute__((weak))
 trivfs_S_fsys_getfile (struct trivfs_control *cntl,
 		       mach_port_t reply,
 		       mach_msg_type_name_t replytype,
-		       uid_t *genuids,
+		       const uid_t *genuids,
 		       size_t ngenuids,
-		       uid_t *gengids,
+		       const uid_t *gengids,
 		       size_t ngengids,
-		       data_t handle,
+		       const_data_t handle,
 		       size_t handlesize,
 		       mach_port_t *file,
 		       mach_msg_type_name_t *filetype)
diff --git a/libtrivfs/io-restrict-auth.c b/libtrivfs/io-restrict-auth.c
index 6c807f17..38ab06a7 100644
--- a/libtrivfs/io-restrict-auth.c
+++ b/libtrivfs/io-restrict-auth.c
@@ -40,8 +40,8 @@ trivfs_S_io_restrict_auth (struct trivfs_protid *cred,
 			   mach_msg_type_name_t replytype,
 			   mach_port_t *newport,
 			   mach_msg_type_name_t *newporttype,
-			   uid_t *uids, size_t nuids,
-			   uid_t *gids, size_t ngids)
+			   const uid_t *uids, size_t nuids,
+			   const uid_t *gids, size_t ngids)
 {
   unsigned int i;
   error_t err;
diff --git a/libtrivfs/io-write.c b/libtrivfs/io-write.c
index 31e05548..74cbb32b 100644
--- a/libtrivfs/io-write.c
+++ b/libtrivfs/io-write.c
@@ -24,7 +24,7 @@ kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply,
 		   mach_msg_type_name_t replytype,
-		   data_t data,
+		   const_data_t data,
 		   mach_msg_type_number_t datalen,
 		   off_t off,
 		   mach_msg_type_number_t *amt)
diff --git a/libtrivfs/trivfs.h b/libtrivfs/trivfs.h
index 1295fe17..4b96f224 100644
--- a/libtrivfs/trivfs.h
+++ b/libtrivfs/trivfs.h
@@ -287,7 +287,7 @@ typedef struct trivfs_control *trivfs_control_t;
 kern_return_t trivfs_S_io_write (trivfs_protid_t io_object,
 				 mach_port_t reply,
 				 mach_msg_type_name_t replyPoly,
-				 data_t data,
+				 const_data_t data,
 				 mach_msg_type_number_t dataCnt,
 				 loff_t offset,
 				 vm_size_t *amount);
diff --git a/lwip/iioctl-ops.c b/lwip/iioctl-ops.c
index 0834cd32..041da106 100644
--- a/lwip/iioctl-ops.c
+++ b/lwip/iioctl-ops.c
@@ -108,7 +108,7 @@ siocgifXaddr (struct sock_user *user,
 #define SIOCSIF(name, type)						\
   kern_return_t								\
   lwip_S_iioctl_siocsif##name (struct sock_user *user,                       \
-			  ifname_t ifnam,				\
+			  const ifname_t ifnam,				\
 			  sockaddr_t addr)				\
   {									\
     return siocsifXaddr (user, ifnam, &addr, type);			\
@@ -117,7 +117,7 @@ siocgifXaddr (struct sock_user *user,
 /* Set some sockaddr type of info.  */
 static kern_return_t
 siocsifXaddr (struct sock_user *user,
-	      ifname_t ifnam, sockaddr_t * addr, enum siocgif_type type)
+	      const ifname_t ifnam, sockaddr_t * addr, enum siocgif_type type)
 {
   error_t err = 0;
   struct sockaddr_in sin;
@@ -170,7 +170,7 @@ SIOCSIF (dstaddr, DSTADDR);
 /* 16 SIOCSIFFLAGS -- Set flags of a network interface.  */
 kern_return_t
 lwip_S_iioctl_siocsifflags (struct sock_user * user,
-			    ifname_t ifnam,
+			    const ifname_t ifnam,
 			    short flags)
 {
   error_t err = 0;
@@ -244,7 +244,7 @@ lwip_S_iioctl_siocgifmetric (struct sock_user * user,
 /* 24 SIOCSIFMETRIC -- Set metric of a network interface.  */
 kern_return_t
 lwip_S_iioctl_siocsifmetric (struct sock_user * user,
-			     ifname_t ifnam,
+			     const ifname_t ifnam,
 			     int metric)
 {
   return EOPNOTSUPP;
@@ -253,7 +253,7 @@ lwip_S_iioctl_siocsifmetric (struct sock_user * user,
 /* 25 SIOCDIFADDR -- Delete interface address.  */
 kern_return_t
 lwip_S_iioctl_siocdifaddr (struct sock_user * user,
-			   ifname_t ifnam,
+			   const ifname_t ifnam,
 			   sockaddr_t addr)
 {
   return EOPNOTSUPP;
@@ -318,7 +318,7 @@ lwip_S_iioctl_siocgifmtu (struct sock_user * user, ifname_t ifnam, int *mtu)
 
 /* 51 SIOCSIFMTU -- Set mtu of a network interface.  */
 error_t
-lwip_S_iioctl_siocsifmtu (struct sock_user * user, ifname_t ifnam, int mtu)
+lwip_S_iioctl_siocsifmtu (struct sock_user * user, const ifname_t ifnam, int mtu)
 {
   error_t err = 0;
   struct netif *netif;
diff --git a/lwip/io-ops.c b/lwip/io-ops.c
index 8e84e46b..5461d695 100644
--- a/lwip/io-ops.c
+++ b/lwip/io-ops.c
@@ -34,7 +34,7 @@
 
 error_t
 lwip_S_io_write (struct sock_user *user,
-		 char *data,
+		 const_data_t data,
 		 size_t datalen,
 		 off_t offset, mach_msg_type_number_t * amount)
 {
@@ -58,7 +58,7 @@ lwip_S_io_write (struct sock_user *user,
 
 error_t
 lwip_S_io_read (struct sock_user * user,
-		char **data,
+		data_t *data,
 		size_t * datalen, off_t offset, mach_msg_type_number_t amount)
 {
   error_t err;
@@ -378,8 +378,8 @@ error_t
 lwip_S_io_restrict_auth (struct sock_user * user,
 			 mach_port_t * newobject,
 			 mach_msg_type_name_t * newobject_type,
-			 uid_t * uids, size_t uidslen,
-			 uid_t * gids, size_t gidslen)
+			 const uid_t * uids, size_t uidslen,
+			 const uid_t * gids, size_t gidslen)
 {
   struct sock_user *newuser;
   int i, j;
diff --git a/lwip/port/netif/hurdtunif.c b/lwip/port/netif/hurdtunif.c
index 6e3676c7..79a082cf 100644
--- a/lwip/port/netif/hurdtunif.c
+++ b/lwip/port/netif/hurdtunif.c
@@ -347,7 +347,7 @@ void (*trivfs_protid_destroy_hook) (struct trivfs_protid *) = pi_destroy_hook;
 error_t
 trivfs_S_io_read (struct trivfs_protid *cred,
 		  mach_port_t reply, mach_msg_type_name_t reply_type,
-		  char **data, mach_msg_type_number_t * data_len,
+		  data_t *data, mach_msg_type_number_t * data_len,
 		  loff_t offs, size_t amount)
 {
   struct hurdtunif *tunif;
@@ -421,7 +421,7 @@ error_t
 trivfs_S_io_write (struct trivfs_protid * cred,
 		   mach_port_t reply,
 		   mach_msg_type_name_t replytype,
-		   char *data,
+		   const_data_t data,
 		   mach_msg_type_number_t datalen,
 		   off_t offset, mach_msg_type_number_t * amount)
 {
diff --git a/lwip/socket-ops.c b/lwip/socket-ops.c
index decba3f8..005e41d3 100644
--- a/lwip/socket-ops.c
+++ b/lwip/socket-ops.c
@@ -232,7 +232,7 @@ lwip_S_socket_connect2 (struct sock_user * user, struct sock_user * sock2)
 error_t
 lwip_S_socket_create_address (mach_port_t server,
 			      int sockaddr_type,
-			      char *data,
+			      const char *data,
 			      mach_msg_type_number_t data_len,
 			      mach_port_t * addr_port,
 			      mach_msg_type_name_t * addr_port_type)
@@ -323,7 +323,7 @@ lwip_S_socket_getopt (struct sock_user * user,
 
 error_t
 lwip_S_socket_setopt (struct sock_user * user,
-		      int level, int option, char *data, size_t datalen)
+		      int level, int option, const char *data, size_t datalen)
 {
   if (!user)
     return EOPNOTSUPP;
@@ -337,11 +337,11 @@ error_t
 lwip_S_socket_send (struct sock_user * user,
 		    struct sock_addr * addr,
 		    int flags,
-		    char *data,
+		    const char *data,
 		    size_t datalen,
-		    mach_port_t * ports,
+		    const mach_port_t * ports,
 		    size_t nports,
-		    char *control,
+		    const char *control,
 		    size_t controllen, mach_msg_type_number_t * amount)
 {
   int sent;
diff --git a/mach-defpager/default_pager.c b/mach-defpager/default_pager.c
index c92a9e28..4afe9a76 100644
--- a/mach-defpager/default_pager.c
+++ b/mach-defpager/default_pager.c
@@ -3730,7 +3730,7 @@ kern_return_t
 S_default_pager_paging_file (pager, mdport, file_name, add)
 	mach_port_t			pager;
 	mach_port_t			mdport;
-	default_pager_filename_t	file_name;
+	const_default_pager_filename_t	file_name;
 	boolean_t			add;
 {
 	kern_return_t   kr;
diff --git a/mach-defpager/setup.c b/mach-defpager/setup.c
index 0fc4d9d4..ffd75c20 100644
--- a/mach-defpager/setup.c
+++ b/mach-defpager/setup.c
@@ -42,8 +42,8 @@ extern mach_port_t default_pager_default_port; /* default_pager.c */
 kern_return_t
 S_default_pager_paging_storage (mach_port_t pager,
 				mach_port_t device,
-				recnum_t *runs, mach_msg_type_number_t nrun,
-				default_pager_filename_t name,
+				const recnum_t *runs, mach_msg_type_number_t nrun,
+				const_default_pager_filename_t name,
 				boolean_t add)
 {
   struct file_direct *fdp;
diff --git a/pci-arbiter/main.c b/pci-arbiter/main.c
index 9bcfb676..ec97856d 100644
--- a/pci-arbiter/main.c
+++ b/pci-arbiter/main.c
@@ -59,7 +59,7 @@ static mach_port_t pci_control_port;
 
 static io_return_t
 pci_device_open (mach_port_t reply_port, mach_msg_type_name_t reply_port_type,
-                 dev_mode_t mode, char *name, device_t * devp,
+                 dev_mode_t mode, const char *name, device_t * devp,
                  mach_msg_type_name_t * devicePoly)
 {
   io_return_t err = D_SUCCESS;
diff --git a/pci-arbiter/pci-ops.c b/pci-arbiter/pci-ops.c
index 72720832..ef27a3cd 100644
--- a/pci-arbiter/pci-ops.c
+++ b/pci-arbiter/pci-ops.c
@@ -128,7 +128,7 @@ S_pci_conf_read (struct protid * master, int reg, char **data,
 
 /* Write `datalen' bytes from `data'. `amount' is updated. */
 error_t
-S_pci_conf_write (struct protid * master, int reg, char *data, size_t datalen,
+S_pci_conf_write (struct protid * master, int reg, const char *data, size_t datalen,
 		  mach_msg_type_number_t * amount)
 {
   error_t err;
diff --git a/pfinet/iioctl-ops.c b/pfinet/iioctl-ops.c
index 72e557d9..bccc5e6b 100644
--- a/pfinet/iioctl-ops.c
+++ b/pfinet/iioctl-ops.c
@@ -76,7 +76,7 @@ enum siocgif_type
   kern_return_t								\
   S_iioctl_siocgif##name (struct sock_user *user,                       \
 			  ifname_t ifnam,				\
-			  sockaddr_t *addr)				\
+			  sockaddr_t *addr)			\
   {									\
     return siocgifXaddr (user, ifnam, addr, type);			\
   }
@@ -116,7 +116,7 @@ siocgifXaddr (struct sock_user *user,
 #define SIOCSIF(name, type)						\
   kern_return_t								\
   S_iioctl_siocsif##name (struct sock_user *user,                       \
-			  ifname_t ifnam,				\
+			  const ifname_t ifnam,				\
 			  sockaddr_t addr)				\
   {									\
     return siocsifXaddr (user, ifnam, &addr, type);			\
@@ -125,7 +125,7 @@ siocgifXaddr (struct sock_user *user,
 /* Set some sockaddr type of info.  */
 static kern_return_t
 siocsifXaddr (struct sock_user *user,
-	      ifname_t ifnam,
+	      const ifname_t ifnam,
 	      sockaddr_t *addr,
 	      enum siocgif_type type)
 {
@@ -167,7 +167,7 @@ SIOCSIF (dstaddr, DSTADDR);
 /* 16 SIOCSIFFLAGS -- Set flags of a network interface.  */
 kern_return_t
 S_iioctl_siocsifflags (struct sock_user *user,
-		       ifname_t ifnam,
+		       const ifname_t ifnam,
 		       short flags)
 {
   error_t err = 0;
@@ -238,7 +238,7 @@ S_iioctl_siocgifmetric (struct sock_user *user,
 /* 24 SIOCSIFMETRIC -- Set metric of a network interface.  */
 kern_return_t
 S_iioctl_siocsifmetric (struct sock_user *user,
-			ifname_t ifnam,
+			const ifname_t ifnam,
 			int metric)
 {
   return EOPNOTSUPP;
@@ -247,7 +247,7 @@ S_iioctl_siocsifmetric (struct sock_user *user,
 /* 25 SIOCDIFADDR -- Delete interface address.  */
 kern_return_t
 S_iioctl_siocdifaddr (struct sock_user *user,
-		      ifname_t ifnam,
+		      const ifname_t ifnam,
 		      sockaddr_t addr)
 {
   return EOPNOTSUPP;
@@ -313,7 +313,7 @@ S_iioctl_siocgifmtu (struct sock_user *user,
 /* 51 SIOCSIFMTU -- Set mtu of a network interface.  */
 error_t
 S_iioctl_siocsifmtu (struct sock_user *user,
-		     ifname_t ifnam,
+		     const ifname_t ifnam,
 		     int mtu)
 {
   error_t err = 0;
diff --git a/pfinet/io-ops.c b/pfinet/io-ops.c
index a4b012c0..e5df059d 100644
--- a/pfinet/io-ops.c
+++ b/pfinet/io-ops.c
@@ -36,7 +36,7 @@
 
 error_t
 S_io_write (struct sock_user *user,
-	    data_t data,
+	    const_data_t data,
 	    size_t datalen,
 	    off_t offset,
 	    mach_msg_type_number_t *amount)
@@ -439,8 +439,8 @@ error_t
 S_io_restrict_auth (struct sock_user *user,
 		    mach_port_t *newobject,
 		    mach_msg_type_name_t *newobject_type,
-		    uid_t *uids, size_t uidslen,
-		    uid_t *gids, size_t gidslen)
+		    const uid_t *uids, size_t uidslen,
+		    const uid_t *gids, size_t gidslen)
 {
   struct sock_user *newuser;
   int i, j;
diff --git a/pfinet/socket-ops.c b/pfinet/socket-ops.c
index 71b458c8..490920e0 100644
--- a/pfinet/socket-ops.c
+++ b/pfinet/socket-ops.c
@@ -292,7 +292,7 @@ S_socket_connect2 (struct sock_user *user1,
 error_t
 S_socket_create_address (mach_port_t server,
 			 int sockaddr_type,
-			 data_t data,
+			 const_data_t data,
 			 mach_msg_type_number_t data_len,
 			 mach_port_t *addr_port,
 			 mach_msg_type_name_t *addr_port_type)
@@ -403,7 +403,7 @@ error_t
 S_socket_setopt (struct sock_user *user,
 		 int level,
 		 int option,
-		 data_t data,
+		 const_data_t data,
 		 size_t datalen)
 {
   error_t err;
@@ -430,11 +430,11 @@ error_t
 S_socket_send (struct sock_user *user,
 	       struct sock_addr *addr,
 	       int flags,
-	       data_t data,
+	       const_data_t data,
 	       size_t datalen,
-	       mach_port_t *ports,
+	       const mach_port_t *ports,
 	       size_t nports,
-	       data_t control,
+	       const_data_t control,
 	       size_t controllen,
 	       mach_msg_type_number_t *amount)
 {
diff --git a/pfinet/tunnel.c b/pfinet/tunnel.c
index d140b657..1082404e 100644
--- a/pfinet/tunnel.c
+++ b/pfinet/tunnel.c
@@ -369,7 +369,7 @@ error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
                    mach_port_t reply,
                    mach_msg_type_name_t replytype,
-                   data_t data,
+                   const_data_t data,
                    mach_msg_type_number_t datalen,
                    off_t offset,
                    mach_msg_type_number_t *amount)
diff --git a/pflocal/io.c b/pflocal/io.c
index 4c79ec9f..96b2fc48 100644
--- a/pflocal/io.c
+++ b/pflocal/io.c
@@ -79,7 +79,7 @@ S_io_read (struct sock_user *user,
    if they recevie more than one write when not prepared for it.  */
 error_t
 S_io_write (struct sock_user *user,
-	    data_t data, mach_msg_type_number_t data_len,
+	    const_data_t data, mach_msg_type_number_t data_len,
 	    off_t offset, mach_msg_type_number_t *amount)
 {
   error_t err;
@@ -479,8 +479,8 @@ error_t
 S_io_restrict_auth (struct sock_user *user,
 		    mach_port_t *new_port,
 		    mach_msg_type_name_t *new_port_type,
-		    uid_t *uids, size_t num_uids,
-		    uid_t *gids, size_t num_gids)
+		    const uid_t *uids, size_t num_uids,
+		    const uid_t *gids, size_t num_gids)
 {
   if (!user)
     return EOPNOTSUPP;
diff --git a/pflocal/pf.c b/pflocal/pf.c
index c905f3bf..37787f91 100644
--- a/pflocal/pf.c
+++ b/pflocal/pf.c
@@ -89,7 +89,7 @@ S_socket_create (trivfs_protid_t pf,
 
 error_t
 S_socket_create_address (mach_port_t pf, int sockaddr_type,
-			 data_t data, size_t data_len,
+			 const_data_t data, size_t data_len,
 			 mach_port_t *addr_port,
 			 mach_msg_type_name_t *addr_port_type)
 {
diff --git a/pflocal/socket.c b/pflocal/socket.c
index 30ebe33f..8c1ee3e9 100644
--- a/pflocal/socket.c
+++ b/pflocal/socket.c
@@ -287,9 +287,9 @@ S_socket_peername (struct sock_user *user,
 /* Send data over a socket, possibly including Mach ports.  */
 error_t
 S_socket_send (struct sock_user *user, struct addr *dest_addr, int flags,
-	       data_t data, size_t data_len,
-	       mach_port_t *ports, size_t num_ports,
-	       data_t control, size_t control_len,
+	       const_data_t data, size_t data_len,
+	       const mach_port_t *ports, size_t num_ports,
+	       const_data_t control, size_t control_len,
 	       size_t *amount)
 {
   error_t err = 0;
@@ -531,7 +531,7 @@ S_socket_getopt (struct sock_user *user,
 
 error_t
 S_socket_setopt (struct sock_user *user,
-		 int level, int opt, data_t value, size_t value_len)
+		 int level, int opt, const_data_t value, size_t value_len)
 {
   int ret = 0;
   struct pipe *pipe;
diff --git a/proc/host.c b/proc/host.c
index 9934837f..991d1335 100644
--- a/proc/host.c
+++ b/proc/host.c
@@ -79,9 +79,9 @@ S_proc_getprivports (struct proc *p,
 /* Implement proc_setexecdata as described in <hurd/process.defs>. */
 kern_return_t
 S_proc_setexecdata (struct proc *p,
-		    mach_port_t *ports,
+		    const mach_port_t *ports,
 		    size_t nports,
-		    int *ints,
+		    const int *ints,
 		    size_t nints)
 {
   int i;
@@ -409,9 +409,9 @@ S_proc_uname (pstruct_t process,
 kern_return_t
 S_proc_register_version (pstruct_t server,
 			 mach_port_t credential,
-			 string_t name,
-			 string_t release,
-			 string_t version)
+			 const_string_t name,
+			 const_string_t release,
+			 const_string_t version)
 {
   error_t err = 0;
   int i;
diff --git a/proc/info.c b/proc/info.c
index 435c718f..edade95b 100644
--- a/proc/info.c
+++ b/proc/info.c
@@ -954,7 +954,7 @@ S_proc_getloginpids (struct proc *callerp,
 /* Implement proc_setlogin as described in <hurd/process.defs>. */
 kern_return_t
 S_proc_setlogin (struct proc *p,
-	         string_t login)
+	         const_string_t login)
 {
   struct login *l;
 
@@ -1030,7 +1030,7 @@ S_proc_getnports (struct proc *callerp,
 /* Implement proc_set_path as described in <hurd/process.defs>. */
 kern_return_t
 S_proc_set_exe (struct proc *p,
-	        string_t path)
+	        const_string_t path)
 {
   char *copy;
 
diff --git a/rumpdisk/block-rump.c b/rumpdisk/block-rump.c
index fe97bf85..946792a5 100644
--- a/rumpdisk/block-rump.c
+++ b/rumpdisk/block-rump.c
@@ -206,7 +206,7 @@ rumpdisk_device_sync (void)
 
 static io_return_t
 rumpdisk_device_open (mach_port_t reply_port, mach_msg_type_name_t reply_port_type,
-		      dev_mode_t mode, char *name, device_t * devp,
+		      dev_mode_t mode, const char *name, device_t * devp,
 		      mach_msg_type_name_t * devicePoly)
 {
   io_return_t err;
diff --git a/startup/startup.c b/startup/startup.c
index 3db7e5b5..649d98ab 100644
--- a/startup/startup.c
+++ b/startup/startup.c
@@ -1459,7 +1459,7 @@ S_startup_essential_task (mach_port_t server,
 			  mach_msg_type_name_t replytype,
 			  task_t task,
 			  mach_port_t excpt,
-			  string_t name,
+			  const_string_t name,
 			  mach_port_t credential)
 {
   static int authinit, procinit, execinit, fsinit;
@@ -1546,7 +1546,7 @@ S_startup_essential_task (mach_port_t server,
 kern_return_t
 S_startup_request_notification (mach_port_t server,
 				mach_port_t notify,
-				string_t name)
+				const_string_t name)
 {
   struct ntfy_task *nt;
 
@@ -1694,9 +1694,9 @@ S_msg_add_auth (mach_port_t process,
 kern_return_t
 S_msg_del_auth (mach_port_t process,
 	mach_port_t task,
-	intarray_t uids,
+	const_intarray_t uids,
 	mach_msg_type_number_t uidsCnt,
-	intarray_t gids,
+	const_intarray_t gids,
 	mach_msg_type_number_t gidsCnt)
 { return _S_msg_del_auth (process, task, uids, uidsCnt, gids, gidsCnt); }
 
@@ -1730,7 +1730,7 @@ S_msg_get_init_ports (mach_port_t process,
 kern_return_t
 S_msg_set_init_ports (mach_port_t process,
 	mach_port_t refport,
-	portarray_t ports,
+	const_portarray_t ports,
 	mach_msg_type_number_t portsCnt)
 { return _S_msg_set_init_ports (process, refport, ports, portsCnt); }
 
@@ -1762,7 +1762,7 @@ S_msg_get_init_ints (mach_port_t process,
 kern_return_t
 S_msg_set_init_ints (mach_port_t process,
 	mach_port_t refport,
-	intarray_t values,
+	const_intarray_t values,
 	mach_msg_type_number_t valuesCnt)
 { return _S_msg_set_init_ints (process, refport, values, valuesCnt); }
 
@@ -1779,7 +1779,7 @@ S_msg_get_dtable (mach_port_t process,
 kern_return_t
 S_msg_set_dtable (mach_port_t process,
 	mach_port_t refport,
-	portarray_t dtable,
+	const_portarray_t dtable,
 	mach_msg_type_number_t dtableCnt)
 { return _S_msg_set_dtable (process, refport, dtable, dtableCnt); }
 
@@ -1811,14 +1811,14 @@ S_msg_get_environment (mach_port_t process,
 kern_return_t
 S_msg_set_environment (mach_port_t process,
 	mach_port_t refport,
-	data_t value,
+	const_data_t value,
 	mach_msg_type_number_t valueCnt)
 { return _S_msg_set_environment (process, refport, value, valueCnt); }
 
 
 kern_return_t
 S_msg_get_env_variable (mach_port_t process,
-	string_t variable,
+	const_string_t variable,
 	data_t *value,
 	mach_msg_type_number_t *valueCnt)
 { return _S_msg_get_env_variable (process, variable, value, valueCnt); }
@@ -1827,15 +1827,15 @@ S_msg_get_env_variable (mach_port_t process,
 kern_return_t
 S_msg_set_env_variable (mach_port_t process,
 	mach_port_t refport,
-	string_t variable,
-	string_t value,
+	const_string_t variable,
+	const_string_t value,
 	boolean_t replace)
 { return _S_msg_set_env_variable (process, refport, variable, value, replace); }
 
 error_t
 S_msg_describe_ports (mach_port_t process,
 		      mach_port_t refport,
-		      mach_port_array_t names,
+		      const_mach_port_array_t names,
 		      mach_msg_type_number_t namesCnt,
 		      data_t *descriptions,
 		      mach_msg_type_number_t *descriptionsCnt)
@@ -1857,8 +1857,8 @@ S_msg_report_wait (mach_port_t process, thread_t thread,
 error_t
 S_fsys_getroot (mach_port_t fsys_t,
 		mach_port_t dotdotnode,
-		uid_t *uids, size_t nuids,
-		uid_t *gids, size_t ngids,
+		const id_t *uids, size_t nuids,
+		const id_t *gids, size_t ngids,
 		int flags,
 		retry_type *do_retry,
 		string_t retry_name,
@@ -1923,8 +1923,8 @@ error_t
 S_io_restrict_auth (mach_port_t server,
                     mach_port_t *newport,
                     mach_msg_type_name_t *newporttype,
-                    uid_t *uids, size_t nuids,
-                    uid_t *gids, size_t ngids)
+                    const uid_t *uids, size_t nuids,
+                    const uid_t *gids, size_t ngids)
 {
   struct idvec user = { uids, (unsigned) nuids, (unsigned) nuids };
 
diff --git a/storeio/io.c b/storeio/io.c
index 62bc514f..94bd559a 100644
--- a/storeio/io.c
+++ b/storeio/io.c
@@ -125,7 +125,7 @@ trivfs_S_io_readable (struct trivfs_protid *cred,
 error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
-		   data_t data, mach_msg_type_number_t data_len,
+		   const_data_t data, mach_msg_type_number_t data_len,
 		   loff_t offs, mach_msg_type_number_t *amount)
 {
   if (! cred)
diff --git a/term/ptyio.c b/term/ptyio.c
index 6b015851..fadddc16 100644
--- a/term/ptyio.c
+++ b/term/ptyio.c
@@ -300,7 +300,7 @@ const struct bottomhalf ptyio_bottom =
 /* Validation has already been done by trivfs_S_io_read. */
 error_t
 pty_io_read (struct trivfs_protid *cred,
-	     char **data,
+	     data_t *data,
 	     mach_msg_type_number_t *datalen,
 	     mach_msg_type_number_t amount)
 {
@@ -384,7 +384,7 @@ pty_io_read (struct trivfs_protid *cred,
 /* Validation has already been done by trivfs_S_io_write. */
 error_t
 pty_io_write (struct trivfs_protid *cred,
-	      char *data,
+	      const_data_t data,
 	      mach_msg_type_number_t datalen,
 	      mach_msg_type_number_t *amount)
 {
diff --git a/term/term.h b/term/term.h
index c6763d06..162ed49d 100644
--- a/term/term.h
+++ b/term/term.h
@@ -384,7 +384,7 @@ extern dev_t rdev;
 
 /* kludge--these are pty versions of trivfs_S_io_* functions called by
    the real functions in users.c to do work for ptys.  */
-error_t pty_io_write (struct trivfs_protid *, char *,
+error_t pty_io_write (struct trivfs_protid *, const char *,
 		      mach_msg_type_number_t, mach_msg_type_number_t *);
 error_t pty_io_read (struct trivfs_protid *, char **,
 		     mach_msg_type_number_t *, mach_msg_type_number_t);
diff --git a/term/users.c b/term/users.c
index 0289969d..72f5507d 100644
--- a/term/users.c
+++ b/term/users.c
@@ -561,7 +561,7 @@ error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply,
 		   mach_msg_type_name_t replytype,
-		   data_t data,
+		   const_data_t data,
 		   size_t datalen,
 		   loff_t offset,
 		   size_t *amt)
@@ -1075,9 +1075,9 @@ S_tioctl_tiocgeta (struct trivfs_protid *cred,
 /* Common code for the varios TIOCSET* commands. */
 static error_t
 set_state (struct trivfs_protid *cred,
-	   tcflag_t *modes,
-	   cc_t *ccs,
-	   speed_t *speeds,
+	   const modes_t modes,
+	   const ccs_t ccs,
+	   const speeds_t speeds,
 	   int draino,
 	   int flushi)
 {
@@ -1166,9 +1166,9 @@ set_state (struct trivfs_protid *cred,
 /* TIOCSETA -- Set termios state */
 kern_return_t
 S_tioctl_tiocseta (struct trivfs_protid *cred,
-		   modes_t modes,
-		   ccs_t ccs,
-		   speeds_t speeds)
+		   const modes_t modes,
+		   const ccs_t ccs,
+		   const speeds_t speeds)
 {
   return set_state (cred, modes, ccs, speeds, 0, 0);
 }
@@ -1176,9 +1176,9 @@ S_tioctl_tiocseta (struct trivfs_protid *cred,
 /* Drain output, then set term state.  */
 kern_return_t
 S_tioctl_tiocsetaw (struct trivfs_protid *cred,
-		    modes_t modes,
-		    ccs_t ccs,
-		    speeds_t speeds)
+		    const modes_t modes,
+		    const ccs_t ccs,
+		    const speeds_t speeds)
 {
   return set_state (cred, modes, ccs, speeds, 1, 0);
 }
@@ -1186,9 +1186,9 @@ S_tioctl_tiocsetaw (struct trivfs_protid *cred,
 /* Flush input, drain output, then set term state.  */
 kern_return_t
 S_tioctl_tiocsetaf (struct trivfs_protid *cred,
-		    modes_t modes,
-		    ccs_t ccs,
-		    speeds_t speeds)
+		    const modes_t modes,
+		    const ccs_t ccs,
+		    const speeds_t speeds)
 
 {
   return set_state (cred, modes, ccs, speeds, 1, 1);
@@ -2144,7 +2144,7 @@ S_term_get_nodename (struct trivfs_protid *cred,
 
 kern_return_t
 S_term_set_nodename (struct trivfs_protid *cred,
-		     string_t name)
+		     const_string_t name)
 {
   error_t err = 0;
   if (!cred
diff --git a/trans/bogus-fifo.c b/trans/bogus-fifo.c
index acad6e4b..20941e37 100644
--- a/trans/bogus-fifo.c
+++ b/trans/bogus-fifo.c
@@ -87,7 +87,7 @@ main (int argc, char **argv)
 
 error_t
 S_fsys_getroot (mach_port_t fsys, mach_port_t parent,
-		uid_t *uids, unsigned num_uids, gid_t *gids, unsigned num_gids,
+		const id_t *uids, unsigned num_uids, const id_t *gids, unsigned num_gids,
 		int flags,
 		retry_type *do_retry, char *retry_name,
 		mach_port_t *result, mach_msg_type_name_t *result_type)
@@ -123,15 +123,15 @@ S_fsys_syncfs (mach_port_t fsys, int wait, int recurse)
 
 error_t
 S_fsys_set_options (mach_port_t fsys,
-		    char *data, mach_msg_type_number_t data_len, int recurse)
+		    const char *data, mach_msg_type_number_t data_len, int recurse)
 {
   return EOPNOTSUPP;
 }
 
 error_t
 S_fsys_getfile (mach_port_t fsys,
-		uid_t *uids, unsigned num_uids, gid_t *gids, unsigned num_gids,
-		char *handle, unsigned handle_len,
+		const uid_t *uids, unsigned num_uids, const gid_t *gids, unsigned num_gids,
+		const char *handle, unsigned handle_len,
 		mach_port_t *port, mach_msg_type_name_t *port_type)
 {
   return EOPNOTSUPP;
@@ -154,7 +154,7 @@ S_fsys_init (mach_port_t fsys,
 
 error_t
 S_fsys_forward (mach_port_t server, mach_port_t requestor,
-		char *argz, size_t argz_len)
+		const char *argz, size_t argz_len)
 {
   return EOPNOTSUPP;
 }
diff --git a/trans/crash.c b/trans/crash.c
index 838ae9b2..6d494ce0 100644
--- a/trans/crash.c
+++ b/trans/crash.c
@@ -856,9 +856,9 @@ S_msg_add_auth (mach_port_t process,
 kern_return_t
 S_msg_del_auth (mach_port_t process,
 		mach_port_t task,
-		intarray_t uids,
+		const_intarray_t uids,
 		mach_msg_type_number_t uidsCnt,
-		intarray_t gids,
+		const_intarray_t gids,
 		mach_msg_type_number_t gidsCnt)
 { return EBUSY; }
 
@@ -888,7 +888,7 @@ S_msg_get_init_ports (mach_port_t process,
 kern_return_t
 S_msg_set_init_ports (mach_port_t process,
 		      mach_port_t refport,
-		      portarray_t ports,
+		      const_portarray_t ports,
 		      mach_msg_type_number_t portsCnt)
 { return EBUSY; }
 
@@ -916,7 +916,7 @@ S_msg_get_init_ints (mach_port_t process,
 kern_return_t
 S_msg_set_init_ints (mach_port_t process,
 		     mach_port_t refport,
-		     intarray_t values,
+		     const_intarray_t values,
 		     mach_msg_type_number_t valuesCnt)
 { return EBUSY; }
 
@@ -931,7 +931,7 @@ S_msg_get_dtable (mach_port_t process,
 kern_return_t
 S_msg_set_dtable (mach_port_t process,
 		  mach_port_t refport,
-		  portarray_t dtable,
+		  const_portarray_t dtable,
 		  mach_msg_type_number_t dtableCnt)
 { return EBUSY; }
 
@@ -959,13 +959,13 @@ S_msg_get_environment (mach_port_t process,
 kern_return_t
 S_msg_set_environment (mach_port_t process,
 		       mach_port_t refport,
-		       data_t value,
+		       const_data_t value,
 		       mach_msg_type_number_t valueCnt)
 { return EBUSY; }
 
 kern_return_t
 S_msg_get_env_variable (mach_port_t process,
-			string_t variable,
+			const_string_t variable,
 			data_t *value,
 			mach_msg_type_number_t *valueCnt)
 { return EBUSY; }
@@ -973,8 +973,8 @@ S_msg_get_env_variable (mach_port_t process,
 kern_return_t
 S_msg_set_env_variable (mach_port_t process,
 			mach_port_t refport,
-			string_t variable,
-			string_t value,
+			const_string_t variable,
+			const_string_t value,
 			boolean_t replace)
 { return EBUSY; }
 kern_return_t
@@ -996,6 +996,6 @@ S_msg_report_wait (mach_port_t process, thread_t thread,
 { return EBUSY; }
 error_t
 S_msg_describe_ports (mach_port_t msgport, mach_port_t refport,
-		      mach_port_t *ports, mach_msg_type_number_t nports,
+		      const mach_port_t *ports, mach_msg_type_number_t nports,
 		      data_t *desc, mach_msg_type_number_t *desclen)
 { return EBUSY; }
diff --git a/trans/fakeroot.c b/trans/fakeroot.c
index e8825abf..c43a1c00 100644
--- a/trans/fakeroot.c
+++ b/trans/fakeroot.c
@@ -282,7 +282,7 @@ netfs_check_open_permissions (struct iouser *user, struct node *np,
 
 error_t
 netfs_S_dir_lookup (struct protid *diruser,
-		    string_t filename,
+		    const_string_t filename,
 		    int flags,
 		    mode_t mode,
 		    retry_type *do_retry,
@@ -907,21 +907,21 @@ kern_return_t
 netfs_S_file_exec_paths (struct protid *user,
 			 task_t task,
 			 int flags,
-			 string_t path,
-			 string_t abspath,
-			 char *argv,
+			 const_string_t path,
+			 const_string_t abspath,
+			 const char *argv,
 			 size_t argvlen,
-			 char *envp,
+			 const char *envp,
 			 size_t envplen,
-			 mach_port_t *fds,
+			 const mach_port_t *fds,
 			 size_t fdslen,
-			 mach_port_t *portarray,
+			 const mach_port_t *portarray,
 			 size_t portarraylen,
-			 int *intarray,
+			 const int *intarray,
 			 size_t intarraylen,
-			 mach_port_t *deallocnames,
+			 const mach_port_t *deallocnames,
 			 size_t deallocnameslen,
-			 mach_port_t *destroynames,
+			 const mach_port_t *destroynames,
 			 size_t destroynameslen)
 {
   error_t err;
@@ -984,19 +984,19 @@ kern_return_t
 netfs_S_file_exec (struct protid *user,
                    task_t task,
                    int flags,
-                   data_t argv,
+                   const_data_t argv,
                    size_t argvlen,
-                   data_t envp,
+                   const_data_t envp,
                    size_t envplen,
-                   mach_port_t *fds,
+                   const mach_port_t *fds,
                    size_t fdslen,
-                   mach_port_t *portarray,
+                   const mach_port_t *portarray,
                    size_t portarraylen,
-                   int *intarray,
+                   const int *intarray,
                    size_t intarraylen,
-                   mach_port_t *deallocnames,
+                   const mach_port_t *deallocnames,
                    size_t deallocnameslen,
-                   mach_port_t *destroynames,
+                   const mach_port_t *destroynames,
                    size_t destroynameslen)
 {
   return netfs_S_file_exec_paths (user,
diff --git a/trans/fifo.c b/trans/fifo.c
index 326e9a1d..ce7c7729 100644
--- a/trans/fifo.c
+++ b/trans/fifo.c
@@ -502,7 +502,7 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
-		   data_t data, size_t data_len,
+		   const_data_t data, size_t data_len,
 		   off_t offs, size_t *amount)
 {
   error_t err;
diff --git a/trans/magic.c b/trans/magic.c
index e38efcae..bc23e719 100644
--- a/trans/magic.c
+++ b/trans/magic.c
@@ -217,7 +217,7 @@ magic_protid_destroy (struct trivfs_protid *cred)
 error_t
 trivfs_S_dir_lookup (struct trivfs_protid *cred,
 		     mach_port_t reply, mach_msg_type_name_t reply_type,
-		     char *name,
+		     const_string_t name,
 		     int flags,
 		     mode_t mode,
 		     retry_type *retry_type,
@@ -525,7 +525,7 @@ trivfs_S_fsys_forward (mach_port_t server,
 		       mach_port_t reply,
 		       mach_msg_type_name_t replytype,
 		       mach_port_t requestor,
-		       char *argz, size_t argz_len)
+		       const char *argz, size_t argz_len)
 {
   struct trivfs_protid *cred
     = ports_lookup_port (all_fsys->pi.bucket, server, trivfs_protid_class);
diff --git a/trans/new-fifo.c b/trans/new-fifo.c
index f674837f..9a959a39 100644
--- a/trans/new-fifo.c
+++ b/trans/new-fifo.c
@@ -689,7 +689,7 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
-		   data_t data, size_t data_len,
+		   const_data_t data, size_t data_len,
 		   off_t offs, size_t *amount)
 {
   error_t err;
@@ -821,7 +821,7 @@ trivfs_S_fsys_forward (mach_port_t server,
 		       mach_port_t reply,
 		       mach_msg_type_name_t replytype,
 		       mach_port_t requestor,
-		       data_t argz, size_t argz_len)
+		       const_data_t argz, size_t argz_len)
 {
   error_t err;
   struct fifo_trans *server_trans, *trans;
diff --git a/trans/null.c b/trans/null.c
index 5f7660f5..034bb103 100644
--- a/trans/null.c
+++ b/trans/null.c
@@ -227,7 +227,7 @@ trivfs_S_io_select_timeout (struct trivfs_protid *cred,
 kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t replytype,
-		   data_t data, mach_msg_type_number_t datalen,
+		   const_data_t data, mach_msg_type_number_t datalen,
 		   loff_t offs, mach_msg_type_number_t *amt)
 {
   if (!cred)
diff --git a/trans/password.c b/trans/password.c
index 2b16cefd..2777b43d 100644
--- a/trans/password.c
+++ b/trans/password.c
@@ -141,7 +141,7 @@ trivfs_goaway (struct trivfs_control *fsys, int flags)
 
 /* Implement password_check_user as described in <hurd/password.defs>.  */
 kern_return_t
-S_password_check_user (struct trivfs_protid *cred, uid_t user, string_t pw,
+S_password_check_user (struct trivfs_protid *cred, uid_t user, const_string_t pw,
 		       mach_port_t *port, mach_msg_type_name_t *port_type)
 {
   struct ugids ugids = UGIDS_INIT;
@@ -189,7 +189,7 @@ S_password_check_user (struct trivfs_protid *cred, uid_t user, string_t pw,
 
 /* Implement password_check_group as described in <hurd/password.defs>.  */
 kern_return_t
-S_password_check_group (struct trivfs_protid *cred, uid_t group, string_t pw,
+S_password_check_group (struct trivfs_protid *cred, uid_t group, const_string_t pw,
 			mach_port_t *port, mach_msg_type_name_t *port_type)
 {
   struct ugids ugids = UGIDS_INIT;
diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c
index 1bb13b7d..8ca25b72 100644
--- a/trans/proxy-defpager.c
+++ b/trans/proxy-defpager.c
@@ -103,7 +103,7 @@ S_default_pager_object_pages (mach_port_t default_pager,
 kern_return_t
 S_default_pager_paging_file (mach_port_t default_pager,
 			     mach_port_t master_device_port,
-			     default_pager_filename_t filename,
+			     const_default_pager_filename_t filename,
 			     boolean_t add)
 {
   return allowed (default_pager, O_WRITE)
@@ -114,8 +114,8 @@ S_default_pager_paging_file (mach_port_t default_pager,
 kern_return_t
 S_default_pager_paging_storage (mach_port_t default_pager,
 				mach_port_t device,
-				recnum_t *runs, mach_msg_type_number_t nruns,
-				default_pager_filename_t name,
+				const recnum_t *runs, mach_msg_type_number_t nruns,
+				const_default_pager_filename_t name,
 				boolean_t add)
 {
   return allowed (default_pager, O_WRITE)
@@ -180,7 +180,7 @@ trivfs_S_io_read (struct trivfs_protid *cred,
 kern_return_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t replytype,
-		   data_t data, mach_msg_type_number_t datalen,
+		   const_data_t data, mach_msg_type_number_t datalen,
 		   loff_t offs, mach_msg_type_number_t *amt)
 {
   if (!cred)
diff --git a/trans/random.c b/trans/random.c
index e85bf65e..c230280a 100644
--- a/trans/random.c
+++ b/trans/random.c
@@ -375,7 +375,7 @@ error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
                    mach_port_t reply,
                    mach_msg_type_name_t replytype,
-                   data_t data,
+                   const_data_t data,
                    mach_msg_type_number_t datalen,
                    loff_t offset,
                    mach_msg_type_number_t *amount)
diff --git a/trans/remap.c b/trans/remap.c
index fcd276d6..29feef95 100644
--- a/trans/remap.c
+++ b/trans/remap.c
@@ -56,7 +56,7 @@ static struct remap *remaps;
 error_t
 trivfs_S_dir_lookup (struct trivfs_protid *diruser,
 		     mach_port_t reply, mach_msg_type_name_t reply_type,
-		     char *filename,
+		     const_string_t filename,
 		     int flags,
 		     mode_t mode,
 		     retry_type *do_retry,
diff --git a/trans/streamio.c b/trans/streamio.c
index fb449a8a..566f0aa5 100644
--- a/trans/streamio.c
+++ b/trans/streamio.c
@@ -520,7 +520,7 @@ trivfs_S_io_readable (struct trivfs_protid *cred,
 error_t
 trivfs_S_io_write (struct trivfs_protid *cred,
 		   mach_port_t reply, mach_msg_type_name_t reply_type,
-		   data_t data, mach_msg_type_number_t data_len,
+		   const_data_t data, mach_msg_type_number_t data_len,
 		   loff_t offs, mach_msg_type_number_t *amount)
 {
   error_t err;
@@ -998,7 +998,7 @@ dev_read (size_t amount, void **buf, size_t *len, int nowait)
 
 error_t
 device_read_reply_inband (mach_port_t reply, error_t errorcode,
-			  io_buf_ptr_inband_t data, u_int datalen)
+			  const io_buf_ptr_inband_t data, u_int datalen)
 {
   if (reply != phys_reply)
     return EOPNOTSUPP;
diff --git a/trans/symlink.c b/trans/symlink.c
index f7883448..06e962cf 100644
--- a/trans/symlink.c
+++ b/trans/symlink.c
@@ -125,8 +125,8 @@ main (int argc, char **argv)
 error_t
 S_fsys_getroot (mach_port_t fsys_t,
 		mach_port_t dotdotnode,
-		uid_t *uids, size_t nuids,
-		uid_t *gids, size_t ngids,
+		const id_t *uids, size_t nuids,
+		const id_t *gids, size_t ngids,
 		int flags,
 		retry_type *do_retry,
 		string_t retry_name,
diff --git a/utils/fakeauth.c b/utils/fakeauth.c
index 264be22b..5669f624 100644
--- a/utils/fakeauth.c
+++ b/utils/fakeauth.c
@@ -105,11 +105,11 @@ S_auth_getids (struct authhandle *auth,
 /* Implement auth_makeauth as described in <hurd/auth.defs>. */
 kern_return_t
 S_auth_makeauth (struct authhandle *auth,
-		 mach_port_t *authpts, size_t nauths,
-		 uid_t *euids, size_t neuids,
-		 uid_t *auids, size_t nauids,
-		 uid_t *egids, size_t negids,
-		 uid_t *agids, size_t nagids,
+		 const mach_port_t *authpts, size_t nauths,
+		 const uid_t *euids, size_t neuids,
+		 const uid_t *auids, size_t nauids,
+		 const uid_t *egids, size_t negids,
+		 const uid_t *agids, size_t nagids,
 		 mach_port_t *newhandle)
 {
   struct authhandle *newauth, *auths[1 + nauths];