Added two dependencies to generated files, to avoid potential build failures due to premature use of them