should fix some circular imports

fixes #2994