Fix header dependancies