Fix header building