Reduce dependency on headers