Added missing "#ifdef ICONV_OPTION" conditionals.