fix forward declations