[LWFKit] Fix circular dependency issues