fix: support basic dual includes (#2804)

5 files changed