Remove some circular references
Merge pull request #859 from romainneutron/circular

[3.9] Remove some circular references