[TAKKit] Fix circular dependency issues