Reworked header dependencies.