g++ fixes
Added forward declarations
Fix forward declaration