Revert "Revert "Add missing dependencies""

This reverts commit 6f0280ceaab8689d4edc027fc7c45b67d59bc111.