Clean forward declaration

Authored by mlaurent on Feb 12 2020, 7:58 AM.