Now hopefully our layers don't have to be always depending on everything

Signed-off-by: Michael Donaghy <md401@srcf.ucam.org>