Handling header dependencies