Reduce inclusion of dependencies to reduce dependency cycles