Correct mismatched forward declarations
Fixes to compile with clang++