Fix Athena compilation due to Validator.cxx move