Add explicit #includes of Function.h to make up for the removed #include