Fixed reference range and include search
Improved include resolver + inspection