Merge "Fix valgrind includes"