Clean forward declaration

Authored by mlaurent on Sep 13 2017, 5:09 AM.