Solve cyclic references

Why remove the header?