Add diagnostic_aggregator and enu dependencies