Index: include/iconv.h
===================================================================
--- include/iconv.h	(revision 280959)
+++ include/iconv.h	(working copy)
@@ -53,7 +53,7 @@ typedef	struct __tag_iconv_t	*iconv_t;
 
 __BEGIN_DECLS
 iconv_t	iconv_open(const char *, const char *);
-size_t	iconv(iconv_t, const char ** __restrict,
+size_t	iconv(iconv_t, char ** __restrict,
 	      size_t * __restrict, char ** __restrict,
 	      size_t * __restrict);
 int	iconv_close(iconv_t);
Index: lib/libiconv_modules/iconv_none/citrus_iconv_none.c
===================================================================
--- lib/libiconv_modules/iconv_none/citrus_iconv_none.c	(revision 280959)
+++ lib/libiconv_modules/iconv_none/citrus_iconv_none.c	(working copy)
@@ -97,7 +97,7 @@ _citrus_iconv_none_iconv_uninit_context(
 static int
 /*ARGSUSED*/
 _citrus_iconv_none_iconv_convert(struct _citrus_iconv * __restrict ci __unused,
-    const char * __restrict * __restrict in, size_t * __restrict inbytes,
+    char * __restrict * __restrict in, size_t * __restrict inbytes,
     char * __restrict * __restrict out, size_t * __restrict outbytes,
     uint32_t flags __unused, size_t * __restrict invalids)
 {
Index: lib/libiconv_modules/iconv_std/citrus_iconv_std.c
===================================================================
--- lib/libiconv_modules/iconv_std/citrus_iconv_std.c	(revision 280959)
+++ lib/libiconv_modules/iconv_std/citrus_iconv_std.c	(working copy)
@@ -461,7 +461,7 @@ _citrus_iconv_std_iconv_uninit_context(s
 
 static int
 _citrus_iconv_std_iconv_convert(struct _citrus_iconv * __restrict cv,
-    const char * __restrict * __restrict in, size_t * __restrict inbytes,
+    char * __restrict * __restrict in, size_t * __restrict inbytes,
     char * __restrict * __restrict out, size_t * __restrict outbytes,
     uint32_t flags, size_t * __restrict invalids)
 {
Index: lib/libc/iconv/bsd_iconv.c
===================================================================
--- lib/libc/iconv/bsd_iconv.c	(revision 280959)
+++ lib/libc/iconv/bsd_iconv.c	(working copy)
@@ -120,7 +120,7 @@ __bsd_iconv_close(iconv_t handle)
 }
 
 size_t
-__bsd_iconv(iconv_t handle, const char **in, size_t *szin, char **out, size_t *szout)
+__bsd_iconv(iconv_t handle, char **in, size_t *szin, char **out, size_t *szout)
 {
 	size_t ret;
 	int err;
Index: lib/libc/iconv/citrus_iconv.h
===================================================================
--- lib/libc/iconv/citrus_iconv.h	(revision 280959)
+++ lib/libc/iconv/citrus_iconv.h	(working copy)
@@ -52,7 +52,7 @@ __END_DECLS
  */
 static __inline int
 _citrus_iconv_convert(struct _citrus_iconv * __restrict cv,
-    const char * __restrict * __restrict in, size_t * __restrict inbytes,
+    char * __restrict * __restrict in, size_t * __restrict inbytes,
     char * __restrict * __restrict out, size_t * __restrict outbytes,
     uint32_t flags, size_t * __restrict nresults)
 {
Index: lib/libc/iconv/citrus_iconv_local.h
===================================================================
--- lib/libc/iconv/citrus_iconv_local.h	(revision 280959)
+++ lib/libc/iconv/citrus_iconv_local.h	(working copy)
@@ -46,7 +46,7 @@ static void	 _citrus_##_m_##_iconv_unini
 		    (struct _citrus_iconv_shared *);			\
 static int	 _citrus_##_m_##_iconv_convert				\
 		    (struct _citrus_iconv * __restrict,			\
-		    const char * __restrict * __restrict,		\
+		    char * __restrict * __restrict,			\
 		    size_t * __restrict,				\
 		    char * __restrict * __restrict,			\
 		    size_t * __restrict outbytes,			\
@@ -75,7 +75,7 @@ typedef void (*_citrus_iconv_uninit_shar
     (struct _citrus_iconv_shared *);
 typedef int (*_citrus_iconv_convert_t)
     (struct _citrus_iconv * __restrict,
-    const char *__restrict* __restrict, size_t * __restrict,
+    char *__restrict* __restrict, size_t * __restrict,
     char * __restrict * __restrict, size_t * __restrict, uint32_t,
     size_t * __restrict);
 typedef int (*_citrus_iconv_init_context_t)(struct _citrus_iconv *);
Index: lib/libc/iconv/iconv-internal.h
===================================================================
--- lib/libc/iconv/iconv-internal.h	(revision 280959)
+++ lib/libc/iconv/iconv-internal.h	(working copy)
@@ -33,7 +33,7 @@ size_t	__bsd___iconv(iconv_t, const char
 		size_t *, __uint32_t, size_t *);
 void	__bsd___iconv_free_list(char **, size_t);
 int	__bsd___iconv_get_list(char ***, size_t *, __iconv_bool);
-size_t	__bsd_iconv(iconv_t, const char ** __restrict,
+size_t	__bsd_iconv(iconv_t, char ** __restrict,
 		    size_t * __restrict, char ** __restrict,
 		    size_t * __restrict);
 const char *__bsd_iconv_canonicalize(const char *);
Index: lib/libc/iconv/iconv.c
===================================================================
--- lib/libc/iconv/iconv.c	(revision 280959)
+++ lib/libc/iconv/iconv.c	(working copy)
@@ -31,7 +31,7 @@
 #include "iconv-internal.h"
 
 size_t
-iconv(iconv_t a, const char ** __restrict b,
+iconv(iconv_t a, char ** __restrict b,
       size_t * __restrict c, char ** __restrict d,
       size_t * __restrict e)
 {