Fix issues with combining unicode srcdirs and source files.