Solve circular dependency to fix build error in file management #16524

few days ago this pr was merged. we have realised that this pr is creating a circular dependency and throws a error while building.