Janitor - fix warning about redefined symbols