Forward declararion fixes