Remove no-longer-necessary forward declarations