Fix #6603: various changes to avoid cyclic references in separate compilation #6842
+393
−262
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.