fix the includes of funm and logm, which were not fixed correctly despite clear instructions of what needed to be done