Remove forward declarations of function objects