Hotfix: Fix incorrect dependencies for some packages #3318

Job	Run time
Check that it conforms to the style guide	2m 52s
Check that it builds without error	2m 17s
	5m 9s

Provide feedback