Fix for circular include that prevented from building the project