All of these import changes seem suspect to me. Within the framework, aren't headers going to be relative to itself?