Fix circular include dependency