Fix class/struct forward declaration inconsistencies (good on ya, MSVC)