fix Issue 11039 - Undefined instantiation from circular imports
Merge pull request #2556 from WalterBright/fix11039

fix Issue 11039 - Undefined instantiation from circular imports