Index: development/scons/scons_manifest.py
===================================================================
--- development/scons/scons_manifest.py	(revision 14673)
+++ development/scons/scons_manifest.py	(working copy)
@@ -124,6 +124,7 @@
     types.h
     unicode.h
     userinfo.h
+    unicode.h
 ''')
 
 
@@ -157,6 +158,7 @@
     unicode.C
     unlink.C
     userinfo.C
+    unicode.C
 ''')
 
 
Index: development/scons/SConstruct
===================================================================
--- development/scons/SConstruct	(revision 14673)
+++ development/scons/SConstruct	(working copy)
@@ -1035,6 +1035,12 @@
                 'MKDIR_TAKES_ONE_ARG',
                 'Define if mkdir takes only one argument.'
             ),
+            (conf.CheckIconvConst(),
+                'ICONV_CONST',
+                'Define as const if the declaration of iconv() needs const.',
+                '#define ICONV_CONST',
+                '#define ICONV_CONST const',
+            ),
             (conf.CheckLC_MESSAGES(),
                 'HAVE_LC_MESSAGES',
                 'Define if your <locale.h> file defines LC_MESSAGES.'