Dependence fixes for Catalyst
This issue was created automatically from an original Mantis Issue. Further discussion may take place here.
Add explicit dependence where in the past transitive dependence have been relied on. Also remove some unnecessary dependencies.