diff --git a/ChangeLog b/ChangeLog
index c319a21caa..c95fd268b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2001-08-18  Ulrich Drepper  <drepper@redhat.com>
 
+	* wcsmbs/wchar.h (wcwdith): Change parameter type to wchar_t.
+	* wcsmbs/wcwidth.c (wcwdith): Likewise.
+	* wcsmbs/wcwidth.h (internal_wcwdith): Likewise.
+
+	* conform/data/unistd.h-data: Remove _SC_MULTIPLE_PROCESS.
+
+	* conform/data/ucontext.h-data: Fix typos in ucontext_t element tests.
+
 	* time/time.h (struct timespec): Use __time_t for tv_sec element.
 
 	* sysdeps/generic/inttypes.h: Define __wchar_t.  Use it instead of
diff --git a/conform/data/ucontext.h-data b/conform/data/ucontext.h-data
index 87a6025b55..3540fdd27f 100644
--- a/conform/data/ucontext.h-data
+++ b/conform/data/ucontext.h-data
@@ -2,10 +2,10 @@ type mcontext_t
 
 type ucontext_t
 
-element {struct ucontext_t} {ucontext_t*} uc_link
-element {struct ucontext_t} sigset_t uc_sigmask
-element {struct ucontext_t} stack_t uc_stack
-element {struct ucontext_t} mcontext_t uc_mcontext
+element ucontext_t {ucontext_t*} uc_link
+element ucontext_t sigset_t uc_sigmask
+element ucontext_t stack_t uc_stack
+element ucontext_t mcontext_t uc_mcontext
 
 type sigset_t
 type stack_t
diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data
index c7e9f9920a..757d5c9905 100644
--- a/conform/data/unistd.h-data
+++ b/conform/data/unistd.h-data
@@ -174,7 +174,6 @@ constant _SC_MESSAGE_PASSING
 constant _SC_MONOTONIC_CLOCK
 constant _SC_MQ_OPEN_MAX
 constant _SC_MQ_PRIO_MAX
-constant _SC_MULTIPLE_PROCESS
 constant _SC_NETWORKING
 constant _SC_NGROUPS_MAX
 constant _SC_OPEN_MAX
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 46ed8d8458..b7b63baadc 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -324,7 +324,7 @@ extern size_t wcsnrtombs (char *__restrict __dst,
 /* The following functions are extensions found in X/Open CAE.  */
 #ifdef __USE_XOPEN
 /* Determine number of column positions required for C.  */
-extern int wcwidth (wint_t __c) __THROW;
+extern int wcwidth (wchar_t __c) __THROW;
 
 /* Determine number of column positions required for first N wide
    characters (or fewer if S ends before this) in S.  */
diff --git a/wcsmbs/wcwidth.c b/wcsmbs/wcwidth.c
index 6631c47ead..82dd0201df 100644
--- a/wcsmbs/wcwidth.c
+++ b/wcsmbs/wcwidth.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
 
@@ -21,7 +21,7 @@
 
 /* Determine number of column positions required for CH.  */
 int
-wcwidth (wint_t ch)
+wcwidth (wchar_t ch)
 {
   return internal_wcwidth (ch);
 }
diff --git a/wcsmbs/wcwidth.h b/wcsmbs/wcwidth.h
index 2cea530a16..92ee3d62fe 100644
--- a/wcsmbs/wcwidth.h
+++ b/wcsmbs/wcwidth.h
@@ -1,5 +1,5 @@
 /* Internal header containing implementation of wcwidth() function.
-   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
 
@@ -26,7 +26,7 @@
 extern const char *__ctype32_width;
 
 static __inline int
-internal_wcwidth (wint_t wc)
+internal_wcwidth (wchar_t wc)
 {
   unsigned char res;