Add a couple of missing #include <functional>, required by MSVC++2012