Fix preprocessor indentation and restore missing iconv code