Forward declarations are perfectly fine, you don’t have change anything here.
Previously most of the engine classes included huge headers like Engine.h (the bigger one, there are 2 of them…) which includes insane amount of headers, but given class utilized only like 1 or 2 headers. It was slowing down compilation of the entire engine.
And right now engine classes include only headers they actually use. You’re already doing that 