Fix forward declarations