fix import error and initial support for include hierarchy command scope