Further reduce header dependencies