Bilal Elmoussaoui authored Oct 20, 2024 and Marge Bot committed Nov 11, 2024

Avoids re-defining the types and cyclic dependencies between headers.

Part-of: <!4100>