fixing dependencies
fixing dependencies 2
removing unnecessary dependencies
Merge pull request #86 from Jailander/hydro-devel

fixing circular dependencies