Changes to make includes resolution more precise while keeping current soundness