Circular dependencies

[remojansen]

Description

Fixes incorrect circular dependencies errors

Related Issue

#677
#543

Motivation and Context

#677
#543

How Has This Been Tested?

CI

Types of changes

• Updated docs / Refactor code / Added a tests case (non-breaking change)
• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.

[remojansen]

Blocked by nodejs/node#17684