Added back some indirect but used deps.