diff --git a/hurd/hurdioctl.c b/hurd/hurdioctl.c
index 9fdb1bc0cc..96d910ba1a 100644
--- a/hurd/hurdioctl.c
+++ b/hurd/hurdioctl.c
@@ -1,5 +1,5 @@
 /* ioctl commands which must be done in the C library.
-   Copyright (C) 1994,95,96,97,99,2001 Free Software Foundation, Inc.
+   Copyright (C) 1994,95,96,97,99,2001,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -311,7 +311,7 @@ static int
 siocgifconf (int fd, int request, struct ifconf *ifc)
 {
   error_t err;
-  int data_len = ifc->ifc_len;
+  size_t data_len = ifc->ifc_len;
   char *data = ifc->ifc_buf;
 
   if (data_len <= 0)
diff --git a/sysdeps/mach/hurd/getpriority.c b/sysdeps/mach/hurd/getpriority.c
index e3016ee1d8..9fede4d2f0 100644
--- a/sysdeps/mach/hurd/getpriority.c
+++ b/sysdeps/mach/hurd/getpriority.c
@@ -31,7 +31,7 @@ getpriority (enum __priority_which which, id_t who)
   int maxpri = INT_MIN;
   struct procinfo *pip;		/* Just for sizeof.  */
   int pibuf[sizeof *pip + 2 * sizeof (pip->threadinfos[0])], *pi = pibuf;
-  unsigned int pisize = sizeof pibuf / sizeof pibuf[0];
+  size_t pisize = sizeof pibuf / sizeof pibuf[0];
 
   error_t getonepriority (pid_t pid, struct procinfo *pip)
     {
@@ -40,7 +40,7 @@ getpriority (enum __priority_which which, id_t who)
       else
 	{
 	  int *oldpi = pi;
-	  unsigned int oldpisize = pisize;
+	  size_t oldpisize = pisize;
 	  char *tw = 0;
 	  size_t twsz = 0;
 	  int flags = PI_FETCH_TASKINFO;
diff --git a/sysdeps/mach/hurd/send.c b/sysdeps/mach/hurd/send.c
index a5d57b8c4b..69cec5512e 100644
--- a/sysdeps/mach/hurd/send.c
+++ b/sysdeps/mach/hurd/send.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1996, 1997, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1994,96,97,2001,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ __send (fd, buf, n, flags)
      int flags;
 {
   error_t err;
-  int wrote;
+  size_t wrote;
 
   err = HURD_DPORT_USE (fd, __socket_send (port, MACH_PORT_NULL,
 					   flags, buf, n,
diff --git a/sysdeps/mach/hurd/sendto.c b/sysdeps/mach/hurd/sendto.c
index 70ea54c38e..50bb77172c 100644
--- a/sysdeps/mach/hurd/sendto.c
+++ b/sysdeps/mach/hurd/sendto.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1996, 1997, 1999, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1994,95,96,97,99,2001,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ sendto (int fd,
 {
   addr_port_t aport;
   error_t err;
-  int wrote;
+  size_t wrote;
 
   if (addr->sun_family == AF_LOCAL)
     {
diff --git a/sysdeps/mach/hurd/wait4.c b/sysdeps/mach/hurd/wait4.c
index 2a6e820097..d9e23412ea 100644
--- a/sysdeps/mach/hurd/wait4.c
+++ b/sysdeps/mach/hurd/wait4.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,94,95,96,97,98,99 Free Software Foundation, Inc.
+/* Copyright (C) 1993,94,95,96,97,98,99,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@ __wait4 (pid_t pid, __WAIT_STATUS_DEFN stat_loc, int options,
   pid_t dead;
   error_t err;
   struct rusage ignored;
-  natural_t sigcode;
+  int sigcode;
   int dummy;
 
   err = __USEPORT (PROC, __proc_wait (port, pid, options,