Refactor how dependencies are included; fixes #5109