make dependencies general

Change-Id: I7eea22219342a14524e6dada1431434696eb3d7c