Correct heuristics header files and calls to heuristics functions