Revert "No circular includes allowed"

This reverts commit 73c0a46d Circular dependencies are working, I shouldn't delete this many working code