fix forward declarations