Issue #195: Fixing dependencies in FOAM (III)