diff --git a/elf/dl-close.c b/elf/dl-close.c
index cd4e44eef4..df0572265d 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -1,5 +1,5 @@
 /* Close a shared object opened by `_dl_open'.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,1998,1999,2000,2001 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
@@ -182,7 +182,7 @@ _dl_close (void *_map)
 	  if (__builtin_expect (imap->l_global, 0))
 	    {
 	      /* This object is in the global scope list.  Remove it.  */
-	      int cnt = _dl_main_searchlist->r_nlist;
+	      unsigned int cnt = _dl_main_searchlist->r_nlist;
 
 	      do
 		--cnt;
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 8eff49cbbe..b18089c05e 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1604,7 +1604,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
 	      if (l && __builtin_expect (l->l_flags_1 & DF_1_NODEFLIB, 0))
 		{
 		  const char *dirp = system_dirs;
-		  int cnt = 0;
+		  unsigned int cnt = 0;
 
 		  do
 		    {
diff --git a/elf/dl-open.c b/elf/dl-open.c
index b8d28f826f..c02ecab26d 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -1,5 +1,5 @@
 /* Load a shared object at runtime, relocate it, and run its initializer.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,1998,1999,2000,2001 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
@@ -397,7 +397,7 @@ _dl_open (const char *file, int mode, const void *caller)
 	 state if relocation failed, for example.  */
       if (args.map)
 	{
-	  int i;
+	  unsigned int i;
 
 	  /* Increment open counters for all objects since this has
 	     not happened yet.  */
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 644b15b2e0..a6e4cd3c1f 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -462,7 +462,7 @@ process_fd (iconv_t cd, int fd, FILE *output)
 
   while (actlen < maxlen)
     {
-      size_t n = read (fd, inptr, maxlen - actlen);
+      ssize_t n = read (fd, inptr, maxlen - actlen);
 
       if (n == 0)
 	/* No more text to read.  */
@@ -482,7 +482,7 @@ process_fd (iconv_t cd, int fd, FILE *output)
   if (actlen == maxlen)
     while (1)
       {
-	size_t n;
+	ssize_t n;
 
 	/* Increase the buffer.  */
 	maxlen += 32768;
diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c
index 4c619ed4bb..24a72e2131 100644
--- a/posix/fnmatch_loop.c
+++ b/posix/fnmatch_loop.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993, 1996-1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993, 1996-2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This library is free software; you can redistribute it and/or
@@ -438,7 +438,7 @@ FCT (pattern, string, no_leading_period, flags)
 			    const int32_t *symb_table;
 # ifdef WIDE_CHAR_VERSION
 			    char str[c1];
-			    int strcnt;
+			    unsigned int strcnt;
 # else
 #  define str (startp + 1)
 # endif
@@ -643,7 +643,7 @@ FCT (pattern, string, no_leading_period, flags)
 				const int32_t *symb_table;
 # ifdef WIDE_CHAR_VERSION
 				char str[c1];
-				int strcnt;
+				unsigned int strcnt;
 # else
 #  define str (startp + 1)
 # endif
diff --git a/posix/wordexp.c b/posix/wordexp.c
index 4bd84ddb7a..82765e1820 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -1,5 +1,5 @@
 /* POSIX.2 wordexp implementation.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Tim Waugh <tim@cyberelk.demon.co.uk>.
 
@@ -382,7 +382,7 @@ do_parse_glob (const char *glob_word, char **word, size_t *word_length,
 	       const char *ifs_white)
 {
   int error;
-  int match;
+  unsigned int match;
   glob_t globbuf;
 
   error = glob (glob_word, GLOB_NOCHECK, NULL, &globbuf);
diff --git a/sysdeps/posix/sigblock.c b/sysdeps/posix/sigblock.c
index b652cf7c31..3743b5abe0 100644
--- a/sysdeps/posix/sigblock.c
+++ b/sysdeps/posix/sigblock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 94, 95, 96, 97, 98, 2001 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
@@ -24,7 +24,7 @@ int
 __sigblock (mask)
      int mask;
 {
-  register int sig;
+  register unsigned int sig;
   sigset_t set, oset;
 
   if (__sigemptyset (&set) < 0)
diff --git a/sysdeps/posix/sigsetmask.c b/sysdeps/posix/sigsetmask.c
index fbbdafa3c9..4ead0170f3 100644
--- a/sysdeps/posix/sigsetmask.c
+++ b/sysdeps/posix/sigsetmask.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1994,1995,1996,1997,2001 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
@@ -23,7 +23,7 @@
 int
 __sigsetmask (int mask)
 {
-  register int sig;
+  register unsigned int sig;
   sigset_t set, oset;
 
   if (__sigemptyset (&set) < 0)