Added some additional #ifdef SUPPORT_UTF8 to minimize the code when UTF-8 support is not compiled.
Changed paths: