Fix circular requires.