Changes to properly handle includes resolution for constants that could be overridden by imports from dynamic includes