Solve cyclic references

Please add correct header