Get rid of some more header dependencies