Trying to fix forward declarations.