Remove unnecessary circular dependencies, fix include guard sequencing, and re-implement taneff<->seceff in terms of exp/hyp declines.