patch from nik: properly integrate changes after compilation of multi-source classes