Oops, committed before finishing the removal of "#include "memory.h""