Solve cyclic references

It was adde by mistake at some point. We don't include headers in the auto generated proxy classes.