Changes for script-level includes resolution, plus updates of license headers.