Clean forward declaration

Authored by mlaurent on Aug 17 2019, 10:42 AM.