Need to fix dependencies because of upstream package split.
Needed in hbl and newer (hbd and master).