[Typhoon] Fix circular dependency issues