Clean up header dependencies