CSPACE-6266: Fix requires, had caused a cyclic dependency graph.