Solve cyclic references

Why remove header?