BZ 1038713: adjusted module dependencies.