g2-Common: dependencies fixup.